From gerrit-no-reply at lists.osmocom.org Wed Jul 1 07:50:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 07:50:08 +0000 Subject: Change in gapk[master]: don't assert just because a broken RTP packet (wrong lenth) is received In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/gapk/+/18930 to look at the new patch set (#2). Change subject: don't assert just because a broken RTP packet (wrong lenth) is received ...................................................................... don't assert just because a broken RTP packet (wrong lenth) is received Change-Id: I373308ed40614d29d9b578ddc056f27e20e4aa21 --- M src/fmt_rtp_efr.c M src/fmt_rtp_hr_etsi.c M src/fmt_rtp_hr_ietf.c 3 files changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gapk refs/changes/30/18930/2 -- To view, visit https://gerrit.osmocom.org/c/gapk/+/18930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I373308ed40614d29d9b578ddc056f27e20e4aa21 Gerrit-Change-Number: 18930 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 07:50:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 07:50:20 +0000 Subject: Change in gapk[master]: don't assert just because a broken RTP packet (wrong lenth) is received In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/gapk/+/18930 ) Change subject: don't assert just because a broken RTP packet (wrong lenth) is received ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/gapk/+/18930/1/src/fmt_rtp_efr.c File src/fmt_rtp_efr.c: https://gerrit.osmocom.org/c/gapk/+/18930/1/src/fmt_rtp_efr.c at 56 PS1, Line 56: EFR_CANON_LEN > Shouldn't it be EFR_LEN? Done -- To view, visit https://gerrit.osmocom.org/c/gapk/+/18930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I373308ed40614d29d9b578ddc056f27e20e4aa21 Gerrit-Change-Number: 18930 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-CC: tnt Gerrit-Comment-Date: Wed, 01 Jul 2020 07:50:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 07:52:45 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Wed, 1 Jul 2020 07:52:45 +0000 Subject: Change in gapk[master]: don't assert just because a broken RTP packet (wrong lenth) is received In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/gapk/+/18930 ) Change subject: don't assert just because a broken RTP packet (wrong lenth) is received ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/gapk/+/18930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I373308ed40614d29d9b578ddc056f27e20e4aa21 Gerrit-Change-Number: 18930 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 01 Jul 2020 07:52:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 07:57:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 07:57:35 +0000 Subject: Change in libosmo-abis[master]: move flip_buf_bits() from DAHDI to a shared flip.c In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/19070 to look at the new patch set (#2). Change subject: move flip_buf_bits() from DAHDI to a shared flip.c ...................................................................... move flip_buf_bits() from DAHDI to a shared flip.c This way other drivers such as e1d can re-use it. Change-Id: I8c6dc3eea921a73ebe65540aad0f0c0584d47e5a --- M src/Makefile.am A src/flip.c A src/flip.h M src/input/dahdi.c M src/input/e1d.c 5 files changed, 38 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/70/19070/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I8c6dc3eea921a73ebe65540aad0f0c0584d47e5a Gerrit-Change-Number: 19070 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 07:57:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 07:57:35 +0000 Subject: Change in libosmo-abis[master]: fix compilation with --enable-e1d In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/19069 to look at the new patch set (#3). Change subject: fix compilation with --enable-e1d ...................................................................... fix compilation with --enable-e1d In Commit Ib81a749ae24013b17caaf5fd64ccd9acbbc3ce08 we introduced a syntax error leading to compile failure sfor --enable-e1d ever since. This hsan't been discovered as osmo-e1d support is not built automatically anywhere. Change-Id: If1f4bd9469a614470045716df4c35187ff2cc76b --- M src/input/e1d.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/69/19069/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If1f4bd9469a614470045716df4c35187ff2cc76b Gerrit-Change-Number: 19069 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 07:57:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 07:57:38 +0000 Subject: Change in libosmo-abis[master]: input/e1d: Add missing "RAW" timeslot support References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19083 ) Change subject: input/e1d: Add missing "RAW" timeslot support ...................................................................... input/e1d: Add missing "RAW" timeslot support Change-Id: Ia4ef5fd40ce15f824a3cbfec533dde2169464c3b --- M src/input/e1d.c 1 file changed, 74 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/83/19083/1 diff --git a/src/input/e1d.c b/src/input/e1d.c index 6b2e23c..4e3cb9d 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -190,6 +190,74 @@ return ret; } +/* write to a raw channel TS */ +static int handle_ts_raw_write(struct osmo_fd *bfd) +{ + struct e1inp_line *line = bfd->data; + unsigned int ts_nr = bfd->priv_nr; + struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; + struct msgb *msg; + int ret; + + /* get the next msg for this timeslot */ + msg = e1inp_tx_ts(e1i_ts, NULL); + if (!msg) + return 0; + + if (msg->len != D_BCHAN_TX_GRAN) { + /* This might lead to a transmit underrun, as we call tx + * from the rx path, as there's no select/poll on dahdi + * */ + LOGPITS(e1i_ts, DLINP, LOGL_NOTICE, "unexpected msg->len = %u, " + "expected %u\n", msg->len, D_BCHAN_TX_GRAN); + } + + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "RAW CHAN TX: %s\n", osmo_hexdump(msg->data, msg->len)); + + if (0/*invertbits*/) { + flip_buf_bits(msg->data, msg->len); + } + + ret = write(bfd->fd, msg->data, msg->len); + if (ret < msg->len) + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "send returns %d instead of %d\n", ret, msg->len); + msgb_free(msg); + + return ret; +} + +static int handle_ts_raw_read(struct osmo_fd *bfd) +{ + struct e1inp_line *line = bfd->data; + unsigned int ts_nr = bfd->priv_nr; + struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; + struct msgb *msg = msgb_alloc(D_TSX_ALLOC_SIZE, "E1D Raw TS"); + int ret; + + if (!msg) + return -ENOMEM; + + ret = read(bfd->fd, msg->data, D_TSX_ALLOC_SIZE); + if (ret < 0 || ret != D_TSX_ALLOC_SIZE) { + LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "read error %d %s\n", ret, strerror(errno)); + return ret; + } + + if (0/*invertbits*/) { + flip_buf_bits(msg->data, ret); + } + + msgb_put(msg, ret); + + msg->l2h = msg->data; + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "RAW CHAN RX: %s\n", osmo_hexdump(msgb_l2(msg), ret)); + ret = e1inp_rx_ts(e1i_ts, msg, 0, 0); + /* physical layer indicates that data has been sent, + * we thus can send some more data */ + ret = handle_ts_raw_write(bfd); + + return ret; +} static void e1d_write_msg(struct msgb *msg, void *cbdata) @@ -228,6 +296,12 @@ if (what & BSC_FD_WRITE) ret = handle_ts_trau_write(bfd); break; + case E1INP_TS_TYPE_RAW: + if (what & BSC_FD_READ) + ret = handle_ts_raw_read(bfd); + if (what & BSC_FD_WRITE) + ret = handle_ts_raw_write(bfd); + break; default: LOGPITS(e1i_ts, DLINP, LOGL_NOTICE, "unknown/unsupported E1 TS type %u\n", e1i_ts->type); break; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ia4ef5fd40ce15f824a3cbfec533dde2169464c3b Gerrit-Change-Number: 19083 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 07:57:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 07:57:57 +0000 Subject: Change in libosmo-abis[master]: fix compilation with --enable-e1d In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19069 ) Change subject: fix compilation with --enable-e1d ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If1f4bd9469a614470045716df4c35187ff2cc76b Gerrit-Change-Number: 19069 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 01 Jul 2020 07:57:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 07:58:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 07:58:31 +0000 Subject: Change in libosmo-abis[master]: fix compilation with --enable-e1d In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19069 ) Change subject: fix compilation with --enable-e1d ...................................................................... fix compilation with --enable-e1d In Commit Ib81a749ae24013b17caaf5fd64ccd9acbbc3ce08 we introduced a syntax error leading to compile failure sfor --enable-e1d ever since. This hsan't been discovered as osmo-e1d support is not built automatically anywhere. Change-Id: If1f4bd9469a614470045716df4c35187ff2cc76b --- M src/input/e1d.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/input/e1d.c b/src/input/e1d.c index f7a0b18..4fc0749 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -256,7 +256,7 @@ if (!e1i_ts->lapd) { char name[32]; - e1inp_ts_name(name, e1i_ts); + e1inp_ts_name(name, sizeof(name), e1i_ts); e1i_ts->lapd = lapd_instance_alloc2(1, e1d_write_msg, bfd, e1inp_dlsap_up, e1i_ts, &lapd_profile_abis, name); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If1f4bd9469a614470045716df4c35187ff2cc76b Gerrit-Change-Number: 19069 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 07:59:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 07:59:00 +0000 Subject: Change in osmo-e1d[master]: add example configurations In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19078 ) Change subject: add example configurations ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I25c28f7a1eeb4deaebba3b2fd593cbbdceb1fa07 Gerrit-Change-Number: 19078 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 01 Jul 2020 07:59:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 07:59:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 07:59:17 +0000 Subject: Change in osmo-e1d[master]: add git-version-gen to EXTRA_DIST In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19079 ) Change subject: add git-version-gen to EXTRA_DIST ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I874e7c323e0700c3282cb992dfaf1853bdc3a8c8 Gerrit-Change-Number: 19079 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 01 Jul 2020 07:59:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:05:07 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Wed, 1 Jul 2020 08:05:07 +0000 Subject: Change in osmo-e1d[master]: add example configurations In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19078 ) Change subject: add example configurations ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I25c28f7a1eeb4deaebba3b2fd593cbbdceb1fa07 Gerrit-Change-Number: 19078 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 01 Jul 2020 08:05:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:05:15 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Wed, 1 Jul 2020 08:05:15 +0000 Subject: Change in osmo-e1d[master]: add git-version-gen to EXTRA_DIST In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19079 ) Change subject: add git-version-gen to EXTRA_DIST ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I874e7c323e0700c3282cb992dfaf1853bdc3a8c8 Gerrit-Change-Number: 19079 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 01 Jul 2020 08:05:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:06:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 08:06:47 +0000 Subject: Change in osmo-e1d[master]: debian packaging In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/19080 to look at the new patch set (#3). Change subject: debian packaging ...................................................................... debian packaging Change-Id: Idac376e92f95ab8beef506e9617227f1c7277838 --- M .gitignore M Makefile.am A debian/changelog A debian/compat A debian/control A debian/copyright A debian/libosmo-e1d-dev.install A debian/libosmo-e1d.install A debian/osmo-e1d.install A debian/rules A debian/source/format 11 files changed, 161 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/80/19080/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Idac376e92f95ab8beef506e9617227f1c7277838 Gerrit-Change-Number: 19080 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:06:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 08:06:48 +0000 Subject: Change in osmo-e1d[master]: proto*.[ch]: Don'r refer to GPL if license is LGPL References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19084 ) Change subject: proto*.[ch]: Don'r refer to GPL if license is LGPL ...................................................................... proto*.[ch]: Don'r refer to GPL if license is LGPL while at it, also change from physical address to URL. Change-Id: I60a25f802a7b4535f7d47bb04b9f36194ea4e290 --- M include/osmocom/e1d/proto.h M include/osmocom/e1d/proto_clnt.h M include/osmocom/e1d/proto_srv.h M src/proto.c M src/proto_clnt.c M src/proto_srv.c 6 files changed, 12 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/84/19084/1 diff --git a/include/osmocom/e1d/proto.h b/include/osmocom/e1d/proto.h index ef95d0c..56064b8 100644 --- a/include/osmocom/e1d/proto.h +++ b/include/osmocom/e1d/proto.h @@ -17,9 +17,8 @@ * 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see . */ #pragma once diff --git a/include/osmocom/e1d/proto_clnt.h b/include/osmocom/e1d/proto_clnt.h index 9288af9..0914de7 100644 --- a/include/osmocom/e1d/proto_clnt.h +++ b/include/osmocom/e1d/proto_clnt.h @@ -17,9 +17,8 @@ * 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see . */ #pragma once diff --git a/include/osmocom/e1d/proto_srv.h b/include/osmocom/e1d/proto_srv.h index c5faec8..e794725 100644 --- a/include/osmocom/e1d/proto_srv.h +++ b/include/osmocom/e1d/proto_srv.h @@ -17,9 +17,8 @@ * 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see . */ #pragma once diff --git a/src/proto.c b/src/proto.c index 6a32bb7..85f5115 100644 --- a/src/proto.c +++ b/src/proto.c @@ -17,9 +17,8 @@ * 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see . */ #include diff --git a/src/proto_clnt.c b/src/proto_clnt.c index f378f5b..7c6df27 100644 --- a/src/proto_clnt.c +++ b/src/proto_clnt.c @@ -17,9 +17,8 @@ * 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see . */ #include diff --git a/src/proto_srv.c b/src/proto_srv.c index c74e043..6ec7397 100644 --- a/src/proto_srv.c +++ b/src/proto_srv.c @@ -17,9 +17,8 @@ * 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see . */ #include -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I60a25f802a7b4535f7d47bb04b9f36194ea4e290 Gerrit-Change-Number: 19084 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:07:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 08:07:03 +0000 Subject: Change in osmo-e1d[master]: proto*.[ch]: Don't refer to GPL if license is LGPL In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-e1d/+/19084 ) Change subject: proto*.[ch]: Don't refer to GPL if license is LGPL ...................................................................... proto*.[ch]: Don't refer to GPL if license is LGPL while at it, also change from physical address to URL. Change-Id: I60a25f802a7b4535f7d47bb04b9f36194ea4e290 --- M include/osmocom/e1d/proto.h M include/osmocom/e1d/proto_clnt.h M include/osmocom/e1d/proto_srv.h M src/proto.c M src/proto_clnt.c M src/proto_srv.c 6 files changed, 12 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/84/19084/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I60a25f802a7b4535f7d47bb04b9f36194ea4e290 Gerrit-Change-Number: 19084 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:07:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 08:07:36 +0000 Subject: Change in osmo-e1d[master]: proto*.[ch]: Don't refer to GPL if license is LGPL In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19084 ) Change subject: proto*.[ch]: Don't refer to GPL if license is LGPL ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I60a25f802a7b4535f7d47bb04b9f36194ea4e290 Gerrit-Change-Number: 19084 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-CC: tnt Gerrit-Comment-Date: Wed, 01 Jul 2020 08:07:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:08:20 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Wed, 1 Jul 2020 08:08:20 +0000 Subject: Change in osmo-e1d[master]: debian packaging In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19080 ) Change subject: debian packaging ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Idac376e92f95ab8beef506e9617227f1c7277838 Gerrit-Change-Number: 19080 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 01 Jul 2020 08:08:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:08:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 08:08:32 +0000 Subject: Change in osmo-e1d[master]: add example configurations In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19078 ) Change subject: add example configurations ...................................................................... add example configurations Change-Id: I25c28f7a1eeb4deaebba3b2fd593cbbdceb1fa07 --- M Makefile.am M configure.ac A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/osmo-e1d-vpair.cfg A doc/examples/osmo-e1d.cfg 6 files changed, 41 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved tnt: Looks good to me, but someone else must approve diff --git a/Makefile.am b/Makefile.am index 9862cd8..029b599 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,14 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 SUBDIRS = \ + doc \ src \ include \ $(NULL) EXTRA_DIST = \ .version \ + doc \ $(NULL) pkgconfigdir = $(libdir)/pkgconfig diff --git a/configure.ac b/configure.ac index 5be845b..0320b6f 100644 --- a/configure.ac +++ b/configure.ac @@ -74,6 +74,8 @@ AC_OUTPUT( Makefile + doc/Makefile + doc/examples/Makefile src/Makefile include/Makefile libosmo-e1d.pc diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..8acb8f8 --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + examples \ + $(NULL) diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am new file mode 100644 index 0000000..9fd345c --- /dev/null +++ b/doc/examples/Makefile.am @@ -0,0 +1,32 @@ +OSMOCONF_FILES = \ + osmo-e1d.cfg \ + osmo-e1d-vpair.cfg \ + $(NULL) + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = $(OSMOCONF_FILES) + +EXTRA_DIST = $(OSMOCONF_FILES) + +CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' + +dist-hook: + for f in $$($(CFG_FILES)); do \ + j="$(distdir)/$$f" && \ + mkdir -p "$$(dirname $$j)" && \ + $(INSTALL_DATA) $(srcdir)/$$f $$j; \ + done + +install-data-hook: + for f in $$($(CFG_FILES)); do \ + j="$(DESTDIR)$(docdir)/examples/$$f" && \ + mkdir -p "$$(dirname $$j)" && \ + $(INSTALL_DATA) $(srcdir)/$$f $$j; \ + done + +uninstall-hook: + @$(PRE_UNINSTALL) + for f in $$($(CFG_FILES)); do \ + j="$(DESTDIR)$(docdir)/examples/$$f" && \ + $(RM) $$j; \ + done diff --git a/doc/examples/osmo-e1d-vpair.cfg b/doc/examples/osmo-e1d-vpair.cfg new file mode 100644 index 0000000..32742de --- /dev/null +++ b/doc/examples/osmo-e1d-vpair.cfg @@ -0,0 +1,2 @@ + +virtual-e1-pair 1 diff --git a/doc/examples/osmo-e1d.cfg b/doc/examples/osmo-e1d.cfg new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/doc/examples/osmo-e1d.cfg -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I25c28f7a1eeb4deaebba3b2fd593cbbdceb1fa07 Gerrit-Change-Number: 19078 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:08:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 08:08:32 +0000 Subject: Change in osmo-e1d[master]: add git-version-gen to EXTRA_DIST In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19079 ) Change subject: add git-version-gen to EXTRA_DIST ...................................................................... add git-version-gen to EXTRA_DIST Change-Id: I874e7c323e0700c3282cb992dfaf1853bdc3a8c8 --- M Makefile.am 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved tnt: Looks good to me, but someone else must approve diff --git a/Makefile.am b/Makefile.am index 029b599..cecc020 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,7 @@ EXTRA_DIST = \ .version \ doc \ + git-version-gen \ $(NULL) pkgconfigdir = $(libdir)/pkgconfig -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I874e7c323e0700c3282cb992dfaf1853bdc3a8c8 Gerrit-Change-Number: 19079 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:08:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 08:08:58 +0000 Subject: Change in gapk[master]: don't assert just because a broken RTP packet (wrong lenth) is received In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/gapk/+/18930 ) Change subject: don't assert just because a broken RTP packet (wrong lenth) is received ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gapk/+/18930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I373308ed40614d29d9b578ddc056f27e20e4aa21 Gerrit-Change-Number: 18930 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 01 Jul 2020 08:08:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:09:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 08:09:01 +0000 Subject: Change in gapk[master]: don't assert just because a broken RTP packet (wrong lenth) is received In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/gapk/+/18930 ) Change subject: don't assert just because a broken RTP packet (wrong lenth) is received ...................................................................... don't assert just because a broken RTP packet (wrong lenth) is received Change-Id: I373308ed40614d29d9b578ddc056f27e20e4aa21 --- M src/fmt_rtp_efr.c M src/fmt_rtp_hr_etsi.c M src/fmt_rtp_hr_ietf.c 3 files changed, 15 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/fmt_rtp_efr.c b/src/fmt_rtp_efr.c index accfd4f..7afb1a3 100644 --- a/src/fmt_rtp_efr.c +++ b/src/fmt_rtp_efr.c @@ -52,7 +52,11 @@ { int i; - assert(src_len == EFR_LEN); + /* broken RTP frames may be short; substitute empty frame */ + if (src_len != EFR_LEN) { + memset(dst, 0, EFR_CANON_LEN); + return EFR_CANON_LEN; + } for (i=0; i<(EFR_LEN-1); i++) dst[i] = (src[i] << 4) | (src[i+1] >> 4); diff --git a/src/fmt_rtp_hr_etsi.c b/src/fmt_rtp_hr_etsi.c index 9ed9b22..0b7e392 100644 --- a/src/fmt_rtp_hr_etsi.c +++ b/src/fmt_rtp_hr_etsi.c @@ -42,7 +42,11 @@ rtp_hr_etsi_to_canon(uint8_t *dst, const uint8_t *src, unsigned int src_len) { /* according to TS 101 318 */ - assert(src_len == HR_CANON_LEN); + /* broken RTP frames may be short; substitute empty frame */ + if (src_len != HR_CANON_LEN) { + memset(dst, 0, HR_CANON_LEN); + return HR_CANON_LEN; + } memcpy(dst, src, src_len); return HR_CANON_LEN; diff --git a/src/fmt_rtp_hr_ietf.c b/src/fmt_rtp_hr_ietf.c index 4ee548f..a840d4b 100644 --- a/src/fmt_rtp_hr_ietf.c +++ b/src/fmt_rtp_hr_ietf.c @@ -60,7 +60,11 @@ rtp_hr_ietf_to_canon(uint8_t *dst, const uint8_t *src, unsigned int src_len) { /* according to RFC5993 */ - assert(src_len == HR_LEN); + /* broken RTP frames may be short; substitute empty frame */ + if (src_len != HR_LEN) { + memset(dst, 0, HR_LEN); + return HR_CANON_LEN; + } /* Remove ToC byte */ memcpy(dst, src+1, HR_CANON_LEN); -- To view, visit https://gerrit.osmocom.org/c/gapk/+/18930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gapk Gerrit-Branch: master Gerrit-Change-Id: I373308ed40614d29d9b578ddc056f27e20e4aa21 Gerrit-Change-Number: 18930 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:10:44 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Wed, 1 Jul 2020 08:10:44 +0000 Subject: Change in osmo-e1d[master]: proto*.[ch]: Don't refer to GPL if license is LGPL In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19084 ) Change subject: proto*.[ch]: Don't refer to GPL if license is LGPL ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I60a25f802a7b4535f7d47bb04b9f36194ea4e290 Gerrit-Change-Number: 19084 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 01 Jul 2020 08:10:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:11:27 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Wed, 1 Jul 2020 08:11:27 +0000 Subject: Change in osmo-e1d[master]: add systemd service/unit In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19081 ) Change subject: add systemd service/unit ...................................................................... Patch Set 3: Code-Review+1 I don't have systemd but looks fine to me. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I956cd9e7ff378a6372524175a1c83416be45610b Gerrit-Change-Number: 19081 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 01 Jul 2020 08:11:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:28:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 08:28:52 +0000 Subject: Change in osmo-e1d[master]: add systemd service/unit In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19081 ) Change subject: add systemd service/unit ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I956cd9e7ff378a6372524175a1c83416be45610b Gerrit-Change-Number: 19081 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 01 Jul 2020 08:28:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:28:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 08:28:56 +0000 Subject: Change in osmo-e1d[master]: debian packaging In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19080 ) Change subject: debian packaging ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Idac376e92f95ab8beef506e9617227f1c7277838 Gerrit-Change-Number: 19080 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 01 Jul 2020 08:28:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:29:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 08:29:29 +0000 Subject: Change in osmo-e1d[master]: proto*.[ch]: Don't refer to GPL if license is LGPL In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19084 ) Change subject: proto*.[ch]: Don't refer to GPL if license is LGPL ...................................................................... proto*.[ch]: Don't refer to GPL if license is LGPL while at it, also change from physical address to URL. Change-Id: I60a25f802a7b4535f7d47bb04b9f36194ea4e290 --- M include/osmocom/e1d/proto.h M include/osmocom/e1d/proto_clnt.h M include/osmocom/e1d/proto_srv.h M src/proto.c M src/proto_clnt.c M src/proto_srv.c 6 files changed, 12 insertions(+), 18 deletions(-) Approvals: laforge: Looks good to me, approved tnt: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/e1d/proto.h b/include/osmocom/e1d/proto.h index ef95d0c..56064b8 100644 --- a/include/osmocom/e1d/proto.h +++ b/include/osmocom/e1d/proto.h @@ -17,9 +17,8 @@ * 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see . */ #pragma once diff --git a/include/osmocom/e1d/proto_clnt.h b/include/osmocom/e1d/proto_clnt.h index 9288af9..0914de7 100644 --- a/include/osmocom/e1d/proto_clnt.h +++ b/include/osmocom/e1d/proto_clnt.h @@ -17,9 +17,8 @@ * 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see . */ #pragma once diff --git a/include/osmocom/e1d/proto_srv.h b/include/osmocom/e1d/proto_srv.h index c5faec8..e794725 100644 --- a/include/osmocom/e1d/proto_srv.h +++ b/include/osmocom/e1d/proto_srv.h @@ -17,9 +17,8 @@ * 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see . */ #pragma once diff --git a/src/proto.c b/src/proto.c index 6a32bb7..85f5115 100644 --- a/src/proto.c +++ b/src/proto.c @@ -17,9 +17,8 @@ * 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see . */ #include diff --git a/src/proto_clnt.c b/src/proto_clnt.c index f378f5b..7c6df27 100644 --- a/src/proto_clnt.c +++ b/src/proto_clnt.c @@ -17,9 +17,8 @@ * 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see . */ #include diff --git a/src/proto_srv.c b/src/proto_srv.c index c74e043..6ec7397 100644 --- a/src/proto_srv.c +++ b/src/proto_srv.c @@ -17,9 +17,8 @@ * 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, see . */ #include -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I60a25f802a7b4535f7d47bb04b9f36194ea4e290 Gerrit-Change-Number: 19084 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:29:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 08:29:39 +0000 Subject: Change in osmo-e1d[master]: debian packaging In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19080 ) Change subject: debian packaging ...................................................................... debian packaging Change-Id: Idac376e92f95ab8beef506e9617227f1c7277838 --- M .gitignore M Makefile.am A debian/changelog A debian/compat A debian/control A debian/copyright A debian/libosmo-e1d-dev.install A debian/libosmo-e1d.install A debian/osmo-e1d.install A debian/rules A debian/source/format 11 files changed, 161 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved tnt: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index aef7cd0..3e31435 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,13 @@ .deps .libs +debian/.debhelper +debian/autoreconf.* +debian/libosmo-e1d* +debian/osmo-e1d +debian/*.log +debian/tmp + *.la *.lo *.o diff --git a/Makefile.am b/Makefile.am index cecc020..40dff3f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,7 @@ EXTRA_DIST = \ .version \ + debian \ doc \ git-version-gen \ $(NULL) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..238f98d --- /dev/null +++ b/debian/changelog @@ -0,0 +1,6 @@ +osmo-e1d (0.0.1) unstable; urgency=medium + + [ Harald Welte ] + * initial debian package + + -- Harald Welte Tue, 30 Jun 2020 18:24:51 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..66cef8a --- /dev/null +++ b/debian/control @@ -0,0 +1,43 @@ +Source: osmo-e1d +Section: net +Priority: extra +Maintainer: Harald Welte +Build-Depends: debhelper (>=9), + dh-autoreconf, + autotools-dev, + autoconf, + automake, + libtool, + pkg-config, + python3-minimal, + libosmocore-dev (>= 1.3.0), + libosmo-abis-dev (>= 0.6.0), + osmo-gsm-manuals-dev +Standards-Version: 3.9.8 +Vcs-Git: git://git.osmocom.org/osmo-e1d.git +Vcs-Browser: https://git.osmocom.org/osmo-e1d/ +Homepage: https://projects.osmocom.org/projects/osmo-e1d + +Package: osmo-e1d +Architecture: any +Multi-Arch: foreign +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: osmo-e1d: Osmocom's E1 interface daemon + +Package: libosmo-e1d0 +Section: libs +Architecture: any +Multi-Arch: same +Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends} +Description: Client library for talking to the Osmocom E1 interface daemon osmo-e1d. + +Package: libosmo-e1d-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: ${misc:Depends}, ${shlibs:Depends}, + libosmo-e1d0 (= ${binary:Version}), + libosmocore-dev, + libosmo-abis-dev +Description: Development headers for the osmo-e1d library. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..9602f83 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,36 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: osmo-e1d +Source: git://git.osmocom.org/osmo-e1d + +Files: * +Copyright: 2019 Sylvain Munaut +License: 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 Affero General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Files: src/proto*.c + include/osmocom/e1d/proto*.h +Copyright: 2019 Sylvain Munaut +License: LGPL-3.0+ + This program 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 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 Lesser General Public License + along with this program. If not, see . diff --git a/debian/libosmo-e1d-dev.install b/debian/libosmo-e1d-dev.install new file mode 100644 index 0000000..6179405 --- /dev/null +++ b/debian/libosmo-e1d-dev.install @@ -0,0 +1,5 @@ +usr/include/osmocom/e1d +usr/lib/*/libosmo-e1d*.a +usr/lib/*/libosmo-e1d*.so +usr/lib/*/libosmo-e1d*.la +usr/lib/*/pkgconfig/libosmo-e1d.pc diff --git a/debian/libosmo-e1d.install b/debian/libosmo-e1d.install new file mode 100644 index 0000000..dd98843 --- /dev/null +++ b/debian/libosmo-e1d.install @@ -0,0 +1 @@ +usr/lib/*/libosmo-e1d*.so.* diff --git a/debian/osmo-e1d.install b/debian/osmo-e1d.install new file mode 100644 index 0000000..7aeba92 --- /dev/null +++ b/debian/osmo-e1d.install @@ -0,0 +1,2 @@ +/etc/osmocom/osmo-e1d.cfg +usr/bin/osmo-e1d diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..33be3c8 --- /dev/null +++ b/debian/rules @@ -0,0 +1,58 @@ +#!/usr/bin/make -f +# You must remove unused comment lines for the released package. +# See debhelper(7) (uncomment to enable) +# This is an autogenerated template for debian/rules. +# +# Output every command that modifies files on the build system. +#export DH_VERBOSE = 1 +# +# Copy some variable definitions from pkg-info.mk and vendor.mk +# under /usr/share/dpkg/ to here if they are useful. +# +# See FEATURE AREAS/ENVIRONMENT in dpkg-buildflags(1) +# Apply all hardening options +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all +# Package maintainers to append CFLAGS +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# Package maintainers to append LDFLAGS +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +# +# With debhelper version 9 or newer, the dh command exports +# all buildflags. So there is no need to include the +# /usr/share/dpkg/buildflags.mk file here if compat is 9 or newer. +# +# These are rarely used code. (START) +# +# The following include for *.mk magically sets miscellaneous +# variables while honoring existing values of pertinent +# environment variables: +# +# Architecture-related variables such as DEB_TARGET_MULTIARCH: +#include /usr/share/dpkg/architecture.mk +# Vendor-related variables such as DEB_VENDOR: +#include /usr/share/dpkg/vendor.mk +# Package-related variables such as DEB_DISTRIBUTION +#include /usr/share/dpkg/pkg-info.mk +# +# You may alternatively set them susing a simple script such as: +# DEB_VENDOR ?= $(shell dpkg-vendor --query Vendor) +# +# These are rarely used code. (END) +# + +# main packaging script based on dh7 syntax +%: + dh $@ --with autoreconf + +# debmake generated override targets +CONFIGURE_FLAGS += --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals +override_dh_auto_configure: + dh_auto_configure -- $(CONFIGURE_FLAGS) +# +# Do not install libtool archive, python .pyc .pyo +#override_dh_install: +# dh_install --list-missing -X.la -X.pyc -X.pyo + +# Don't create .pdf.gz files (barely saves space and they can't be opened directly by most pdf readers) +override_dh_compress: + dh_compress -X.pdf diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Idac376e92f95ab8beef506e9617227f1c7277838 Gerrit-Change-Number: 19080 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:29:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 08:29:39 +0000 Subject: Change in osmo-e1d[master]: add systemd service/unit In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19081 ) Change subject: add systemd service/unit ...................................................................... add systemd service/unit Change-Id: I956cd9e7ff378a6372524175a1c83416be45610b --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am A contrib/systemd/osmo-e1d.service M debian/osmo-e1d.install 6 files changed, 43 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved tnt: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/Makefile.am b/Makefile.am index 40dff3f..3f87824 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 SUBDIRS = \ + contrib \ doc \ src \ include \ @@ -16,6 +17,10 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmo-e1d.pc +AM_DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + + @RELMAKE@ BUILT_SOURCES = $(top_srcdir)/.version diff --git a/configure.ac b/configure.ac index 0320b6f..548cc68 100644 --- a/configure.ac +++ b/configure.ac @@ -72,8 +72,26 @@ CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" fi +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_OUTPUT( Makefile + contrib/Makefile + contrib/systemd/Makefile doc/Makefile doc/examples/Makefile src/Makefile diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..54c6c6e --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,6 @@ +EXTRA_DIST = osmo-e1d.service + +if HAVE_SYSTEMD +systemdsystemunit_DATA = \ + osmo-e1d.service +endif diff --git a/contrib/systemd/osmo-e1d.service b/contrib/systemd/osmo-e1d.service new file mode 100644 index 0000000..03ac643 --- /dev/null +++ b/contrib/systemd/osmo-e1d.service @@ -0,0 +1,12 @@ +[Unit] +Description=Osmocom E1 Interface Daemon +Wants=osmo-e1d.service + +[Service] +Type=simple +Restart=always +ExecStart=/usr/bin/osmo-e1d -c /etc/osmocom/osmo-e1d.cfg +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/debian/osmo-e1d.install b/debian/osmo-e1d.install index 7aeba92..80bd25a 100644 --- a/debian/osmo-e1d.install +++ b/debian/osmo-e1d.install @@ -1,2 +1,3 @@ /etc/osmocom/osmo-e1d.cfg +lib/systemd/system/osmo-e1d.service usr/bin/osmo-e1d -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I956cd9e7ff378a6372524175a1c83416be45610b Gerrit-Change-Number: 19081 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:40:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 08:40:44 +0000 Subject: Change in docker-playground[master]: fix bts-test: logging for virtphy lost by typo In-Reply-To: References: Message-ID: laforge has abandoned this change. ( https://gerrit.osmocom.org/c/docker-playground/+/18174 ) Change subject: fix bts-test: logging for virtphy lost by typo ...................................................................... Abandoned superseded by I2c92ca7d8839a5e141a756f0e1ca26f5f27ca143 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/18174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I78c62321eef5603c161597caf30319c5696ac45a Gerrit-Change-Number: 18174 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Assignee: neels Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:52:18 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 1 Jul 2020 08:52:18 +0000 Subject: Change in osmo-gsm-tester[master]: {ms, enb}_srs: add method to read kpi from a test run In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18986 to look at the new patch set (#4). Change subject: {ms,enb}_srs: add method to read kpi from a test run ...................................................................... {ms,enb}_srs: add method to read kpi from a test run this method uses the kpi_analyzer module for analyzing stdout, CSV metrics and the logfile (if present). if the module can't be loaded, no KPI will be added. Change-Id: I28226a375f9ac4e08424c488062ae6a74a19af92 --- M src/osmo_gsm_tester/obj/enb_srs.py M src/osmo_gsm_tester/obj/ms_srs.py A src/osmo_gsm_tester/obj/srslte_common.py 3 files changed, 56 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/86/18986/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I28226a375f9ac4e08424c488062ae6a74a19af92 Gerrit-Change-Number: 18986 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: srs_andre Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:52:19 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 1 Jul 2020 08:52:19 +0000 Subject: Change in osmo-gsm-tester[master]: ms_srs: add min_rolling_average calculation References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19085 ) Change subject: ms_srs: add min_rolling_average calculation ...................................................................... ms_srs: add min_rolling_average calculation useful metric to detect low/zero downlink throughput for longer time periods Change-Id: I77a82a68689bc6c21cb9227dc9e7616d03e2b547 --- M src/osmo_gsm_tester/obj/ms_srs.py 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/85/19085/1 diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py index ebd066d..96623a2 100644 --- a/src/osmo_gsm_tester/obj/ms_srs.py +++ b/src/osmo_gsm_tester/obj/ms_srs.py @@ -400,7 +400,7 @@ class srsUEMetrics(log.Origin): - VALID_OPERATIONS = ['avg', 'sum', 'max_rolling_avg'] + VALID_OPERATIONS = ['avg', 'sum', 'max_rolling_avg', 'min_rolling_avg'] VALID_CRITERION = ['eq','gt','lt'] CRITERION_TO_SYM = { 'eq' : '==', 'gt' : '>', 'lt' : '<' } CRYTERION_TO_SYM_OPPOSITE = { 'eq' : '!=', 'gt' : '<=', 'lt' : '>=' } @@ -458,6 +458,9 @@ elif operation == 'max_rolling_avg': # calculate rolling average over window and take maximum value result = numpy.amax(numpy.convolve(sel_data, numpy.ones((window,))/window, mode='valid')) + elif operation == 'min_rolling_avg': + # calculate rolling average over window and take minimum value + result = numpy.amin(numpy.convolve(sel_data, numpy.ones((window,))/window, mode='valid')) self.dbg(result=result, value=value) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I77a82a68689bc6c21cb9227dc9e7616d03e2b547 Gerrit-Change-Number: 19085 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 1 08:54:04 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 08:54:04 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5efc4f469b06d_20cb2acbf8f725f850024c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 96s] #define HAVE_SYS_TYPES_H 1 [ 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] #define PACKAGE "osmo-e1d" [ 96s] #define VERSION "0.0.1" [ 96s] [ 96s] configure: exit 1 [ 96s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 96s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 96s] make[1]: *** [override_dh_auto_configure] Error 255 [ 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] ### VM INTERACTION START ### [ 99s] [ 93.953467] sysrq: SysRq : Power Off [ 99s] [ 93.959349] reboot: Power down [ 99s] ### VM INTERACTION END ### [ 99s] [ 99s] goat19 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 08:53:56 UTC 2020. [ 99s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 08:55:12 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 08:55:12 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5efc4f8254f29_20cb2acbf8f725f850043a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 146s] #define HAVE_SYS_TYPES_H 1 [ 146s] #define HAVE_SYS_STAT_H 1 [ 146s] #define HAVE_STDLIB_H 1 [ 146s] #define HAVE_STRING_H 1 [ 146s] #define HAVE_MEMORY_H 1 [ 146s] #define HAVE_STRINGS_H 1 [ 146s] #define HAVE_INTTYPES_H 1 [ 146s] #define HAVE_STDINT_H 1 [ 146s] #define HAVE_UNISTD_H 1 [ 146s] #define HAVE_DLFCN_H 1 [ 146s] #define LT_OBJDIR ".libs/" [ 146s] #define PACKAGE "osmo-e1d" [ 146s] #define VERSION "0.0.1" [ 146s] [ 146s] configure: exit 1 [ 146s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 146s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 146s] make[1]: *** [override_dh_auto_configure] Error 2 [ 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 subprocess returned exit status 2 [ 146s] ### VM INTERACTION START ### [ 149s] [ 141.456479] sysrq: SysRq : Power Off [ 149s] [ 141.458058] reboot: Power down [ 149s] ### VM INTERACTION END ### [ 149s] [ 149s] build72 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 08:54:57 UTC 2020. [ 149s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 08:55:12 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 08:55:12 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5efc4f81e2f54_20cb2acbf8f725f85003c1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 151s] #define HAVE_SYS_TYPES_H 1 [ 151s] #define HAVE_SYS_STAT_H 1 [ 151s] #define HAVE_STDLIB_H 1 [ 151s] #define HAVE_STRING_H 1 [ 151s] #define HAVE_MEMORY_H 1 [ 151s] #define HAVE_STRINGS_H 1 [ 151s] #define HAVE_INTTYPES_H 1 [ 151s] #define HAVE_STDINT_H 1 [ 151s] #define HAVE_UNISTD_H 1 [ 151s] #define HAVE_DLFCN_H 1 [ 151s] #define LT_OBJDIR ".libs/" [ 151s] #define PACKAGE "osmo-e1d" [ 151s] #define VERSION "0.0.1" [ 151s] [ 151s] configure: exit 1 [ 151s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 151s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 151s] make[1]: *** [override_dh_auto_configure] Error 2 [ 151s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 151s] debian/rules:45: recipe for target 'build' failed [ 151s] make: *** [build] Error 2 [ 151s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 151s] ### VM INTERACTION START ### [ 154s] [ 145.445663] sysrq: SysRq : Power Off [ 154s] [ 145.446804] reboot: Power down [ 154s] ### VM INTERACTION END ### [ 154s] [ 154s] build77 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 08:54:56 UTC 2020. [ 154s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 08:56:04 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 08:56:04 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5efc4fbe420a9_20cb2acbf8f725f8500573@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_8.0/i586 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 198s] #define HAVE_SYS_TYPES_H 1 [ 198s] #define HAVE_SYS_STAT_H 1 [ 198s] #define HAVE_STDLIB_H 1 [ 198s] #define HAVE_STRING_H 1 [ 198s] #define HAVE_MEMORY_H 1 [ 198s] #define HAVE_STRINGS_H 1 [ 198s] #define HAVE_INTTYPES_H 1 [ 198s] #define HAVE_STDINT_H 1 [ 198s] #define HAVE_UNISTD_H 1 [ 198s] #define HAVE_DLFCN_H 1 [ 198s] #define LT_OBJDIR ".libs/" [ 198s] #define PACKAGE "osmo-e1d" [ 198s] #define VERSION "0.0.1" [ 198s] [ 198s] configure: exit 1 [ 198s] dh_auto_configure: ./configure --build=i586-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 198s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 198s] make[1]: *** [override_dh_auto_configure] Error 255 [ 198s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 198s] debian/rules:45: recipe for target 'build' failed [ 198s] make: *** [build] Error 2 [ 198s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 198s] ### VM INTERACTION START ### [ 199s] Powering off. [ 199s] [ 182.451989] reboot: Power down [ 199s] ### VM INTERACTION END ### [ 199s] [ 199s] cloud102 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 08:55:49 UTC 2020. [ 199s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 08:56:21 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 08:56:21 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5efc4fbf11a89_20cb2acbf8f725f8500635@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 157s] #define HAVE_SYS_TYPES_H 1 [ 157s] #define HAVE_SYS_STAT_H 1 [ 157s] #define HAVE_STDLIB_H 1 [ 157s] #define HAVE_STRING_H 1 [ 157s] #define HAVE_MEMORY_H 1 [ 157s] #define HAVE_STRINGS_H 1 [ 157s] #define HAVE_INTTYPES_H 1 [ 157s] #define HAVE_STDINT_H 1 [ 157s] #define HAVE_UNISTD_H 1 [ 157s] #define HAVE_DLFCN_H 1 [ 157s] #define LT_OBJDIR ".libs/" [ 157s] #define PACKAGE "osmo-e1d" [ 157s] #define VERSION "0.0.1" [ 157s] [ 157s] configure: exit 1 [ 157s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 157s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 157s] make[1]: *** [override_dh_auto_configure] Error 255 [ 157s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 157s] debian/rules:45: recipe for target 'build' failed [ 157s] make: *** [build] Error 2 [ 157s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 157s] ### VM INTERACTION START ### [ 160s] [ 151.766408] sysrq: SysRq : Power Off [ 160s] [ 151.771481] reboot: Power down [ 160s] ### VM INTERACTION END ### [ 160s] [ 160s] lamb07 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 08:56:09 UTC 2020. [ 160s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 08:56:38 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 08:56:38 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5efc4fde62fb_20cb2acbf8f725f8500769@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 182s] #define PACKAGE_URL "" [ 182s] #define STDC_HEADERS 1 [ 182s] #define HAVE_SYS_TYPES_H 1 [ 182s] #define HAVE_SYS_STAT_H 1 [ 182s] #define HAVE_STDLIB_H 1 [ 182s] #define HAVE_STRING_H 1 [ 182s] #define HAVE_MEMORY_H 1 [ 182s] #define HAVE_STRINGS_H 1 [ 182s] #define HAVE_INTTYPES_H 1 [ 182s] #define HAVE_STDINT_H 1 [ 182s] #define HAVE_UNISTD_H 1 [ 182s] #define HAVE_DLFCN_H 1 [ 182s] #define LT_OBJDIR ".libs/" [ 182s] #define PACKAGE "osmo-e1d" [ 182s] #define VERSION "0.0.1" [ 182s] [ 182s] configure: exit 1 [ 182s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 182s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 2 [ 182s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 182s] make: *** [debian/rules:45: build] Error 2 [ 182s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 182s] ### VM INTERACTION START ### [ 185s] [ 175.440659] sysrq: SysRq : Power Off [ 185s] [ 175.445254] reboot: Power down [ 185s] ### VM INTERACTION END ### [ 185s] [ 185s] sheep88 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 08:56:23 UTC 2020. [ 185s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 08:56:55 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 08:56:55 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5efc4fdf503b2_20cb2acbf8f725f8500864@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 268s] #define STDC_HEADERS 1 [ 268s] #define HAVE_SYS_TYPES_H 1 [ 268s] #define HAVE_SYS_STAT_H 1 [ 268s] #define HAVE_STDLIB_H 1 [ 268s] #define HAVE_STRING_H 1 [ 268s] #define HAVE_MEMORY_H 1 [ 268s] #define HAVE_STRINGS_H 1 [ 268s] #define HAVE_INTTYPES_H 1 [ 268s] #define HAVE_STDINT_H 1 [ 268s] #define HAVE_UNISTD_H 1 [ 268s] #define HAVE_DLFCN_H 1 [ 268s] #define LT_OBJDIR ".libs/" [ 268s] #define PACKAGE "osmo-e1d" [ 268s] #define VERSION "0.0.1" [ 268s] [ 268s] configure: exit 1 [ 268s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr[ 256.220500] serial8250: too much work for irq4 [ 268s] --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 268s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 2 [ 268s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 268s] make: *** [debian/rules:45: build] Error 2 [ 268s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 268s] ### VM INTERACTION START ### [ 271s] [ 259.430111] sysrq: SysRq : Power Off [ 271s] [ 259.433909] reboot: Power down [ 271s] ### VM INTERACTION END ### [ 271s] [ 271s] lamb13 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 08:56:53 UTC 2020. [ 271s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:57:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 08:57:31 +0000 Subject: Change in osmo-e1d[master]: debian/control: Add missing dependency to libusb-1.0-0-dev References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19086 ) Change subject: debian/control: Add missing dependency to libusb-1.0-0-dev ...................................................................... debian/control: Add missing dependency to libusb-1.0-0-dev Change-Id: I65c4693ea88a0417574258d4df99c6ec1755ee0d --- M debian/control 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/86/19086/1 diff --git a/debian/control b/debian/control index 66cef8a..522bc60 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,7 @@ python3-minimal, libosmocore-dev (>= 1.3.0), libosmo-abis-dev (>= 0.6.0), + libusb-1.0-0-dev, osmo-gsm-manuals-dev Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-e1d.git -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I65c4693ea88a0417574258d4df99c6ec1755ee0d Gerrit-Change-Number: 19086 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 1 08:57:30 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 08:57:30 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5efc500847a26_20cb2acbf8f725f8500970@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 146s] #define PACKAGE_URL "" [ 146s] #define STDC_HEADERS 1 [ 146s] #define HAVE_SYS_TYPES_H 1 [ 146s] #define HAVE_SYS_STAT_H 1 [ 146s] #define HAVE_STDLIB_H 1 [ 146s] #define HAVE_STRING_H 1 [ 146s] #define HAVE_MEMORY_H 1 [ 146s] #define HAVE_STRINGS_H 1 [ 146s] #define HAVE_INTTYPES_H 1 [ 146s] #define HAVE_STDINT_H 1 [ 146s] #define HAVE_UNISTD_H 1 [ 146s] #define HAVE_DLFCN_H 1 [ 146s] #define LT_OBJDIR ".libs/" [ 146s] #define PACKAGE "osmo-e1d" [ 146s] #define VERSION "0.0.1" [ 146s] [ 146s] configure: exit 1 [ 146s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 146s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 2 [ 146s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 146s] make: *** [debian/rules:45: build] Error 2 [ 146s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 146s] ### VM INTERACTION START ### [ 149s] [ 141.124411] sysrq: SysRq : Power Off [ 149s] [ 141.125624] reboot: Power down [ 149s] ### VM INTERACTION END ### [ 149s] [ 149s] build71 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 08:57:25 UTC 2020. [ 149s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:58:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 08:58:10 +0000 Subject: Change in osmo-e1d[master]: debian/control: Add missing dependency to libusb-1.0-0-dev In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19086 ) Change subject: debian/control: Add missing dependency to libusb-1.0-0-dev ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I65c4693ea88a0417574258d4df99c6ec1755ee0d Gerrit-Change-Number: 19086 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 01 Jul 2020 08:58:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 08:58:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 08:58:13 +0000 Subject: Change in osmo-e1d[master]: debian/control: Add missing dependency to libusb-1.0-0-dev In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19086 ) Change subject: debian/control: Add missing dependency to libusb-1.0-0-dev ...................................................................... debian/control: Add missing dependency to libusb-1.0-0-dev Change-Id: I65c4693ea88a0417574258d4df99c6ec1755ee0d --- M debian/control 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/debian/control b/debian/control index 66cef8a..522bc60 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,7 @@ python3-minimal, libosmocore-dev (>= 1.3.0), libosmo-abis-dev (>= 0.6.0), + libusb-1.0-0-dev, osmo-gsm-manuals-dev Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-e1d.git -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I65c4693ea88a0417574258d4df99c6ec1755ee0d Gerrit-Change-Number: 19086 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 1 08:58:21 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 08:58:21 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5efc50394fdd3_20cb2acbf8f725f85010b1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_9.0/i586 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 190s] #define HAVE_SYS_STAT_H 1 [ 190s] #define HAVE_STDLIB_H 1 [ 190s] #define HAVE_STRING_H 1 [ 190s] #define HAVE_MEMORY_H 1 [ 190s] #define HAVE_STRINGS_H 1 [ 190s] #define HAVE_INTTYPES_H 1 [ 190s] #define HAVE_STDINT_H 1 [ 190s] #define HAVE_UNISTD_H 1 [ 190s] #define HAVE_DLFCN_H 1[ 178.121680] serial8250: too much work for irq4 [ 190s] [ 190s] #define LT_OBJDIR ".libs/" [ 190s] #define PACKAGE "osmo-e1d" [ 190s] #define VERSION "0.0.1" [ 190s] [ 190s] configure: exit 1 [ 190s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 190s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 190s] make[1]: *** [override_dh_auto_configure] Error 2 [ 190s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 190s] debian/rules:45: recipe for target 'build' failed [ 190s] make: *** [build] Error 2 [ 190s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 190s] ### VM INTERACTION START ### [ 193s] [ 181.246280] sysrq: SysRq : Power Off [ 193s] [ 181.251353] reboot: Power down [ 193s] ### VM INTERACTION END ### [ 193s] [ 193s] lamb54 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 08:58:09 UTC 2020. [ 193s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 08:59:12 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 08:59:12 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5efc50736e962_20cb2acbf8f725f85011b1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 351s] #define PACKAGE_URL "" [ 351s] #define STDC_HEADERS 1 [ 351s] #define HAVE_SYS_TYPES_H 1 [ 351s] #define HAVE_SYS_STAT_H 1 [ 351s] #define HAVE_STDLIB_H 1 [ 351s] #define HAVE_STRING_H 1 [ 351s] #define HAVE_MEMORY_H 1 [ 351s] #define HAVE_STRINGS_H 1 [ 351s] #define HAVE_INTTYPES_H 1 [ 351s] #define HAVE_STDINT_H 1 [ 351s] #define HAVE_UNISTD_H 1 [ 351s] #define HAVE_DLFCN_H 1 [ 351s] #define LT_OBJDIR ".libs/" [ 351s] #define PACKAGE "osmo-e1d" [ 351s] #define VERSION "0.0.1" [ 351s] [ 351s] configure: exit 1 [ 351s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 351s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 255 [ 351s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 351s] make: *** [debian/rules:45: build] Error 2 [ 351s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 351s] ### VM INTERACTION START ### [ 354s] [ 332.218676] sysrq: SysRq : Power Off [ 354s] [ 332.241853] reboot: Power down [ 354s] ### VM INTERACTION END ### [ 354s] [ 354s] cloud118 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 08:59:10 UTC 2020. [ 354s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 08:59:30 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 08:59:30 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5efc509243e2c_20cb2acbf8f725f85012dc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/xUbuntu_16.04/x86_64 Package network:osmocom:latest/osmo-e1d failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 123s] #define HAVE_SYS_TYPES_H 1 [ 123s] #define HAVE_SYS_STAT_H 1 [ 123s] #define HAVE_STDLIB_H 1 [ 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 PACKAGE "osmo-e1d" [ 123s] #define VERSION "0.0.1" [ 123s] [ 123s] configure: exit 1 [ 123s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 123s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 123s] make[1]: *** [override_dh_auto_configure] Error 255 [ 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] ### VM INTERACTION START ### [ 126s] [ 118.356368] sysrq: SysRq : Power Off [ 126s] [ 118.359655] reboot: Power down [ 126s] ### VM INTERACTION END ### [ 126s] [ 126s] sheep86 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 08:59:25 UTC 2020. [ 126s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 08:59:30 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 08:59:30 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5efc5092c44cf_20cb2acbf8f725f85013c1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 145s] #define HAVE_SYS_TYPES_H 1 [ 145s] #define HAVE_SYS_STAT_H 1 [ 145s] #define HAVE_STDLIB_H 1 [ 145s] #define HAVE_STRING_H 1 [ 145s] #define HAVE_MEMORY_H 1 [ 145s] #define HAVE_STRINGS_H 1 [ 145s] #define HAVE_INTTYPES_H 1 [ 145s] #define HAVE_STDINT_H 1 [ 145s] #define HAVE_UNISTD_H 1 [ 145s] #define HAVE_DLFCN_H 1 [ 145s] #define LT_OBJDIR ".libs/" [ 145s] #define PACKAGE "osmo-e1d" [ 145s] #define VERSION "0.0.1" [ 145s] [ 145s] configure: exit 1 [ 145s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 145s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 145s] make[1]: *** [override_dh_auto_configure] Error 255 [ 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] ### VM INTERACTION START ### [ 146s] Powering off. [ 146s] [ 137.376683] reboot: Power down [ 146s] ### VM INTERACTION END ### [ 146s] [ 146s] lamb61 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 08:59:14 UTC 2020. [ 146s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:00:21 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:00:21 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5efc50b358cd5_20cb2acbf8f725f8501451@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_8.0/i586 Package network:osmocom:latest/osmo-e1d failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 164s] #define HAVE_SYS_TYPES_H 1 [ 164s] #define HAVE_SYS_STAT_H 1 [ 164s] #define HAVE_STDLIB_H 1 [ 164s] #define HAVE_STRING_H 1 [ 164s] #define HAVE_MEMORY_H 1 [ 164s] #define HAVE_STRINGS_H 1 [ 164s] #define HAVE_INTTYPES_H 1 [ 164s] #define HAVE_STDINT_H 1 [ 164s] #define HAVE_UNISTD_H 1 [ 164s] #define HAVE_DLFCN_H 1 [ 164s] #define LT_OBJDIR ".libs/" [ 164s] #define PACKAGE "osmo-e1d" [ 164s] #define VERSION "0.0.1" [ 164s] [ 164s] configure: exit 1 [ 164s] dh_auto_configure: ./configure --build=i586-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 164s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 164s] make[1]: *** [override_dh_auto_configure] Error 255 [ 164s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 164s] debian/rules:45: recipe for target 'build' failed [ 164s] make: *** [build] Error 2 [ 164s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 164s] ### VM INTERACTION START ### [ 165s] Powering off. [ 165s] [ 154.419113] reboot: Power down [ 165s] ### VM INTERACTION END ### [ 165s] [ 165s] lamb25 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:00:09 UTC 2020. [ 165s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:00:38 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:00:38 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5efc50cd79cbf_20cb2acbf8f725f8501581@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_8.0/x86_64 Package network:osmocom:latest/osmo-e1d failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 160s] #define HAVE_SYS_TYPES_H 1 [ 160s] #define HAVE_SYS_STAT_H 1 [ 160s] #define HAVE_STDLIB_H 1 [ 160s] #define HAVE_STRING_H 1 [ 160s] #define HAVE_MEMORY_H 1 [ 160s] #define HAVE_STRINGS_H 1 [ 160s] #define HAVE_INTTYPES_H 1 [ 160s] #define HAVE_STDINT_H 1 [ 160s] #define HAVE_UNISTD_H 1 [ 160s] #define HAVE_DLFCN_H 1 [ 160s] #define LT_OBJDIR ".libs/" [ 160s] #define PACKAGE "osmo-e1d" [ 160s] #define VERSION "0.0.1" [ 160s] [ 160s] configure: exit 1 [ 160s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 160s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 160s] make[1]: *** [override_dh_auto_configure] Error 255 [ 160s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 160s] debian/rules:45: recipe for target 'build' failed [ 160s] make: *** [build] Error 2 [ 160s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 160s] ### VM INTERACTION START ### [ 161s] Powering off. [ 161s] [ 143.922855] reboot: Power down [ 161s] ### VM INTERACTION END ### [ 161s] [ 161s] cloud120 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:00:33 UTC 2020. [ 161s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:00:38 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:00:38 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5efc50cde0030_20cb2acbf8f725f8501649@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/xUbuntu_16.04/i586 Package network:osmocom:latest/osmo-e1d failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 159s] #define HAVE_SYS_TYPES_H 1 [ 159s] #define HAVE_SYS_STAT_H 1 [ 159s] #define HAVE_STDLIB_H 1 [ 159s] #define HAVE_STRING_H 1 [ 159s] #define HAVE_MEMORY_H 1 [ 159s] #define HAVE_STRINGS_H 1 [ 159s] #define HAVE_INTTYPES_H 1 [ 159s] #define HAVE_STDINT_H 1 [ 159s] #define HAVE_UNISTD_H 1 [ 159s] #define HAVE_DLFCN_H 1 [ 159s] #define LT_OBJDIR ".libs/" [ 159s] #define PACKAGE "osmo-e1d" [ 159s] #define VERSION "0.0.1" [ 159s] [ 159s] configure: exit 1 [ 159s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 159s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 159s] make[1]: *** [override_dh_auto_configure] Error 255 [ 159s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 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] ### VM INTERACTION START ### [ 162s] [ 152.204366] sysrq: SysRq : Power Off [ 162s] [ 152.209396] reboot: Power down [ 162s] ### VM INTERACTION END ### [ 162s] [ 162s] lamb61 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:00:37 UTC 2020. [ 162s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:00:55 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:00:55 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_10/i586 In-Reply-To: References: Message-ID: <5efc50ceb5291_20cb2acbf8f725f8501746@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_10/i586 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 369s] #define PACKAGE_URL "" [ 369s] #define STDC_HEADERS 1 [ 369s] #define HAVE_SYS_TYPES_H 1 [ 369s] #define HAVE_SYS_STAT_H 1 [ 369s] #define HAVE_STDLIB_H 1 [ 369s] #define HAVE_STRING_H 1 [ 369s] #define HAVE_MEMORY_H 1 [ 369s] #define HAVE_STRINGS_H 1 [ 369s] #define HAVE_INTTYPES_H 1 [ 369s] #define HAVE_STDINT_H 1 [ 369s] #define HAVE_UNISTD_H 1 [ 369s] #define HAVE_DLFCN_H 1 [ 369s] #define LT_OBJDIR ".libs/" [ 369s] #define PACKAGE "osmo-e1d" [ 369s] #define VERSION "0.0.1" [ 369s] [ 369s] configure: exit 1 [ 369s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 369s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 2 [ 369s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 369s] make: *** [debian/rules:45: build] Error 2 [ 369s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 369s] ### VM INTERACTION START ### [ 373s] [ 359.739882] sysrq: SysRq : Power Off [ 373s] [ 359.744982] reboot: Power down [ 373s] ### VM INTERACTION END ### [ 373s] [ 373s] lamb59 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:00:38 UTC 2020. [ 373s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:01:12 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:01:12 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5efc50ed40f58_20cb2acbf8f725f8501840@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/xUbuntu_18.10/x86_64 Package network:osmocom:latest/osmo-e1d failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 239s] #define STDC_HEADERS 1 [ 239s] #define HAVE_SYS_TYPES_H 1 [ 239s] #define HAVE_SYS_STAT_H 1 [ 239s] #define HAVE_STDLIB_[ 228.044195] serial8250: too much work for irq4 [ 239s] H 1 [ 239s] #define HAVE_STRING_H 1 [ 239s] #define HAVE_MEMORY_H 1 [ 239s] #define HAVE_STRINGS_H 1 [ 239s] #define HAVE_INTTYPES_H 1 [ 239s] #define HAVE_STDINT_H 1 [ 239s] #define HAVE_UNISTD_H 1 [ 239s] #define HAVE_DLFCN_H 1 [ 239s] #define LT_OBJDIR ".libs/" [ 239s] #define PACKAGE "osmo-e1d" [ 239s] #define VERSION "0.0.1" [ 239s] [ 239s] configure: exit 1 [ 239s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 239s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 2 [ 239s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 239s] make: *** [debian/rules:45: build] Error 2 [ 239s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 239s] ### VM INTERACTION START ### [ 242s] [ 231.184734] sysrq: SysRq : Power Off [ 242s] [ 231.190965] reboot: Power down [ 242s] ### VM INTERACTION END ### [ 242s] [ 242s] lamb52 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:01:11 UTC 2020. [ 242s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:01:30 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:01:30 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5efc50ee2ba44_20cb2acbf8f725f8501950@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_9.0/x86_64 Package network:osmocom:latest/osmo-e1d failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 202s] #define HAVE_SYS_TYPES_H 1 [ 202s] #define HAVE_SYS_STAT_H 1 [ 202s] #define HAVE_STDLIB_H 1 [ 202s] #define HAVE_STRING_H 1 [ 202s] #define HAVE_MEMORY_H 1 [ 202s] #define HAVE_STRINGS_H 1 [ 202s] #define HAVE_INTTYPES_H 1 [ 202s] #define HAVE_STDINT_H 1 [ 202s] #define HAVE_UNISTD_H 1 [ 202s] #define HAVE_DLFCN_H 1 [ 202s] #define LT_OBJDIR ".libs/" [ 202s] #define PACKAGE "osmo-e1d" [ 202s] #define VERSION "0.0.1" [ 202s] [ 202s] configure: exit 1 [ 202s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 202s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 202s] make[1]: *** [override_dh_auto_configure] Error 2 [ 202s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 202s] debian/rules:45: recipe for target 'build' failed [ 202s] make: *** [build] Error 2 [ 202s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 202s] ### VM INTERACTION START ### [ 205s] [ 192.564931] sysrq: SysRq : Power Off [ 205s] [ 192.574882] reboot: Power down [ 205s] ### VM INTERACTION END ### [ 205s] [ 205s] lamb62 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:01:16 UTC 2020. [ 205s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:01:30 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:01:30 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5efc50eea7323_20cb2acbf8f725f8502085@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_9.0/i586 Package network:osmocom:latest/osmo-e1d failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 243s] #define HAVE_SYS_STAT_H 1 [ 243s] #define HAVE_STDLIB_H 1 [ 243s] #define HAVE_STRING_H 1 [ 243s] #define HAVE_MEMORY_H 1 [ 243s] #define HAVE_STRINGS_H 1 [ 243s] #define HAVE_INTTYPES_H 1 [ 243s] #define HAVE_STDINT_H 1 [ 243s] #define HAVE_UNISTD_H 1 [ 243s] #define HAVE_DLFCN_H[ 202.055116] serial8250: too much work for irq4 [ 243s] 1 [ 243s] #define LT_OBJDIR ".libs/" [ 243s] #define PACKAGE "osmo-e1d" [ 243s] #define VERSION "0.0.1" [ 243s] [ 243s] configure: exit 1 [ 243s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 243s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 243s] make[1]: *** [override_dh_auto_configure] Error 2 [ 243s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 243s] debian/rules:45: recipe for target 'build' failed [ 243s] make: *** [build] Error 2 [ 243s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 243s] ### VM INTERACTION START ### [ 246s] [ 205.162275] sysrq: SysRq : Power Off [ 246s] [ 205.165896] reboot: Power down [ 246s] ### VM INTERACTION END ### [ 246s] [ 246s] cloud124 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:01:25 UTC 2020. [ 246s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:01:47 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:01:47 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5efc510a7dd40_20cb2acbf8f725f8502171@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/xUbuntu_19.10/x86_64 Package network:osmocom:latest/osmo-e1d failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 275s] #define PACKAGE_URL "" [ 275s] #define STDC_HEADERS 1 [ 275s] #define HAVE_SYS_TYPES_H 1 [ 275s] #define HAVE_SYS_STAT_H 1 [ 275s] #define HAVE_STDLIB_H 1 [ 275s] #define HAVE_STRING_H 1 [ 275s] #define HAVE_MEMORY_H 1 [ 275s] #define HAVE_STRINGS_H 1 [ 275s] #define HAVE_INTTYPES_H 1 [ 275s] #define HAVE_STDINT_H 1 [ 275s] #define HAVE_UNISTD_H 1 [ 275s] #define HAVE_DLFCN_H 1 [ 275s] #define LT_OBJDIR ".libs/" [ 275s] #define PACKAGE "osmo-e1d" [ 275s] #define VERSION "0.0.1" [ 275s] [ 275s] configure: exit 1 [ 275s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 275s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 255 [ 275s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 275s] make: *** [debian/rules:45: build] Error 2 [ 275s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 276s] ### VM INTERACTION START ### [ 279s] [ 267.024283] sysrq: SysRq : Power Off [ 279s] [ 267.030321] reboot: Power down [ 279s] ### VM INTERACTION END ### [ 279s] [ 279s] lamb61 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:01:37 UTC 2020. [ 279s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:01:47 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:01:47 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in xUbuntu_19.04/i586 In-Reply-To: References: Message-ID: <5efc510b23dcf_20cb2acbf8f725f85022df@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/xUbuntu_19.04/i586 Package network:osmocom:latest/osmo-e1d failed to build in xUbuntu_19.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 263s] #define STDC_HEADERS 1 [ 263s] #define HAVE_SYS_TYPES_H 1 [ 263s] #define HAVE_SYS_STAT_H 1 [ 263s] #define HAVE_STDLIB_H 1 [ 263s] #define HAVE_STRING_H 1 [ 263s] #define HAVE_MEMORY_H 1 [ 263s] #define HAVE_STRINGS_H 1 [ 263s] #define HAVE_INTTYPES_H 1 [ 263s] #define HAVE_STDINT_H 1 [ 263s] #define HAVE_UNISTD_H 1 [ 263s] #define HAVE_DLFCN_H 1 [ 263s] #define LT_OBJDIR ".libs/" [ 263s] #define PACKAGE "osmo-e1d" [ 263s] #define VERSION "0.0.1" [ 263s] [ 263s] configure: exit 1 [ 263s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\$[ 251.768079] serial8250: too much work for irq4 [ 263s] {prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 263s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 2 [ 263s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 263s] make: *** [debian/rules:45: build] Error 2 [ 263s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 263s] ### VM INTERACTION START ### [ 267s] [ 254.884212] sysrq: SysRq : Power Off [ 267s] [ 254.889713] reboot: Power down [ 267s] ### VM INTERACTION END ### [ 267s] [ 267s] lamb07 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:01:42 UTC 2020. [ 267s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:01:47 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:01:47 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5efc510bdaf49_20cb2acbf8f725f8502343@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 4s] [46/71] preinstalling dash... [ 4s] [47/71] preinstalling grep... [ 4s] [48/71] preinstalling debconf... [ 4s] [49/71] preinstalling init-system-helpers... [ 4s] [50/71] preinstalling libreadline7... [ 4s] [51/71] preinstalling perl... [ 4s] [52/71] preinstalling tzdata... [ 5s] [53/71] preinstalling libpam0g... [ 5s] [54/71] preinstalling gawk... [ 5s] [55/71] preinstalling libpam-modules-bin... [ 5s] [56/71] preinstalling libpam-modules... [ 5s] [57/71] preinstalling libpam-runtime... [ 5s] [58/71] preinstalling passwd... [ 5s] [59/71] preinstalling libuuid1... [ 5s] [60/71] preinstalling user-setup... [ 5s] [61/71] preinstalling login... [ 5s] [62/71] preinstalling base-files... [ 5s] [63/71] preinstalling libblkid1... [ 5s] [64/71] preinstalling libmount1... [ 5s] [65/71] preinstalling bash... [ 5s] [66/71] preinstalling mount... [ 5s] [67/71] preinstalling util-linux... [ 5s] [68/71] preinstalling sysvinit-utils... [ 5s] [69/71] preinstalling e2fsprogs... [ 6s] [70/71] preinstalling sysv-rc... [ 6s] [71/71] preinstalling initscripts... [ 6s] [ 6s] [1/1] preinstalling libdevmapper1.02.1... [ 6s] copying packages... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:02:04 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:02:04 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5efc512b948a1_20cb2acbf8f725f850265@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/xUbuntu_18.04/i586 Package network:osmocom:latest/osmo-e1d failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 279s] #define HAVE_SYS_STAT_H 1 [ 279s] #define HAVE_STDLIB_H 1 [ 279s] #define HAVE_STRING_H 1 [ 279s] #define HAVE_MEMORY_H 1 [ 279s] #define HAVE_STRINGS_H 1 [ 279s] #define HAVE_INTTYPES_H 1 [ 279s] #define HAVE_STDINT_H 1 [ 279s] #define HAVE_UNISTD_H 1 [ 279s] #define HAVE_DLFCN_H 1 [ 279s] #define LT_OBJDIR ".libs/" [ 279s] #define PACKAGE "osmo-e1d" [ 279s] #define VERSION "0.0.1" [ 279s] [ 279s] configure: exit 1 [ 279s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix[ 263.876932] serial8250: too much work for irq4 [ 279s] =/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 279s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 279s] make[1]: *** [override_dh_auto_configure] Error 2 [ 279s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 279s] debian/rules:45: recipe for target 'build' failed [ 279s] make: *** [build] Error 2 [ 279s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 279s] ### VM INTERACTION START ### [ 282s] [ 266.998168] sysrq: SysRq : Power Off [ 282s] [ 267.017951] reboot: Power down [ 282s] ### VM INTERACTION END ### [ 282s] [ 282s] cloud104 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:01:50 UTC 2020. [ 282s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:02:04 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:02:04 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5efc512b366af_20cb2acbf8f725f85025cd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/xUbuntu_19.04/x86_64 Package network:osmocom:latest/osmo-e1d failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 248s] #define PACKAGE_URL "" [ 248s] #define STDC_HEADERS 1 [ 248s] #define HAVE_SYS_TYPES_H 1 [ 248s] #define HAVE_SYS_STAT_H 1 [ 248s] #define HAVE_STDLIB_H 1 [ 248s] #define HAVE_STRING_H 1 [ 248s] #define HAVE_MEMORY_H 1 [ 248s] #define HAVE_STRINGS_H 1 [ 248s] #define HAVE_INTTYPES_H 1 [ 248s] #define HAVE_STDINT_H 1 [ 248s] #define HAVE_UNISTD_H 1 [ 248s] #define HAVE_DLFCN_H 1 [ 248s] #define LT_OBJDIR ".libs/" [ 248s] #define PACKAGE "osmo-e1d" [ 248s] #define VERSION "0.0.1" [ 248s] [ 248s] configure: exit 1 [ 248s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 248s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 2 [ 248s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 248s] make: *** [debian/rules:45: build] Error 2 [ 248s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 248s] ### VM INTERACTION START ### [ 252s] [ 239.741028] sysrq: SysRq : Power Off [ 252s] [ 239.746892] reboot: Power down [ 252s] ### VM INTERACTION END ### [ 252s] [ 252s] lamb16 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:02:02 UTC 2020. [ 252s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:02:21 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:02:21 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5efc512d54175_20cb2acbf8f725f850276c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/xUbuntu_18.10/i586 Package network:osmocom:latest/osmo-e1d failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 315s] #define PACKAGE_URL "" [ 315s] #define STDC_HEADERS 1 [ 315s] #define HAVE_SYS_TYPES_H 1 [ 315s] #define HAVE_SYS_STAT_H 1 [ 315s] #define HAVE_STDLIB_H 1 [ 315s] #define HAVE_STRING_H 1 [ 315s] #define HAVE_MEMORY_H 1 [ 315s] #define HAVE_STRINGS_H 1 [ 315s] #define HAVE_INTTYPES_H 1 [ 315s] #define HAVE_STDINT_H 1 [ 315s] #define HAVE_UNISTD_H 1 [ 315s] #define HAVE_DLFCN_H 1 [ 315s] #define LT_OBJDIR ".libs/" [ 315s] #define PACKAGE "osmo-e1d" [ 315s] #define VERSION "0.0.1" [ 315s] [ 315s] configure: exit 1 [ 315s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 315s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 2 [ 315s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 315s] make: *** [debian/rules:45: build] Error 2 [ 315s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 315s] ### VM INTERACTION START ### [ 318s] [ 304.130601] sysrq: SysRq : Power Off [ 318s] [ 304.138730] reboot: Power down [ 318s] ### VM INTERACTION END ### [ 318s] [ 318s] lamb58 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:02:19 UTC 2020. [ 318s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:02:21 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:02:21 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_10/i586 In-Reply-To: References: Message-ID: <5efc512d8f4ca_20cb2acbf8f725f8502821@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_10/i586 Package network:osmocom:latest/osmo-e1d failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 285s] #define STDC_HEADERS 1 [ 285s] #define HAVE_SYS_TYPES_H 1 [ 285s] #define HAVE_SYS_STAT_H 1 [ 285s] #define HAVE_STDLIB_H 1 [ 285s] #define HAVE_STRING_H 1 [ 285s] #define HAVE_MEMORY_H 1 [ 285s] #define HAVE_STRINGS_H 1 [ 285s] #define HAVE_INTTYPES_H 1 [ 285s] #define HAVE_STDINT_H 1 [ 285s] #define HAVE_UNISTD_H 1 [ 285s] #define HAVE_DLFCN_H 1 [ 285s] #define LT_OBJDIR ".libs/" [ 285s] #define PACKAGE "osmo-e1d" [ 285s] #define VERSION "0.0.1" [ 285s] [ 285s] configure: exit 1 [ 285s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/syste[ 271.279121] serial8250: too much work for irq4 [ 285s] m --enable-manuals returned exit code 1 [ 285s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 2 [ 285s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 285s] make: *** [debian/rules:45: build] Error 2 [ 285s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 285s] ### VM INTERACTION START ### [ 288s] [ 274.487581] sysrq: SysRq : Power Off [ 288s] [ 274.491982] reboot: Power down [ 288s] ### VM INTERACTION END ### [ 288s] [ 288s] lamb03 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:02:19 UTC 2020. [ 288s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:02:38 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:02:38 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5efc5147400b8_20cb2acbf8f725f8502987@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/xUbuntu_18.04/x86_64 Package network:osmocom:latest/osmo-e1d failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 306s] #define HAVE_SYS_TYPES_H 1 [ 306s] #define HAVE_SYS_STAT_H 1 [ 306s] #define HAVE_STDLIB_H 1 [ 306s] #define HAVE_STRING_H 1 [ 306s] #define HAVE_MEMORY_H 1 [ 306s] #define HAVE_STRINGS_H 1 [ 306s] #define HAVE_INTTYPES_H 1 [ 306s] #define HAVE_STDINT_H 1 [ 306s] #define HAVE_UNISTD_H 1 [ 306s] #define HAVE_DLFCN_H 1 [ 306s] #define LT_OBJDIR ".libs/" [ 306s] #define PACKAGE "osmo-e1d" [ 306s] #define VERSION "0.0.1" [ 306s] [ 306s] configure: exit 1 [ 306s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 306s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 306s] make[1]: *** [override_dh_auto_configure] Error 2 [ 306s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 306s] debian/rules:45: recipe for target 'build' failed [ 306s] make: *** [build] Error 2 [ 306s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 306s] ### VM INTERACTION START ### [ 310s] [ 296.757113] sysrq: SysRq : Power Off [ 310s] [ 296.777346] reboot: Power down [ 310s] ### VM INTERACTION END ### [ 310s] [ 310s] lamb24 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:02:26 UTC 2020. [ 310s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:02:38 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:02:38 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5efc5147d961d_20cb2acbf8f725f8503078@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_10/x86_64 Package network:osmocom:latest/osmo-e1d failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 276s] #define STDC_HEADERS 1 [ 276s] #define HAVE_SYS_TYPES_H 1 [ 276s] #define HAVE_SYS_STAT_H 1 [ 276s] #define HAVE_STDLIB_H 1 [ 276s] #define HAVE_STRING_H 1 [ 276s] #define HAVE_MEMORY_H 1 [ 276s] #define HAVE_STRINGS_H 1 [ 276s] #define HAVE_INTTYPES_H 1 [ 276s] #define HAVE_STDINT_H 1 [ 276s] #define HAVE_UNISTD_H 1 [ 276s] #define[ 253.293573] serial8250: too much work for irq4 [ 276s] HAVE_DLFCN_H 1 [ 276s] #define LT_OBJDIR ".libs/" [ 276s] #define PACKAGE "osmo-e1d" [ 276s] #define VERSION "0.0.1" [ 276s] [ 276s] configure: exit 1 [ 276s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 276s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 2 [ 276s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 276s] make: *** [debian/rules:45: build] Error 2 [ 276s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 276s] ### VM INTERACTION START ### [ 279s] [ 256.416218] sysrq: SysRq : Power Off [ 279s] [ 256.420944] reboot: Power down [ 279s] ### VM INTERACTION END ### [ 279s] [ 279s] cloud103 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:02:37 UTC 2020. [ 279s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:03:47 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:03:47 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5efc5181acb29_20cb2acbf8f725f85032d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 116s] #define HAVE_SYS_TYPES_H 1 [ 116s] #define HAVE_SYS_STAT_H 1 [ 116s] #define HAVE_STDLIB_H 1 [ 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 PACKAGE "osmo-e1d" [ 116s] #define VERSION "0.0.1.1-cf3b" [ 116s] [ 116s] configure: exit 1 [ 117s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 117s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 117s] make[1]: *** [override_dh_auto_configure] Error 255 [ 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] ### VM INTERACTION START ### [ 120s] [ 113.397808] sysrq: SysRq : Power Off [ 120s] [ 113.399629] reboot: Power down [ 120s] ### VM INTERACTION END ### [ 120s] [ 120s] build73 failed "build osmo-e1d_0.0.1.1.cf3b.dsc" at Wed Jul 1 09:03:31 UTC 2020. [ 120s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:03:47 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:03:47 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5efc518248a5b_20cb2acbf8f725f85033f3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_8.0/i586 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 122s] #define HAVE_SYS_TYPES_H 1 [ 122s] #define HAVE_SYS_STAT_H 1 [ 122s] #define HAVE_STDLIB_H 1 [ 122s] #define HAVE_STRING_H 1 [ 122s] #define HAVE_MEMORY_H 1 [ 122s] #define HAVE_STRINGS_H 1 [ 122s] #define HAVE_INTTYPES_H 1 [ 122s] #define HAVE_STDINT_H 1 [ 122s] #define HAVE_UNISTD_H 1 [ 122s] #define HAVE_DLFCN_H 1 [ 122s] #define LT_OBJDIR ".libs/" [ 122s] #define PACKAGE "osmo-e1d" [ 122s] #define VERSION "0.0.1.1-cf3b" [ 122s] [ 122s] configure: exit 1 [ 122s] dh_auto_configure: ./configure --build=i586-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 122s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 122s] make[1]: *** [override_dh_auto_configure] Error 255 [ 122s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 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] ### VM INTERACTION START ### [ 123s] Powering off. [ 123s] [ 116.550305] reboot: Power down [ 123s] ### VM INTERACTION END ### [ 123s] [ 123s] sheep86 failed "build osmo-e1d_0.0.1.1.cf3b.dsc" at Wed Jul 1 09:03:41 UTC 2020. [ 123s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:04:04 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:04:04 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5efc51a165af3_20cb2acbf8f725f8503486@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-e1d failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 376s] #define STDC_HEADERS 1 [ 376s] #define HAVE_SYS_TYPES_H 1 [ 376s] #define HAVE_S[ 359.260178] serial8250: too much work for irq4 [ 376s] YS_STAT_H 1 [ 376s] #define HAVE_STDLIB_H 1 [ 376s] #define HAVE_STRING_H 1 [ 376s] #define HAVE_MEMORY_H 1 [ 376s] #define HAVE_STRINGS_H 1 [ 376s] #define HAVE_INTTYPES_H 1 [ 376s] #define HAVE_STDINT_H 1 [ 376s] #define HAVE_UNISTD_H 1 [ 376s] #define HAVE_DLFCN_H 1 [ 376s] #define LT_OBJDIR ".libs/" [ 376s] #define PACKAGE "osmo-e1d" [ 376s] #define VERSION "0.0.1" [ 376s] [ 376s] configure: exit 1 [ 376s] dh_auto_configure: error: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 376s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 25 [ 376s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 376s] make: *** [debian/rules:45: build] Error 2 [ 376s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 376s] ### VM INTERACTION START ### [ 377s] Powering off. [ 377s] [ 360.392944] reboot: Power down [ 377s] ### VM INTERACTION END ### [ 377s] [ 377s] lamb60 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:03:48 UTC 2020. [ 377s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:04:38 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:04:38 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5efc51bd69b55_20cb2acbf8f725f85036b0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 145s] #define HAVE_SYS_TYPES_H 1 [ 145s] #define HAVE_SYS_STAT_H 1 [ 145s] #define HAVE_STDLIB_H 1 [ 145s] #define HAVE_STRING_H 1 [ 145s] #define HAVE_MEMORY_H 1 [ 145s] #define HAVE_STRINGS_H 1 [ 145s] #define HAVE_INTTYPES_H 1 [ 145s] #define HAVE_STDINT_H 1 [ 145s] #define HAVE_UNISTD_H 1 [ 145s] #define HAVE_DLFCN_H 1 [ 145s] #define LT_OBJDIR ".libs/" [ 145s] #define PACKAGE "osmo-e1d" [ 145s] #define VERSION "0.0.1.1-cf3b" [ 145s] [ 145s] configure: exit 1 [ 145s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 145s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 145s] make[1]: *** [override_dh_auto_configure] Error 255 [ 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] ### VM INTERACTION START ### [ 146s] Powering off. [ 146s] [ 137.052595] reboot: Power down [ 146s] ### VM INTERACTION END ### [ 146s] [ 146s] lamb54 failed "build osmo-e1d_0.0.1.1.cf3b.dsc" at Wed Jul 1 09:04:22 UTC 2020. [ 146s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:04:38 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:04:38 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5efc51bdc9fca_20cb2acbf8f725f8503787@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-e1d failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 403s] #define STDC_HEADERS 1 [ 403s] #define HAVE_SYS_TYPES_H 1 [ 403s] #define HAVE[ 374.178055] serial8250: too much work for irq4 [ 403s] _SYS_STAT_H 1 [ 403s] #define HAVE_STDLIB_H 1 [ 403s] #define HAVE_STRING_H 1 [ 403s] #define HAVE_MEMORY_H 1 [ 403s] #define HAVE_STRINGS_H 1 [ 403s] #define HAVE_INTTYPES_H 1 [ 403s] #define HAVE_STDINT_H 1 [ 403s] #define HAVE_UNISTD_H 1 [ 403s] #define HAVE_DLFCN_H 1 [ 403s] #define LT_OBJDIR ".libs/" [ 403s] #define PACKAGE "osmo-e1d" [ 403s] #define VERSION "0.0.1" [ 403s] [ 403s] configure: exit 1 [ 403s] dh_auto_configure: error: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 403s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 25 [ 403s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 403s] make: *** [debian/rules:45: build] Error 2 [ 403s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 403s] ### VM INTERACTION START ### [ 404s] Powering off. [ 404s] [ 375.352674] reboot: Power down [ 404s] ### VM INTERACTION END ### [ 404s] [ 404s] cloud114 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:04:25 UTC 2020. [ 404s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:04:55 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:04:55 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5efc51be43d8d_20cb2acbf8f725f8503897@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-e1d failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 460s] configure:6866: checking for stdlib.h [ 460s] configure:6866: 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 [ 460s] configure:6866: $? = 0 [ 460s] configure:6866: result: yes [ 460s] configure:6866: checking for string.h [ 460s] configure:6866: 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 [ 460s] configure:6866: $? = 0 [ 460s] configure:6866: result: yes [ 460s] configure:6866: checking for memory.h [ 460s] configure:6866: 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 [ 460s] configure:6866: $? = 0 [ 460s] configure:6866: result: yes [ 460s] configure:6866: checking for strings.h [ 460s] configure:6866: 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 [ 460s] configure:6866: $? = 0 [ 460s] configure:6866: result: yes [ 460s] configure:6866: checking for inttypes.h [ 460s] configure:6866: 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 [ 460s] configure:6866: $? = 0 [ 460s] configure:6866: result: yes [ 460s] configure:6866: checking for stdint.h [ 460s] configure:6866: 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 [ 460s] configure:6866: $? = 0 [ 462s] config[ 438.607540] sysrq: SysRq : Power Off [ 462s] [ 438.648769] reboot: Power down [ 462s] ### VM INTERACTION END ### [ 462s] [ 462s] obs-arm-3 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:04:48 UTC 2020. [ 462s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:04:55 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:04:55 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5efc51bf1d200_20cb2acbf8f725f850392b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 184s] dh_installchangelogs [ 184s] dh_perl [ 184s] dh_link [ 184s] dh_strip_nondeterminism [ 184s] debian/rules override_dh_compress [ 184s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 184s] dh_compress -X.pdf [ 184s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 184s] dh_fixperms [ 184s] dh_missing [ 184s] dh_strip [ 184s] dh_makeshlibs [ 185s] dh_shlibdeps [ 185s] dpkg-shlibdeps: error: cannot find library libosmo-e1d.so.0 needed by debian/osmo-e1d/usr/bin/osmo-e1d (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') [ 185s] dpkg-shlibdeps: error: cannot continue due to the error above [ 185s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 185s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 185s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/osmo-e1d.substvars debian/osmo-e1d/usr/bin/osmo-e1d returned exit code 2 [ 185s] dh_shlibdeps: Aborting due to earlier error [ 185s] debian/rules:45: recipe for target 'binary' failed [ 185s] make: *** [binary] Error 25 [ 185s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 185s] ### VM INTERACTION START ### [ 188s] [ 181.238703] sysrq: SysRq : Power Off [ 188s] [ 181.246179] reboot: Power down [ 188s] ### VM INTERACTION END ### [ 188s] [ 188s] goat09 failed "build osmo-e1d_0.0.1.1.cf3b.dsc" at Wed Jul 1 09:04:40 UTC 2020. [ 188s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:04:55 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:04:55 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5efc51bf64f48_20cb2acbf8f725f85040f8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 153s] #define HAVE_SYS_TYPES_H 1 [ 153s] #define HAVE_SYS_STAT_H 1 [ 153s] #define HAVE_STDLIB_H 1 [ 153s] #define HAVE_STRING_H 1 [ 153s] #define HAVE_MEMORY_H 1 [ 153s] #define HAVE_STRINGS_H 1 [ 153s] #define HAVE_INTTYPES_H 1 [ 153s] #define HAVE_STDINT_H 1 [ 153s] #define HAVE_UNISTD_H 1 [ 153s] #define HAVE_DLFCN_H 1 [ 153s] #define LT_OBJDIR ".libs/" [ 153s] #define PACKAGE "osmo-e1d" [ 153s] #define VERSION "0.0.1.1-cf3b" [ 153s] [ 153s] configure: exit 1 [ 153s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 153s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 153s] make[1]: *** [override_dh_auto_configure] Error 255 [ 153s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 153s] debian/rules:45: recipe for target 'build' failed [ 153s] make: *** [build] Error 2 [ 153s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 153s] ### VM INTERACTION START ### [ 156s] [ 146.970153] sysrq: SysRq : Power Off [ 156s] [ 146.976406] reboot: Power down [ 156s] ### VM INTERACTION END ### [ 156s] [ 156s] lamb02 failed "build osmo-e1d_0.0.1.1.cf3b.dsc" at Wed Jul 1 09:04:40 UTC 2020. [ 156s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:05:12 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:05:12 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5efc51de2b485_20cb2acbf8f725f850413e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 176s] dh_install [ 177s] dh_installdocs [ 177s] dh_installchangelogs [ 177s] dh_perl [ 177s] dh_link [ 177s] dh_strip_nondeterminism [ 177s] debian/rules override_dh_compress [ 177s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 177s] dh_compress -X.pdf [ 177s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 177s] dh_fixperms [ 177s] dh_strip [ 177s] dh_makeshlibs [ 178s] dh_shlibdeps [ 178s] dpkg-shlibdeps: error: cannot find library libosmo-e1d.so.0 needed by debian/osmo-e1d/usr/bin/osmo-e1d (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 178s] dpkg-shlibdeps: error: cannot continue due to the error above [ 178s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 178s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 178s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/osmo-e1d.substvars debian/osmo-e1d/usr/bin/osmo-e1d returned exit code 2 [ 178s] debian/rules:45: recipe for target 'binary' failed [ 178s] make: *** [binary] Error 2 [ 178s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 178s] ### VM INTERACTION START ### [ 181s] [ 171.074173] sysrq: SysRq : Power Off [ 181s] [ 171.079362] reboot: Power down [ 182s] ### VM INTERACTION END ### [ 182s] [ 182s] lamb07 failed "build osmo-e1d_0.0.1.1.cf3b.dsc" at Wed Jul 1 09:04:59 UTC 2020. [ 182s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:05:30 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:05:30 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5efc51dfe47b0_20cb2acbf8f725f850422@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_9.0/i586 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 211s] dh_install [ 211s] dh_installdocs [ 211s] dh_installchangelogs [ 211s] dh_perl [ 211s] dh_link [ 211s] dh_strip_nondeterminism [ 211s] debian/rules override_dh_compress [ 211s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 211s] dh_compress -X.pdf [ 211s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 211s] dh_fixperms [ 212s] dh_strip [ 212s] dh_makeshlibs [ 212s] dh_shlibdeps [ 212s] dpkg-shlibdeps: error: cannot find library libosmo-e1d.so.0 needed by debian/osmo-e1d/usr/bin/osmo-e1d (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') [ 213s] dpkg-shlibdeps: error: cannot continue due to the error above [ 213s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 213s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 213s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/osmo-e1d.substvars debian/osmo-e1d/usr/bin/osmo-e1d returned exit code 2 [ 213s] debian/rules:45: recipe for target 'binary' failed [ 213s] make: *** [binary] Error 2 [ 213s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 213s] ### VM INTERACTION START ### [ 216s] [ 200.185584] sysrq: SysRq : Power Off [ 216s] [ 200.189130] reboot: Power down [ 216s] ### VM INTERACTION END ### [ 216s] [ 216s] cloud127 failed "build osmo-e1d_0.0.1.1.cf3b.dsc" at Wed Jul 1 09:05:15 UTC 2020. [ 216s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:05:30 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:05:30 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_10/i586 In-Reply-To: References: Message-ID: <5efc51e11a9a4_20cb2acbf8f725f850434d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_10/i586 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 222s] dh_installdocs [ 222s] dh_installchangelogs [ 222s] dh_perl [ 222s] dh_link [ 222s] dh_strip_nondeterminism [ 222s] debian/rules override_dh_compress [ 222s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 222s] dh_compress -X.pdf [ 222s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 222s] dh_fixperms [ 222s] dh_missing [ 222s] dh_strip [ 222s] dh_makeshlibs [ 222s] dh_shlibdeps [ 222s] dpkg-shlibdeps: error: cannot find library libosmo-e1d.so.0 needed by debian/osmo-e1d/usr/bin/osmo-e1d (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') [ 223s] dpkg-shlibdeps: error: cannot continue due to the error above [ 223s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 223s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 223s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/osmo-e1d.substvars debian/osmo-e1d/usr/bin/osmo-e1d returned exit code 2 [ 223s] dh_shlibdeps: Aborting due to earlier error [ 223s] make: *** [debian/rules:45: binary] Error 25 [ 223s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 223s] ### VM INTERACTION START ### [ 226s] [ 216.176981] sysrq: SysRq : Power Off [ 226s] [ 216.181199] reboot: Power down [ 226s] ### VM INTERACTION END ### [ 226s] [ 226s] sheep85 failed "build osmo-e1d_0.0.1.1.cf3b.dsc" at Wed Jul 1 09:05:27 UTC 2020. [ 226s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:06:04 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:06:04 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5efc521a4352c_20cb2acbf8f725f85045b5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 258s] dh_installdocs [ 258s] dh_installchangelogs [ 258s] dh_perl [ 259s] dh_link [ 259s] dh_strip_nondeterminism [ 259s] debian/rules override_dh_compress [ 259s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 259s] dh_compress -X.pdf [ 259s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 259s] dh_fixperms [ 259s] dh_missing [ 259s] dh_strip [ 259s] dh_makeshlibs [ 259s] dh_shlibdeps [ 259s] dpkg-shlibdeps: error: cannot find library libosmo-e1d.so.0 needed by debian/osmo-e1d/usr/bin/osmo-e1d (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 260s] dpkg-shlibdeps: error: cannot continue due to the error above [ 260s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 260s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 260s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/osmo-e1d.substvars debian/osmo-e1d/usr/bin/osmo-e1d returned exit code 2 [ 260s] dh_shlibdeps: Aborting due to earlier error [ 260s] make: *** [debian/rules:45: binary] Error 25 [ 260s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 260s] ### VM INTERACTION START ### [ 263s] [ 251.563322] sysrq: SysRq : Power Off [ 263s] [ 251.569343] reboot: Power down [ 263s] ### VM INTERACTION END ### [ 263s] [ 263s] lamb12 failed "build osmo-e1d_0.0.1.1.cf3b.dsc" at Wed Jul 1 09:05:54 UTC 2020. [ 263s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:06:21 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:06:21 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5efc521b28f7f_20cb2acbf8f725f8504661@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 261s] dh_installchangelogs [ 261s] dh_perl [ 261s] dh_link [ 261s] dh_strip_nondeterminism [ 261s] debian/rules override_dh_compress [ 261s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 261s] dh_compress -X.pdf [ 261s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 261s] dh_fixperms [ 261s] dh_missing [ 262s] dh_strip [ 262s] dh_makeshlibs [ 262s] dh_shlibdeps [ 262s] dpkg-shlibdeps: error: cannot find library libosmo-e1d.so.0 needed by debian/osmo-e1d/usr/bin/osmo-e1d (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 263s] dpkg-shlibdeps: error: cannot continue due to the error above [ 263s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 263s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 263s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/osmo-e1d.substvars debian/osmo-e1d/usr/bin/osmo-e1d returned exit code 2 [ 263s] dh_shlibdeps: Aborting due to earlier error [ 263s] debian/rules:45: recipe for target 'binary' failed [ 263s] make: *** [binary] Error 25 [ 263s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 263s] ### VM INTERACTION START ### [ 266s] [ 238.587809] sysrq: SysRq : Power Off [ 266s] [ 238.591911] reboot: Power down [ 266s] ### VM INTERACTION END ### [ 266s] [ 266s] cloud107 failed "build osmo-e1d_0.0.1.1.cf3b.dsc" at Wed Jul 1 09:06:10 UTC 2020. [ 266s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:06:21 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:06:21 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Raspbian_9.0/armv7l In-Reply-To: References: Message-ID: <5efc521bc1715_20cb2acbf8f725f8504755@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Raspbian_9.0/armv7l Package network:osmocom:latest/osmo-e1d failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 519s] #define HAVE_SYS_TYPES_H 1 [ 519s] #define HAVE_SYS_STAT_H 1 [ 519s] #define HAVE_STDLIB_H 1 [ 519s] #define HAVE_STRING_H 1 [ 519s] #define HAVE_MEMORY_H 1 [ 519s] #define HAVE_STRINGS_H 1 [ 519s] #define HAVE_INTTYPES_H 1 [ 519s] #define HAVE_STDINT_H 1 [ 519s] #define HAVE_UNISTD_H 1 [ 519s] #define HAVE_DLFCN_H 1 [ 519s] #define LT_OBJDIR ".libs/" [ 519s] #define PACKAGE "osmo-e1d" [ 519s] #define VERSION "0.0.1" [ 519s] [ 519s] configure: exit 1 [ 519s] 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-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 519s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 519s] make[1]: *** [override_dh_auto_configure] Error 2 [ 519s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 519s] debian/rules:45: recipe for target 'build' failed [ 519s] make: *** [build] Error 2 [ 519s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 519s] ### VM INTERACTION START ### [ 522s] [ 499.619861] sysrq: SysRq : Power Off [ 522s] [ 499.634411] reboot: Power down [ 522s] ### VM INTERACTION END ### [ 522s] [ 522s] obs-arm-6 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:06:16 UTC 2020. [ 522s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:06:38 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:06:38 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5efc5235ab1f0_20cb2acbf8f725f85049c1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 279s] dh_installdocs [ 279s] dh_installchangelogs [ 279s] dh_perl [ 279s] dh_link [ 279s] dh_strip_nondeterminism [ 279s] debian/rules override_dh_compress [ 279s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 279s] dh_compress -X.pdf [ 279s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 279s] dh_fixperms [ 279s] dh_missing [ 279s] dh_strip [ 279s] dh_makeshlibs [ 280s] dh_shlibdeps [ 280s] dpkg-shlibdeps: error: cannot find library libosmo-e1d.so.0 needed by debian/osmo-e1d/usr/bin/osmo-e1d (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 280s] dpkg-shlibdeps: error: cannot continue due to the error above [ 280s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 280s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 280s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/osmo-e1d.substvars debian/osmo-e1d/usr/bin/osmo-e1d returned exit code 2 [ 280s] dh_shlibdeps: Aborting due to earlier error [ 280s] make: *** [debian/rules:45: binary] Error 255 [ 280s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 280s] ### VM INTERACTION START ### [ 284s] [ 271.751186] sysrq: SysRq : Power Off [ 284s] [ 271.755231] reboot: Power down [ 284s] ### VM INTERACTION END ### [ 284s] [ 284s] lamb55 failed "build osmo-e1d_0.0.1.1.cf3b.dsc" at Wed Jul 1 09:06:22 UTC 2020. [ 284s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:06:38 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:06:38 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5efc523612c07_20cb2acbf8f725f8505059@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 286s] dh_installdocs [ 286s] dh_installchangelogs [ 286s] dh_perl [ 287s] dh_link [ 287s] dh_strip_nondeterminism [ 287s] debian/rules override_dh_compress [ 287s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 287s] dh_compress -X.pdf [ 287s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 287s] dh_fixperms [ 287s] dh_missing [ 287s] dh_strip [ 287s] dh_makeshlibs [ 287s] dh_shlibdeps [ 287s] dpkg-shlibdeps: error: cannot find library libosmo-e1d.so.0 needed by debian/osmo-e1d/usr/bin/osmo-e1d (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 288s] dpkg-shlibdeps: error: cannot continue due to the error above [ 288s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 288s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 288s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/osmo-e1d.substvars debian/osmo-e1d/usr/bin/osmo-e1d returned exit code 2 [ 288s] dh_shlibdeps: Aborting due to earlier error [ 288s] make: *** [debian/rules:45: binary] Error 25 [ 288s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 288s] ### VM INTERACTION START ### [ 291s] [ 248.940812] sysrq: SysRq : Power Off [ 291s] [ 248.944385] reboot: Power down [ 291s] ### VM INTERACTION END ### [ 291s] [ 291s] cloud103 failed "build osmo-e1d_0.0.1.1.cf3b.dsc" at Wed Jul 1 09:06:24 UTC 2020. [ 291s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:06:38 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:06:38 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_10/aarch64 In-Reply-To: References: Message-ID: <5efc5236e81f9_20cb2acbf8f725f85051cd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_10/aarch64 Package network:osmocom:latest/osmo-e1d failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 547s] #define PACKAGE_URL "" [ 547s] #define STDC_HEADERS 1 [ 547s] #define HAVE_SYS_TYPES_H 1 [ 547s] #define HAVE_SYS_STAT_H 1 [ 547s] #define HAVE_STDLIB_H 1 [ 547s] #define HAVE_STRING_H 1 [ 547s] #define HAVE_MEMORY_H 1 [ 547s] #define HAVE_STRINGS_H 1 [ 547s] #define HAVE_INTTYPES_H 1 [ 547s] #define HAVE_STDINT_H 1 [ 547s] #define HAVE_UNISTD_H 1 [ 547s] #define HAVE_DLFCN_H 1 [ 547s] #define LT_OBJDIR ".libs/" [ 547s] #define PACKAGE "osmo-e1d" [ 547s] #define VERSION "0.0.1" [ 547s] [ 547s] configure: exit 1 [ 547s] dh_auto_configure: ./configure --build=aarch64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/aarch64-linux-gnu --libexecdir=\${prefix}/lib/aarch64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 547s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 2 [ 547s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 547s] make: *** [debian/rules:45: build] Error 2 [ 547s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 547s] ### VM INTERACTION START ### [ 549s] [ 486.893694] sysrq: SysRq : Power Off [ 549s] [ 486.897921] reboot: Power down [ 550s] ### VM INTERACTION END ### [ 550s] [ 550s] armbuild02 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:06:36 UTC 2020. [ 550s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:06:55 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:06:55 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5efc52376db16_20cb2acbf8f725f85052b2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 312s] dh_installdocs [ 313s] dh_installchangelogs [ 313s] dh_perl [ 313s] dh_link [ 313s] dh_strip_nondeterminism [ 313s] debian/rules override_dh_compress [ 313s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 313s] dh_compress -X.pdf [ 313s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 313s] dh_fixperms [ 313s] dh_missing [ 313s] dh_strip [ 313s] dh_makeshlibs [ 313s] dh_shlibdeps [ 314s] dpkg-shlibdeps: error: cannot find library libosmo-e1d.so.0 needed by debian/osmo-e1d/usr/bin/osmo-e1d (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') [ 314s] dpkg-shlibdeps: error: cannot continue due to the error above [ 314s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 314s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 314s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/osmo-e1d.substvars debian/osmo-e1d/usr/bin/osmo-e1d returned exit code 2 [ 314s] dh_shlibdeps: Aborting due to earlier error [ 314s] make: *** [debian/rules:45: binary] Error 25 [ 314s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 314s] ### VM INTERACTION START ### [ 317s] [ 304.602676] sysrq: SysRq : Power Off [ 317s] [ 304.608269] reboot: Power down [ 317s] ### VM INTERACTION END ### [ 317s] [ 317s] lamb58 failed "build osmo-e1d_0.0.1.1.cf3b.dsc" at Wed Jul 1 09:06:49 UTC 2020. [ 317s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:07:47 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:07:47 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5efc52716f37e_20cb2acbf8f725f850536b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_10/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 322s] dh_installdocs [ 323s] dh_installchangelogs [ 323s] dh_perl [ 323s] dh_link [ 323s] dh_strip_nondeterminism [ 323s] debian/rules override_dh_compress [ 323s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 323s] dh_compress -X.pdf [ 323s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 323s] dh_fixperms [ 323s] dh_missing [ 323s] dh_strip [ 323s] dh_makeshlibs [ 323s] dh_shlibdeps [ 324s] dpkg-shlibdeps: error: cannot find library libosmo-e1d.so.0 needed by debian/osmo-e1d/usr/bin/osmo-e1d (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 324s] dpkg-shlibdeps: error: cannot continue due to the error above [ 324s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 324s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 324s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/osmo-e1d.substvars debian/osmo-e1d/usr/bin/osmo-e1d returned exit code 2 [ 324s] dh_shlibdeps: Aborting due to earlier error [ 324s] make: *** [debian/rules:45: binary] Error 25 [ 324s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 324s] ### VM INTERACTION START ### [ 327s] [ 301.103177] sysrq: SysRq : Power Off [ 327s] [ 301.117960] reboot: Power down [ 328s] ### VM INTERACTION END ### [ 328s] [ 328s] cloud129 failed "build osmo-e1d_0.0.1.1.cf3b.dsc" at Wed Jul 1 09:07:35 UTC 2020. [ 328s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:08:21 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:08:21 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5efc529472fd3_20cb2acbf8f725f8505821@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 382s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 382s] dh_fixperms [ 383s] dh_missing [ 383s] dh_missing: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 383s] dh_strip [ 383s] dh_strip: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 383s] dh_strip: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 383s] dh_strip: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 383s] dh_makeshlibs [ 383s] dh_makeshlibs: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 383s] dh_shlibdeps [ 383s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 383s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 383s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 383s] dpkg-shlibdeps: error: cannot find library libosmo-e1d.so.0 needed by debian/osmo-e1d/usr/bin/osmo-e1d (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 384s] dpkg-shlibdeps: error: cannot continue due to the error above [ 384s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 384s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 384s] dh_shlibdeps: error: dpkg-shlibdeps -Tdebian/osmo-e1d.substvars debian/osmo-e1d/usr/bin/osmo-e1d returned exit code 2 [ 384s] dh_shlibdeps: error: Aborting due to earlier error [ 384s] make: *** [debian/rules:45: binary] Error 25 [ 384s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 384s] ### VM INTERACTION START ### [ 385s] Powering off. [ 385s] [ 369.533925] reboot: Power down [ 385s] ### VM INTERACTION END ### [ 385s] [ 385s] lamb60 failed "build osmo-e1d_0.0.1.1.cf3b.dsc" at Wed Jul 1 09:08:16 UTC 2020. [ 385s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:08:21 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:08:21 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5efc5294cae91_20cb2acbf8f725f8505984@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 383s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 383s] dh_fixperms [ 383s] dh_missing [ 383s] dh_missing: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 383s] dh_strip [ 383s] dh_strip: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 383s] dh_strip: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 383s] dh_strip: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 383s] dh_makeshlibs [ 383s] dh_makeshlibs: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 383s] dh_shlibdeps [ 383s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 383s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 383s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 383s] dpkg-shlibdeps: error: cannot find library libosmo-e1d.so.0 needed by debian/osmo-e1d/usr/bin/osmo-e1d (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 384s] dpkg-shlibdeps: error: cannot continue due to the error above [ 384s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 384s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 384s] dh_shlibdeps: error: dpkg-shlibdeps -Tdebian/osmo-e1d.substvars debian/osmo-e1d/usr/bin/osmo-e1d returned exit code 2 [ 384s] dh_shlibdeps: error: Aborting due to earlier error [ 384s] make: *** [debian/rules:45: binary] Error 25 [ 384s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 384s] ### VM INTERACTION START ### [ 385s] Powering off. [ 385s] [ 370.624163] reboot: Power down [ 385s] ### VM INTERACTION END ### [ 385s] [ 385s] lamb61 failed "build osmo-e1d_0.0.1.1.cf3b.dsc" at Wed Jul 1 09:08:18 UTC 2020. [ 385s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:08:38 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:08:38 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_10/armv7l In-Reply-To: References: Message-ID: <5efc52af987a1_20cb2acbf8f725f8506191@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_10/armv7l Package network:osmocom:latest/osmo-e1d failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 640s] #define PACKAGE_URL "" [ 640s] #define STDC_HEADERS 1 [ 640s] #define HAVE_SYS_TYPES_H 1 [ 640s] #define HAVE_SYS_STAT_H 1 [ 640s] #define HAVE_STDLIB_H 1 [ 640s] #define HAVE_STRING_H 1 [ 640s] #define HAVE_MEMORY_H 1 [ 640s] #define HAVE_STRINGS_H 1 [ 640s] #define HAVE_INTTYPES_H 1 [ 640s] #define HAVE_STDINT_H 1 [ 640s] #define HAVE_UNISTD_H 1 [ 640s] #define HAVE_DLFCN_H 1 [ 640s] #define LT_OBJDIR ".libs/" [ 640s] #define PACKAGE "osmo-e1d" [ 640s] #define VERSION "0.0.1" [ 640s] [ 640s] configure: exit 1 [ 640s] 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-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 640s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 2 [ 640s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 640s] make: *** [debian/rules:45: build] Error 2 [ 640s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 640s] ### VM INTERACTION START ### [ 643s] [ 610.696194] sysrq: SysRq : Power Off [ 643s] [ 610.718406] reboot: Power down [ 643s] ### VM INTERACTION END ### [ 643s] [ 643s] obs-arm-6 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:08:22 UTC 2020. [ 643s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 1 09:14:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 09:14:04 +0000 Subject: Change in osmo-e1d[master]: debian: Fix packaging of libosmo-e1d References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19087 ) Change subject: debian: Fix packaging of libosmo-e1d ...................................................................... debian: Fix packaging of libosmo-e1d dpkg-shlibdeps: error: cannot find library libosmo-e1d.so.0 needed by debian/osmo-e1d/usr/bin/osmo-e1d (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') Change-Id: Iaacd17aa69e56b21b925710d63b699c2e7ede12a --- R debian/libosmo-e1d0.install 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/87/19087/1 diff --git a/debian/libosmo-e1d.install b/debian/libosmo-e1d0.install similarity index 100% rename from debian/libosmo-e1d.install rename to debian/libosmo-e1d0.install -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Iaacd17aa69e56b21b925710d63b699c2e7ede12a Gerrit-Change-Number: 19087 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 09:14:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 09:14:22 +0000 Subject: Change in osmo-e1d[master]: debian: Fix packaging of libosmo-e1d In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19087 ) Change subject: debian: Fix packaging of libosmo-e1d ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Iaacd17aa69e56b21b925710d63b699c2e7ede12a Gerrit-Change-Number: 19087 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 01 Jul 2020 09:14:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 09:14:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 09:14:26 +0000 Subject: Change in osmo-e1d[master]: debian: Fix packaging of libosmo-e1d In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19087 ) Change subject: debian: Fix packaging of libosmo-e1d ...................................................................... debian: Fix packaging of libosmo-e1d dpkg-shlibdeps: error: cannot find library libosmo-e1d.so.0 needed by debian/osmo-e1d/usr/bin/osmo-e1d (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') Change-Id: Iaacd17aa69e56b21b925710d63b699c2e7ede12a --- R debian/libosmo-e1d0.install 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/debian/libosmo-e1d.install b/debian/libosmo-e1d0.install similarity index 100% rename from debian/libosmo-e1d.install rename to debian/libosmo-e1d0.install -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Iaacd17aa69e56b21b925710d63b699c2e7ede12a Gerrit-Change-Number: 19087 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 1 09:18:55 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:18:55 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5efc55053b357_20cb2acbf8f725f850789b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_9.0/armv7l Package network:osmocom:latest/osmo-e1d failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 598s] #define HAVE_SYS_TYPES_H 1 [ 598s] #define HAVE_SYS_STAT_H 1 [ 598s] #define HAVE_STDLIB_H 1 [ 598s] #define HAVE_STRING_H 1 [ 598s] #define HAVE_MEMORY_H 1 [ 598s] #define HAVE_STRINGS_H 1 [ 598s] #define HAVE_INTTYPES_H 1 [ 598s] #define HAVE_STDINT_H 1 [ 598s] #define HAVE_UNISTD_H 1 [ 598s] #define HAVE_DLFCN_H 1 [ 598s] #define LT_OBJDIR ".libs/" [ 598s] #define PACKAGE "osmo-e1d" [ 598s] #define VERSION "0.0.1" [ 598s] [ 598s] configure: exit 1 [ 598s] 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-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 598s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 598s] make[1]: *** [override_dh_auto_configure] Error 2 [ 598s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 598s] debian/rules:45: recipe for target 'build' failed [ 598s] make: *** [build] Error 2 [ 598s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 598s] ### VM INTERACTION START ### [ 601s] [ 542.006044] sysrq: SysRq : Power Off [ 601s] [ 542.007971] reboot: Power down [ 601s] ### VM INTERACTION END ### [ 601s] [ 601s] armbuild17 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:18:50 UTC 2020. [ 601s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:19:30 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:19:30 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5efc5524cfbd0_20cb2acbf8f725f8507950@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Raspbian_10/armv7l Package network:osmocom:latest/osmo-e1d failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 536s] #define PACKAGE_URL "" [ 536s] #define STDC_HEADERS 1 [ 536s] #define HAVE_SYS_TYPES_H 1 [ 536s] #define HAVE_SYS_STAT_H 1 [ 536s] #define HAVE_STDLIB_H 1 [ 536s] #define HAVE_STRING_H 1 [ 536s] #define HAVE_MEMORY_H 1 [ 536s] #define HAVE_STRINGS_H 1 [ 536s] #define HAVE_INTTYPES_H 1 [ 536s] #define HAVE_STDINT_H 1 [ 536s] #define HAVE_UNISTD_H 1 [ 536s] #define HAVE_DLFCN_H 1 [ 536s] #define LT_OBJDIR ".libs/" [ 536s] #define PACKAGE "osmo-e1d" [ 536s] #define VERSION "0.0.1" [ 536s] [ 536s] configure: exit 1 [ 536s] 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-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 536s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 2 [ 536s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 536s] make: *** [debian/rules:45: build] Error 2 [ 536s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 536s] ### VM INTERACTION START ### [ 539s] [ 510.661680] sysrq: SysRq : Power Off [ 539s] [ 510.696742] reboot: Power down [ 540s] ### VM INTERACTION END ### [ 540s] [ 540s] obs-arm-6 failed "build osmo-e1d_0.0.1.dsc" at Wed Jul 1 09:19:12 UTC 2020. [ 540s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:19:47 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:19:47 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5efc5543ce870_20cb2acbf8f725f85080a2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_8.0/i586 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 95s] #define HAVE_SYS_TYPES_H 1 [ 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] #define PACKAGE "osmo-e1d" [ 95s] #define VERSION "0.0.1.2-7731" [ 95s] [ 95s] configure: exit 1 [ 95s] dh_auto_configure: ./configure --build=i586-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 95s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 95s] make[1]: *** [override_dh_auto_configure] Error 255 [ 95s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 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] ### VM INTERACTION START ### [ 96s] Powering off. [ 96s] [ 89.297532] reboot: Power down [ 96s] ### VM INTERACTION END ### [ 96s] [ 96s] build74 failed "build osmo-e1d_0.0.1.2.7731.dsc" at Wed Jul 1 09:19:32 UTC 2020. [ 96s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:21:12 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:21:12 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5efc559dcbc6c_20cb2acbf8f725f8508149@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 186s] #define HAVE_SYS_TYPES_H 1 [ 186s] #define HAVE_SYS_STAT_H 1 [ 186s] #define HAVE_STDLIB_H 1 [ 186s] #define HAVE_STRING_H 1 [ 186s] #define HAVE_MEMORY_H 1 [ 186s] #define HAVE_STRINGS_H 1 [ 186s] #define HAVE_INTTYPES_H 1 [ 186s] #define HAVE_STDINT_H 1 [ 186s] #define HAVE_UNISTD_H 1 [ 186s] #define HAVE_DLFCN_H 1 [ 186s] #define LT_OBJDIR ".libs/" [ 186s] #define PACKAGE "osmo-e1d" [ 186s] #define VERSION "0.0.1.2-7731" [ 186s] [ 186s] configure: exit 1 [ 186s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 186s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 186s] make[1]: *** [override_dh_auto_configure] Error 255 [ 186s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 186s] debian/rules:45: recipe for target 'build' failed [ 186s] make: *** [build] Error 2 [ 186s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 186s] ### VM INTERACTION START ### [ 189s] [ 179.748096] sysrq: SysRq : Power Off [ 189s] [ 179.758586] reboot: Power down [ 189s] ### VM INTERACTION END ### [ 189s] [ 189s] lamb02 failed "build osmo-e1d_0.0.1.2.7731.dsc" at Wed Jul 1 09:20:58 UTC 2020. [ 189s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:22:21 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:22:21 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5efc55d9a8d57_20cb2acbf8f725f8508828@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 95s] #define HAVE_SYS_TYPES_H 1 [ 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] #define PACKAGE "osmo-e1d" [ 95s] #define VERSION "0.0.1.2-7731" [ 95s] [ 95s] configure: exit 1 [ 95s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 95s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 95s] make[1]: *** [override_dh_auto_configure] Error 255 [ 95s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 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] ### VM INTERACTION START ### [ 96s] Powering off. [ 96s] [ 89.314201] reboot: Power down [ 96s] ### VM INTERACTION END ### [ 96s] [ 96s] build73 failed "build osmo-e1d_0.0.1.2.7731.dsc" at Wed Jul 1 09:22:05 UTC 2020. [ 96s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 09:23:12 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 09:23:12 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5efc5612bf254_20cb2acbf8f725f85089ab@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 154s] #define HAVE_SYS_TYPES_H 1 [ 154s] #define HAVE_SYS_STAT_H 1 [ 154s] #define HAVE_STDLIB_H 1 [ 154s] #define HAVE_STRING_H 1 [ 154s] #define HAVE_MEMORY_H 1 [ 154s] #define HAVE_STRINGS_H 1 [ 154s] #define HAVE_INTTYPES_H 1 [ 154s] #define HAVE_STDINT_H 1 [ 154s] #define HAVE_UNISTD_H 1 [ 154s] #define HAVE_DLFCN_H 1 [ 154s] #define LT_OBJDIR ".libs/" [ 154s] #define PACKAGE "osmo-e1d" [ 154s] #define VERSION "0.0.1.2-7731" [ 154s] [ 154s] configure: exit 1 [ 154s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 154s] debian/rules:50: recipe for target 'override_dh_auto_configure' failed [ 154s] make[1]: *** [override_dh_auto_configure] Error 255 [ 154s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 154s] debian/rules:45: recipe for target 'build' failed [ 154s] make: *** [build] Error 2 [ 154s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 154s] ### VM INTERACTION START ### [ 157s] [ 147.980138] sysrq: SysRq : Power Off [ 157s] [ 147.986640] reboot: Power down [ 157s] ### VM INTERACTION END ### [ 157s] [ 157s] lamb71 failed "build osmo-e1d_0.0.1.2.7731.dsc" at Wed Jul 1 09:22:56 UTC 2020. [ 157s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 1 09:28:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jul 2020 09:28:40 +0000 Subject: Change in osmo-bts[master]: bts-trx: Implement ramp up/down during ADM state change In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18967 ) Change subject: bts-trx: Implement ramp up/down during ADM state change ...................................................................... Patch Set 4: Code-Review-1 marking with -1 due to issues after lock->unlock explained above -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7a7b0a0c24779349f142215f0bb32b72c86ce70 Gerrit-Change-Number: 18967 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 01 Jul 2020 09:28:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 09:29:03 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 1 Jul 2020 09:29:03 +0000 Subject: Change in osmo-bsc[master]: vty: check with is_ipaccess_bts() before using IPACC In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18971 ) Change subject: vty: check with is_ipaccess_bts() before using IPACC ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9ee78b6b1d342abaccc09a87dee6af79e76e5468 Gerrit-Change-Number: 18971 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 01 Jul 2020 09:29:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 09:29:12 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 1 Jul 2020 09:29:12 +0000 Subject: Change in osmo-bsc[master]: vty: check with is_ipaccess_bts() before using IPACC In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18971 ) Change subject: vty: check with is_ipaccess_bts() before using IPACC ...................................................................... vty: check with is_ipaccess_bts() before using IPACC The IPACC protocol is an extension to the conventional RSL protocol to negotiate ip address and port for RTP/VoIP. This protocol is BTS specific (sysmobts, ip-access nanobts) and not used with E1 BTSs The bsc VTY is able to trigger certain IPACC functions for debug purposes. Some of those commands do not check if the BTS is really of type IP-access before trying to send an IPACC command. Let's add checks to prevent IPACC messages to be sent to E1 or otherwise incompatible BTSs models. Change-Id: I9ee78b6b1d342abaccc09a87dee6af79e76e5468 Related: OS#2547 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: neels: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve dexter: 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 f46a84c..36b16a2 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -5045,7 +5045,8 @@ } vty_out(vty, "%% activating lchan %s%s", gsm_lchan_name(lchan), VTY_NEWLINE); rsl_tx_chan_activ(lchan, RSL_ACT_TYPE_INITIAL, 0); - rsl_tx_ipacc_crcx(lchan); + if (is_ipaccess_bts(lchan->ts->trx->bts)) + rsl_tx_ipacc_crcx(lchan); } else { if (!lchan->fi) { vty_out(vty, "%% Cannot release: Channel not initialized%s", VTY_NEWLINE); @@ -5124,6 +5125,11 @@ lchan = &ts->lchan[ss_nr]; + if (!is_ipaccess_bts(lchan->ts->trx->bts)) { + vty_out(vty, "%% BTS is not of ip.access type%s", VTY_NEWLINE); + return CMD_WARNING; + } + if (ss_nr >= pchan_subslots(ts->pchan_is)) { vty_out(vty, "%% subslot index %d too large for physical channel %s (%u slots)%s", ss_nr, gsm_pchan_name(ts->pchan_is), pchan_subslots(ts->pchan_is), -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9ee78b6b1d342abaccc09a87dee6af79e76e5468 Gerrit-Change-Number: 18971 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 09:41:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jul 2020 09:41:13 +0000 Subject: Change in osmo-gsm-tester[master]: {ms, enb}_srs: add method to read kpi from a test run In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18986 ) Change subject: {ms,enb}_srs: add method to read kpi from a test run ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I28226a375f9ac4e08424c488062ae6a74a19af92 Gerrit-Change-Number: 18986 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-Comment-Date: Wed, 01 Jul 2020 09:41:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 09:41:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jul 2020 09:41:41 +0000 Subject: Change in osmo-gsm-tester[master]: ms_srs: add min_rolling_average calculation In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19085 ) Change subject: ms_srs: add min_rolling_average calculation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I77a82a68689bc6c21cb9227dc9e7616d03e2b547 Gerrit-Change-Number: 19085 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 01 Jul 2020 09:41:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 09:49:39 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 1 Jul 2020 09:49:39 +0000 Subject: Change in osmo-gsm-tester[master]: process: provide API to return filename for process output In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18985 ) Change subject: process: provide API to return filename for process output ...................................................................... process: provide API to return filename for process output this is useful if the caller handles the opening/reading from the file itself Change-Id: I5e70fd1593a5bc7902fa218aae6452103545e4e0 --- M src/osmo_gsm_tester/core/process.py 1 file changed, 10 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/core/process.py b/src/osmo_gsm_tester/core/process.py index 1823a20..eaf8de7 100644 --- a/src/osmo_gsm_tester/core/process.py +++ b/src/osmo_gsm_tester/core/process.py @@ -321,12 +321,20 @@ return self.process_obj is not None and self.result is None def get_output(self, which): + ''' Read process output ''' + path = self.get_output_file(which) + if path is None: + return None + with open(path, 'r') as f2: + return f2.read() + + def get_output_file(self, which): + ''' Return filename for given output ''' v = self.outputs.get(which) if not v: return None path, f = v - with open(path, 'r') as f2: - return f2.read() + return path def get_output_tail(self, which, tail=10, prefix=''): out = self.get_output(which) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I5e70fd1593a5bc7902fa218aae6452103545e4e0 Gerrit-Change-Number: 18985 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 09:49:40 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 1 Jul 2020 09:49:40 +0000 Subject: Change in osmo-gsm-tester[master]: {ms, enb}_srs: add method to read kpi from a test run In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18986 ) Change subject: {ms,enb}_srs: add method to read kpi from a test run ...................................................................... {ms,enb}_srs: add method to read kpi from a test run this method uses the kpi_analyzer module for analyzing stdout, CSV metrics and the logfile (if present). if the module can't be loaded, no KPI will be added. Change-Id: I28226a375f9ac4e08424c488062ae6a74a19af92 --- M src/osmo_gsm_tester/obj/enb_srs.py M src/osmo_gsm_tester/obj/ms_srs.py A src/osmo_gsm_tester/obj/srslte_common.py 3 files changed, 56 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py index 0bf4f8b..fe1ea4e 100644 --- a/src/osmo_gsm_tester/obj/enb_srs.py +++ b/src/osmo_gsm_tester/obj/enb_srs.py @@ -23,6 +23,7 @@ from ..core import log, util, config, template, process, remote from . import enb from . import rfemu +from .srslte_common import srslte_common from ..core import schema @@ -36,7 +37,7 @@ def rf_type_valid(rf_type_str): return rf_type_str in ('zmq', 'uhd', 'soapy', 'bladerf') -class srsENB(enb.eNodeB): +class srsENB(enb.eNodeB, srslte_common): REMOTE_DIR = '/osmo-gsm-tester-srsenb' BINFILE = 'srsenb' @@ -68,6 +69,7 @@ self.remote_log_file = None self.remote_pcap_file = None self.enable_pcap = False + self.metrics_file = None self.testenv = testenv self._additional_args = [] if not rf_type_valid(conf.get('rf_dev_type', None)): @@ -89,6 +91,9 @@ except Exception as e: self.log(repr(e)) + # Collect KPIs for each TC + self.testenv.test().set_kpis(self.get_kpis()) + def start(self, epc): self.log('Starting srsENB') self._epc = epc diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py index 9f77bb6..ebd066d 100644 --- a/src/osmo_gsm_tester/obj/ms_srs.py +++ b/src/osmo_gsm_tester/obj/ms_srs.py @@ -26,6 +26,7 @@ from .run_node import RunNode from ..core.event_loop import MainLoop from .ms import MS +from .srslte_common import srslte_common def rf_type_valid(rf_type_str): return rf_type_str in ('zmq', 'uhd', 'soapy', 'bladerf') @@ -64,7 +65,7 @@ def num_prb2base_srate(num_prb): return num_prb2symbol_sz(num_prb) * 15 * 1000 -class srsUE(MS): +class srsUE(MS, srslte_common): REMOTE_DIR = '/osmo-gsm-tester-srsue' BINFILE = 'srsue' @@ -120,6 +121,9 @@ except Exception as e: self.log(repr(e)) + # Collect KPIs for each TC + self.testenv.test().set_kpis(self.get_kpis()) + def scp_back_metrics(self, raiseException=True): ''' Copy back metrics only if they have not been copied back yet ''' if not self.have_metrics_file: diff --git a/src/osmo_gsm_tester/obj/srslte_common.py b/src/osmo_gsm_tester/obj/srslte_common.py new file mode 100644 index 0000000..33f12d4 --- /dev/null +++ b/src/osmo_gsm_tester/obj/srslte_common.py @@ -0,0 +1,45 @@ +# osmo_gsm_tester: common methods shared among srsLTE components +# +# Copyright (C) 2020 by Software Radio Systems Ltd +# +# Author: Andre Puschmann +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from ..core import log + +class srslte_common(): # don't inherit from log.Origin here but instead use .name() from whoever inherits from us + + def __init__(self): + self.log_file = None + self.process = None + self.metrics_file = None + + def get_kpis(self): + ''' Use the srsLTE KPI analyzer module (part of srsLTE.git) if available to collect KPIs ''' + kpis = {} + try: + # Please make sure the srsLTE scripts folder is included in your PYTHONPATH env variable + from kpi_analyzer import kpi_analyzer + analyzer = kpi_analyzer(self.name()) + if self.log_file is not None: + kpis["log_" + self.name()] = analyzer.get_kpi_from_logfile(self.log_file) + if self.process.get_output_file('stdout') is not None: + kpis["stdout_" + self.name()] = analyzer.get_kpi_from_stdout(self.process.get_output_file('stdout')) + if self.metrics_file is not None: + kpis["csv_" + self.name()] = analyzer.get_kpi_from_csv(self.metrics_file) + except ImportError: + self.log("Can't load KPI analyzer module.") + + return kpis -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I28226a375f9ac4e08424c488062ae6a74a19af92 Gerrit-Change-Number: 18986 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 09:50:14 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 1 Jul 2020 09:50:14 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_enb: update lteenb default parameter for PDCCH, SRS and CQI In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18987 ) Change subject: amarisoft_enb: update lteenb default parameter for PDCCH, SRS and CQI ...................................................................... amarisoft_enb: update lteenb default parameter for PDCCH, SRS and CQI those configs should provide better HO performance, PDDCH format is selected automatically Change-Id: I62a4240ac062d793ae5e197f852ea09eb4fe4ae9 --- M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl index c02192c..09532cc 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl @@ -123,7 +123,7 @@ /* If defined, force for number of CCEs for UE specific PDCCH to 2^pdcch_format. Otherwise it is computed from the reported CQI. Range: 0 to 3. */ - pdcch_format: 1, + //pdcch_format: 1, /* if defined, force the PDSCH MCS for all UEs. Otherwise it is computed from the reported CQI */ @@ -152,7 +152,7 @@ sr_period: 20, /* CQI report config */ - cqi_period: 160, /* period (ms). Must be >= 32 for HD-FDD */ + cqi_period: 40, /* period (ms). Must be >= 32 for HD-FDD */ /* RI reporting is done with a period of m_ri * cqi_period. m_ri = 0 (default) disables RI reporting. */ @@ -186,7 +186,7 @@ parameters. srs_config_index and freq_domain_position are allocated for each UE) */ srs_dedicated: { - srs_period: 80, /* period (ms). Must be >= 40 for HD-FDD */ + srs_period: 160, /* period (ms). Must be >= 40 for HD-FDD */ srs_bandwidth: 1, srs_hopping_bandwidth: 0, }, -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I62a4240ac062d793ae5e197f852ea09eb4fe4ae9 Gerrit-Change-Number: 18987 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 09:50:22 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 1 Jul 2020 09:50:22 +0000 Subject: Change in osmo-gsm-tester[master]: test: append KPI rather than overwrite in set_kpi() method In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18988 ) Change subject: test: append KPI rather than overwrite in set_kpi() method ...................................................................... test: append KPI rather than overwrite in set_kpi() method this allows to call set_kpi() multiple times in one TC Change-Id: I5f68d9e6e1135ee2afa79c9af2ed240d371214c4 --- M src/osmo_gsm_tester/core/test.py 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/core/test.py b/src/osmo_gsm_tester/core/test.py index dfbd169..fd3ac04 100644 --- a/src/osmo_gsm_tester/core/test.py +++ b/src/osmo_gsm_tester/core/test.py @@ -143,7 +143,10 @@ def set_kpis(self, kpis): if not isinstance(kpis, dict): raise log.Error('Expected dictionary in toplevel kpis') - self._kpis = kpis + if isinstance(self._kpis, dict): + self._kpis.update(kpis) + else: + self._kpis = kpis def kpis(self): return self._kpis -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I5f68d9e6e1135ee2afa79c9af2ed240d371214c4 Gerrit-Change-Number: 18988 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 09:50:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jul 2020 09:50:53 +0000 Subject: Change in osmo-trx[master]: TransceiverState: Initialize ctrs field in constructor References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/19088 ) Change subject: TransceiverState: Initialize ctrs field in constructor ...................................................................... TransceiverState: Initialize ctrs field in constructor Coverity dixit: "Non-static class member field "ctrs.tx_stale_bursts" is not initialized in this constructor nor in any functions that it calls." Fixes: CID#211258 Change-Id: I4643a0500e9cad09938c05fab2f358167f72ffa9 --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/88/19088/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 941b761..2ae5eda 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -65,6 +65,7 @@ for (int n = 0; n < 102; n++) fillerTable[n][i] = NULL; } + memset(&ctrs, 0, sizeof(struct trx_counters)); } TransceiverState::~TransceiverState() -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4643a0500e9cad09938c05fab2f358167f72ffa9 Gerrit-Change-Number: 19088 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 09:51:30 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 1 Jul 2020 09:51:30 +0000 Subject: Change in osmo-gsm-tester[master]: srsue.conf.tmpl: add default EARFCNs for 4xCA config In-Reply-To: References: Message-ID: srs_andre has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18989 ) Change subject: srsue.conf.tmpl: add default EARFCNs for 4xCA config ...................................................................... Patch Set 4: not sure why the test fails. I don't see why this commit can break anything else -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I553241735b5e204cb4be03936b90628d156c418c Gerrit-Change-Number: 18989 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-Comment-Date: Wed, 01 Jul 2020 09:51:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 09:51:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jul 2020 09:51:52 +0000 Subject: Change in docker-playground[master]: Makefile: Support overriding LIBOSMOCORE_BRANCH In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19066 ) Change subject: Makefile: Support overriding LIBOSMOCORE_BRANCH ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia9f26f3513da339d2255a0f6b2277682fe15bdf2 Gerrit-Change-Number: 19066 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 01 Jul 2020 09:51:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:06:50 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 1 Jul 2020 10:06:50 +0000 Subject: Change in osmo-gsm-tester[master]: srsue.conf.tmpl: add default EARFCNs for 4xCA config In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18989 ) Change subject: srsue.conf.tmpl: add default EARFCNs for 4xCA config ...................................................................... srsue.conf.tmpl: add default EARFCNs for 4xCA config Change-Id: I553241735b5e204cb4be03936b90628d156c418c --- M src/osmo_gsm_tester/templates/srsue.conf.tmpl 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl b/src/osmo_gsm_tester/templates/srsue.conf.tmpl index a9faa75..f1a5333 100644 --- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl @@ -31,7 +31,9 @@ # Default is auto (yes for UHD, no for rest) ##################################################################### [rf] -% if int(ue.num_carriers) == 2: +% if int(ue.num_carriers) == 4: +dl_earfcn = 2850,3050,3250,3350 +% elif int(ue.num_carriers) == 2: dl_earfcn = 2850,3050 % else: dl_earfcn = 2850 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I553241735b5e204cb4be03936b90628d156c418c Gerrit-Change-Number: 18989 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:07:01 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 1 Jul 2020 10:07:01 +0000 Subject: Change in osmo-gsm-tester[master]: enb_srs: remove comment introduced through copy+paste In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19064 ) Change subject: enb_srs: remove comment introduced through copy+paste ...................................................................... enb_srs: remove comment introduced through copy+paste Change-Id: I7d14ae5c17bd1cd1c1b23657dc60dc331519e32c --- M src/osmo_gsm_tester/obj/enb_srs.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py index fe1ea4e..a945319 100644 --- a/src/osmo_gsm_tester/obj/enb_srs.py +++ b/src/osmo_gsm_tester/obj/enb_srs.py @@ -235,7 +235,7 @@ if cell_list is None or len(cell_list) < cell + 1: raise log.Error('cell_list attribute or subitem not found!') rfemu_cfg = cell_list[cell].get('dl_rfemu', None) - if rfemu_cfg is None: # craft amarisfot by default: + if rfemu_cfg is None: raise log.Error('rfemu attribute not found in cell_list item!') rfemu_obj = rfemu.get_instance_by_type(rfemu_cfg['type'], rfemu_cfg) return rfemu_obj -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I7d14ae5c17bd1cd1c1b23657dc60dc331519e32c Gerrit-Change-Number: 19064 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:07:11 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 1 Jul 2020 10:07:11 +0000 Subject: Change in osmo-gsm-tester[master]: ms_srs: add min_rolling_average calculation In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19085 ) Change subject: ms_srs: add min_rolling_average calculation ...................................................................... ms_srs: add min_rolling_average calculation useful metric to detect low/zero downlink throughput for longer time periods Change-Id: I77a82a68689bc6c21cb9227dc9e7616d03e2b547 --- M src/osmo_gsm_tester/obj/ms_srs.py 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py index ebd066d..96623a2 100644 --- a/src/osmo_gsm_tester/obj/ms_srs.py +++ b/src/osmo_gsm_tester/obj/ms_srs.py @@ -400,7 +400,7 @@ class srsUEMetrics(log.Origin): - VALID_OPERATIONS = ['avg', 'sum', 'max_rolling_avg'] + VALID_OPERATIONS = ['avg', 'sum', 'max_rolling_avg', 'min_rolling_avg'] VALID_CRITERION = ['eq','gt','lt'] CRITERION_TO_SYM = { 'eq' : '==', 'gt' : '>', 'lt' : '<' } CRYTERION_TO_SYM_OPPOSITE = { 'eq' : '!=', 'gt' : '<=', 'lt' : '>=' } @@ -458,6 +458,9 @@ elif operation == 'max_rolling_avg': # calculate rolling average over window and take maximum value result = numpy.amax(numpy.convolve(sel_data, numpy.ones((window,))/window, mode='valid')) + elif operation == 'min_rolling_avg': + # calculate rolling average over window and take minimum value + result = numpy.amin(numpy.convolve(sel_data, numpy.ones((window,))/window, mode='valid')) self.dbg(result=result, value=value) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I77a82a68689bc6c21cb9227dc9e7616d03e2b547 Gerrit-Change-Number: 19085 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:25:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jul 2020 10:25:25 +0000 Subject: Change in osmo-trx[master]: doc/manuals: Update thread documentation after dropping CTRL sock thr... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/19089 ) Change subject: doc/manuals: Update thread documentation after dropping CTRL sock threads ...................................................................... doc/manuals: Update thread documentation after dropping CTRL sock threads Per-ARFCN CTRL threads managing CTRL socket loops were dropped a while ago, but it was forgotten to udpate the documentation. Change-Id: I34d117325e60b04b075c205d21bb0b827a5e8c52 --- M doc/manuals/chapters/code-architecture.adoc 1 file changed, 5 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/89/19089/1 diff --git a/doc/manuals/chapters/code-architecture.adoc b/doc/manuals/chapters/code-architecture.adoc index 18d0e3a..f1feb2c 100644 --- a/doc/manuals/chapters/code-architecture.adoc +++ b/doc/manuals/chapters/code-architecture.adoc @@ -39,8 +39,7 @@ radioiface [label="RadioInterface"]; radiodev [label="RadioDevice"]; -trans:nw->trans:ne [label="Trx.ControlServiceLoop_0"]; -trans:nw->trans:ne [label="Trx.ControlServiceLoop_1"]; +trans:nw->trans:ne [label="Main"]; trans:w->radioiface:w [label="Trx.TxPriorityQueueServiceLoop_0"]; trans:w->radioiface:w [label="Trx.TxPriorityQueueServiceLoop_1"]; radioiface:e->trans:e [label="Trx.RxServiceLoop_0"]; @@ -92,14 +91,6 @@ Dynamic amount of Threads (1 per RF logical channel on the `Transceiver` instance): -* `ControlServiceLoop`: Handles commands from the Per-ARFCN Control Interface - socket (<>). Each thread is responsible for managing one - socket related to one ARFCN or which is the same, to one RF logical channel. - These are the only threads expected to use the private `start()` and `stop()` - methods of the `Transceiver()` class, since those methods don't stop any of - the `ControlServiceLoop` threads as they must keep running to handle new - commands (for instance, to re-start processing samples with the _POWERON_ - command). * `RxServiceLoop`: Each thread of this type pulls bursts from the `RadioInterface` FIFO for one specific logical RF channel and handles it according to the slot and burst correlation type, finally sending proper data @@ -108,6 +99,10 @@ Manager UDP socket (<>), and fills the `RadioInterface` with it setting clock related information. +All the Per-ARFCN Control Interface socket (<>) commands are +handled by the event loop runnnig on the main thread. This is the only thread +expected to use the private `start()` and `stop()` methods. + [[code_component_radioiface]] === RadioInterface -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I34d117325e60b04b075c205d21bb0b827a5e8c52 Gerrit-Change-Number: 19089 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:26:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 10:26:04 +0000 Subject: Change in osmo-ci[master]: nightly-packages: Add osmo-e1d References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/19090 ) Change subject: nightly-packages: Add osmo-e1d ...................................................................... nightly-packages: Add osmo-e1d Change-Id: I71630d9f99e3fe703fc90ce14f3f0c3a82282a0d --- M scripts/osmocom-nightly-packages.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/90/19090/1 diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 0e5dcbf..29e8275 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -236,6 +236,7 @@ checkout_open5gs checkout neocon https://github.com/laf0rge/neocon checkout osmo-uecups + checkout osmo-e1d cd "$REPO" osmo_obs_checkout_copy debian8 osmo-gsm-manuals @@ -278,6 +279,7 @@ build open5gs build neocon build osmo-uecups + build osmo-e1d download_bumpversion -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/19090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I71630d9f99e3fe703fc90ce14f3f0c3a82282a0d Gerrit-Change-Number: 19090 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:26:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 10:26:53 +0000 Subject: Change in osmo-ci[master]: nightly-packages: Add osmo-e1d In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/19090 ) Change subject: nightly-packages: Add osmo-e1d ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/19090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I71630d9f99e3fe703fc90ce14f3f0c3a82282a0d Gerrit-Change-Number: 19090 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 01 Jul 2020 10:26:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:27:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 10:27:02 +0000 Subject: Change in osmo-ci[master]: nightly-packages: Add osmo-e1d In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/19090 ) Change subject: nightly-packages: Add osmo-e1d ...................................................................... nightly-packages: Add osmo-e1d Change-Id: I71630d9f99e3fe703fc90ce14f3f0c3a82282a0d --- M scripts/osmocom-nightly-packages.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 0e5dcbf..29e8275 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -236,6 +236,7 @@ checkout_open5gs checkout neocon https://github.com/laf0rge/neocon checkout osmo-uecups + checkout osmo-e1d cd "$REPO" osmo_obs_checkout_copy debian8 osmo-gsm-manuals @@ -278,6 +279,7 @@ build open5gs build neocon build osmo-uecups + build osmo-e1d download_bumpversion -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/19090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I71630d9f99e3fe703fc90ce14f3f0c3a82282a0d Gerrit-Change-Number: 19090 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:29:12 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 1 Jul 2020 10:29:12 +0000 Subject: Change in osmo-gsm-tester[master]: enb_amarisoft: register log options as config scheme References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19091 ) Change subject: enb_amarisoft: register log options as config scheme ...................................................................... enb_amarisoft: register log options as config scheme allows setting those in scenario files Change-Id: Idefd3c628441ededbee9411117ec426dd585eae0 --- M src/osmo_gsm_tester/obj/enb_amarisoft.py 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/91/19091/1 diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py index 8b4ecae..4b24844 100644 --- a/src/osmo_gsm_tester/obj/enb_amarisoft.py +++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py @@ -31,6 +31,11 @@ } schema.register_config_schema('amarisoft', config_schema) + config_schema = { + 'log_options': schema.STR, + } + schema.register_config_schema('amarisoftenb', config_schema) + def rf_type_valid(rf_type_str): return rf_type_str in ('uhd', 'zmq') -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Idefd3c628441ededbee9411117ec426dd585eae0 Gerrit-Change-Number: 19091 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:31:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 10:31:09 +0000 Subject: Change in osmo-e1d[master]: debian: Remove dependency to libosmo-abis; remove explicit libosmocor... References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19092 ) Change subject: debian: Remove dependency to libosmo-abis; remove explicit libosmocore version ...................................................................... debian: Remove dependency to libosmo-abis; remove explicit libosmocore version Change-Id: Icee48755142a90dac9843c9230a3b23551815fc1 --- M debian/control 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/92/19092/1 diff --git a/debian/control b/debian/control index 522bc60..562e1df 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,7 @@ libtool, pkg-config, python3-minimal, - libosmocore-dev (>= 1.3.0), - libosmo-abis-dev (>= 0.6.0), + libosmocore-dev, libusb-1.0-0-dev, osmo-gsm-manuals-dev Standards-Version: 3.9.8 @@ -40,5 +39,4 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libosmo-e1d0 (= ${binary:Version}), libosmocore-dev, - libosmo-abis-dev Description: Development headers for the osmo-e1d library. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Icee48755142a90dac9843c9230a3b23551815fc1 Gerrit-Change-Number: 19092 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:31:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 10:31:10 +0000 Subject: =?UTF-8?Q?Change_in_osmo-e1d=5Bmaster=5D=3A_Bump_version=3A_0=2E0=2E1=2E2-7731_=E2=86=92_0=2E1=2E0?= References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19093 ) Change subject: Bump version: 0.0.1.2-7731 ? 0.1.0 ...................................................................... Bump version: 0.0.1.2-7731 ? 0.1.0 Change-Id: I1a73ef1c6db1e5ccec4fbe29a94a26bce4f5d1a9 --- M debian/changelog 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/93/19093/1 diff --git a/debian/changelog b/debian/changelog index 238f98d..2180767 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +osmo-e1d (0.1.0) unstable; urgency=medium + + * debian/control: Add missing dependency to libusb-1.0-0-dev + * debian: Fix packaging of libosmo-e1d + * debian: Remove dependency to libosmo-abis; remove explicit libosmocore version + + -- Harald Welte Wed, 01 Jul 2020 12:29:43 +0200 + osmo-e1d (0.0.1) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I1a73ef1c6db1e5ccec4fbe29a94a26bce4f5d1a9 Gerrit-Change-Number: 19093 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:31:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jul 2020 10:31:27 +0000 Subject: Change in osmo-gsm-tester[master]: enb_amarisoft: register log options as config scheme In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19091 ) Change subject: enb_amarisoft: register log options as config scheme ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Idefd3c628441ededbee9411117ec426dd585eae0 Gerrit-Change-Number: 19091 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 01 Jul 2020 10:31:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:32:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jul 2020 10:32:15 +0000 Subject: Change in osmo-e1d[master]: debian: Remove dependency to libosmo-abis; remove explicit libosmocor... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19092 ) Change subject: debian: Remove dependency to libosmo-abis; remove explicit libosmocore version ...................................................................... Patch Set 1: Why removing specific libosmocore version? You are not really using new features? -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Icee48755142a90dac9843c9230a3b23551815fc1 Gerrit-Change-Number: 19092 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 01 Jul 2020 10:32:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:32:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jul 2020 10:32:35 +0000 Subject: Change in osmo-e1d[master]: debian: Remove dependency to libosmo-abis; remove explicit libosmocor... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19092 ) Change subject: debian: Remove dependency to libosmo-abis; remove explicit libosmocore version ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Icee48755142a90dac9843c9230a3b23551815fc1 Gerrit-Change-Number: 19092 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 01 Jul 2020 10:32:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:32:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 10:32:54 +0000 Subject: Change in osmo-e1d[master]: debian: Remove dependency to libosmo-abis; remove explicit libosmocor... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19092 ) Change subject: debian: Remove dependency to libosmo-abis; remove explicit libosmocore version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Icee48755142a90dac9843c9230a3b23551815fc1 Gerrit-Change-Number: 19092 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 01 Jul 2020 10:32:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:32:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jul 2020 10:32:59 +0000 Subject: =?UTF-8?Q?Change_in_osmo-e1d=5Bmaster=5D=3A_Bump_version=3A_0=2E0=2E1=2E2-7731_=E2=86=92_0=2E1=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19093 ) Change subject: Bump version: 0.0.1.2-7731 ? 0.1.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I1a73ef1c6db1e5ccec4fbe29a94a26bce4f5d1a9 Gerrit-Change-Number: 19093 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 01 Jul 2020 10:32:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:32:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 10:32:59 +0000 Subject: =?UTF-8?Q?Change_in_osmo-e1d=5Bmaster=5D=3A_Bump_version=3A_0=2E0=2E1=2E2-7731_=E2=86=92_0=2E1=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19093 ) Change subject: Bump version: 0.0.1.2-7731 ? 0.1.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I1a73ef1c6db1e5ccec4fbe29a94a26bce4f5d1a9 Gerrit-Change-Number: 19093 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 01 Jul 2020 10:32:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:33:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 10:33:02 +0000 Subject: Change in osmo-e1d[master]: debian: Remove dependency to libosmo-abis; remove explicit libosmocor... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19092 ) Change subject: debian: Remove dependency to libosmo-abis; remove explicit libosmocore version ...................................................................... debian: Remove dependency to libosmo-abis; remove explicit libosmocore version Change-Id: Icee48755142a90dac9843c9230a3b23551815fc1 --- M debian/control 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/debian/control b/debian/control index 522bc60..562e1df 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,7 @@ libtool, pkg-config, python3-minimal, - libosmocore-dev (>= 1.3.0), - libosmo-abis-dev (>= 0.6.0), + libosmocore-dev, libusb-1.0-0-dev, osmo-gsm-manuals-dev Standards-Version: 3.9.8 @@ -40,5 +39,4 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libosmo-e1d0 (= ${binary:Version}), libosmocore-dev, - libosmo-abis-dev Description: Development headers for the osmo-e1d library. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Icee48755142a90dac9843c9230a3b23551815fc1 Gerrit-Change-Number: 19092 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:33:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 10:33:04 +0000 Subject: =?UTF-8?Q?Change_in_osmo-e1d=5Bmaster=5D=3A_Bump_version=3A_0=2E0=2E1=2E2-7731_=E2=86=92_0=2E1=2E0?= In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19093 ) Change subject: Bump version: 0.0.1.2-7731 ? 0.1.0 ...................................................................... Bump version: 0.0.1.2-7731 ? 0.1.0 Change-Id: I1a73ef1c6db1e5ccec4fbe29a94a26bce4f5d1a9 --- M debian/changelog 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/debian/changelog b/debian/changelog index 238f98d..2180767 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +osmo-e1d (0.1.0) unstable; urgency=medium + + * debian/control: Add missing dependency to libusb-1.0-0-dev + * debian: Fix packaging of libosmo-e1d + * debian: Remove dependency to libosmo-abis; remove explicit libosmocore version + + -- Harald Welte Wed, 01 Jul 2020 12:29:43 +0200 + osmo-e1d (0.0.1) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I1a73ef1c6db1e5ccec4fbe29a94a26bce4f5d1a9 Gerrit-Change-Number: 19093 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:33:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 10:33:32 +0000 Subject: Change in osmo-trx[master]: TransceiverState: Initialize ctrs field in constructor In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19088 ) Change subject: TransceiverState: Initialize ctrs field in constructor ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4643a0500e9cad09938c05fab2f358167f72ffa9 Gerrit-Change-Number: 19088 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 01 Jul 2020 10:33:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:33:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 10:33:53 +0000 Subject: Change in osmo-trx[master]: doc/manuals: Update thread documentation after dropping CTRL sock thr... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19089 ) Change subject: doc/manuals: Update thread documentation after dropping CTRL sock threads ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I34d117325e60b04b075c205d21bb0b827a5e8c52 Gerrit-Change-Number: 19089 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 01 Jul 2020 10:33:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:39:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 10:39:58 +0000 Subject: Change in osmo-ci[master]: latest-packages: build osmo-e1d References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/19094 ) Change subject: latest-packages: build osmo-e1d ...................................................................... latest-packages: build osmo-e1d Change-Id: Ib74832bff1ce6856ada126c54f5f66c510034af4 --- M scripts/osmocom-latest-packages.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/94/19094/1 diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 6566951..212bb4c 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -150,6 +150,7 @@ checkout open5gs https://github.com/open5gs/open5gs checkout neocon https://github.com/laf0rge/neocon checkout osmo-uecups + checkout osmo-e1d cd "$TOP" osmo_obs_checkout_copy debian8 osmo-gsm-manuals @@ -188,6 +189,7 @@ build neocon # re-enable after libosmcoore > 1.3.1 is released (osmo_system_nowait2) #build osmo-uecups + build osmo-e1d cd "$TOP/$PROJ" osc ci -m "Latest Tagged versions of $DT" --noservice -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/19094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib74832bff1ce6856ada126c54f5f66c510034af4 Gerrit-Change-Number: 19094 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 1 10:39:57 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 10:39:57 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5efc680773afb_20cb2acbf8f725f8521642@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_9.0/i586 Package network:osmocom:latest/osmo-e1d failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 115s] /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_exit' [ 115s] /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_init' [ 115s] /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_get_device_descriptor' [ 115s] /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_free_device_list' [ 115s] /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_claim_interface' [ 115s] /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_get_port_numbers' [ 115s] /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_unref_device' [ 115s] /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_get_device_address' [ 115s] collect2: error: ld returned 1 exit status [ 115s] Makefile:521: recipe for target 'osmo-e1d-pipe' failed [ 115s] make[3]: *** [osmo-e1d-pipe] Error 1 [ 115s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 115s] Makefile:466: recipe for target 'all-recursive' failed [ 115s] make[2]: *** [all-recursive] Error 1 [ 115s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 115s] Makefile:390: 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] ### VM INTERACTION START ### [ 118s] [ 111.049652] sysrq: SysRq : Power Off [ 118s] [ 111.050822] reboot: Power down [ 118s] ### VM INTERACTION END ### [ 118s] [ 118s] build78 failed "build osmo-e1d_0.1.0.dsc" at Wed Jul 1 10:39:41 UTC 2020. [ 118s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:40:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 10:40:15 +0000 Subject: Change in osmo-ci[master]: latest-packages: build osmo-e1d In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/19094 ) Change subject: latest-packages: build osmo-e1d ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/19094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib74832bff1ce6856ada126c54f5f66c510034af4 Gerrit-Change-Number: 19094 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 01 Jul 2020 10:40:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:40:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 10:40:20 +0000 Subject: Change in osmo-ci[master]: latest-packages: build osmo-e1d In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/19094 ) Change subject: latest-packages: build osmo-e1d ...................................................................... latest-packages: build osmo-e1d Change-Id: Ib74832bff1ce6856ada126c54f5f66c510034af4 --- M scripts/osmocom-latest-packages.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 6566951..212bb4c 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -150,6 +150,7 @@ checkout open5gs https://github.com/open5gs/open5gs checkout neocon https://github.com/laf0rge/neocon checkout osmo-uecups + checkout osmo-e1d cd "$TOP" osmo_obs_checkout_copy debian8 osmo-gsm-manuals @@ -188,6 +189,7 @@ build neocon # re-enable after libosmcoore > 1.3.1 is released (osmo_system_nowait2) #build osmo-uecups + build osmo-e1d cd "$TOP/$PROJ" osc ci -m "Latest Tagged versions of $DT" --noservice -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/19094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib74832bff1ce6856ada126c54f5f66c510034af4 Gerrit-Change-Number: 19094 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 1 10:43:23 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 10:43:23 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5efc68d785aeb_20cb2acbf8f725f8521812@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-e1d failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 323s] /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_exit' [ 323s] /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_init' [ 323s] /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_get_device_descriptor' [ 323s] /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_free_device_list' [ 323s] /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_claim_interface' [ 323s] /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_get_port_numbers' [ 323s] /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_unref_device' [ 323s] /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_get_device_address' [ 323s] collect2: error: ld returned 1 exit status [ 323s] Makefile:521: recipe for target 'osmo-e1d-pipe' failed [ 323s] make[3]: *** [osmo-e1d-pipe] Error 1 [ 323s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 323s] Makefile:466: recipe for target 'all-recursive' failed [ 323s] make[2]: *** [all-recursive] Error 1 [ 323s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 323s] Makefile:390: recipe for target 'all' failed [ 323s] make[1]: *** [all] Error 2 [ 323s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 323s] dh_auto_build: make -j1 returned exit code 2 [ 323s] debian/rules:45: recipe for target 'build' failed [ 323s] make: *** [build] Error 2 [ 323s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 323s] ### VM INTERACTION START ### [ 326s] [ 311.424294] sysrq: SysRq : Power Off [ 326s] [ 311.498626] reboot: Power down [ 327s] ### VM INTERACTION END ### [ 327s] [ 327s] armbuild22 failed "build osmo-e1d_0.1.0.dsc" at Wed Jul 1 10:43:18 UTC 2020. [ 327s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 10:43:23 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 10:43:23 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_10/i586 In-Reply-To: References: Message-ID: <5efc68d91d263_20cb2acbf8f725f852211@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_10/i586 Package network:osmocom:latest/osmo-e1d failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 298s] /usr/bin/ld: /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_error_name' [ 298s] /usr/bin/ld: /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_set_configuration' [ 298s] /usr/bin/ld: /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_handle_events_timeout' [ 298s] /usr/bin/ld: /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_get_device' [ 298s] /usr/bin/ld: /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_exit' [ 298s] /usr/bin/ld: /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_init' [ 298s] /usr/bin/ld: /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_get_device_descriptor' [ 298s] /usr/bin/ld: /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_free_device_list' [ 298s] /usr/bin/ld: /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_claim_interface' [ 298s] /usr/bin/ld: /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_get_port_numbers' [ 298s] /usr/bin/ld: /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_unref_device' [ 298s] /usr/bin/ld: /usr/lib/i386-linux-gnu/libosmousb.so: undefined reference to `libusb_get_device_address' [ 298s] collect2: error: ld returned 1 exit status [ 298s] make[3]: *** [Makefile:527: osmo-e1d-pipe] Error 1 [ 298s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 298s] make[2]: *** [Makefile:466: all-recursive] Error 1 [ 298s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 298s] make[1]: *** [Makefile:390: all] Error 2 [ 298s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 298s] dh_auto_build: make -j1 returned exit code 2 [ 298s] make: *** [debian/rules:45: build] Error 2 [ 298s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 298s] ### VM INTERACTION START ### [ 301s] [ 284.513952] sysrq: SysRq : Power Off [ 301s] [ 284.527639] reboot: Power down [ 301s] ### VM INTERACTION END ### [ 301s] [ 301s] lamb26 failed "build osmo-e1d_0.1.0.dsc" at Wed Jul 1 10:43:11 UTC 2020. [ 301s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 1 10:43:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jul 2020 10:43:52 +0000 Subject: Change in osmo-pcu[master]: decoding.cpp: Improve logging in malformed UL data parsing References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19095 ) Change subject: decoding.cpp: Improve logging in malformed UL data parsing ...................................................................... decoding.cpp: Improve logging in malformed UL data parsing Change-Id: Ic4ad14b88fddde8d9e62e0a2587b501d36821f01 --- M src/decoding.cpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/95/19095/1 diff --git a/src/decoding.cpp b/src/decoding.cpp index 064c974..0437994 100644 --- a/src/decoding.cpp +++ b/src/decoding.cpp @@ -282,8 +282,8 @@ offs += chunks[i].length; if (offs > data_len) { LOGP(DRLCMACUL, LOGL_NOTICE, "UL DATA out of block " - "border, chunk idx: %d, size: %d\n", - i, chunks[i].length); + "border, chunk idx: %d, offset: %u, size: %d, data_len: %u\n", + i, offs, chunks[i].length, data_len); return -EINVAL; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic4ad14b88fddde8d9e62e0a2587b501d36821f01 Gerrit-Change-Number: 19095 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 1 10:45:07 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 10:45:07 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_10/aarch64 In-Reply-To: References: Message-ID: <5efc694e19f35_20cb2acbf8f725f85230b8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_10/aarch64 Package network:osmocom:latest/osmo-e1d failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 433s] /usr/bin/ld: /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_error_name' [ 433s] /usr/bin/ld: /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_set_configuration' [ 433s] /usr/bin/ld: /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_handle_events_timeout' [ 433s] /usr/bin/ld: /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_get_device' [ 433s] /usr/bin/ld: /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_exit' [ 433s] /usr/bin/ld: /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_init' [ 433s] /usr/bin/ld: /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_get_device_descriptor' [ 433s] /usr/bin/ld: /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_free_device_list' [ 433s] /usr/bin/ld: /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_claim_interface' [ 433s] /usr/bin/ld: /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_get_port_numbers' [ 433s] /usr/bin/ld: /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_unref_device' [ 433s] /usr/bin/ld: /usr/lib/aarch64-linux-gnu/libosmousb.so: undefined reference to `libusb_get_device_address' [ 433s] collect2: error: ld returned 1 exit status [ 433s] make[3]: *** [Makefile:527: osmo-e1d-pipe] Error 1 [ 433s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 433s] make[2]: *** [Makefile:466: all-recursive] Error 1 [ 433s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 433s] make[1]: *** [Makefile:390: all] Error 2 [ 433s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 433s] dh_auto_build: make -j1 returned exit code 2 [ 433s] make: *** [debian/rules:45: build] Error 2 [ 433s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 433s] ### VM INTERACTION START ### [ 437s] [ 416.840344] sysrq: SysRq : Power Off [ 437s] [ 417.046794] reboot: Power down [ 437s] ### VM INTERACTION END ### [ 437s] [ 437s] obs-arm-9 failed "build osmo-e1d_0.1.0.dsc" at Wed Jul 1 10:45:01 UTC 2020. [ 437s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 10:47:24 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 10:47:24 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5efc69c7d5803_20cb2acbf8f725f8523283@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_9.0/armv7l Package network:osmocom:latest/osmo-e1d failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 566s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_exit' [ 566s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_init' [ 566s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_get_device_descriptor' [ 566s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_free_device_list' [ 566s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_claim_interface' [ 566s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_get_port_numbers' [ 566s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_unref_device' [ 566s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_get_device_address' [ 566s] collect2: error: ld returned 1 exit status [ 566s] Makefile:521: recipe for target 'osmo-e1d-pipe' failed [ 566s] make[3]: *** [osmo-e1d-pipe] Error 1 [ 566s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 566s] Makefile:466: recipe for target 'all-recursive' failed [ 566s] make[2]: *** [all-recursive] Error 1 [ 566s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 566s] Makefile:390: recipe for target 'all' failed [ 566s] make[1]: *** [all] Error 2 [ 566s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 566s] dh_auto_build: make -j1 returned exit code 2 [ 566s] debian/rules:45: recipe for target 'build' failed [ 566s] make: *** [build] Error 2 [ 566s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 566s] ### VM INTERACTION START ### [ 569s] [ 542.753991] sysrq: SysRq : Power Off [ 569s] [ 542.846688] reboot: Power down [ 569s] ### VM INTERACTION END ### [ 569s] [ 569s] obs-arm-6 failed "build osmo-e1d_0.1.0.dsc" at Wed Jul 1 10:47:10 UTC 2020. [ 569s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 10:48:50 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 10:48:50 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5efc6a238b4dd_20cb2acbf8f725f85234be@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_9.0/x86_64 Package network:osmocom:latest/osmo-e1d failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 174s] /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_exit' [ 174s] /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_init' [ 174s] /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_get_device_descriptor' [ 174s] /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_free_device_list' [ 174s] /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_claim_interface' [ 174s] /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_get_port_numbers' [ 174s] /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_unref_device' [ 174s] /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_get_device_address' [ 174s] collect2: error: ld returned 1 exit status [ 174s] Makefile:521: recipe for target 'osmo-e1d-pipe' failed [ 174s] make[3]: *** [osmo-e1d-pipe] Error 1 [ 174s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 174s] Makefile:466: recipe for target 'all-recursive' failed [ 174s] make[2]: *** [all-recursive] Error 1 [ 174s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 174s] Makefile:390: recipe for target 'all' failed [ 174s] make[1]: *** [all] Error 2 [ 174s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 174s] dh_auto_build: make -j1 returned exit code 2 [ 174s] debian/rules:45: recipe for target 'build' failed [ 174s] make: *** [build] Error 2 [ 174s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 174s] ### VM INTERACTION START ### [ 177s] [ 167.241878] sysrq: SysRq : Power Off [ 177s] [ 167.245839] reboot: Power down [ 177s] ### VM INTERACTION END ### [ 177s] [ 177s] lamb16 failed "build osmo-e1d_0.1.0.dsc" at Wed Jul 1 10:48:38 UTC 2020. [ 177s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 10:49:57 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 10:49:57 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5efc6a623738c_20cb2acbf8f725f8523981@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_10/x86_64 Package network:osmocom:latest/osmo-e1d failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 213s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_error_name' [ 213s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_set_configuration' [ 213s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_handle_events_timeout' [ 213s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_get_device' [ 213s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_exit' [ 213s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_init' [ 213s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_get_device_descriptor' [ 213s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_free_device_list' [ 213s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_claim_interface' [ 213s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_get_port_numbers' [ 213s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_unref_device' [ 213s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_get_device_address' [ 213s] collect2: error: ld returned 1 exit status [ 213s] make[3]: *** [Makefile:527: osmo-e1d-pipe] Error 1 [ 213s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 213s] make[2]: *** [Makefile:466: all-recursive] Error 1 [ 213s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 213s] make[1]: *** [Makefile:390: all] Error 2 [ 213s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 213s] dh_auto_build: make -j1 returned exit code 2 [ 213s] make: *** [debian/rules:45: build] Error 2 [ 213s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 213s] ### VM INTERACTION START ### [ 217s] [ 206.814321] sysrq: SysRq : Power Off [ 217s] [ 206.824264] reboot: Power down [ 217s] ### VM INTERACTION END ### [ 217s] [ 217s] sheep81 failed "build osmo-e1d_0.1.0.dsc" at Wed Jul 1 10:49:48 UTC 2020. [ 217s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 10:49:58 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 10:49:58 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Raspbian_9.0/armv7l In-Reply-To: References: Message-ID: <5efc6a644ffab_20cb2acbf8f725f852407d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Raspbian_9.0/armv7l Package network:osmocom:latest/osmo-e1d failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 731s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_exit' [ 731s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_init' [ 731s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_get_device_descriptor' [ 731s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_free_device_list' [ 731s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_claim_interface' [ 731s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_get_port_numbers' [ 731s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_unref_device' [ 731s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_get_device_address' [ 731s] collect2: error: ld returned 1 exit status [ 731s] Makefile:521: recipe for target 'osmo-e1d-pipe' failed [ 731s] make[3]: *** [osmo-e1d-pipe] Error 1 [ 731s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 731s] Makefile:466: recipe for target 'all-recursive' failed [ 731s] make[2]: *** [all-recursive] Error 1 [ 731s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 731s] Makefile:390: recipe for target 'all' failed [ 731s] make[1]: *** [all] Error 2 [ 731s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 731s] dh_auto_build: make -j1 returned exit code 2 [ 731s] debian/rules:45: recipe for target 'build' failed [ 731s] make: *** [build] Error 2 [ 731s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 731s] ### VM INTERACTION START ### [ 735s] [ 711.184355] sysrq: SysRq : Power Off [ 735s] [ 711.230800] reboot: Power down [ 737s] ### VM INTERACTION END ### [ 737s] [ 737s] obs-arm-5 failed "build osmo-e1d_0.1.0.dsc" at Wed Jul 1 10:49:56 UTC 2020. [ 737s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 10:59:40 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 10:59:40 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_10/armv7l In-Reply-To: References: Message-ID: <5efc6cb3b59f7_20cb2acbf8f725f85259f4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_10/armv7l Package network:osmocom:latest/osmo-e1d failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 624s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_error_name' [ 624s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_set_configuration' [ 624s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_handle_events_timeout' [ 624s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_get_device' [ 624s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_exit' [ 624s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_init' [ 624s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_get_device_descriptor' [ 624s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_free_device_list' [ 624s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_claim_interface' [ 624s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_get_port_numbers' [ 624s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_unref_device' [ 624s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_get_device_address' [ 624s] collect2: error: ld returned 1 exit status [ 624s] make[3]: *** [Makefile:527: osmo-e1d-pipe] Error 1 [ 624s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 624s] make[2]: *** [Makefile:466: all-recursive] Error 1 [ 624s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 624s] make[1]: *** [Makefile:390: all] Error 2 [ 624s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 624s] dh_auto_build: make -j1 returned exit code 2 [ 624s] make: *** [debian/rules:45: build] Error 2 [ 624s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 624s] ### VM INTERACTION START ### [ 627s] [ 592.667564] sysrq: SysRq : Power Off [ 627s] [ 592.669416] reboot: Power down [ 627s] ### VM INTERACTION END ### [ 627s] [ 627s] obs-arm-6 failed "build osmo-e1d_0.1.0.dsc" at Wed Jul 1 10:59:25 UTC 2020. [ 627s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 1 10:59:57 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 01 Jul 2020 10:59:57 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5efc6cb9a1f5d_20cb2acbf8f725f8526215@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Raspbian_10/armv7l Package network:osmocom:latest/osmo-e1d failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 640s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_error_name' [ 640s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_set_configuration' [ 640s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_handle_events_timeout' [ 640s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_get_device' [ 640s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_exit' [ 640s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_init' [ 640s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_get_device_descriptor' [ 640s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_free_device_list' [ 640s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_claim_interface' [ 640s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_get_port_numbers' [ 640s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_unref_device' [ 640s] /usr/bin/ld: /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_get_device_address' [ 640s] collect2: error: ld returned 1 exit status [ 640s] make[3]: *** [Makefile:527: osmo-e1d-pipe] Error 1 [ 640s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 640s] make[2]: *** [Makefile:466: all-recursive] Error 1 [ 640s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 640s] make[1]: *** [Makefile:390: all] Error 2 [ 640s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 640s] dh_auto_build: make -j1 returned exit code 2 [ 640s] make: *** [debian/rules:45: build] Error 2 [ 640s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 640s] ### VM INTERACTION START ### [ 643s] [ 610.878299] sysrq: SysRq : Power Off [ 643s] [ 610.901628] reboot: Power down [ 644s] ### VM INTERACTION END ### [ 644s] [ 644s] obs-arm-5 failed "build osmo-e1d_0.1.0.dsc" at Wed Jul 1 10:59:41 UTC 2020. [ 644s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 1 11:07:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 11:07:28 +0000 Subject: Change in osmo-e1d[master]: Makefile.am: Don't put LIBS into CFLAGS References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19096 ) Change subject: Makefile.am: Don't put LIBS into CFLAGS ...................................................................... Makefile.am: Don't put LIBS into CFLAGS this was accidentially introduced in Change-Id I47b6e4efaad52e68e2b50a7993076f3706f86628 and causese build failures on some targets: libtool: link: gcc -Wall -Wno-unused-result -pthread -I/usr/include/ -I/usr/include/libusb-1.0 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -o .libs/osmo-e1d-pipe e1d-ts-pipe.o /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmousb.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmocore.so ./.libs/libosmo-e1d.so -pthread /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_open' Change-Id: I09fc640847e2701ea13a0afa759e8cc0ed75cab9 --- M src/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/96/19096/1 diff --git a/src/Makefile.am b/src/Makefile.am index 9c098e7..6dd13ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS=-Wall -Wno-unused-result $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOVTY_LIBS) $(LIBOSMOUSB_LIBS) $(LIBUSB_CFLAGS) + $(LIBOSMOVTY_CFLAGS) $(LIBOSMOUSB_CFLAGS) $(LIBUSB_CFLAGS) lib_LTLIBRARIES = libosmo-e1d.la -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I09fc640847e2701ea13a0afa759e8cc0ed75cab9 Gerrit-Change-Number: 19096 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 11:49:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jul 2020 11:49:41 +0000 Subject: Change in osmo-e1d[master]: Makefile.am: Don't put LIBS into CFLAGS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19096 ) Change subject: Makefile.am: Don't put LIBS into CFLAGS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I09fc640847e2701ea13a0afa759e8cc0ed75cab9 Gerrit-Change-Number: 19096 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 01 Jul 2020 11:49:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 12:01:57 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 1 Jul 2020 12:01:57 +0000 Subject: Change in osmo-gsm-tester[master]: enb_amarisoft: register log options as config scheme In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19091 ) Change subject: enb_amarisoft: register log options as config scheme ...................................................................... enb_amarisoft: register log options as config scheme allows setting those in scenario files Change-Id: Idefd3c628441ededbee9411117ec426dd585eae0 --- M src/osmo_gsm_tester/obj/enb_amarisoft.py 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py index 8b4ecae..4b24844 100644 --- a/src/osmo_gsm_tester/obj/enb_amarisoft.py +++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py @@ -31,6 +31,11 @@ } schema.register_config_schema('amarisoft', config_schema) + config_schema = { + 'log_options': schema.STR, + } + schema.register_config_schema('amarisoftenb', config_schema) + def rf_type_valid(rf_type_str): return rf_type_str in ('uhd', 'zmq') -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Idefd3c628441ededbee9411117ec426dd585eae0 Gerrit-Change-Number: 19091 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 14:51:32 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 1 Jul 2020 14:51:32 +0000 Subject: Change in osmo-msc[master]: refactor: move RESET Osmux TLV parsing to ran_msg_a.c In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/19024 to look at the new patch set (#3). Change subject: refactor: move RESET Osmux TLV parsing to ran_msg_a.c ...................................................................... refactor: move RESET Osmux TLV parsing to ran_msg_a.c ran_peer.c is not the proper place to parse messages, because it should be RAN agnostic. All parsing and encoding belongs in ran_msg_a.c and ran_msg_iu.c. Move the Osmux TLV parsing into the is_reset_msg op: add supports_osmux out-parameter (and add a logging fi pointer). To be able to modify msg->l3h, also make the msgb arg non-const. In ranap_is_reset_msg(), always return non-support for Osmux. In bssmap_is_reset_msg(), return 0 if no TLVs were parsed, 1/-1 if an Osmux TLV was present/not present. Update the osmux support flag directly where the ConnectionLess message is received, so that there is only one place responsible for that. Related: OS#4595 Change-Id: I1ad4a3f9356216dd4bf8c48fba29fd23438810a7 --- M include/osmocom/msc/ran_msg_a.h M include/osmocom/msc/ran_msg_iu.h M include/osmocom/msc/sccp_ran.h M src/libmsc/ran_msg_a.c M src/libmsc/ran_msg_iu.c M src/libmsc/ran_peer.c 6 files changed, 60 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/24/19024/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1ad4a3f9356216dd4bf8c48fba29fd23438810a7 Gerrit-Change-Number: 19024 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 14:51:34 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 1 Jul 2020 14:51:34 +0000 Subject: Change in osmo-msc[master]: refactor: move RESET Osmux TLV parsing to ran_msg_a.c In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19024 ) Change subject: refactor: move RESET Osmux TLV parsing to ran_msg_a.c ...................................................................... Patch Set 2: (5 comments) > TBH I don't see a problem with also checking for osmux support on RANAP, even if no HNGBW or whatever doesn't support it yet, it may in the future. That's exactly why there is a supports_osmux param in ranap_is_reset_msg(). > That being said, if you think it's more convenient or there's any benefit in doing it this way for whatever reason then fine with me. It sounds like you don't acknowledge the big problem of feeding a RANAP message to the gsm0808 TLV decoding functions. That is just plain insane, and that comes from doing message decoding in ran_peer.c where it doesn't belong at all. The "whatever reason" is absolute basic sanity of keeping completely different RAN message coding in the proper places :P https://gerrit.osmocom.org/c/osmo-msc/+/19024/2/src/libmsc/ran_msg_a.c File src/libmsc/ran_msg_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/19024/2/src/libmsc/ran_msg_a.c at 1283 PS2, Line 1283: if (supports_osmux == NULL) > simply check supports_osmux in bssmap_is_reset_msg()? What abnout simply returning a bool? then i'd have to do that check twice. bool: I want to also reflect a "don't know" case where neither support nor non-support are certain, for non-RESET related messages. Hence -1, 0, 1 rc. The caller can then simply handle the supports_osmux rc without having to convolute with the returned enum reset_msg_type. https://gerrit.osmocom.org/c/osmo-msc/+/19024/2/src/libmsc/ran_msg_a.c at 1286 PS2, Line 1286: rc = tlv_parse(&tp, gsm0808_att_tlvdef(), msgb_l3(msg) + 1, msgb_l3len(msg) - 1, 0, 0); (answering below comment here) I was going back and forth on modifying msg->l3h. I had already written const char *l3h = msgb_l2(msg) + sizeof(struct bssmap_header); int l3_len = msgb_l2len(msg) - sizeof(struct bssmap_header); rc = tlv_parse(..., l3h + 1, l3_len - 1, ...); But dropped that again because IMHO we should rather use the proper msgb_l3len() definitions than copying the calculation code. Also when receiving a BSSMAP message, setting l3h to the right location is the right thing to do. Since this code is called in code paths where we anyway set l3h everywhere else, it is a bit ridiculous to require a const msgb instead of using the proper msgb macros. I also considered putting the l3h modification outside of *_is_reset_msg() but that doesn't fit well, because we're doing msg size plausibility checks below in bssmap_is_reset_msg(), and setting l3h only makes sense after those checks passed. https://gerrit.osmocom.org/c/osmo-msc/+/19024/2/src/libmsc/ran_msg_a.c at 1314 PS2, Line 1314: l2->l3h = msgb_l2(l2) + sizeof(struct bssmap_header); > Ack (answer for this is above) https://gerrit.osmocom.org/c/osmo-msc/+/19024/2/src/libmsc/ran_msg_a.c at 1316 PS2, Line 1316: switch (l2->l2h[sizeof(*bs)]) { ...and I should actually also do msgb_l3(l2)[0] here https://gerrit.osmocom.org/c/osmo-msc/+/19024/2/src/libmsc/ran_msg_iu.c File src/libmsc/ran_msg_iu.c: https://gerrit.osmocom.org/c/osmo-msc/+/19024/2/src/libmsc/ran_msg_iu.c at 447 PS2, Line 447: if (supports_osmux != NULL) > You are using "if (supports_osmux)" on the other, you could use it too here. oh you mean writing "x != NULL" vs just "x" ... well, does it matter? (usually I'm all for 'if (x)' but here 'if (supports_osmux)' reads like we're analysing the flag, and '!= NULL' sort of hints that it is a pointer to the flag instead; so I'm changing the other one) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1ad4a3f9356216dd4bf8c48fba29fd23438810a7 Gerrit-Change-Number: 19024 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 01 Jul 2020 14:51:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 14:55:22 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 1 Jul 2020 14:55:22 +0000 Subject: Change in osmo-msc[master]: refactor: move RESET Osmux TLV parsing to ran_msg_a.c In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19024 ) Change subject: refactor: move RESET Osmux TLV parsing to ran_msg_a.c ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/19024/2/src/libmsc/ran_msg_a.c File src/libmsc/ran_msg_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/19024/2/src/libmsc/ran_msg_a.c at 1286 PS2, Line 1286: rc = tlv_parse(&tp, gsm0808_att_tlvdef(), msgb_l3(msg) + 1, msgb_l3len(msg) - 1, 0, 0); > (answering below comment here) [?] actually the reason why we can't set l3h outside of is_reset_msg() is because the code there is RAN agnostic and doesn't know which header to add to l2h -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1ad4a3f9356216dd4bf8c48fba29fd23438810a7 Gerrit-Change-Number: 19024 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 01 Jul 2020 14:55:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 14:58:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jul 2020 14:58:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 ) Change subject: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibafa4246b442e7c26666eb0d37570bfbbf1dbda7 Gerrit-Change-Number: 19076 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 01 Jul 2020 14:58:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 14:58:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jul 2020 14:58:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ull_all_sizes In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19077 ) Change subject: pcu: Introduce test TC_ull_all_sizes ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I293c8dea2d44c5232a96c44b605e0d8c6dc1fa0e Gerrit-Change-Number: 19077 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 01 Jul 2020 14:58:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 15:41:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 15:41:03 +0000 Subject: Change in osmo-e1d[master]: Makefile.am: Don't put LIBS into CFLAGS In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19096 ) Change subject: Makefile.am: Don't put LIBS into CFLAGS ...................................................................... Makefile.am: Don't put LIBS into CFLAGS this was accidentially introduced in Change-Id I47b6e4efaad52e68e2b50a7993076f3706f86628 and causese build failures on some targets: libtool: link: gcc -Wall -Wno-unused-result -pthread -I/usr/include/ -I/usr/include/libusb-1.0 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -o .libs/osmo-e1d-pipe e1d-ts-pipe.o /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmousb.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmocore.so ./.libs/libosmo-e1d.so -pthread /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libosmousb.so: undefined reference to `libusb_open' Change-Id: I09fc640847e2701ea13a0afa759e8cc0ed75cab9 --- M src/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/Makefile.am b/src/Makefile.am index 9c098e7..6dd13ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS=-Wall -Wno-unused-result $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOVTY_LIBS) $(LIBOSMOUSB_LIBS) $(LIBUSB_CFLAGS) + $(LIBOSMOVTY_CFLAGS) $(LIBOSMOUSB_CFLAGS) $(LIBUSB_CFLAGS) lib_LTLIBRARIES = libosmo-e1d.la -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I09fc640847e2701ea13a0afa759e8cc0ed75cab9 Gerrit-Change-Number: 19096 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 15:42:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 15:42:50 +0000 Subject: Change in osmo-pcu[master]: decoding.cpp: Improve logging in malformed UL data parsing In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19095 ) Change subject: decoding.cpp: Improve logging in malformed UL data parsing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic4ad14b88fddde8d9e62e0a2587b501d36821f01 Gerrit-Change-Number: 19095 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 01 Jul 2020 15:42:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 15:43:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 15:43:10 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Fix logging line format in rcv_block wrong length In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19065 ) Change subject: pdch.cpp: Fix logging line format in rcv_block wrong length ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2f818021cef41ab6f4569cd87026072811853352 Gerrit-Change-Number: 19065 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 01 Jul 2020 15:43:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 15:43:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 15:43:36 +0000 Subject: Change in osmo-pcu[master]: Set correct GSMTAP channel type for PDTCH messages returning error In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19068 ) Change subject: Set correct GSMTAP channel type for PDTCH messages returning error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ifea94095d669b528874e64ca823a776cd6e22b4b Gerrit-Change-Number: 19068 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 01 Jul 2020 15:43:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 15:43:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 15:43:39 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Fix logging line format in rcv_block wrong length In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19065 ) Change subject: pdch.cpp: Fix logging line format in rcv_block wrong length ...................................................................... pdch.cpp: Fix logging line format in rcv_block wrong length Change-Id: I2f818021cef41ab6f4569cd87026072811853352 --- M src/pdch.cpp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/pdch.cpp b/src/pdch.cpp index b97f4c7..6bddbfd 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -754,8 +754,8 @@ enum CodingScheme cs = mcs_get_by_size_ul(len); if (!cs) { bts()->do_rate_ctr_inc(CTR_DECODE_ERRORS); - LOGP(DRLCMACUL, LOGL_ERROR, "Dropping data block with invalid" - "length: %d)\n", len); + LOGP(DRLCMACUL, LOGL_ERROR, "Dropping data block with invalid " + "length %d: %s\n", len, osmo_hexdump(data, len)); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2f818021cef41ab6f4569cd87026072811853352 Gerrit-Change-Number: 19065 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 15:43:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 15:43:40 +0000 Subject: Change in osmo-pcu[master]: Set correct GSMTAP channel type for PDTCH messages returning error In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19068 ) Change subject: Set correct GSMTAP channel type for PDTCH messages returning error ...................................................................... Set correct GSMTAP channel type for PDTCH messages returning error For instance, that may happen because the len of the message is not filling the expect size (because padding is missing for example). Still, in this case we know the channel type, so we set it so that wireshark tries to decode the message as a data one. Change-Id: Ifea94095d669b528874e64ca823a776cd6e22b4b --- M src/pcu_l1_if.cpp 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 23f6fbb..7fa82fb 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -315,6 +315,7 @@ int rc; int current_fn = get_current_fn(); pcu_l1_meas meas; + uint8_t gsmtap_chantype; LOGP(DL1IF, LOGL_DEBUG, "Data indication received: sapi=%d arfcn=%d " "fn=%d cur_fn=%d block=%d data=%s\n", data_ind->sapi, @@ -335,19 +336,22 @@ rc = pcu_rx_data_ind_pdtch(data_ind->trx_nr, data_ind->ts_nr, data_ind->data, data_ind->len, data_ind->fn, &meas); + gsmtap_chantype = GSMTAP_CHANNEL_PDTCH; break; case PCU_IF_SAPI_BCCH: rc = pcu_rx_data_ind_bcch(data_ind->data, data_ind->len); + gsmtap_chantype = GSMTAP_CHANNEL_BCCH; break; default: LOGP(DL1IF, LOGL_ERROR, "Received PCU data indication with " "unsupported sapi %d\n", data_ind->sapi); rc = -EINVAL; + gsmtap_chantype = GSMTAP_CHANNEL_UNKNOWN; } if (rc < 0 && (bts->gsmtap_categ_mask & (1 <gsmtap, data_ind->arfcn | GSMTAP_ARFCN_F_UPLINK, data_ind->ts_nr, - GSMTAP_CHANNEL_UNKNOWN, 0, data_ind->fn, meas.rssi, meas.link_qual, data_ind->data, data_ind->len); + gsmtap_chantype, 0, data_ind->fn, meas.rssi, meas.link_qual, data_ind->data, data_ind->len); } return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ifea94095d669b528874e64ca823a776cd6e22b4b Gerrit-Change-Number: 19068 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 15:45:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 15:45:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_flow_multiple_llc_blocks In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19073 ) Change subject: pcu: Introduce test TC_ul_flow_multiple_llc_blocks ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I62f42981d31bc5c2e4c61e92bea329bd74cb2d19 Gerrit-Change-Number: 19073 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 01 Jul 2020 15:45:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 15:46:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 15:46:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 ) Change subject: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() ...................................................................... Patch Set 2: I'm not sure it should automatically choose the cs based on the length only. I think we want to explicitly ask for a given cs -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibafa4246b442e7c26666eb0d37570bfbbf1dbda7 Gerrit-Change-Number: 19076 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 01 Jul 2020 15:46:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 15:47:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 15:47:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ull_all_sizes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19077 ) Change subject: pcu: Introduce test TC_ull_all_sizes ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I293c8dea2d44c5232a96c44b605e0d8c6dc1fa0e Gerrit-Change-Number: 19077 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 01 Jul 2020 15:47:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 15:48:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 1 Jul 2020 15:48:29 +0000 Subject: Change in docker-playground[master]: Makefile: Support overriding LIBOSMOCORE_BRANCH In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19066 ) Change subject: Makefile: Support overriding LIBOSMOCORE_BRANCH ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia9f26f3513da339d2255a0f6b2277682fe15bdf2 Gerrit-Change-Number: 19066 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 01 Jul 2020 15:48:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 15:52:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jul 2020 15:52:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 ) Change subject: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() ...................................................................... Patch Set 2: > Patch Set 2: > > I'm not sure it should automatically choose the cs based on the length only. I think we want to explicitly ask for a given cs I thought about it and I don't think it makes much sense in the context of GPRS, since the message itself doesn't contain information about the CS it uses, since that's done at a lower layer and we don't reach that point, we simply encode based on block size. Also I don't see the point in transmitting in for instance CS3 if the LLC block you want to transmit fits in a CS1. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibafa4246b442e7c26666eb0d37570bfbbf1dbda7 Gerrit-Change-Number: 19076 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 01 Jul 2020 15:52:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 16:10:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jul 2020 16:10:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce TC_ul_data_toolong_fills_padding References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19097 ) Change subject: pcu: Introduce TC_ul_data_toolong_fills_padding ...................................................................... pcu: Introduce TC_ul_data_toolong_fills_padding Change-Id: Ic37294efac005ed6c0ce48dea566fd20284b5868 --- M pcu/PCU_Tests.ttcn 1 file changed, 66 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/19097/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 3bad7d5..b6badc0 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -966,6 +966,71 @@ setverdict(pass); } +function f_TC_ul_data_toolong_fills_padding_cs(inout GprsMS ms, CodingScheme cs, integer cv) runs on RAW_PCU_Test_CT { + var octetstring payload; + var template (value) RlcmacUlBlock ul_data; + var integer block_len, max_valid_data_len; + timer T; + + block_len := f_rlcmac_cs_mcs2block_len(cs); + /* We need to send with TLLI since we are in One-Phase Access Contenion + * resoultion), so that's -4 bytes of data, -3 for headers, -1 for LI + * indicator, -1 for spare bits octet at the end */ + max_valid_data_len := block_len - 4 - 3 - 1 - 1; + payload := f_rnd_octstring(max_valid_data_len + 1); /* +1 to write LLC data on last padding octet */ + ul_data := t_RLCMAC_UL_DATA_TLLI(tfi := ms.ul_tbf.tfi, + cv := cv, + bsn := ms.ul_tbf.bsn, + blocks := { t_RLCMAC_LLCBLOCK(payload, + t_RLCMAC_LLCBLOCK_HDR(length_ind := lengthof(payload), more := false, e := true)) + }, + tlli := ms.tlli); + f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_data_ind(ms, enc_RlcmacUlBlock(valueof(ul_data))); + + T.start(0.5); + alt { + [] BSSGP[0].receive(tr_BSSGP_UL_UD(ms.tlli, mp_gb_cfg.cell_id, ?)) { + setverdict(fail, "LLC PDU in Malformed RLC block was forwarded"); + f_shutdown(__BFILE__, __LINE__); + } + [] T.timeout { + setverdict(pass); + } + } +} +/* Verify PCU finds out incorrectly formated RLC block and discards it. This + blocks intentionally contain last byte of data placed in last byte of RLC + containing padding/spare bits, which is incorrect. Spare bits exist and are + described for CS2..4 in 3GPP TS 44.060 Table 10.2.1: "RLC data block size, + discounting padding in octet" */ +testcase TC_ul_data_toolong_fills_padding() runs on RAW_PCU_Test_CT { + var GprsMS ms; + var integer block_len, max_valid_data_len; + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename()); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign('FFFFFFFF'O, ms.tlli); + + /* Establish an Uplink TBF */ + f_ms_establish_ul_tbf(ms); + + f_TC_ul_data_toolong_fills_padding_cs(ms, CS_2, 2); + f_TC_ul_data_toolong_fills_padding_cs(ms, CS_3, 1); + f_TC_ul_data_toolong_fills_padding_cs(ms, CS_4, 0); + + setverdict(pass); +} + /* Test scenario where MS wants to send some data on PDCH against SGSN and it is * answered, so TBFs for uplink and later for downlink are created. */ @@ -1953,6 +2018,7 @@ execute( TC_t3193() ); execute( TC_countdown_procedure() ); execute( TC_ul_all_sizes() ); + execute( TC_ul_data_toolong_fills_padding() ); execute( TC_mo_ping_pong() ); execute( TC_mo_ping_pong_with_ul_racap() ); execute( TC_force_two_phase_access() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic37294efac005ed6c0ce48dea566fd20284b5868 Gerrit-Change-Number: 19097 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 16:11:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jul 2020 16:11:39 +0000 Subject: Change in docker-playground[master]: Makefile: Support overriding LIBOSMOCORE_BRANCH In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19066 ) Change subject: Makefile: Support overriding LIBOSMOCORE_BRANCH ...................................................................... Makefile: Support overriding LIBOSMOCORE_BRANCH gr-gsm-master is using it but it cannot be overriden. Similarly iy can be helpful to do so in temporarliy modified images when testing libosmocore features. Change-Id: Ia9f26f3513da339d2255a0f6b2277682fe15bdf2 --- M make/Makefile 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: pespin: Verified laforge: Looks good to me, approved diff --git a/make/Makefile b/make/Makefile index 0dd111c..d483082 100644 --- a/make/Makefile +++ b/make/Makefile @@ -16,6 +16,7 @@ REGISTRY_HOST?=docker.io USERNAME?=$(USER) NAME?=$(shell basename $(CURDIR)) +LIBOSMOCORE_BRANCH?=master OSMO_TTCN3_BRANCH?=master OSMO_BB_BRANCH?=master OSMO_BSC_BRANCH?=master @@ -60,6 +61,7 @@ --build-arg USER=$(USERNAME) \ --build-arg OSMO_TTCN3_BRANCH=$(OSMO_TTCN3_BRANCH) \ --build-arg DISTRO=$(DISTRO) \ + --build-arg LIBOSMOCORE_BRANCH=$(LIBOSMOCORE_BRANCH) \ --build-arg OSMO_BB_BRANCH=$(OSMO_BB_BRANCH) \ --build-arg OSMO_BSC_BRANCH=$(OSMO_BSC_BRANCH) \ --build-arg OSMO_BTS_BRANCH=$(OSMO_BTS_BRANCH) \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia9f26f3513da339d2255a0f6b2277682fe15bdf2 Gerrit-Change-Number: 19066 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 16:11:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 1 Jul 2020 16:11:52 +0000 Subject: Change in osmo-pcu[master]: decoding.cpp: Improve logging in malformed UL data parsing In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19095 ) Change subject: decoding.cpp: Improve logging in malformed UL data parsing ...................................................................... decoding.cpp: Improve logging in malformed UL data parsing Change-Id: Ic4ad14b88fddde8d9e62e0a2587b501d36821f01 --- M src/decoding.cpp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/decoding.cpp b/src/decoding.cpp index 064c974..0437994 100644 --- a/src/decoding.cpp +++ b/src/decoding.cpp @@ -282,8 +282,8 @@ offs += chunks[i].length; if (offs > data_len) { LOGP(DRLCMACUL, LOGL_NOTICE, "UL DATA out of block " - "border, chunk idx: %d, size: %d\n", - i, chunks[i].length); + "border, chunk idx: %d, offset: %u, size: %d, data_len: %u\n", + i, offs, chunks[i].length, data_len); return -EINVAL; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic4ad14b88fddde8d9e62e0a2587b501d36821f01 Gerrit-Change-Number: 19095 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 21:33:33 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 1 Jul 2020 21:33:33 +0000 Subject: Change in osmo-msc[master]: refactor: move RESET Osmux TLV parsing to ran_msg_a.c In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/19024 to look at the new patch set (#4). Change subject: refactor: move RESET Osmux TLV parsing to ran_msg_a.c ...................................................................... refactor: move RESET Osmux TLV parsing to ran_msg_a.c ran_peer.c is not the proper place to parse messages, because it should be RAN agnostic. All parsing and encoding belongs in ran_msg_a.c and ran_msg_iu.c. Move the Osmux TLV parsing into the is_reset_msg op: add supports_osmux out-parameter (and add a logging fi pointer). To be able to modify msg->l3h, also make the msgb arg non-const. In ranap_is_reset_msg(), always return non-support for Osmux. In bssmap_is_reset_msg(), return 0 if no TLVs were parsed, 1/-1 if an Osmux TLV was present/not present. Update the osmux support flag directly where the ConnectionLess message is received, so that there is only one place responsible for that. Related: OS#4595 Change-Id: I1ad4a3f9356216dd4bf8c48fba29fd23438810a7 --- M include/osmocom/msc/ran_msg_a.h M include/osmocom/msc/ran_msg_iu.h M include/osmocom/msc/sccp_ran.h M src/libmsc/ran_msg_a.c M src/libmsc/ran_msg_iu.c M src/libmsc/ran_peer.c 6 files changed, 60 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/24/19024/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1ad4a3f9356216dd4bf8c48fba29fd23438810a7 Gerrit-Change-Number: 19024 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 21:33:48 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 1 Jul 2020 21:33:48 +0000 Subject: Change in osmo-msc[master]: sgs_tx_loc_upd_resp_cb(): fix error handling for MI encoding References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/19098 ) Change subject: sgs_tx_loc_upd_resp_cb(): fix error handling for MI encoding ...................................................................... sgs_tx_loc_upd_resp_cb(): fix error handling for MI encoding new_id_ptr should be passed as NULL if encoding the TMSI failed, so initialize it accordingly. Also add some bloat to better handle the case of an encoding error, even though from code analysis that should not be possible here: there is enough buffer, the MI is a TMSI encoded from a uint32_t... The problem was introduced by Idfc8e576e10756aeaacf5569f6178068313eb7ea, before which new_id_len was always 0 when no TMSI was present. Related: CID#210894 Change-Id: I800c5dca3fdbdedf70a64d9fd5a1bdfd1397f431 --- M src/libmsc/sgs_iface.c 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/98/19098/1 diff --git a/src/libmsc/sgs_iface.c b/src/libmsc/sgs_iface.c index b792e46..d13449d 100644 --- a/src/libmsc/sgs_iface.c +++ b/src/libmsc/sgs_iface.c @@ -372,7 +372,7 @@ struct vlr_subscr *vsub = response->vsub; struct sgs_mme_ctx *mme; uint8_t new_id[2 + GSM48_TMSI_LEN]; - uint8_t *new_id_ptr = new_id; + uint8_t *new_id_ptr = NULL; int new_id_len = 0; uint8_t resp_msg_type; @@ -403,8 +403,14 @@ .tmsi = vsub->tmsi_new, }; new_id_len = osmo_mobile_identity_encode_buf(new_id, sizeof(new_id), &tmsi_mi, false); - if (new_id_len > 0) + if (new_id_len > 0) { new_id_ptr = new_id; + } else { + /* Failure to encode the TMSI is not actually possible here, this is just for paranoia + * and coverity scan. */ + new_id_len = 0; + LOGPFSMSL(vsub->sgs_fsm, DMM, LOGL_ERROR, "Cannot encode TMSI Mobile Identity\n"); + } } resp = gsm29118_create_lu_ack(vsub->imsi, &vsub->sgs.lai, new_id_ptr, new_id_len); sgs_tx(mme->conn, resp); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I800c5dca3fdbdedf70a64d9fd5a1bdfd1397f431 Gerrit-Change-Number: 19098 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 1 21:34:35 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 1 Jul 2020 21:34:35 +0000 Subject: Change in osmo-bsc[master]: create ASP+AS only once per cs7 instance In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19003 ) Change subject: create ASP+AS only once per cs7 instance ...................................................................... create ASP+AS only once per cs7 instance Refactor osmo_bsc_sigtran_init(): invoke osmo_sccp_simple_client_on_ss7_id() exactly once per cs7 instance. When introducing MSC pooling to the ttcn3-bsc-tests, it became apparent that osmo-bsc rapidly huts down and re-creates the SCTP link for each configured MSC. This manifested in an osmo-stp crash (fixed in libosmo-sccp I9b3ae6dfcf6efeabb7fb6c33503d1d7924fec2fa). I first tried to fix it by only restarting an ASP when it wasn't found in the AS yet, but that created obscure problems described in OS#4635 which in turn completely broke ttcn3-msc-tests. This solution keeps osmo_sccp_simple_client_on_ss7_id() unchanged and instead invokes it exactly once per cs7 instance. Keep the same auto-config logic, but change and improve the mechanisms to achieve it: Replace the fail_on_next_invalid_cfg flag with a more accurate check against remote PC collisions between configured MSCs. Before this patch, the code made sure that at most one MSC lacks an explicit remote address (and cs7 instance), so that no two MSCs get the same default remote PC. This patch more accurately checks that no two MSCs use the same remote PC on the same cs7 instance, period, whether implicitly or explicitly configured. Before this patch, the logic amounted to creating cs7 instance 0 implicitly, but it was not very obvious: If an 'msc' has an msc-addr configured, it is associated with the cs7 instance that has this addr in its address book. If it has no msc-addr configured, then msc->a.cs7_instance_valid == false. In that case, msc->a.cs7_instance is still 0 (from talloc_zero) and hence osmo_sccp_simple_client_on_ss7_id(ss7_id = 0) created cs7 instance 0. In this patch, that logic remains unchanged, but is written out more explicitly: if any msc has no cs7 instance associated, make sure to create cs7 instance 0 beforehand. Then iterate all osmo_ss7_instances. If at least one MSC uses it, set up the SCCP client on it and connect all MSCs as appropriate. Related: OS#4625 OS#4635 Change-Id: I16f4f7f447f69525a2f57c4649ab295112904d6a --- M src/osmo-bsc/osmo_bsc_sigtran.c 1 file changed, 138 insertions(+), 84 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 43ffae0..afc6c8d 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -468,66 +468,25 @@ /* Initialize osmo sigtran backhaul */ int osmo_bsc_sigtran_init(struct llist_head *mscs) { - bool free_attempt_used = false; - bool fail_on_next_invalid_cfg = false; - struct bsc_msc_data *msc; - char msc_name[32]; uint32_t default_pc; + struct osmo_ss7_instance *inst; + int create_instance_0_for_msc_nr = -1; osmo_ss7_register_rx_unknown_cb(&asp_rx_unknown); OSMO_ASSERT(mscs); msc_list = mscs; + /* Guard against multiple MSCs with identical config */ llist_for_each_entry(msc, msc_list, entry) { - snprintf(msc_name, sizeof(msc_name), "msc-%u", msc->nr); - LOGP(DMSC, LOGL_NOTICE, "Initializing SCCP connection to MSC %s\n", msc_name); + struct bsc_msc_data *msc2; - /* Check if the VTY could determine a valid CS7 instance, - * use safe default in case none is set */ - if (msc->a.cs7_instance_valid == false) { - msc->a.cs7_instance = 0; - if (fail_on_next_invalid_cfg) - goto fail_auto_cofiguration; - free_attempt_used = true; - } - LOGP(DMSC, LOGL_NOTICE, "CS7 Instance identifier, A-Interface: %u\n", msc->a.cs7_instance); + /* An MSC with invalid cs7 instance defaults to cs7 instance 0 */ + uint32_t msc_inst = (msc->a.cs7_instance_valid ? msc->a.cs7_instance : 0); - /* Pre-Check if there is an ss7 instance present */ - if (osmo_ss7_instance_find(msc->a.cs7_instance) == NULL) { - if (fail_on_next_invalid_cfg) - goto fail_auto_cofiguration; - free_attempt_used = true; - } - - /* SS7 Protocol stack */ - default_pc = osmo_ss7_pointcode_parse(NULL, BSC_DEFAULT_PC); - msc->a.sccp = - osmo_sccp_simple_client_on_ss7_id(msc, msc->a.cs7_instance, msc_name, default_pc, - msc->a.asp_proto, 0, NULL, 0, DEFAULT_ASP_REMOTE_IP); - if (!msc->a.sccp) - return -EINVAL; - - /* In SCCPlite, the MSC side of the MGW endpoint is configured by the MSC. Since we have - * no way to figure out which CallID ('C:') the MSC will issue in its CRCX command, set - * an X-Osmo-IGN flag telling osmo-mgw to ignore CallID mismatches for this endpoint. - * If an explicit VTY command has already indicated whether or not to send X-Osmo-IGN, do - * not overwrite that setting. */ - if (msc_is_sccplite(msc) && !msc->x_osmo_ign_configured) - msc->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID; - - /* If unset, use default local SCCP address */ - if (!msc->a.bsc_addr.presence) - osmo_sccp_local_addr_by_instance(&msc->a.bsc_addr, msc->a.sccp, - OSMO_SCCP_SSN_BSSAP); - - if (!osmo_sccp_check_addr(&msc->a.bsc_addr, OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC)) { - LOGP(DMSC, LOGL_ERROR, - "(%s) A-interface: invalid local (BSC) SCCP address: %s\n", - msc_name, osmo_sccp_inst_addr_name(msc->a.sccp, &msc->a.bsc_addr)); - return -EINVAL; - } + if (!msc->a.cs7_instance_valid) + create_instance_0_for_msc_nr = msc->nr; /* If unset, use default SCCP address for the MSC */ if (!msc->a.msc_addr.presence) @@ -535,50 +494,145 @@ osmo_ss7_pointcode_parse(NULL, MSC_DEFAULT_PC), OSMO_SCCP_SSN_BSSAP); - if (!osmo_sccp_check_addr(&msc->a.msc_addr, OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC)) { - LOGP(DMSC, LOGL_ERROR, - "(%s) A-interface: invalid remote (MSC) SCCP address: %s\n", - msc_name, osmo_sccp_inst_addr_name(msc->a.sccp, &msc->a.msc_addr)); - return -EINVAL; + /* (more optimally, we'd only iterate the remaining other mscs after this msc, but this happens only + * during startup, so nevermind that complexity and rather check each pair twice. That also ensures to + * compare all MSCs that have no explicit msc_addr set, see osmo_sccp_make_addr_pc_ssn() above.) */ + llist_for_each_entry(msc2, msc_list, entry) { + uint32_t msc2_inst; + + if (msc2 == msc) + continue; + + msc2_inst = (msc2->a.cs7_instance_valid ? msc2->a.cs7_instance : 0); + if (msc_inst != msc2_inst) + continue; + + if (osmo_sccp_addr_cmp(&msc->a.msc_addr, &msc2->a.msc_addr, OSMO_SCCP_ADDR_T_PC) == 0) { + LOGP(DMSC, LOGL_ERROR, "'msc %d' and 'msc %d' cannot use the same remote PC" + " %s on the same cs7 instance %u\n", + msc->nr, msc2->nr, osmo_sccp_addr_dump(&msc->a.msc_addr), msc_inst); + return -EINVAL; + } + } + } + + if (create_instance_0_for_msc_nr >= 0 && !osmo_ss7_instance_find(0)) { + LOGP(DMSC, LOGL_NOTICE, "To auto-configure msc %d, creating cs7 instance 0 implicitly\n", + create_instance_0_for_msc_nr); + OSMO_ASSERT(osmo_ss7_instance_find_or_create(tall_bsc_ctx, 0)); + } + + /* Set up exactly one SCCP user and one ASP+AS per cs7 instance. + * Iterate cs7 instance indexes and see for each one whether an MSC is configured for it. + * The 'msc' / 'msc-addr' command selects the cs7 instance used for an MSC. + */ + llist_for_each_entry(inst, &osmo_ss7_instances, list) { + char inst_name[32]; + enum osmo_ss7_asp_protocol used_proto = OSMO_SS7_ASP_PROT_NONE; + int prev_msc_nr; + + struct osmo_sccp_instance *sccp; + + llist_for_each_entry(msc, msc_list, entry) { + /* An MSC with invalid cs7 instance id defaults to cs7 instance 0 */ + if ((inst->cfg.id != msc->a.cs7_instance) + && !(inst->cfg.id == 0 && !msc->a.cs7_instance_valid)) + continue; + + /* This msc runs on this cs7 inst. Check the asp_proto. */ + if (used_proto != OSMO_SS7_ASP_PROT_NONE + && used_proto != msc->a.asp_proto) { + LOGP(DMSC, LOGL_ERROR, "'msc %d' and 'msc %d' with differing ASP protocols" + " %s and %s cannot use the same cs7 instance %u\n", + prev_msc_nr, msc->nr, + osmo_ss7_asp_protocol_name(used_proto), + osmo_ss7_asp_protocol_name(msc->a.asp_proto), + inst->cfg.id); + return -EINVAL; + } + + used_proto = msc->a.asp_proto; + prev_msc_nr = msc->nr; + /* still run through the other MSCs to catch asp_proto mismatches */ } - LOGP(DMSC, LOGL_NOTICE, "(%s) A-interface: local (BSC) SCCP address: %s\n", - msc_name, osmo_sccp_inst_addr_name(msc->a.sccp, &msc->a.bsc_addr)); - LOGP(DMSC, LOGL_NOTICE, "(%s) A-interface: remote (MSC) SCCP address: %s\n", - msc_name, osmo_sccp_inst_addr_name(msc->a.sccp, &msc->a.msc_addr)); + if (used_proto == OSMO_SS7_ASP_PROT_NONE) { + /* This instance has no MSC associated with it */ + LOGP(DMSC, LOGL_ERROR, "cs7 instance %u has no MSCs configured to run on it\n", inst->cfg.id); + continue; + } - /* Bind SCCP user. Bind only one user per sccp_instance. */ - msc->a.sccp_user = osmo_sccp_user_find(msc->a.sccp, msc->a.bsc_addr.ssn, msc->a.bsc_addr.pc); - LOGP(DMSC, LOGL_NOTICE, "(%s) A-interface: %s\n", msc_name, - msc->a.sccp_user ? "user already bound for this SCCP instance" : "binding SCCP user"); - if (!msc->a.sccp_user) - msc->a.sccp_user = osmo_sccp_user_bind(msc->a.sccp, msc_name, sccp_sap_up, msc->a.bsc_addr.ssn); - if (!msc->a.sccp_user) + snprintf(inst_name, sizeof(inst_name), "A-%u-%s", inst->cfg.id, osmo_ss7_asp_protocol_name(used_proto)); + LOGP(DMSC, LOGL_NOTICE, "Initializing SCCP connection for A/%s on cs7 instance %u\n", + osmo_ss7_asp_protocol_name(used_proto), inst->cfg.id); + + /* SS7 Protocol stack */ + default_pc = osmo_ss7_pointcode_parse(NULL, BSC_DEFAULT_PC); + sccp = osmo_sccp_simple_client_on_ss7_id(tall_bsc_ctx, inst->cfg.id, inst_name, default_pc, used_proto, 0, NULL, + 0, DEFAULT_ASP_REMOTE_IP); + if (!sccp) return -EINVAL; - /* Start MSC-Reset procedure */ - a_reset_alloc(msc, msc_name, osmo_bsc_sigtran_reset_cb); + /* Now that the SCCP client is set up, configure all MSCs on this cs7 instance to use it */ + llist_for_each_entry(msc, msc_list, entry) { + char msc_name[32]; - /* If we have detected that the SS7 configuration of the MSC we have just initialized - * was incomplete or completely missing, we can not tolerate another incomplete - * configuration. The reason for this is that we do only specify exactly one default - * pointcode pair. We also specify localhost as default IP-Address. If we have wanted - * to support multiple MSCs with automatic configuration we would be forced to invent - * a complex ruleset how to allocate the pointcodes and respective IP-Addresses. - * Furthermore, the situation where a single BSC is connected to multiple MSCs - * is a very rare situation anyway. In this case we expect the user to experienced - * enough to create a valid SS7/CS7 VTY configuration that does not lack any - * components */ - if (free_attempt_used) - fail_on_next_invalid_cfg = true; + /* Skip MSCs that don't run on this cs7 instance */ + if ((inst->cfg.id != msc->a.cs7_instance) + && !(inst->cfg.id == 0 && !msc->a.cs7_instance_valid)) + continue; + + snprintf(msc_name, sizeof(msc_name), "msc-%d", msc->nr); + + msc->a.sccp = sccp; + + /* In SCCPlite, the MSC side of the MGW endpoint is configured by the MSC. Since we have + * no way to figure out which CallID ('C:') the MSC will issue in its CRCX command, set + * an X-Osmo-IGN flag telling osmo-mgw to ignore CallID mismatches for this endpoint. + * If an explicit VTY command has already indicated whether or not to send X-Osmo-IGN, do + * not overwrite that setting. */ + if (msc_is_sccplite(msc) && !msc->x_osmo_ign_configured) + msc->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID; + + /* If unset, use default local SCCP address */ + if (!msc->a.bsc_addr.presence) + osmo_sccp_local_addr_by_instance(&msc->a.bsc_addr, sccp, + OSMO_SCCP_SSN_BSSAP); + + if (!osmo_sccp_check_addr(&msc->a.bsc_addr, OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC)) { + LOGP(DMSC, LOGL_ERROR, + "%s %s: invalid local (BSC) SCCP address: %s\n", + inst_name, msc_name, osmo_sccp_inst_addr_name(sccp, &msc->a.bsc_addr)); + return -EINVAL; + } + + if (!osmo_sccp_check_addr(&msc->a.msc_addr, OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC)) { + LOGP(DMSC, LOGL_ERROR, + "%s %s: invalid remote (MSC) SCCP address: %s\n", + inst_name, msc_name, osmo_sccp_inst_addr_name(sccp, &msc->a.msc_addr)); + return -EINVAL; + } + + LOGP(DMSC, LOGL_NOTICE, "%s %s: local (BSC) SCCP address: %s\n", + inst_name, msc_name, osmo_sccp_inst_addr_name(sccp, &msc->a.bsc_addr)); + LOGP(DMSC, LOGL_NOTICE, "%s %s: remote (MSC) SCCP address: %s\n", + inst_name, msc_name, osmo_sccp_inst_addr_name(sccp, &msc->a.msc_addr)); + + /* Bind SCCP user. Bind only one user per sccp_instance and bsc_addr. */ + msc->a.sccp_user = osmo_sccp_user_find(sccp, msc->a.bsc_addr.ssn, msc->a.bsc_addr.pc); + LOGP(DMSC, LOGL_NOTICE, "%s %s: %s\n", inst_name, msc_name, + msc->a.sccp_user ? "user already bound for this SCCP instance" : "binding SCCP user"); + if (!msc->a.sccp_user) + msc->a.sccp_user = osmo_sccp_user_bind(sccp, msc_name, sccp_sap_up, msc->a.bsc_addr.ssn); + if (!msc->a.sccp_user) + return -EINVAL; + + /* Start MSC-Reset procedure */ + a_reset_alloc(msc, msc_name, osmo_bsc_sigtran_reset_cb); + } } return 0; - -fail_auto_cofiguration: - LOGP(DMSC, LOGL_ERROR, - "A-interface: More than one invalid/inclomplete configuration detected, unable to revover - check config file!\n"); - return -EINVAL; } /* this function receives all messages received on an ASP for a PPID / StreamID that -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I16f4f7f447f69525a2f57c4649ab295112904d6a Gerrit-Change-Number: 19003 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 08:17:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 08:17:59 +0000 Subject: Change in osmo-msc[master]: sgs_tx_loc_upd_resp_cb(): fix error handling for MI encoding In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19098 ) Change subject: sgs_tx_loc_upd_resp_cb(): fix error handling for MI encoding ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I800c5dca3fdbdedf70a64d9fd5a1bdfd1397f431 Gerrit-Change-Number: 19098 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 02 Jul 2020 08:17:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 08:48:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 08:48:00 +0000 Subject: Change in osmo-msc[master]: refactor: move RESET Osmux TLV parsing to ran_msg_a.c In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19024 ) Change subject: refactor: move RESET Osmux TLV parsing to ran_msg_a.c ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1ad4a3f9356216dd4bf8c48fba29fd23438810a7 Gerrit-Change-Number: 19024 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 08:48:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 08:48:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 08:48:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce TC_ul_data_toolong_fills_padding In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19097 ) Change subject: pcu: Introduce TC_ul_data_toolong_fills_padding ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic37294efac005ed6c0ce48dea566fd20284b5868 Gerrit-Change-Number: 19097 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 02 Jul 2020 08:48:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 08:50:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 08:50:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 ) Change subject: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() ...................................................................... Patch Set 2: > I thought about it and I don't think it makes much sense in the context of GPRS, since the message itself doesn't contain information about the CS it uses, since that's done at a lower layer and we don't reach that point, we simply encode based on block size. Also I don't see the point in transmitting in for instance CS3 if the LLC block you want to transmit fits in a CS1. It does't make sense in a practical use case (i.e. an actual production implementation). However, in a test tool, I think it does make sense to be able to express such unusual (but legal!) situations. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibafa4246b442e7c26666eb0d37570bfbbf1dbda7 Gerrit-Change-Number: 19076 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 02 Jul 2020 08:50:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:12:00 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Jul 2020 09:12:00 +0000 Subject: Change in osmo-mgw[master]: trunk: parse E1 trunk number In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/18752 to look at the new patch set (#11). Change subject: trunk: parse E1 trunk number ...................................................................... trunk: parse E1 trunk number The E1 trunk number is currently not parsed, whenever a trunk prefix is detected that indicates an E1 trunk, then the entire request is rejected. Parse the trunk number and select the trunk accordingly Related: OS#2547 Change-Id: Ifdaab953544151e73b58cc3e95d21afdb40765f4 --- M include/osmocom/mgcp/mgcp_trunk.h M src/libosmo-mgcp/mgcp_trunk.c M tests/mgcp/mgcp_test.c 3 files changed, 60 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/52/18752/11 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifdaab953544151e73b58cc3e95d21afdb40765f4 Gerrit-Change-Number: 18752 Gerrit-PatchSet: 11 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:12:02 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Jul 2020 09:12:02 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: fix docstring for mgcp_trunk_alloc() References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19099 ) Change subject: mgcp_trunk: fix docstring for mgcp_trunk_alloc() ...................................................................... mgcp_trunk: fix docstring for mgcp_trunk_alloc() Change-Id: I845397d829476e15f7e3221c63ea35a00a965647 --- M src/libosmo-mgcp/mgcp_trunk.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/99/19099/1 diff --git a/src/libosmo-mgcp/mgcp_trunk.c b/src/libosmo-mgcp/mgcp_trunk.c index 3692351..bd7bb2a 100644 --- a/src/libosmo-mgcp/mgcp_trunk.c +++ b/src/libosmo-mgcp/mgcp_trunk.c @@ -28,8 +28,8 @@ /*! allocate trunk and add it (if required) to the trunk list. * (called once at startup by VTY). * \param[in] cfg mgcp configuration. - * \param[in] nr trunk number. * \param[in] ttype trunk type. + * \param[in] nr trunk number. * \returns pointer to allocated trunk, NULL on failure. */ struct mgcp_trunk *mgcp_trunk_alloc(struct mgcp_config *cfg, enum mgcp_trunk_type ttype, int nr) { -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I845397d829476e15f7e3221c63ea35a00a965647 Gerrit-Change-Number: 19099 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:12:02 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Jul 2020 09:12:02 +0000 Subject: Change in osmo-mgw[master]: mgcp_osmux: remove unused define constants References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19100 ) Change subject: mgcp_osmux: remove unused define constants ...................................................................... mgcp_osmux: remove unused define constants The define constants CONN_ID_BTS and CONN_ID_NET were used in mgcp_osmux long time ago when osmux support was temporarly broken. Now those defines are no longer used anywhere, so lets remove them. Change-Id: I3d0b9d482ef0e2187bccace5779a7f8b9507c4e2 --- M include/osmocom/mgcp/mgcp_internal.h 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/00/19100/1 diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h index 174bfd9..66a26bd 100644 --- a/include/osmocom/mgcp/mgcp_internal.h +++ b/include/osmocom/mgcp/mgcp_internal.h @@ -32,11 +32,6 @@ #define CI_UNUSED 0 -/* FIXME: This this is only needed to compile the currently - * broken OSMUX support. Remove when fixed */ -#define CONN_ID_BTS "0" -#define CONN_ID_NET "1" - enum mgcp_trunk_type { MGCP_TRUNK_VIRTUAL, MGCP_TRUNK_E1, -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3d0b9d482ef0e2187bccace5779a7f8b9507c4e2 Gerrit-Change-Number: 19100 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:12:03 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Jul 2020 09:12:03 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: move enum mgcp_trunk_type to mgcp_trunk.h References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19101 ) Change subject: mgcp_trunk: move enum mgcp_trunk_type to mgcp_trunk.h ...................................................................... mgcp_trunk: move enum mgcp_trunk_type to mgcp_trunk.h The enum mgcp_trunk_type, which is currently located in mgcp_internal.h makes more sense in mgcp_trunk.h, so lets move it. Related: OS#2659 Change-Id: I077121503c44fc112a33f1c946f368414e28f841 --- M include/osmocom/mgcp/mgcp_internal.h M include/osmocom/mgcp/mgcp_trunk.h 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/01/19101/1 diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h index 66a26bd..f143988 100644 --- a/include/osmocom/mgcp/mgcp_internal.h +++ b/include/osmocom/mgcp/mgcp_internal.h @@ -32,11 +32,6 @@ #define CI_UNUSED 0 -enum mgcp_trunk_type { - MGCP_TRUNK_VIRTUAL, - MGCP_TRUNK_E1, -}; - struct mgcp_rtp_stream_state { uint32_t ssrc; uint16_t last_seq; diff --git a/include/osmocom/mgcp/mgcp_trunk.h b/include/osmocom/mgcp/mgcp_trunk.h index 78d65e4..2bd55e6 100644 --- a/include/osmocom/mgcp/mgcp_trunk.h +++ b/include/osmocom/mgcp/mgcp_trunk.h @@ -1,5 +1,10 @@ #pragma once +enum mgcp_trunk_type { + MGCP_TRUNK_VIRTUAL, + MGCP_TRUNK_E1, +}; + struct mgcp_trunk { struct llist_head entry; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I077121503c44fc112a33f1c946f368414e28f841 Gerrit-Change-Number: 19101 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:12:03 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Jul 2020 09:12:03 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: pick trunk by number and type References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19102 ) Change subject: mgcp_trunk: pick trunk by number and type ...................................................................... mgcp_trunk: pick trunk by number and type The function mgcp_trunk_by_num() is used to directly pick a specific trunk that is known by its id number (sometimes called "index"). Traditionally the virtual trunk will reside under id number 0 and all consecutively created E1 trunks will be created under number 1 to 64. This works fine, but puts a limitation on us should we ever introduce an aditional trunk type (e.g. T1). Since the numbers must be unique regardless of the trunk type one could not have an E1 trunk number 1 and e.g. a T1 trunk number 1 at the same time. So we should pick the trunk not only by its number, but also by its type to allow different trunk types to carry the same number. The trunks will still be distinguishable by its type along with the respective endpoint prefix. Change-Id: I7af1e9ce601babd4a51e88201a98319e03945f83 Related: OS#2659 --- M include/osmocom/mgcp/mgcp_trunk.h M src/libosmo-mgcp/mgcp_osmux.c M src/libosmo-mgcp/mgcp_trunk.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 5 files changed, 49 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/02/19102/1 diff --git a/include/osmocom/mgcp/mgcp_trunk.h b/include/osmocom/mgcp/mgcp_trunk.h index 6d8cae2..c654ea2 100644 --- a/include/osmocom/mgcp/mgcp_trunk.h +++ b/include/osmocom/mgcp/mgcp_trunk.h @@ -48,7 +48,7 @@ struct mgcp_trunk *mgcp_trunk_alloc(struct mgcp_config *cfg, enum mgcp_trunk_type ttype, int nr); int mgcp_trunk_alloc_endpts(struct mgcp_trunk *tcfg); -struct mgcp_trunk *mgcp_trunk_by_num(const struct mgcp_config *cfg, int index); +struct mgcp_trunk *mgcp_trunk_by_num(const struct mgcp_config *cfg, enum mgcp_trunk_type ttype, int nr); struct mgcp_trunk *mgcp_trunk_by_name(const struct mgcp_config *cfg, const char *epname); int e1_trunk_nr_from_epname(const char *epname); diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 9715e70..ceae087 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -198,7 +198,7 @@ osmux_conn_lookup(struct mgcp_config *cfg, uint8_t cid, struct in_addr *from_addr) { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); struct mgcp_endpoint *endp; struct mgcp_conn *conn = NULL; struct mgcp_conn_rtp * conn_rtp; diff --git a/src/libosmo-mgcp/mgcp_trunk.c b/src/libosmo-mgcp/mgcp_trunk.c index 66abae1..346188b 100644 --- a/src/libosmo-mgcp/mgcp_trunk.c +++ b/src/libosmo-mgcp/mgcp_trunk.c @@ -105,15 +105,17 @@ /*! get trunk configuration by trunk number (index). * \param[in] cfg mgcp configuration. - * \param[in] index trunk number. + * \param[in] ttype trunk type. + * \param[in] nr trunk number. * \returns pointer to trunk configuration, NULL on error. */ -struct mgcp_trunk *mgcp_trunk_by_num(const struct mgcp_config *cfg, int index) +struct mgcp_trunk *mgcp_trunk_by_num(const struct mgcp_config *cfg, enum mgcp_trunk_type ttype, int nr) { struct mgcp_trunk *trunk; - llist_for_each_entry(trunk, &cfg->trunks, entry) - if (trunk->trunk_nr == index) - return trunk; + llist_for_each_entry(trunk, &cfg->trunks, entry) { + if (trunk->trunk_nr == nr && trunk->trunk_type == ttype) + return trunk; + } return NULL; } @@ -150,7 +152,7 @@ prefix_len = sizeof(MGCP_ENDPOINT_PREFIX_VIRTUAL_TRUNK) - 1; if (strncmp(epname, MGCP_ENDPOINT_PREFIX_VIRTUAL_TRUNK, prefix_len) == 0) { - return mgcp_trunk_by_num(cfg, MGCP_VIRT_TRUNK_ID); + return mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); } prefix_len = sizeof(MGCP_ENDPOINT_PREFIX_E1_TRUNK) - 1; @@ -158,7 +160,7 @@ trunk_nr = e1_trunk_nr_from_epname(epname); if (trunk_nr < 0) return NULL; - return mgcp_trunk_by_num(cfg, trunk_nr); + return mgcp_trunk_by_num(cfg, MGCP_TRUNK_E1, trunk_nr); } /* Earlier versions of osmo-mgw were accepting endpoint names @@ -172,7 +174,7 @@ if ((epname[0] >= '0' && epname[0] <= '9') || (epname[0] >= 'a' && epname[0] <= 'f')) { LOGP(DLMGCP, LOGL_ERROR, "missing trunk prefix in endpoint name \"%s\", assuming trunk \"%s\"!\n", epname, MGCP_ENDPOINT_PREFIX_VIRTUAL_TRUNK); - return mgcp_trunk_by_num(cfg, MGCP_VIRT_TRUNK_ID); + return mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); } LOGP(DLMGCP, LOGL_ERROR, "unable to find trunk for endpoint name \"%s\"!\n", epname); diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index cbff700..2f862f1 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -57,7 +57,7 @@ static int config_write_mgcp(struct vty *vty) { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); vty_out(vty, "mgcp%s", VTY_NEWLINE); @@ -377,7 +377,7 @@ struct mgcp_trunk *trunk; int trunkidx = atoi(argv[0]); - trunk = mgcp_trunk_by_num(g_cfg, trunkidx); + trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_E1, trunkidx); if (!trunk) { vty_out(vty, "trunk %d not found%s", trunkidx, VTY_NEWLINE); return CMD_WARNING; @@ -567,7 +567,7 @@ "Add extra fmtp for the SDP file\n" "Audio\n" "Fmtp-extra\n" "Extra Information\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); char *txt = argv_concat(argv, argc, 0); if (!txt) @@ -582,7 +582,7 @@ cfg_mgcp_allow_transcoding_cmd, "allow-transcoding", "Allow transcoding\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->no_audio_transcoding = 0; return CMD_SUCCESS; @@ -592,7 +592,7 @@ cfg_mgcp_no_allow_transcoding_cmd, "no allow-transcoding", NO_STR "Allow transcoding\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->no_audio_transcoding = 1; return CMD_SUCCESS; @@ -630,7 +630,7 @@ "sdp audio-payload send-ptime", SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->audio_send_ptime = 1; return CMD_SUCCESS; @@ -641,7 +641,7 @@ "no sdp audio-payload send-ptime", NO_STR SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->audio_send_ptime = 0; return CMD_SUCCESS; @@ -652,7 +652,7 @@ "sdp audio-payload send-name", SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->audio_send_name = 1; return CMD_SUCCESS; @@ -663,7 +663,7 @@ "no sdp audio-payload send-name", NO_STR SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->audio_send_name = 0; return CMD_SUCCESS; @@ -674,7 +674,7 @@ "loop (0|1)", "Loop audio for all endpoints on main trunk\n" "Don't Loop\n" "Loop\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); if (g_cfg->osmux) { vty_out(vty, "Cannot use `loop' with `osmux'.%s", VTY_NEWLINE); @@ -690,7 +690,7 @@ "Force endpoint reallocation when the endpoint is still seized\n" "Don't force reallocation\n" "force reallocation\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->force_realloc = atoi(argv[0]); return CMD_SUCCESS; @@ -702,7 +702,7 @@ "Accept all RTP packets, even when the originating IP/Port does not match\n" "enable filter\n" "disable filter\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->rtp_accept_all = atoi(argv[0]); return CMD_SUCCESS; @@ -713,7 +713,7 @@ "number endpoints <0-65534>", "Number options\n" "Endpoints available\n" "Number endpoints\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); /* + 1 as we start counting at one */ trunk->vty_number_endpoints = atoi(argv[0]) + 1; @@ -722,7 +722,7 @@ DEFUN(cfg_mgcp_omit_rtcp, cfg_mgcp_omit_rtcp_cmd, "rtcp-omit", RTCP_OMIT_STR) { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, 0); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); trunk->omit_rtcp = 1; return CMD_SUCCESS; } @@ -730,7 +730,7 @@ DEFUN(cfg_mgcp_no_omit_rtcp, cfg_mgcp_no_omit_rtcp_cmd, "no rtcp-omit", NO_STR RTCP_OMIT_STR) { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->omit_rtcp = 0; return CMD_SUCCESS; @@ -740,7 +740,7 @@ cfg_mgcp_patch_rtp_ssrc_cmd, "rtp-patch ssrc", RTP_PATCH_STR "Force a fixed SSRC\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->force_constant_ssrc = 1; return CMD_SUCCESS; @@ -750,7 +750,7 @@ cfg_mgcp_no_patch_rtp_ssrc_cmd, "no rtp-patch ssrc", NO_STR RTP_PATCH_STR "Force a fixed SSRC\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->force_constant_ssrc = 0; return CMD_SUCCESS; @@ -760,7 +760,7 @@ cfg_mgcp_patch_rtp_ts_cmd, "rtp-patch timestamp", RTP_PATCH_STR "Adjust RTP timestamp\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->force_aligned_timing = 1; return CMD_SUCCESS; @@ -770,7 +770,7 @@ cfg_mgcp_no_patch_rtp_ts_cmd, "no rtp-patch timestamp", NO_STR RTP_PATCH_STR "Adjust RTP timestamp\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->force_aligned_timing = 0; return CMD_SUCCESS; @@ -780,7 +780,7 @@ cfg_mgcp_patch_rtp_rfc5993hr_cmd, "rtp-patch rfc5993hr", RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR) { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->rfc5993_hr_convert = true; return CMD_SUCCESS; @@ -790,7 +790,7 @@ cfg_mgcp_no_patch_rtp_rfc5993hr_cmd, "no rtp-patch rfc5993hr", NO_STR RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR) { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->rfc5993_hr_convert = false; return CMD_SUCCESS; @@ -799,7 +799,7 @@ DEFUN(cfg_mgcp_no_patch_rtp, cfg_mgcp_no_patch_rtp_cmd, "no rtp-patch", NO_STR RTP_PATCH_STR) { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->force_constant_ssrc = 0; trunk->force_aligned_timing = 0; @@ -812,7 +812,7 @@ "rtp keep-alive <1-120>", RTP_STR RTP_KEEPALIVE_STR "Keep alive interval in secs\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); mgcp_trunk_set_keepalive(trunk, atoi(argv[0])); return CMD_SUCCESS; @@ -823,7 +823,7 @@ "rtp keep-alive once", RTP_STR RTP_KEEPALIVE_STR "Send dummy packet only once after CRCX/MDCX\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); mgcp_trunk_set_keepalive(trunk, MGCP_KEEPALIVE_ONCE); return CMD_SUCCESS; @@ -833,7 +833,7 @@ cfg_mgcp_no_rtp_keepalive_cmd, "no rtp keep-alive", NO_STR RTP_STR RTP_KEEPALIVE_STR) { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); mgcp_trunk_set_keepalive(trunk, MGCP_KEEPALIVE_NEVER); return CMD_SUCCESS; @@ -865,7 +865,7 @@ * parameters, so we restrict the access to trunks with id numbers * greater than 0. */ - trunk = mgcp_trunk_by_num(g_cfg, index); + trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_E1, index); if (!trunk) { trunk = mgcp_trunk_alloc(g_cfg, MGCP_TRUNK_E1, index); if (!trunk) { @@ -1171,7 +1171,7 @@ struct mgcp_endpoint *endp; struct mgcp_conn *conn; - trunk = mgcp_trunk_by_num(g_cfg, atoi(argv[0])); + trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_E1, atoi(argv[0])); if (!trunk) { vty_out(vty, "%%Trunk %d not found in the config.%s", atoi(argv[0]), VTY_NEWLINE); @@ -1230,7 +1230,7 @@ struct mgcp_conn_rtp *conn; const char *conn_id = NULL; - trunk = mgcp_trunk_by_num(g_cfg, atoi(argv[0])); + trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_E1, atoi(argv[0])); if (!trunk) { vty_out(vty, "%%Trunk %d not found in the config.%s", atoi(argv[0]), VTY_NEWLINE); @@ -1283,7 +1283,7 @@ struct mgcp_trunk *trunk; struct mgcp_endpoint *endp; - trunk = mgcp_trunk_by_num(g_cfg, atoi(argv[0])); + trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_E1, atoi(argv[0])); if (!trunk) { vty_out(vty, "%%Trunk %d not found in the config.%s", atoi(argv[0]), VTY_NEWLINE); @@ -1316,7 +1316,7 @@ struct mgcp_endpoint *endp; int endp_no, rc; - trunk = mgcp_trunk_by_num(g_cfg, atoi(argv[0])); + trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_E1, atoi(argv[0])); if (!trunk) { vty_out(vty, "%%Trunk %d not found in the config.%s", atoi(argv[0]), VTY_NEWLINE); @@ -1365,7 +1365,7 @@ "osmux (on|off|only)", OSMUX_STR "Enable OSMUX\n" "Disable OSMUX\n" "Only use OSMUX\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); if (strcmp(argv[0], "off") == 0) { diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index f2900ce..9acee19 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -768,7 +768,7 @@ int rc; cfg = mgcp_config_alloc(); - trunk = mgcp_trunk_by_num(cfg, MGCP_VIRT_TRUNK_ID); + trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); trunk->vty_number_endpoints = 64; mgcp_trunk_alloc_endpts(trunk); @@ -910,7 +910,7 @@ int rc; cfg = mgcp_config_alloc(); - trunk = mgcp_trunk_by_num(cfg, MGCP_VIRT_TRUNK_ID); + trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); trunk->vty_number_endpoints = 64; mgcp_trunk_alloc_endpts(trunk); @@ -979,7 +979,7 @@ char conn_id[256]; cfg = mgcp_config_alloc(); - trunk = mgcp_trunk_by_num(cfg, MGCP_VIRT_TRUNK_ID); + trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); cfg->rqnt_cb = rqnt_cb; trunk->vty_number_endpoints = 64; @@ -1393,7 +1393,7 @@ printf("Testing multiple payload types\n"); cfg = mgcp_config_alloc(); - trunk = mgcp_trunk_by_num(cfg, MGCP_VIRT_TRUNK_ID); + trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); trunk->vty_number_endpoints = 64; mgcp_trunk_alloc_endpts(trunk); cfg->policy_cb = mgcp_test_policy_cb; @@ -1539,7 +1539,7 @@ printf("Testing no sequence flow on initial packet\n"); cfg = mgcp_config_alloc(); - trunk = mgcp_trunk_by_num(cfg, MGCP_VIRT_TRUNK_ID); + trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); trunk->vty_number_endpoints = 64; mgcp_trunk_alloc_endpts(trunk); @@ -1588,7 +1588,7 @@ printf("Testing no rtpmap name\n"); cfg = mgcp_config_alloc(); - trunk = mgcp_trunk_by_num(cfg, MGCP_VIRT_TRUNK_ID); + trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); trunk->vty_number_endpoints = 64; trunk->audio_send_name = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I7af1e9ce601babd4a51e88201a98319e03945f83 Gerrit-Change-Number: 19102 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:12:03 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Jul 2020 09:12:03 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: be more specific about E1 trunks References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19103 ) Change subject: mgcp_vty: be more specific about E1 trunks ...................................................................... mgcp_vty: be more specific about E1 trunks Currently only E1 trunks can be crated using the node "trunk". However, should we ever introduce another trunk type we will not be able to distinguish the new trunk type. Lets rename "trunk" to "trunk-e1" along with its underlying constants and function names so that we can easily add another "trunk-t1" for example without making old configs incompatible with the old concept. Related: OS#2659 Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e --- M include/osmocom/mgcp/vty.h M src/libosmo-mgcp/mgcp_vty.c M src/osmo-mgw/mgw_main.c 3 files changed, 34 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/03/19103/1 diff --git a/include/osmocom/mgcp/vty.h b/include/osmocom/mgcp/vty.h index bf6b7a8..3d7ddb1 100644 --- a/include/osmocom/mgcp/vty.h +++ b/include/osmocom/mgcp/vty.h @@ -4,5 +4,5 @@ enum mgcp_vty_node { MGCP_NODE = _LAST_OSMOVTY_NODE + 1, - TRUNK_NODE, + TRUNK_NODE_E1, }; diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 2f862f1..683d2ed 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -49,9 +49,9 @@ 1, }; -struct cmd_node trunk_node = { - TRUNK_NODE, - "%s(config-mgcp-trunk)# ", +struct cmd_node trunk_node_e1 = { + TRUNK_NODE_E1, + "%s(config-mgcp-trunk-e1)# ", 1, }; @@ -855,7 +855,7 @@ "IPv4 Address of the callagent\n") DEFUN(cfg_mgcp_trunk, cfg_mgcp_trunk_cmd, - "trunk <1-64>", "Configure a SS7 trunk\n" "Trunk Nr\n") + "trunk-e1 <1-64>", "Configure a E1 trunk\n" "Trunk Nr\n") { struct mgcp_trunk *trunk; int index = atoi(argv[0]); @@ -875,12 +875,12 @@ } } - vty->node = TRUNK_NODE; + vty->node = TRUNK_NODE_E1; vty->index = trunk; return CMD_SUCCESS; } -static int config_write_trunk(struct vty *vty) +static int config_write_trunk_e1(struct vty *vty) { struct mgcp_trunk *trunk; @@ -894,7 +894,7 @@ if (trunk->trunk_nr == MGCP_VIRT_TRUNK_ID) continue; - vty_out(vty, " trunk %d%s", trunk->trunk_nr, VTY_NEWLINE); + vty_out(vty, " trunk-e1 %d%s", trunk->trunk_nr, VTY_NEWLINE); vty_out(vty, " %ssdp audio-payload send-ptime%s", trunk->audio_send_ptime ? "" : "no ", VTY_NEWLINE); vty_out(vty, " %ssdp audio-payload send-name%s", @@ -1525,31 +1525,31 @@ install_element(MGCP_NODE, &cfg_mgcp_conn_timeout_cmd); install_element(MGCP_NODE, &cfg_mgcp_trunk_cmd); - install_node(&trunk_node, config_write_trunk); - install_element(TRUNK_NODE, &cfg_trunk_rtp_keepalive_cmd); - install_element(TRUNK_NODE, &cfg_trunk_rtp_keepalive_once_cmd); - install_element(TRUNK_NODE, &cfg_trunk_no_rtp_keepalive_cmd); - install_element(TRUNK_NODE, &cfg_trunk_payload_number_cmd); - install_element(TRUNK_NODE, &cfg_trunk_payload_name_cmd); - install_element(TRUNK_NODE, &cfg_trunk_payload_number_cmd_old); - install_element(TRUNK_NODE, &cfg_trunk_payload_name_cmd_old); - install_element(TRUNK_NODE, &cfg_trunk_loop_cmd); - install_element(TRUNK_NODE, &cfg_trunk_omit_rtcp_cmd); - install_element(TRUNK_NODE, &cfg_trunk_no_omit_rtcp_cmd); - install_element(TRUNK_NODE, &cfg_trunk_patch_rtp_ssrc_cmd); - install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_ssrc_cmd); - install_element(TRUNK_NODE, &cfg_trunk_patch_rtp_ts_cmd); - install_element(TRUNK_NODE, &cfg_trunk_patch_rtp_rfc5993hr_cmd); - install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_rfc5993hr_cmd); - install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_ts_cmd); - install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_cmd); - install_element(TRUNK_NODE, &cfg_trunk_sdp_fmtp_extra_cmd); - install_element(TRUNK_NODE, &cfg_trunk_sdp_payload_send_ptime_cmd); - install_element(TRUNK_NODE, &cfg_trunk_no_sdp_payload_send_ptime_cmd); - install_element(TRUNK_NODE, &cfg_trunk_sdp_payload_send_name_cmd); - install_element(TRUNK_NODE, &cfg_trunk_no_sdp_payload_send_name_cmd); - install_element(TRUNK_NODE, &cfg_trunk_allow_transcoding_cmd); - install_element(TRUNK_NODE, &cfg_trunk_no_allow_transcoding_cmd); + install_node(&trunk_node_e1, config_write_trunk_e1); + install_element(TRUNK_NODE_E1, &cfg_trunk_rtp_keepalive_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_rtp_keepalive_once_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_no_rtp_keepalive_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_payload_number_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_payload_name_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_payload_number_cmd_old); + install_element(TRUNK_NODE_E1, &cfg_trunk_payload_name_cmd_old); + install_element(TRUNK_NODE_E1, &cfg_trunk_loop_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_omit_rtcp_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_no_omit_rtcp_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_patch_rtp_ssrc_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_no_patch_rtp_ssrc_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_patch_rtp_ts_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_patch_rtp_rfc5993hr_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_no_patch_rtp_rfc5993hr_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_no_patch_rtp_ts_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_no_patch_rtp_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_sdp_fmtp_extra_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_sdp_payload_send_ptime_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_no_sdp_payload_send_ptime_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_sdp_payload_send_name_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_no_sdp_payload_send_name_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_allow_transcoding_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_no_allow_transcoding_cmd); return 0; } diff --git a/src/osmo-mgw/mgw_main.c b/src/osmo-mgw/mgw_main.c index 99e2499..5d50278 100644 --- a/src/osmo-mgw/mgw_main.c +++ b/src/osmo-mgw/mgw_main.c @@ -224,7 +224,7 @@ int mgcp_vty_go_parent(struct vty *vty) { switch (vty->node) { - case TRUNK_NODE: + case TRUNK_NODE_E1: vty->node = MGCP_NODE; vty->index = NULL; break; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e Gerrit-Change-Number: 19103 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:20:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 09:20:26 +0000 Subject: Change in libosmo-abis[master]: e1_input_vty: Fix VTY help strings References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19104 ) Change subject: e1_input_vty: Fix VTY help strings ...................................................................... e1_input_vty: Fix VTY help strings * HSL was never fully supported, not sure why it's in the help * E1D was neglected to add to the help string Change-Id: I4a5e503676618171e59550774892816b61adecae --- M src/e1_input_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/04/19104/1 diff --git a/src/e1_input_vty.c b/src/e1_input_vty.c index 15f325f..0da1bc5 100644 --- a/src/e1_input_vty.c +++ b/src/e1_input_vty.c @@ -49,8 +49,8 @@ #define E1_DRIVER_HELP "mISDN supported E1 Card (kernel LAPD)\n" \ "mISDN supported E1 Card (userspace LAPD)\n" \ "DAHDI supported E1/T1/J1 Card\n" \ + "osmo-e1d supported E1 interface\n" \ "IPA TCP/IP input\n" \ - "HSL TCP/IP input\n" \ "Unix socket input\n" #define E1_LINE_HELP "Configure E1/T1/J1 Line\n" "Line Number\n" -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I4a5e503676618171e59550774892816b61adecae Gerrit-Change-Number: 19104 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:33:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 09:33:09 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: fix docstring for mgcp_trunk_alloc() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19099 ) Change subject: mgcp_trunk: fix docstring for mgcp_trunk_alloc() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I845397d829476e15f7e3221c63ea35a00a965647 Gerrit-Change-Number: 19099 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 02 Jul 2020 09:33:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:33:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 09:33:20 +0000 Subject: Change in osmo-msc[master]: refactor: move RESET Osmux TLV parsing to ran_msg_a.c In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19024 ) Change subject: refactor: move RESET Osmux TLV parsing to ran_msg_a.c ...................................................................... Patch Set 4: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/19024/4/src/libmsc/ran_peer.c File src/libmsc/ran_peer.c: https://gerrit.osmocom.org/c/osmo-msc/+/19024/4/src/libmsc/ran_peer.c at 213 PS4, Line 213: ran_peer_update_osmux_support(rp, supports_osmux); BY moving call to this function here you are also calling it even if rc return error, which is a bit weird imho -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1ad4a3f9356216dd4bf8c48fba29fd23438810a7 Gerrit-Change-Number: 19024 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 09:33:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:33:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 09:33:28 +0000 Subject: Change in osmo-mgw[master]: mgcp_osmux: remove unused define constants In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19100 ) Change subject: mgcp_osmux: remove unused define constants ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3d0b9d482ef0e2187bccace5779a7f8b9507c4e2 Gerrit-Change-Number: 19100 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 02 Jul 2020 09:33:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:34:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 09:34:04 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: move enum mgcp_trunk_type to mgcp_trunk.h In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19101 ) Change subject: mgcp_trunk: move enum mgcp_trunk_type to mgcp_trunk.h ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/19101/1/include/osmocom/mgcp/mgcp_trunk.h File include/osmocom/mgcp/mgcp_trunk.h: https://gerrit.osmocom.org/c/osmo-mgw/+/19101/1/include/osmocom/mgcp/mgcp_trunk.h at 14 PS1, Line 14: int trunk_type interesting that it's an int here and not an enum. Any idea why? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I077121503c44fc112a33f1c946f368414e28f841 Gerrit-Change-Number: 19101 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 02 Jul 2020 09:34:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:37:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 09:37:13 +0000 Subject: Change in osmo-mgw[master]: trunk: parse E1 trunk number In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18752 ) Change subject: trunk: parse E1 trunk number ...................................................................... Patch Set 11: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/18752/11/tests/mgcp/mgcp_test.c File tests/mgcp/mgcp_test.c: https://gerrit.osmocom.org/c/osmo-mgw/+/18752/11/tests/mgcp/mgcp_test.c at 2144 PS11, Line 2144: trunk_nr = e1_trunk_nr_from_epname("ds/e1+2/s-1/su16-0"); : OSMO_ASSERT(trunk_nr == 2); : trunk_nr = e1_trunk_nr_from_epname("xxxxxx3/s-1/su16-0"); : OSMO_ASSERT(trunk_nr == 3); : trunk_nr = e1_trunk_nr_from_epname("xxxxxx4/zz"); : OSMO_ASSERT(trunk_nr == 4); I really don't want to delay this patch any longer, but to me it doesn't make sense that we ignore the prefix. I think we should match that it is always the intended format, i.e. "ds/e1-" as a prefix. I don't see legitimate use cases of accepting other formats - rather I see potential for accidents where completely unrelated endpoint names sent by accident or misconfiguration would be interpreted as E1 despite not being E1. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifdaab953544151e73b58cc3e95d21afdb40765f4 Gerrit-Change-Number: 18752 Gerrit-PatchSet: 11 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 09:37:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:37:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 09:37:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 ) Change subject: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() ...................................................................... Patch Set 2: > It does't make sense in a practical use case (i.e. an actual production implementation). However, in a test tool, I think it does make sense to be able to express such unusual (but legal!) situations. You can still do so (using whatever padding to simulate whatever CS you want) by using a lower-level API f_ms_tx_data_ind() as I do in TC_ul_data_toolong_fills_padding. I could, however, improve the function to pass CodingScheme cs:=omit and if omit is used, calculate automatically, otherwise calculate based on the cs passed (and error if not possible). -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibafa4246b442e7c26666eb0d37570bfbbf1dbda7 Gerrit-Change-Number: 19076 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 02 Jul 2020 09:37:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:37:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 09:37:52 +0000 Subject: Change in osmo-mgw[master]: endp: require domain name also for E1 endpoints In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19074 ) Change subject: endp: require domain name also for E1 endpoints ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibb800b689e090b97b58d0206959b660890acd967 Gerrit-Change-Number: 19074 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 09:37:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:38:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 09:38:27 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: add function to generate e1-endpoint names In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19075 ) Change subject: mgcp_client: add function to generate e1-endpoint names ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iec35b5bae8a7b07ddb3559f7114a24dcd10e8f14 Gerrit-Change-Number: 19075 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 09:38:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:39:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 09:39:04 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: be more specific about E1 trunks In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19103 ) Change subject: mgcp_vty: be more specific about E1 trunks ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e Gerrit-Change-Number: 19103 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 09:39:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:39:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 09:39:25 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: pick trunk by number and type In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19102 ) Change subject: mgcp_trunk: pick trunk by number and type ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I7af1e9ce601babd4a51e88201a98319e03945f83 Gerrit-Change-Number: 19102 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 02 Jul 2020 09:39:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:40:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 09:40:02 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: be more specific about E1 trunks In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19103 ) Change subject: mgcp_vty: be more specific about E1 trunks ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e Gerrit-Change-Number: 19103 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 09:40:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:40:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 09:40:14 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: pick trunk by number and type In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19102 ) Change subject: mgcp_trunk: pick trunk by number and type ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I7af1e9ce601babd4a51e88201a98319e03945f83 Gerrit-Change-Number: 19102 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 09:40:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:40:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 09:40:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 ) Change subject: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() ...................................................................... Patch Set 2: > I could, however, improve the function to pass CodingScheme cs:=omit and if omit is used, calculate automatically, otherwise calculate based on the cs passed (and error if not possible). I'd appreciate that, if it's not too much effort .thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibafa4246b442e7c26666eb0d37570bfbbf1dbda7 Gerrit-Change-Number: 19076 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 02 Jul 2020 09:40:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:41:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 09:41:08 +0000 Subject: Change in osmo-mgw[master]: mgcp_osmux: remove unused define constants In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19100 ) Change subject: mgcp_osmux: remove unused define constants ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3d0b9d482ef0e2187bccace5779a7f8b9507c4e2 Gerrit-Change-Number: 19100 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 09:41:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 09:41:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 09:41:42 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: move enum mgcp_trunk_type to mgcp_trunk.h In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19101 ) Change subject: mgcp_trunk: move enum mgcp_trunk_type to mgcp_trunk.h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I077121503c44fc112a33f1c946f368414e28f841 Gerrit-Change-Number: 19101 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 09:41:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 10:07:22 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 10:07:22 +0000 Subject: Change in osmo-gsm-tester[master]: srsenb.conf.tmpl: use gtp_bind_addr also s1c bind In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18583 ) Change subject: srsenb.conf.tmpl: use gtp_bind_addr also s1c bind ...................................................................... Patch Set 4: I think this one can be abandoned, topic was fixed in another patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ibf5b0017c781d17c7f20b859c1cda297e2a9cca2 Gerrit-Change-Number: 18583 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-Comment-Date: Thu, 02 Jul 2020 10:07:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 10:07:26 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 10:07:26 +0000 Subject: Change in osmo-gsm-tester[master]: srsenb.conf.tmpl: use gtp_bind_addr also s1c bind In-Reply-To: References: Message-ID: pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18583 ) Change subject: srsenb.conf.tmpl: use gtp_bind_addr also s1c bind ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ibf5b0017c781d17c7f20b859c1cda297e2a9cca2 Gerrit-Change-Number: 18583 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 10:07:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 10:07:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 to look at the new patch set (#3). Change subject: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() ...................................................................... pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() Change-Id: Ibafa4246b442e7c26666eb0d37570bfbbf1dbda7 --- M library/RLCMAC_Templates.ttcn M pcu/GPRS_Components.ttcn 2 files changed, 45 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/19076/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibafa4246b442e7c26666eb0d37570bfbbf1dbda7 Gerrit-Change-Number: 19076 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 11:30:21 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 2 Jul 2020 11:30:21 +0000 Subject: Change in osmo-trx[master]: doc/manuals: Update thread documentation after dropping CTRL sock thr... In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19089 ) Change subject: doc/manuals: Update thread documentation after dropping CTRL sock threads ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I34d117325e60b04b075c205d21bb0b827a5e8c52 Gerrit-Change-Number: 19089 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 11:30:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 11:35:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 11:35:07 +0000 Subject: Change in osmo-gsm-tester[master]: Introduce stress tool object References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19105 ) Change subject: Introduce stress tool object ...................................................................... Introduce stress tool object This object allows to run the "stress" cmdline program in the background on the specifies run_node, to simulate system load. To run stress, a test can simply do: stress = tenv.stress(epc.run_node()) stress.start(cpu_workers=2, mem_workers=1, io_workers=1) And the test environment will remember to stop it when the test finishes. Change-Id: I21023e6c64c48109f294291bfe3d8d8f4e1de038 --- A src/osmo_gsm_tester/obj/stress.py M src/osmo_gsm_tester/testenv.py 2 files changed, 78 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/05/19105/1 diff --git a/src/osmo_gsm_tester/obj/stress.py b/src/osmo_gsm_tester/obj/stress.py new file mode 100644 index 0000000..f0e417a --- /dev/null +++ b/src/osmo_gsm_tester/obj/stress.py @@ -0,0 +1,73 @@ +# osmo_gsm_tester: specifics for running stress(-ng), a tool to load and stress a computer system +# +# Copyright (C) 2020 by sysmocom - s.f.m.c. GmbH +# +# Author: Pau Espin Pedrol +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from ..core import log +from ..core import util +from ..core import process +from ..core import remote + +class StressTool(log.Origin): + + STRESS_BIN = 'stress' + +############## +# PROTECTED +############## + def __init__(self, testenv, run_node): + super().__init__(log.C_RUN, StressTool.STRESS_BIN) + self.testenv = testenv + self._run_node = run_node + self.proc = None + self.rem_host = None + + def runs_locally(self): + locally = not self._run_node or self._run_node.is_local() + return locally + +################### +# PUBLIC (test API included) +################### + def start(self, cpu_workers=0, mem_workers=0, io_workers=0, timeout=0): + self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name())) + + popen_args = (StressTool.STRESS_BIN,) + if cpu_workers > 0: + popen_args += ('-c', str(cpu_workers)) + if mem_workers > 0: + popen_args += ('-m', str(mem_workers)) + if io_workers > 0: + popen_args += ('-i', str(io_workers)) + if timeout > 0: + popen_args += ('-t', str(timeout)) + + if self.runs_locally(): + self.proc = process.Process(self.name(), self.run_dir, popen_args, env={}) + else: + self.rem_host = remote.RemoteHost(self.run_dir, self._run_node.ssh_user(), self._run_node.ssh_addr()) + self.proc = self.rem_host.RemoteProcess(self.name(), popen_args, env={}) + # Warning: Be aware that if process ends before test is finished due to + # "-t timeout" param being set, the test will most probably fail as + # detected 'early exit' by the testenv. + self.testenv.remember_to_stop(self.proc) + self.proc.launch() + + def stop(self): + self.testenv.stop_process(self.proc) + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/testenv.py b/src/osmo_gsm_tester/testenv.py index ea71df9..1790059 100644 --- a/src/osmo_gsm_tester/testenv.py +++ b/src/osmo_gsm_tester/testenv.py @@ -318,6 +318,11 @@ iperf3srv_obj = IPerf3Server(self, ip_address) return iperf3srv_obj + def stress(self, run_node=None): + from .obj.stress import StressTool + stress_obj = StressTool(self, run_node) + return stress_obj + def msisdn(self): msisdn = self.suite_run.resource_pool().next_msisdn(self) self.log('using MSISDN', msisdn) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I21023e6c64c48109f294291bfe3d8d8f4e1de038 Gerrit-Change-Number: 19105 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 11:44:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 11:44:50 +0000 Subject: =?UTF-8?Q?Change_in_osmo-e1d=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E0=2E1-8e1e_=E2=86=92_0=2E1=2E1?= References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19106 ) Change subject: Bump version: 0.1.0.1-8e1e ? 0.1.1 ...................................................................... Bump version: 0.1.0.1-8e1e ? 0.1.1 Change-Id: I4544ad93856355b084a6ee8353438a3ec20097c0 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/06/19106/1 diff --git a/debian/changelog b/debian/changelog index 2180767..6ed3441 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-e1d (0.1.1) unstable; urgency=medium + + * Makefile.am: Don't put LIBS into CFLAGS + + -- Harald Welte Thu, 02 Jul 2020 13:44:06 +0200 + osmo-e1d (0.1.0) unstable; urgency=medium * debian/control: Add missing dependency to libusb-1.0-0-dev -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I4544ad93856355b084a6ee8353438a3ec20097c0 Gerrit-Change-Number: 19106 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 11:54:44 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Jul 2020 11:54:44 +0000 Subject: Change in osmo-mgw[master]: trunk: parse E1 trunk number In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/18752 to look at the new patch set (#12). Change subject: trunk: parse E1 trunk number ...................................................................... trunk: parse E1 trunk number The E1 trunk number is currently not parsed, whenever a trunk prefix is detected that indicates an E1 trunk, then the entire request is rejected. Parse the trunk number and select the trunk accordingly Related: OS#2547 Change-Id: Ifdaab953544151e73b58cc3e95d21afdb40765f4 --- M include/osmocom/mgcp/mgcp_trunk.h M src/libosmo-mgcp/mgcp_trunk.c M tests/mgcp/mgcp_test.c 3 files changed, 70 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/52/18752/12 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifdaab953544151e73b58cc3e95d21afdb40765f4 Gerrit-Change-Number: 18752 Gerrit-PatchSet: 12 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 12:44:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 12:44:07 +0000 Subject: Change in osmo-gsm-tester[master]: Introduce stress tool object In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19105 ) Change subject: Introduce stress tool object ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I21023e6c64c48109f294291bfe3d8d8f4e1de038 Gerrit-Change-Number: 19105 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 12:44:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 12:44:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 12:44:10 +0000 Subject: Change in osmo-gsm-tester[master]: Introduce stress tool object In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19105 ) Change subject: Introduce stress tool object ...................................................................... Introduce stress tool object This object allows to run the "stress" cmdline program in the background on the specifies run_node, to simulate system load. To run stress, a test can simply do: stress = tenv.stress(epc.run_node()) stress.start(cpu_workers=2, mem_workers=1, io_workers=1) And the test environment will remember to stop it when the test finishes. Change-Id: I21023e6c64c48109f294291bfe3d8d8f4e1de038 --- A src/osmo_gsm_tester/obj/stress.py M src/osmo_gsm_tester/testenv.py 2 files changed, 78 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/obj/stress.py b/src/osmo_gsm_tester/obj/stress.py new file mode 100644 index 0000000..f0e417a --- /dev/null +++ b/src/osmo_gsm_tester/obj/stress.py @@ -0,0 +1,73 @@ +# osmo_gsm_tester: specifics for running stress(-ng), a tool to load and stress a computer system +# +# Copyright (C) 2020 by sysmocom - s.f.m.c. GmbH +# +# Author: Pau Espin Pedrol +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from ..core import log +from ..core import util +from ..core import process +from ..core import remote + +class StressTool(log.Origin): + + STRESS_BIN = 'stress' + +############## +# PROTECTED +############## + def __init__(self, testenv, run_node): + super().__init__(log.C_RUN, StressTool.STRESS_BIN) + self.testenv = testenv + self._run_node = run_node + self.proc = None + self.rem_host = None + + def runs_locally(self): + locally = not self._run_node or self._run_node.is_local() + return locally + +################### +# PUBLIC (test API included) +################### + def start(self, cpu_workers=0, mem_workers=0, io_workers=0, timeout=0): + self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name())) + + popen_args = (StressTool.STRESS_BIN,) + if cpu_workers > 0: + popen_args += ('-c', str(cpu_workers)) + if mem_workers > 0: + popen_args += ('-m', str(mem_workers)) + if io_workers > 0: + popen_args += ('-i', str(io_workers)) + if timeout > 0: + popen_args += ('-t', str(timeout)) + + if self.runs_locally(): + self.proc = process.Process(self.name(), self.run_dir, popen_args, env={}) + else: + self.rem_host = remote.RemoteHost(self.run_dir, self._run_node.ssh_user(), self._run_node.ssh_addr()) + self.proc = self.rem_host.RemoteProcess(self.name(), popen_args, env={}) + # Warning: Be aware that if process ends before test is finished due to + # "-t timeout" param being set, the test will most probably fail as + # detected 'early exit' by the testenv. + self.testenv.remember_to_stop(self.proc) + self.proc.launch() + + def stop(self): + self.testenv.stop_process(self.proc) + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/testenv.py b/src/osmo_gsm_tester/testenv.py index ea71df9..1790059 100644 --- a/src/osmo_gsm_tester/testenv.py +++ b/src/osmo_gsm_tester/testenv.py @@ -318,6 +318,11 @@ iperf3srv_obj = IPerf3Server(self, ip_address) return iperf3srv_obj + def stress(self, run_node=None): + from .obj.stress import StressTool + stress_obj = StressTool(self, run_node) + return stress_obj + def msisdn(self): msisdn = self.suite_run.resource_pool().next_msisdn(self) self.log('using MSISDN', msisdn) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I21023e6c64c48109f294291bfe3d8d8f4e1de038 Gerrit-Change-Number: 19105 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 12:55:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 12:55:52 +0000 Subject: =?UTF-8?Q?Change_in_osmo-e1d=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E0=2E1-8e1e_=E2=86=92_0=2E1=2E1?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19106 ) Change subject: Bump version: 0.1.0.1-8e1e ? 0.1.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I4544ad93856355b084a6ee8353438a3ec20097c0 Gerrit-Change-Number: 19106 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 02 Jul 2020 12:55:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 12:55:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 12:55:56 +0000 Subject: =?UTF-8?Q?Change_in_osmo-e1d=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E0=2E1-8e1e_=E2=86=92_0=2E1=2E1?= In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19106 ) Change subject: Bump version: 0.1.0.1-8e1e ? 0.1.1 ...................................................................... Bump version: 0.1.0.1-8e1e ? 0.1.1 Change-Id: I4544ad93856355b084a6ee8353438a3ec20097c0 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 2180767..6ed3441 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-e1d (0.1.1) unstable; urgency=medium + + * Makefile.am: Don't put LIBS into CFLAGS + + -- Harald Welte Thu, 02 Jul 2020 13:44:06 +0200 + osmo-e1d (0.1.0) unstable; urgency=medium * debian/control: Add missing dependency to libusb-1.0-0-dev -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I4544ad93856355b084a6ee8353438a3ec20097c0 Gerrit-Change-Number: 19106 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 13:01:14 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Jul 2020 13:01:14 +0000 Subject: Change in osmo-mgw[master]: trunk: parse E1 trunk number In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18752 ) Change subject: trunk: parse E1 trunk number ...................................................................... Patch Set 12: (3 comments) (ensure that all comments are sent) https://gerrit.osmocom.org/c/osmo-mgw/+/18752/8/src/libosmo-mgcp/mgcp_trunk.c File src/libosmo-mgcp/mgcp_trunk.c: https://gerrit.osmocom.org/c/osmo-mgw/+/18752/8/src/libosmo-mgcp/mgcp_trunk.c at 145 PS8, Line 145: epname + prefix_len == str_trunk_nr_end > Now I finally understand, you want the delimiter to be checked... Done https://gerrit.osmocom.org/c/osmo-mgw/+/18752/10/tests/mgcp/mgcp_test.c File tests/mgcp/mgcp_test.c: https://gerrit.osmocom.org/c/osmo-mgw/+/18752/10/tests/mgcp/mgcp_test.c at 2138 PS10, Line 2138: * the trunk number. Since the prefix has a fixt length, only > fixed Done https://gerrit.osmocom.org/c/osmo-mgw/+/18752/11/tests/mgcp/mgcp_test.c File tests/mgcp/mgcp_test.c: https://gerrit.osmocom.org/c/osmo-mgw/+/18752/11/tests/mgcp/mgcp_test.c at 2144 PS11, Line 2144: trunk_nr = e1_trunk_nr_from_epname("ds/e1+2/s-1/su16-0"); : OSMO_ASSERT(trunk_nr == 2); : trunk_nr = e1_trunk_nr_from_epname("xxxxxx3/s-1/su16-0"); : OSMO_ASSERT(trunk_nr == 3); : trunk_nr = e1_trunk_nr_from_epname("xxxxxx4/zz"); : OSMO_ASSERT(trunk_nr == 4); > I really don't want to delay this patch any longer, but to me it doesn't make sense that we ignore t [?] I have changed the code a bit, now the check s in that function. I also think that this is better. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifdaab953544151e73b58cc3e95d21afdb40765f4 Gerrit-Change-Number: 18752 Gerrit-PatchSet: 12 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 13:01:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter Comment-In-Reply-To: pespin Comment-In-Reply-To: neels Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 13:08:18 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 2 Jul 2020 13:08:18 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08_rr: fix hopping parameters in RR Assignment Command In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19063 ) Change subject: gsm_04_08_rr: fix hopping parameters in RR Assignment Command ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/19063/1/src/osmo-bsc/gsm_04_08_rr.c File src/osmo-bsc/gsm_04_08_rr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/19063/1/src/osmo-bsc/gsm_04_08_rr.c at 47 PS1, Line 47: extern int generate_cell_chan_list(uint8_t *chan_list, struct gsm_bts *bts); > can we add this to some header file please? +1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I43ef66c109b107ebcaa1cb6197637701b13b3787 Gerrit-Change-Number: 19063 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 13:08:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 14:37:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 14:37:06 +0000 Subject: Change in osmo-bts[master]: bts-trx: Introduce rate counter for scheduler timerfd missed FNs References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19107 ) Change subject: bts-trx: Introduce rate counter for scheduler timerfd missed FNs ...................................................................... bts-trx: Introduce rate counter for scheduler timerfd missed FNs This should provide a quick way to check if the system is frequently overloaded over time and hence downlink FNs are scheduled later than expected. Change-Id: I0051b9ab18ebc9f92db11374d856de94f155efa4 --- M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 3 files changed, 24 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/07/19107/1 diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h index 3fda726..7f60ca3 100644 --- a/src/osmo-bts-trx/l1_if.h +++ b/src/osmo-bts-trx/l1_if.h @@ -1,6 +1,8 @@ #ifndef L1_IF_H_TRX #define L1_IF_H_TRX +#include + #include #include #include "trx_if.h" @@ -24,6 +26,11 @@ * send burst data for the missing frame numbers. */ +/* bts-trx specific rate counters */ +enum { + BTSTRX_CTR_SCHED_DL_MISS_FN, +}; + /*! clock state of a given TRX */ struct osmo_trx_clock_state { /*! number of FN periods without TRX clock indication */ @@ -47,6 +54,7 @@ /* gsm_bts->model_priv, specific to osmo-bts-trx */ struct bts_trx_priv { struct osmo_trx_clock_state clk_s; + struct rate_ctr_group *ctrs; /* bts-trx specific rate counters */ }; struct trx_config { diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index 0d2a1f7..984e3bc 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -43,6 +43,8 @@ #include #include #include +#include +#include #include #include @@ -59,6 +61,17 @@ #include "l1_if.h" #include "trx_if.h" +static const struct rate_ctr_desc btstrx_ctr_desc[] = { + [BTSTRX_CTR_SCHED_DL_MISS_FN] = {"trx_clk:sched_dl_miss_fn", "Downlink frames scheduled later than expected due to missed timerfd event (due to high system load)"}, +}; +static const struct rate_ctr_group_desc btstrx_ctrg_desc = { + "bts-trx", + "OsmoBtsTrx specific counters", + OSMO_STATS_CLASS_GLOBAL, + ARRAY_SIZE(btstrx_ctr_desc), + btstrx_ctr_desc +}; + /* dummy, since no direct dsp support */ uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx) { @@ -99,6 +112,7 @@ { struct bts_trx_priv *bts_trx = talloc_zero(bts, struct bts_trx_priv); bts_trx->clk_s.fn_timer_ofd.fd = -1; + bts_trx->ctrs = rate_ctr_group_alloc(bts_trx, &btstrx_ctrg_desc, 0); bts->model_priv = bts_trx; bts->variant = BTS_OSMO_TRX; diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 472bae8..fcd1eee 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -158,7 +158,8 @@ if (expire_count > 1) { LOGP(DL1C, LOGL_NOTICE, "FN timer expire_count=%"PRIu64": We missed %"PRIu64" timers\n", - expire_count, expire_count-1); + expire_count, expire_count - 1); + rate_ctr_add(&bts_trx->ctrs->ctr[BTSTRX_CTR_SCHED_DL_MISS_FN], expire_count - 1); } /* check if transceiver is still alive */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0051b9ab18ebc9f92db11374d856de94f155efa4 Gerrit-Change-Number: 19107 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 15:35:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 15:35:50 +0000 Subject: Change in osmo-bts[master]: bts_shutdown: Speed up shutdown if no TRX is operational References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19108 ) Change subject: bts_shutdown: Speed up shutdown if no TRX is operational ...................................................................... bts_shutdown: Speed up shutdown if no TRX is operational This change avoids waiting for full ramp down if TRXs are already non operational. Change-Id: Ie1c7c3a969e7968075b89edcd1ab2227b178a869 --- M src/common/bts_shutdown_fsm.c 1 file changed, 36 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/08/19108/1 diff --git a/src/common/bts_shutdown_fsm.c b/src/common/bts_shutdown_fsm.c index d8a8d11..d55b1cd 100644 --- a/src/common/bts_shutdown_fsm.c +++ b/src/common/bts_shutdown_fsm.c @@ -22,6 +22,7 @@ #include #include +#include #include #include @@ -38,11 +39,33 @@ #define bts_shutdown_fsm_state_chg(fi, NEXT_STATE) \ osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, bts_shutdown_fsm_timeouts, ((struct gsm_bts *)fi->priv)->T_defs, -1) +static unsigned int count_trx_operational(struct gsm_bts *bts) { + unsigned int count = 0; + struct gsm_bts_trx *trx; + llist_for_each_entry(trx, &bts->trx_list, list) { + if (trx->mo.nm_state.operational == NM_OPSTATE_ENABLED) + count++; + } + return count; +} + static void st_none(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct gsm_bts *bts = (struct gsm_bts *)fi->priv; + unsigned int count; switch(event) { case BTS_SHUTDOWN_EV_START: - bts_shutdown_fsm_state_chg(fi, BTS_SHUTDOWN_ST_WAIT_RAMP_DOWN_COMPL); + count = count_trx_operational(bts); + if (count) { + bts_shutdown_fsm_state_chg(fi, BTS_SHUTDOWN_ST_WAIT_RAMP_DOWN_COMPL); + } else { + /* we can skip ramp down since no TRX is running anyway. + * Let's jump into WAIT_TRX_CLOSED to make sure we + * tell lower layer to close all TRX in case there's some + * open() WIP */ + LOGPFSML(fi, LOGL_INFO, "No TRX is operational, skipping power ramp down\n"); + bts_shutdown_fsm_state_chg(fi, BTS_SHUTDOWN_ST_WAIT_TRX_CLOSED); + } break; } } @@ -56,8 +79,11 @@ struct gsm_bts *bts = (struct gsm_bts *)fi->priv; struct gsm_bts_trx *trx; - llist_for_each_entry(trx, &bts->trx_list, list) + llist_for_each_entry(trx, &bts->trx_list, list) { + if (trx->mo.nm_state.operational != NM_OPSTATE_ENABLED) + continue; power_ramp_start(trx, to_mdB(-10), 1, ramp_down_compl_cb); + } } static void st_wait_ramp_down_compl(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -72,7 +98,8 @@ src_trx = (struct gsm_bts_trx *)data; llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->power_params.p_total_cur_mdBm > 0) + if (trx->mo.nm_state.operational == NM_OPSTATE_ENABLED && + trx->power_params.p_total_cur_mdBm > 0) remaining++; } @@ -100,17 +127,13 @@ static void st_wait_trx_closed(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_bts *bts = (struct gsm_bts *)fi->priv; - struct gsm_bts_trx *src_trx, *trx; - unsigned int remaining = 0; + struct gsm_bts_trx *src_trx; + unsigned int remaining; switch(event) { case BTS_SHUTDOWN_EV_TRX_CLOSED: src_trx = (struct gsm_bts_trx *)data; - - llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->mo.nm_state.operational != NM_OPSTATE_DISABLED) - remaining++; - } + remaining = count_trx_operational(bts); LOGPFSML(fi, LOGL_INFO, "%s TRX closed, %u TRX remaining\n", gsm_trx_name(src_trx), remaining); @@ -130,7 +153,9 @@ [BTS_SHUTDOWN_ST_NONE] = { .in_event_mask = X(BTS_SHUTDOWN_EV_START), - .out_state_mask = X(BTS_SHUTDOWN_ST_WAIT_RAMP_DOWN_COMPL), + .out_state_mask = + X(BTS_SHUTDOWN_ST_WAIT_RAMP_DOWN_COMPL) | + X(BTS_SHUTDOWN_ST_WAIT_TRX_CLOSED), .name = "NONE", .action = st_none, }, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie1c7c3a969e7968075b89edcd1ab2227b178a869 Gerrit-Change-Number: 19108 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 15:54:17 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 2 Jul 2020 15:54:17 +0000 Subject: Change in osmo-bts[master]: bts_shutdown: Speed up shutdown if no TRX is operational In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19108 ) Change subject: bts_shutdown: Speed up shutdown if no TRX is operational ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie1c7c3a969e7968075b89edcd1ab2227b178a869 Gerrit-Change-Number: 19108 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 02 Jul 2020 15:54:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 17:40:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 17:40:46 +0000 Subject: Change in osmo-bts[master]: bts-trx: Implement ramp up/down during ADM state change In-Reply-To: References: Message-ID: Hello dexter, fixeria, daniel, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/18967 to look at the new patch set (#5). Change subject: bts-trx: Implement ramp up/down during ADM state change ...................................................................... bts-trx: Implement ramp up/down during ADM state change Ramp down when BTS is administratevly locked, and ramp up when it becomes unlocked again. Af ramping down, bts_model_trx_deact_rf is called to make sure all channels are released. power_ramp_start() is dropped from inside bts_model_trx_deact_rf since it's not the proper place. In there we simply want to instantaneously drop RF. Related: SYS#4920 Change-Id: Ib7a7b0a0c24779349f142215f0bb32b72c86ce70 --- M src/osmo-bts-trx/l1_if.c 1 file changed, 66 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/67/18967/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7a7b0a0c24779349f142215f0bb32b72c86ce70 Gerrit-Change-Number: 18967 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 17:44:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 17:44:36 +0000 Subject: Change in osmo-bts[master]: bts-trx: Implement ramp up/down during ADM state change In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18967 ) Change subject: bts-trx: Implement ramp up/down during ADM state change ...................................................................... Patch Set 5: With this new version of the patch I can get CS channels/TS working again after "rf_lock 0", but PDCH doesn't work again, and I strangely receive a lot of RACH requests on that TS... osmo-bts-trx: """ 20200702193130055 DL1C <0006> scheduler_trx.c:302 TRX Clock Ind: elapsed_us=1000097, elapsed_fn=216, error_us=+3257 20200702193130055 DL1C <0006> scheduler_trx.c:321 GSM clock jitter: -4023us (elapsed_fn=0) 20200702193130196 DPCU <0009> pcu_sock.c:390 Sending RACH indication: qta=1, ra=118, fn=1395732 20200702193130431 DPCU <0009> pcu_sock.c:390 Sending RACH indication: qta=1, ra=117, fn=1395783 20200702193130667 DPCU <0009> pcu_sock.c:390 Sending RACH indication: qta=1, ra=116, fn=1395834 20200702193130902 DPCU <0009> pcu_sock.c:390 Sending RACH indication: qta=1, ra=114, fn=1395885 """ osmo-trx: """ 20200702192729800 DL1IF pcu_l1_if.cpp:458 RACH request received: sapi=1 qta=2, ra=0x75, fn=2059752, cur_fn=2059754, is_11bit=0 20200702192729808 DRLCMAC sba.cpp:132 Poll timeout for SBA (TRX=0, TS=7, FN=1967428, TA=0) 20200702192730035 DL1IF pcu_l1_if.cpp:458 RACH request received: sapi=1 qta=2, ra=0x70, fn=2059803, cur_fn=2059806, is_11bit=0 20200702192730048 DRLCMAC sba.cpp:132 Poll timeout for SBA (TRX=0, TS=7, FN=1967428, TA=0) 20200702192730270 DL1IF pcu_l1_if.cpp:458 RACH request received: sapi=1 qta=2, ra=0x74, fn=2059854, cur_fn=2059858, is_11bit=0 20200702192730288 DRLCMAC sba.cpp:132 Poll timeout for SBA (TRX=0, TS=7, FN=1967428, TA=0) And also poll timeouts: <0002> /home/pespin/dev/sysmocom/git/osmo-pcu/src/sba.cpp:132 Poll timeout for SBA (TRX=0, TS=7, FN=1385171, TA=0) <0002> /home/pespin/dev/sysmocom/git/osmo-pcu/src/sba.cpp:132 Poll timeout for SBA (TRX=0, TS=7, FN=1385171, TA=0) <0002> /home/pespin/dev/sysmocom/git/osmo-pcu/src/sba.cpp:132 Poll timeout for SBA (TRX=0, TS=7, FN=1385171, TA=0 """ So I guess I'm missing some part to re-activate PDCH. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7a7b0a0c24779349f142215f0bb32b72c86ce70 Gerrit-Change-Number: 18967 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 17:44:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 18:07:40 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 2 Jul 2020 18:07:40 +0000 Subject: Change in osmo-trx[master]: TransceiverState: Initialize ctrs field in constructor In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19088 ) Change subject: TransceiverState: Initialize ctrs field in constructor ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4643a0500e9cad09938c05fab2f358167f72ffa9 Gerrit-Change-Number: 19088 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 18:07:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 19:14:41 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Jul 2020 19:14:41 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: fix docstring for mgcp_trunk_alloc() In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19099 ) Change subject: mgcp_trunk: fix docstring for mgcp_trunk_alloc() ...................................................................... mgcp_trunk: fix docstring for mgcp_trunk_alloc() Change-Id: I845397d829476e15f7e3221c63ea35a00a965647 --- M src/libosmo-mgcp/mgcp_trunk.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_trunk.c b/src/libosmo-mgcp/mgcp_trunk.c index 3692351..bd7bb2a 100644 --- a/src/libosmo-mgcp/mgcp_trunk.c +++ b/src/libosmo-mgcp/mgcp_trunk.c @@ -28,8 +28,8 @@ /*! allocate trunk and add it (if required) to the trunk list. * (called once at startup by VTY). * \param[in] cfg mgcp configuration. - * \param[in] nr trunk number. * \param[in] ttype trunk type. + * \param[in] nr trunk number. * \returns pointer to allocated trunk, NULL on failure. */ struct mgcp_trunk *mgcp_trunk_alloc(struct mgcp_config *cfg, enum mgcp_trunk_type ttype, int nr) { -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I845397d829476e15f7e3221c63ea35a00a965647 Gerrit-Change-Number: 19099 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 19:15:20 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Jul 2020 19:15:20 +0000 Subject: Change in osmo-mgw[master]: mgcp_osmux: remove unused define constants In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19100 ) Change subject: mgcp_osmux: remove unused define constants ...................................................................... mgcp_osmux: remove unused define constants The define constants CONN_ID_BTS and CONN_ID_NET were used in mgcp_osmux long time ago when osmux support was temporarly broken. Now those defines are no longer used anywhere, so lets remove them. Change-Id: I3d0b9d482ef0e2187bccace5779a7f8b9507c4e2 --- M include/osmocom/mgcp/mgcp_internal.h 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h index 174bfd9..66a26bd 100644 --- a/include/osmocom/mgcp/mgcp_internal.h +++ b/include/osmocom/mgcp/mgcp_internal.h @@ -32,11 +32,6 @@ #define CI_UNUSED 0 -/* FIXME: This this is only needed to compile the currently - * broken OSMUX support. Remove when fixed */ -#define CONN_ID_BTS "0" -#define CONN_ID_NET "1" - enum mgcp_trunk_type { MGCP_TRUNK_VIRTUAL, MGCP_TRUNK_E1, -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3d0b9d482ef0e2187bccace5779a7f8b9507c4e2 Gerrit-Change-Number: 19100 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 19:17:36 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Jul 2020 19:17:36 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: move enum mgcp_trunk_type to mgcp_trunk.h In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19101 ) Change subject: mgcp_trunk: move enum mgcp_trunk_type to mgcp_trunk.h ...................................................................... mgcp_trunk: move enum mgcp_trunk_type to mgcp_trunk.h The enum mgcp_trunk_type, which is currently located in mgcp_internal.h makes more sense in mgcp_trunk.h, so lets move it. Related: OS#2659 Change-Id: I077121503c44fc112a33f1c946f368414e28f841 --- M include/osmocom/mgcp/mgcp_internal.h M include/osmocom/mgcp/mgcp_trunk.h 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h index 66a26bd..f143988 100644 --- a/include/osmocom/mgcp/mgcp_internal.h +++ b/include/osmocom/mgcp/mgcp_internal.h @@ -32,11 +32,6 @@ #define CI_UNUSED 0 -enum mgcp_trunk_type { - MGCP_TRUNK_VIRTUAL, - MGCP_TRUNK_E1, -}; - struct mgcp_rtp_stream_state { uint32_t ssrc; uint16_t last_seq; diff --git a/include/osmocom/mgcp/mgcp_trunk.h b/include/osmocom/mgcp/mgcp_trunk.h index 78d65e4..2bd55e6 100644 --- a/include/osmocom/mgcp/mgcp_trunk.h +++ b/include/osmocom/mgcp/mgcp_trunk.h @@ -1,5 +1,10 @@ #pragma once +enum mgcp_trunk_type { + MGCP_TRUNK_VIRTUAL, + MGCP_TRUNK_E1, +}; + struct mgcp_trunk { struct llist_head entry; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I077121503c44fc112a33f1c946f368414e28f841 Gerrit-Change-Number: 19101 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 19:27:22 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Jul 2020 19:27:22 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: use enum type for trunk type variable References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19109 ) Change subject: mgcp_trunk: use enum type for trunk type variable ...................................................................... mgcp_trunk: use enum type for trunk type variable The trunk_type variable in struct mgcp_trunk is specified as an int, however there is an enum mgcp_trunk_type specified. Lets use the enum as type for trunk_type instead of int. Related: OS#2659 Change-Id: I8e8b0cf448cfe67ad3b7caab24f301708d2a515f --- M include/osmocom/mgcp/mgcp_trunk.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/09/19109/1 diff --git a/include/osmocom/mgcp/mgcp_trunk.h b/include/osmocom/mgcp/mgcp_trunk.h index 2bd55e6..c6a0997 100644 --- a/include/osmocom/mgcp/mgcp_trunk.h +++ b/include/osmocom/mgcp/mgcp_trunk.h @@ -11,7 +11,7 @@ struct mgcp_config *cfg; int trunk_nr; - int trunk_type; + enum mgcp_trunk_type trunk_type; char *audio_fmtp_extra; int audio_send_ptime; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I8e8b0cf448cfe67ad3b7caab24f301708d2a515f Gerrit-Change-Number: 19109 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 20:53:38 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 2 Jul 2020 20:53:38 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08_rr: fix hopping parameters in RR Assignment Command In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19063 to look at the new patch set (#2). Change subject: gsm_04_08_rr: fix hopping parameters in RR Assignment Command ...................................................................... gsm_04_08_rr: fix hopping parameters in RR Assignment Command According to 3GPP TS 44.018, section 9.1.2.4, if at least one of the Channel Description IEs indicates frequency hopping, one and only one of the following IEs shall be present: - Mobile Allocation, after time (see 10.5.2.21); - Frequency List, after time (see 10.5.2.13). For some reason, osmo-bsc includes the GSM48_IE_MA_BEFORE instead of GSM48_IE_MA_AFTER - fix this. According to section 9.1.2.6 of the same document, if any of the Mobile Allocation IEs (before/after time) is present, then the network must ensure that either the MS has already received the the proper reference cell frequency list (CA), or that the Cell Channel Description IE (see 10.5.2.1b) is present. Without this IE, the phone I was using in my testing setup sends RR Status message with cause #100 "conditional IE error". Fortunately, we already have generate_cell_chan_list(), since we also need to include the Cell Channel Description in SI Type 1. Change-Id: I43ef66c109b107ebcaa1cb6197637701b13b3787 Related: SYS#4868, OS#4545, OS#4546 --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/63/19063/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I43ef66c109b107ebcaa1cb6197637701b13b3787 Gerrit-Change-Number: 19063 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 20:53:39 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 2 Jul 2020 20:53:39 +0000 Subject: Change in osmo-bsc[master]: system_information: publicly declare generate_cell_chan_list() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19110 ) Change subject: system_information: publicly declare generate_cell_chan_list() ...................................................................... system_information: publicly declare generate_cell_chan_list() Change-Id: Idc7a9ed558ed6897e15a0f6d3c23418db7cee0d0 --- M include/osmocom/bsc/system_information.h M src/osmo-bsc/bts_nokia_site.c M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/system_information.c 4 files changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/10/19110/1 diff --git a/include/osmocom/bsc/system_information.h b/include/osmocom/bsc/system_information.h index 29f639d..35892d9 100644 --- a/include/osmocom/bsc/system_information.h +++ b/include/osmocom/bsc/system_information.h @@ -7,6 +7,7 @@ struct gsm_bts; +int generate_cell_chan_list(uint8_t *chan_list, struct gsm_bts *bts); int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type type); size_t si2q_earfcn_count(const struct osmo_earfcn_si2q *e); unsigned range1024_p(unsigned n); diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c index 8047682..0d0dbb5 100644 --- a/src/osmo-bsc/bts_nokia_site.c +++ b/src/osmo-bsc/bts_nokia_site.c @@ -36,6 +36,7 @@ #include #include #include +#include #include @@ -50,8 +51,6 @@ /* TODO: put in a separate file ? */ extern int abis_nm_sendmsg(struct gsm_bts *bts, struct msgb *msg); -/* was static in system_information.c */ -extern int generate_cell_chan_list(uint8_t * chan_list, struct gsm_bts *bts); static void nokia_abis_nm_queue_send_next(struct gsm_bts *bts); static void reset_timer_cb(void *_bts); diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 5fd02dd..06f0cb1 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -63,6 +63,7 @@ #include #include #include +#include #include @@ -364,8 +365,6 @@ /* TODO: this is required for the Nokia BTS, hopping is configured during OML, other MA is not set. */ struct gsm_bts_trx *cur_trx; - /* was static in system_information.c */ - extern int generate_cell_chan_list(uint8_t *chan_list, struct gsm_bts *bts); uint8_t ca[20]; /* has to be called before generate_ma_for_ts to set bts->si_common.cell_alloc */ diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 4a1118e..19ea998 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -569,7 +569,7 @@ } /* generate a cell channel list as per Section 10.5.2.1b of 04.08 */ -/* static*/ int generate_cell_chan_list(uint8_t *chan_list, struct gsm_bts *bts) +int generate_cell_chan_list(uint8_t *chan_list, struct gsm_bts *bts) { struct gsm_bts_trx *trx; struct bitvec *bv = &bts->si_common.cell_alloc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idc7a9ed558ed6897e15a0f6d3c23418db7cee0d0 Gerrit-Change-Number: 19110 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 20:53:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 2 Jul 2020 20:53:40 +0000 Subject: Change in osmo-bsc[master]: system_information: constify bitvec in freq. list encoding API References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19111 ) Change subject: system_information: constify bitvec in freq. list encoding API ...................................................................... system_information: constify bitvec in freq. list encoding API Change-Id: I95f3a89af16e4a6b4aa1a6a48cf0d0c023f26170 --- M src/osmo-bsc/system_information.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/11/19111/1 diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 19ea998..b17a909 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -398,7 +398,7 @@ /* generate a variable bitmap */ static inline int enc_freq_lst_var_bitmap(uint8_t *chan_list, - struct bitvec *bv, const struct gsm_bts *bts, + const struct bitvec *bv, const struct gsm_bts *bts, bool bis, bool ter, int min, bool pgsm) { int i; @@ -459,7 +459,7 @@ /* generate a frequency list with the range 512 format */ static inline int enc_freq_lst_range(uint8_t *chan_list, - struct bitvec *bv, const struct gsm_bts *bts, + const struct bitvec *bv, const struct gsm_bts *bts, bool bis, bool ter, bool pgsm) { int arfcns[RANGE_ENC_MAX_ARFCNS]; @@ -491,7 +491,7 @@ } /* generate a cell channel list as per Section 10.5.2.1b of 04.08 */ -static int bitvec2freq_list(uint8_t *chan_list, struct bitvec *bv, +static int bitvec2freq_list(uint8_t *chan_list, const struct bitvec *bv, const struct gsm_bts *bts, bool bis, bool ter) { int i, rc, min = -1, max = -1, arfcns = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I95f3a89af16e4a6b4aa1a6a48cf0d0c023f26170 Gerrit-Change-Number: 19111 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 20:53:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 2 Jul 2020 20:53:40 +0000 Subject: Change in osmo-bsc[master]: generate_ma_for_ts(): constify per cell/timeslot ARFCN bit-vectors References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19112 ) Change subject: generate_ma_for_ts(): constify per cell/timeslot ARFCN bit-vectors ...................................................................... generate_ma_for_ts(): constify per cell/timeslot ARFCN bit-vectors Change-Id: If750003beb8653cf67fd192fa5c16343138155c9 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/12/19112/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 06f0cb1..dbd9701 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -234,8 +234,8 @@ { /* we have three bitvecs: the per-timeslot ARFCNs, the cell chan ARFCNs * and the MA */ - struct bitvec *cell_chan = &ts->trx->bts->si_common.cell_alloc; - struct bitvec *ts_arfcn = &ts->hopping.arfcns; + const struct bitvec *cell_chan = &ts->trx->bts->si_common.cell_alloc; + const struct bitvec *ts_arfcn = &ts->hopping.arfcns; struct bitvec *ma = &ts->hopping.ma; unsigned int num_cell_arfcns, bitnum, n_chan; int i; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If750003beb8653cf67fd192fa5c16343138155c9 Gerrit-Change-Number: 19112 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 21:07:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 21:07:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp/STP_Test.cfg: Add M3UA and IPA tests References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19113 ) Change subject: stp/STP_Test.cfg: Add M3UA and IPA tests ...................................................................... stp/STP_Test.cfg: Add M3UA and IPA tests Change-Id: Ib8a874d842854cd919edbc1929352fcc3fc1ad97 --- M stp/STP_Tests.cfg 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/13/19113/1 diff --git a/stp/STP_Tests.cfg b/stp/STP_Tests.cfg index 3ba2d13..945ef8f 100644 --- a/stp/STP_Tests.cfg +++ b/stp/STP_Tests.cfg @@ -15,4 +15,6 @@ [MAIN_CONTROLLER] [EXECUTE] +STP_Tests_M3UA.control +STP_Tests_IPA.control STP_Tests.control -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19113 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib8a874d842854cd919edbc1929352fcc3fc1ad97 Gerrit-Change-Number: 19113 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 21:21:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 21:21:08 +0000 Subject: Change in osmo-trx[master]: TransceiverState: Initialize ctrs field in constructor In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19088 ) Change subject: TransceiverState: Initialize ctrs field in constructor ...................................................................... TransceiverState: Initialize ctrs field in constructor Coverity dixit: "Non-static class member field "ctrs.tx_stale_bursts" is not initialized in this constructor nor in any functions that it calls." Fixes: CID#211258 Change-Id: I4643a0500e9cad09938c05fab2f358167f72ffa9 --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 941b761..2ae5eda 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -65,6 +65,7 @@ for (int n = 0; n < 102; n++) fillerTable[n][i] = NULL; } + memset(&ctrs, 0, sizeof(struct trx_counters)); } TransceiverState::~TransceiverState() -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4643a0500e9cad09938c05fab2f358167f72ffa9 Gerrit-Change-Number: 19088 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 21:21:09 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 21:21:09 +0000 Subject: Change in osmo-trx[master]: doc/manuals: Update thread documentation after dropping CTRL sock thr... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19089 ) Change subject: doc/manuals: Update thread documentation after dropping CTRL sock threads ...................................................................... doc/manuals: Update thread documentation after dropping CTRL sock threads Per-ARFCN CTRL threads managing CTRL socket loops were dropped a while ago, but it was forgotten to udpate the documentation. Change-Id: I34d117325e60b04b075c205d21bb0b827a5e8c52 --- M doc/manuals/chapters/code-architecture.adoc 1 file changed, 5 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/code-architecture.adoc b/doc/manuals/chapters/code-architecture.adoc index 18d0e3a..f1feb2c 100644 --- a/doc/manuals/chapters/code-architecture.adoc +++ b/doc/manuals/chapters/code-architecture.adoc @@ -39,8 +39,7 @@ radioiface [label="RadioInterface"]; radiodev [label="RadioDevice"]; -trans:nw->trans:ne [label="Trx.ControlServiceLoop_0"]; -trans:nw->trans:ne [label="Trx.ControlServiceLoop_1"]; +trans:nw->trans:ne [label="Main"]; trans:w->radioiface:w [label="Trx.TxPriorityQueueServiceLoop_0"]; trans:w->radioiface:w [label="Trx.TxPriorityQueueServiceLoop_1"]; radioiface:e->trans:e [label="Trx.RxServiceLoop_0"]; @@ -92,14 +91,6 @@ Dynamic amount of Threads (1 per RF logical channel on the `Transceiver` instance): -* `ControlServiceLoop`: Handles commands from the Per-ARFCN Control Interface - socket (<>). Each thread is responsible for managing one - socket related to one ARFCN or which is the same, to one RF logical channel. - These are the only threads expected to use the private `start()` and `stop()` - methods of the `Transceiver()` class, since those methods don't stop any of - the `ControlServiceLoop` threads as they must keep running to handle new - commands (for instance, to re-start processing samples with the _POWERON_ - command). * `RxServiceLoop`: Each thread of this type pulls bursts from the `RadioInterface` FIFO for one specific logical RF channel and handles it according to the slot and burst correlation type, finally sending proper data @@ -108,6 +99,10 @@ Manager UDP socket (<>), and fills the `RadioInterface` with it setting clock related information. +All the Per-ARFCN Control Interface socket (<>) commands are +handled by the event loop runnnig on the main thread. This is the only thread +expected to use the private `start()` and `stop()` methods. + [[code_component_radioiface]] === RadioInterface -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I34d117325e60b04b075c205d21bb0b827a5e8c52 Gerrit-Change-Number: 19089 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 21:21:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 21:21:49 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: use enum type for trunk type variable In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19109 ) Change subject: mgcp_trunk: use enum type for trunk type variable ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I8e8b0cf448cfe67ad3b7caab24f301708d2a515f Gerrit-Change-Number: 19109 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 21:21:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 21:23:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 21:23:30 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08_rr: fix hopping parameters in RR Assignment Command In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19063 ) Change subject: gsm_04_08_rr: fix hopping parameters in RR Assignment Command ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I43ef66c109b107ebcaa1cb6197637701b13b3787 Gerrit-Change-Number: 19063 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Thu, 02 Jul 2020 21:23:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 21:27:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 2 Jul 2020 21:27:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp/STP_Test.cfg: Add M3UA and IPA tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19113 ) Change subject: stp/STP_Test.cfg: Add M3UA and IPA tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19113 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib8a874d842854cd919edbc1929352fcc3fc1ad97 Gerrit-Change-Number: 19113 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 21:27:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 22:05:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 22:05:59 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08_rr: fix hopping parameters in RR Assignment Command In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19063 ) Change subject: gsm_04_08_rr: fix hopping parameters in RR Assignment Command ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I43ef66c109b107ebcaa1cb6197637701b13b3787 Gerrit-Change-Number: 19063 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Thu, 02 Jul 2020 22:05:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 22:06:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 22:06:24 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: use enum type for trunk type variable In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19109 ) Change subject: mgcp_trunk: use enum type for trunk type variable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I8e8b0cf448cfe67ad3b7caab24f301708d2a515f Gerrit-Change-Number: 19109 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 22:06:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 22:06:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 22:06:38 +0000 Subject: Change in osmo-bsc[master]: system_information: constify bitvec in freq. list encoding API In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19111 ) Change subject: system_information: constify bitvec in freq. list encoding API ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I95f3a89af16e4a6b4aa1a6a48cf0d0c023f26170 Gerrit-Change-Number: 19111 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 02 Jul 2020 22:06:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 22:06:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 22:06:52 +0000 Subject: Change in osmo-bsc[master]: generate_ma_for_ts(): constify per cell/timeslot ARFCN bit-vectors In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19112 ) Change subject: generate_ma_for_ts(): constify per cell/timeslot ARFCN bit-vectors ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If750003beb8653cf67fd192fa5c16343138155c9 Gerrit-Change-Number: 19112 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 02 Jul 2020 22:06:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 22:07:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 22:07:15 +0000 Subject: Change in osmo-bsc[master]: system_information: publicly declare generate_cell_chan_list() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19110 ) Change subject: system_information: publicly declare generate_cell_chan_list() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idc7a9ed558ed6897e15a0f6d3c23418db7cee0d0 Gerrit-Change-Number: 19110 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 02 Jul 2020 22:07:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 22:07:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 22:07:27 +0000 Subject: Change in osmo-bsc[master]: system_information: publicly declare generate_cell_chan_list() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19110 ) Change subject: system_information: publicly declare generate_cell_chan_list() ...................................................................... system_information: publicly declare generate_cell_chan_list() Change-Id: Idc7a9ed558ed6897e15a0f6d3c23418db7cee0d0 --- M include/osmocom/bsc/system_information.h M src/osmo-bsc/bts_nokia_site.c M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/system_information.c 4 files changed, 4 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/bsc/system_information.h b/include/osmocom/bsc/system_information.h index 29f639d..35892d9 100644 --- a/include/osmocom/bsc/system_information.h +++ b/include/osmocom/bsc/system_information.h @@ -7,6 +7,7 @@ struct gsm_bts; +int generate_cell_chan_list(uint8_t *chan_list, struct gsm_bts *bts); int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type type); size_t si2q_earfcn_count(const struct osmo_earfcn_si2q *e); unsigned range1024_p(unsigned n); diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c index 8047682..0d0dbb5 100644 --- a/src/osmo-bsc/bts_nokia_site.c +++ b/src/osmo-bsc/bts_nokia_site.c @@ -36,6 +36,7 @@ #include #include #include +#include #include @@ -50,8 +51,6 @@ /* TODO: put in a separate file ? */ extern int abis_nm_sendmsg(struct gsm_bts *bts, struct msgb *msg); -/* was static in system_information.c */ -extern int generate_cell_chan_list(uint8_t * chan_list, struct gsm_bts *bts); static void nokia_abis_nm_queue_send_next(struct gsm_bts *bts); static void reset_timer_cb(void *_bts); diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 5fd02dd..06f0cb1 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -63,6 +63,7 @@ #include #include #include +#include #include @@ -364,8 +365,6 @@ /* TODO: this is required for the Nokia BTS, hopping is configured during OML, other MA is not set. */ struct gsm_bts_trx *cur_trx; - /* was static in system_information.c */ - extern int generate_cell_chan_list(uint8_t *chan_list, struct gsm_bts *bts); uint8_t ca[20]; /* has to be called before generate_ma_for_ts to set bts->si_common.cell_alloc */ diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 4a1118e..19ea998 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -569,7 +569,7 @@ } /* generate a cell channel list as per Section 10.5.2.1b of 04.08 */ -/* static*/ int generate_cell_chan_list(uint8_t *chan_list, struct gsm_bts *bts) +int generate_cell_chan_list(uint8_t *chan_list, struct gsm_bts *bts) { struct gsm_bts_trx *trx; struct bitvec *bv = &bts->si_common.cell_alloc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idc7a9ed558ed6897e15a0f6d3c23418db7cee0d0 Gerrit-Change-Number: 19110 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 22:07:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 22:07:27 +0000 Subject: Change in osmo-bsc[master]: system_information: constify bitvec in freq. list encoding API In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19111 ) Change subject: system_information: constify bitvec in freq. list encoding API ...................................................................... system_information: constify bitvec in freq. list encoding API Change-Id: I95f3a89af16e4a6b4aa1a6a48cf0d0c023f26170 --- M src/osmo-bsc/system_information.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 19ea998..b17a909 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -398,7 +398,7 @@ /* generate a variable bitmap */ static inline int enc_freq_lst_var_bitmap(uint8_t *chan_list, - struct bitvec *bv, const struct gsm_bts *bts, + const struct bitvec *bv, const struct gsm_bts *bts, bool bis, bool ter, int min, bool pgsm) { int i; @@ -459,7 +459,7 @@ /* generate a frequency list with the range 512 format */ static inline int enc_freq_lst_range(uint8_t *chan_list, - struct bitvec *bv, const struct gsm_bts *bts, + const struct bitvec *bv, const struct gsm_bts *bts, bool bis, bool ter, bool pgsm) { int arfcns[RANGE_ENC_MAX_ARFCNS]; @@ -491,7 +491,7 @@ } /* generate a cell channel list as per Section 10.5.2.1b of 04.08 */ -static int bitvec2freq_list(uint8_t *chan_list, struct bitvec *bv, +static int bitvec2freq_list(uint8_t *chan_list, const struct bitvec *bv, const struct gsm_bts *bts, bool bis, bool ter) { int i, rc, min = -1, max = -1, arfcns = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I95f3a89af16e4a6b4aa1a6a48cf0d0c023f26170 Gerrit-Change-Number: 19111 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 22:07:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 22:07:27 +0000 Subject: Change in osmo-bsc[master]: generate_ma_for_ts(): constify per cell/timeslot ARFCN bit-vectors In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19112 ) Change subject: generate_ma_for_ts(): constify per cell/timeslot ARFCN bit-vectors ...................................................................... generate_ma_for_ts(): constify per cell/timeslot ARFCN bit-vectors Change-Id: If750003beb8653cf67fd192fa5c16343138155c9 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 06f0cb1..dbd9701 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -234,8 +234,8 @@ { /* we have three bitvecs: the per-timeslot ARFCNs, the cell chan ARFCNs * and the MA */ - struct bitvec *cell_chan = &ts->trx->bts->si_common.cell_alloc; - struct bitvec *ts_arfcn = &ts->hopping.arfcns; + const struct bitvec *cell_chan = &ts->trx->bts->si_common.cell_alloc; + const struct bitvec *ts_arfcn = &ts->hopping.arfcns; struct bitvec *ma = &ts->hopping.ma; unsigned int num_cell_arfcns, bitnum, n_chan; int i; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If750003beb8653cf67fd192fa5c16343138155c9 Gerrit-Change-Number: 19112 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 22:07:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 22:07:28 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08_rr: fix hopping parameters in RR Assignment Command In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19063 ) Change subject: gsm_04_08_rr: fix hopping parameters in RR Assignment Command ...................................................................... gsm_04_08_rr: fix hopping parameters in RR Assignment Command According to 3GPP TS 44.018, section 9.1.2.4, if at least one of the Channel Description IEs indicates frequency hopping, one and only one of the following IEs shall be present: - Mobile Allocation, after time (see 10.5.2.21); - Frequency List, after time (see 10.5.2.13). For some reason, osmo-bsc includes the GSM48_IE_MA_BEFORE instead of GSM48_IE_MA_AFTER - fix this. According to section 9.1.2.6 of the same document, if any of the Mobile Allocation IEs (before/after time) is present, then the network must ensure that either the MS has already received the the proper reference cell frequency list (CA), or that the Cell Channel Description IE (see 10.5.2.1b) is present. Without this IE, the phone I was using in my testing setup sends RR Status message with cause #100 "conditional IE error". Fortunately, we already have generate_cell_chan_list(), since we also need to include the Cell Channel Description in SI Type 1. Change-Id: I43ef66c109b107ebcaa1cb6197637701b13b3787 Related: SYS#4868, OS#4545, OS#4546 --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 9 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 8a74aab..f47c31f 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -43,6 +43,7 @@ #include #include #include +#include int gsm48_sendmsg(struct msgb *msg) @@ -576,13 +577,18 @@ gsm48_lchan2chan_desc(&ass->chan_desc, lchan); ass->power_command = power_command; - /* optional: cell channel description */ + /* Cell Channel Description (freq. hopping), TV (see 3GPP TS 44.018, 10.5.2.1b) */ + if (lchan->ts->hopping.enabled) { + uint8_t *chan_desc = msgb_put(msg, 1 + 16); /* tag + fixed length */ + generate_cell_chan_list(chan_desc + 1, dest_lchan->ts->trx->bts); + chan_desc[0] = GSM48_IE_CELL_CH_DESC; + } msgb_tv_put(msg, GSM48_IE_CHANMODE_1, lchan->tch_mode); - /* mobile allocation in case of hopping */ + /* Mobile Allocation (freq. hopping), TLV (see 3GPP TS 44.018, 10.5.2.21) */ if (lchan->ts->hopping.enabled) { - msgb_tlv_put(msg, GSM48_IE_MA_BEFORE, lchan->ts->hopping.ma_len, + msgb_tlv_put(msg, GSM48_IE_MA_AFTER, lchan->ts->hopping.ma_len, lchan->ts->hopping.ma_data); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I43ef66c109b107ebcaa1cb6197637701b13b3787 Gerrit-Change-Number: 19063 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 22:08:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 22:08:14 +0000 Subject: Change in osmo-mgw[master]: trunk: parse E1 trunk number In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18752 ) Change subject: trunk: parse E1 trunk number ...................................................................... Patch Set 13: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifdaab953544151e73b58cc3e95d21afdb40765f4 Gerrit-Change-Number: 18752 Gerrit-PatchSet: 13 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 22:08:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 22:08:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 22:08:26 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: use enum type for trunk type variable In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19109 ) Change subject: mgcp_trunk: use enum type for trunk type variable ...................................................................... mgcp_trunk: use enum type for trunk type variable The trunk_type variable in struct mgcp_trunk is specified as an int, however there is an enum mgcp_trunk_type specified. Lets use the enum as type for trunk_type instead of int. Related: OS#2659 Change-Id: I8e8b0cf448cfe67ad3b7caab24f301708d2a515f --- M include/osmocom/mgcp/mgcp_trunk.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_trunk.h b/include/osmocom/mgcp/mgcp_trunk.h index 2bd55e6..c6a0997 100644 --- a/include/osmocom/mgcp/mgcp_trunk.h +++ b/include/osmocom/mgcp/mgcp_trunk.h @@ -11,7 +11,7 @@ struct mgcp_config *cfg; int trunk_nr; - int trunk_type; + enum mgcp_trunk_type trunk_type; char *audio_fmtp_extra; int audio_send_ptime; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I8e8b0cf448cfe67ad3b7caab24f301708d2a515f Gerrit-Change-Number: 19109 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 22:09:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 22:09:05 +0000 Subject: Change in osmo-bts[master]: bts-trx: Implement ramp up/down during ADM state change In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18967 ) Change subject: bts-trx: Implement ramp up/down during ADM state change ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7a7b0a0c24779349f142215f0bb32b72c86ce70 Gerrit-Change-Number: 18967 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 22:09:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 22:09:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 22:09:44 +0000 Subject: Change in osmo-bts[master]: bts_shutdown: Speed up shutdown if no TRX is operational In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19108 ) Change subject: bts_shutdown: Speed up shutdown if no TRX is operational ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie1c7c3a969e7968075b89edcd1ab2227b178a869 Gerrit-Change-Number: 19108 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 02 Jul 2020 22:09:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 22:10:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 22:10:29 +0000 Subject: Change in osmo-bts[master]: bts-trx: Introduce rate counter for scheduler timerfd missed FNs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19107 ) Change subject: bts-trx: Introduce rate counter for scheduler timerfd missed FNs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0051b9ab18ebc9f92db11374d856de94f155efa4 Gerrit-Change-Number: 19107 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 02 Jul 2020 22:10:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 22:11:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 22:11:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 ) Change subject: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibafa4246b442e7c26666eb0d37570bfbbf1dbda7 Gerrit-Change-Number: 19076 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 02 Jul 2020 22:11:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 22:12:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 22:12:14 +0000 Subject: Change in libosmocore[master]: Revert "gsmtap_makemsg_ex: NULL for unknown chan_type" In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2) to the change originally created by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/19067 ) Change subject: Revert "gsmtap_makemsg_ex: NULL for unknown chan_type" ...................................................................... Revert "gsmtap_makemsg_ex: NULL for unknown chan_type" Reverting due to being completely normal for some applications to submit usning this channel type when decoding/parsing failed and hence not being able to determine channel type. This reverts Change-Id Ib4147a33a75c3cf425c30da8b0678c7fba8a371d (commit 12f93be6073ed89055862baafbfe0e08e50ed17a.) Change-Id: I6ebaa89cc3422df1d7fd2365a6176cb2902d1c67 --- M src/gsmtap_util.c 1 file changed, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/67/19067/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ebaa89cc3422df1d7fd2365a6176cb2902d1c67 Gerrit-Change-Number: 19067 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 22:13:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 2 Jul 2020 22:13:03 +0000 Subject: Change in libosmocore[master]: Revert "gsmtap_makemsg_ex: NULL for unknown chan_type" In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19067 ) Change subject: Revert "gsmtap_makemsg_ex: NULL for unknown chan_type" ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ebaa89cc3422df1d7fd2365a6176cb2902d1c67 Gerrit-Change-Number: 19067 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 02 Jul 2020 22:13:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 23:45:28 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 2 Jul 2020 23:45:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: library/GSM_RestOctets: add SI3 Rest Octets example for E-UTRAN References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 ) Change subject: WIP: library/GSM_RestOctets: add SI3 Rest Octets example for E-UTRAN ...................................................................... WIP: library/GSM_RestOctets: add SI3 Rest Octets example for E-UTRAN Change-Id: I4162cc39ad351f5e96f5941116a424adc44efaa2 --- M library/GSM_RestOctets.ttcn 1 file changed, 56 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/19114/1 diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn index 3bc9349..31c25f3 100644 --- a/library/GSM_RestOctets.ttcn +++ b/library/GSM_RestOctets.ttcn @@ -513,6 +513,62 @@ rel_additions := { rel5_presence := CSN1_L, rel5 := omit } }; +/* Example template for matching E-UTRAN Neighbour Cell list */ +template SI2quaterRestOctets tra_SI3RestOctets_EUTRAN( + template EUTRAN_NeighbourCells neigh_list := *, + template EUTRAN_MeasParamsDescOpt meas_params := * +) modifies tra_SI2quaterRestOctets_base := { + si2quater_index := ?, + si2quater_count := ?, + + /* FIXME: we need a separate template hierarchy to such a crazy avoid nesting */ + rel_additions := { + rel5_presence := CSN1_H, + rel5 := { + umts_add_meas_params_desc := ?, + umts_add_meas_params_desc2 := ?, + rel6_presence := CSN1_H, + rel6 := { + umts_ccn_active := ?, + rel7_presence := CSN1_H, + rel7 := { + rep700 := ?, + rep810 := ?, + rel8_presence := CSN1_H, + rel8 := { + prio_eutran_params_desc := { + presence := '1'B, + desc := { + sc_prio_params_desc := { + presence := '1'B, + desc := { + geran_priority := ?, + thresh_priority_search := ?, + thresh_gsm_low := ?, + h_prio := ?, + t_reselection := ? + } + }, + utran_prio_params_desc := ?, + eutran_params_desc := { + presence := '1'B, + desc := { + meas_params_desc := meas_params, + gprs_meas_params_desc := ?, + neigh_cell_list := neigh_list + } + } + } + }, + utran_csg_desc := ?, + eutran_csg_desc := ? + } + } + } + } + } +}; + /* 10.5.2.34 SI 3 Rest Octets */ type record SI3RestOctets { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4162cc39ad351f5e96f5941116a424adc44efaa2 Gerrit-Change-Number: 19114 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 2 23:45:43 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 2 Jul 2020 23:45:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RestOctets: initial SI2quater Rest Octets definition In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19082 ) Change subject: library/GSM_RestOctets: initial SI2quater Rest Octets definition ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a12c9ee12f8df8b4fc0976dd593152dc1195718 Gerrit-Change-Number: 19082 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 02 Jul 2020 23:45:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 01:31:02 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 3 Jul 2020 01:31:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RestOctets: initial SI2quater Rest Octets definition In-Reply-To: References: Message-ID: neels has uploaded a new patch set (#3) to the change originally created by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19082 ) Change subject: library/GSM_RestOctets: initial SI2quater Rest Octets definition ...................................................................... library/GSM_RestOctets: initial SI2quater Rest Octets definition This is a very minimalistic (incomplete) implementation of SI2quater Rest Octets as per 3GPP TS 44.018, table 10.5.2.33b.1. Should be enough to decode some of the E-UTRAN specific parameters though. Some BITn fields might need to be replaced with more specific enumerated or integer types. Beware [1], the bit ordering rules are different for integer and bitstring (sub-)types if a field ends up on boundary of the two octets! [1] https://bugs.eclipse.org/bugs/show_bug.cgi?id=562488 Change-Id: I6a12c9ee12f8df8b4fc0976dd593152dc1195718 Related: SYS#4870 --- M library/GSM_RestOctets.ttcn 1 file changed, 505 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/19082/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a12c9ee12f8df8b4fc0976dd593152dc1195718 Gerrit-Change-Number: 19082 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 01:31:02 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 3 Jul 2020 01:31:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: library/GSM_RestOctets: add SI2quater Rest Octets example for E-... In-Reply-To: References: Message-ID: neels has uploaded a new patch set (#2) to the change originally created by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 ) Change subject: WIP: library/GSM_RestOctets: add SI2quater Rest Octets example for E-UTRAN ...................................................................... WIP: library/GSM_RestOctets: add SI2quater Rest Octets example for E-UTRAN Change-Id: I4162cc39ad351f5e96f5941116a424adc44efaa2 --- M library/GSM_RestOctets.ttcn 1 file changed, 56 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/19114/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4162cc39ad351f5e96f5941116a424adc44efaa2 Gerrit-Change-Number: 19114 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 01:31:02 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 3 Jul 2020 01:31:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: verify System Information presence on RSL startup In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 to look at the new patch set (#3). Change subject: bsc: verify System Information presence on RSL startup ...................................................................... bsc: verify System Information presence on RSL startup Store all System Information data received during RSL bootstrap in a list, then verify that the 12 expected SI are indeed sent. The SI data presence and content are recorded, but not yet verified, leaving that to a future patch. Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 --- M bsc/BSC_Tests.ttcn 1 file changed, 176 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/19062/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 01:31:03 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 3 Jul 2020 01:31:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: verify data of SI2quater sent from osmo-bsc References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19115 ) Change subject: bsc: verify data of SI2quater sent from osmo-bsc ...................................................................... bsc: verify data of SI2quater sent from osmo-bsc Change-Id: Ia1736d75839031e90d73dda1d1c267cadc55b702 --- M bsc/BSC_Tests.ttcn M bsc/gen_links.sh 2 files changed, 34 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/19115/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index cae91f3..28493a4 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -59,6 +59,8 @@ import from SCCPasp_Types all; +import from GSM_RestOctets all; + const integer NUM_BTS := 3; const integer NUM_MSC := 3; const float T3101_MAX := 12.0; @@ -98,6 +100,10 @@ /* List of all the System Information received on all RSL ports */ type record of SystemInformationConfig SystemInformationConfig_list; +type set SystemInformationData { + SI2quaterRestOctets si2quater optional +} + const SystemInformationConfig SystemInformationConfig_default := { { si_type := RSL_SYSTEM_INFO_1, from_rsl_msg_type := RSL_MT_BCCH_INFO, data := omit }, { si_type := RSL_SYSTEM_INFO_2, from_rsl_msg_type := RSL_MT_BCCH_INFO, data := omit }, @@ -114,6 +120,10 @@ { si_type := RSL_SYSTEM_INFO_6, from_rsl_msg_type := RSL_MT_SACCH_FILL, data := omit } }; +template SystemInformationData SystemInformationData_default := { + si2quater := tra_SI2quaterRestOctets_EUTRAN +} + type component test_CT extends CTRL_Adapter_CT { /* Array of per-BTS state */ var BTS_State bts[NUM_BTS]; @@ -218,6 +228,28 @@ setverdict(pass); } +private function f_sysinfo_verify_data(integer rsl_idx, template SystemInformationData expected_data := SystemInformationData_default) +runs on test_CT +{ + if (ispresent(expected_data.si2quater)) { + var SystemInformation rx_si2quater := f_sysinfo_get(rsl_idx, RSL_SYSTEM_INFO_2quater); + + if (not isbound(rx_si2quater)) { + setverdict(fail, "RSL ", rsl_idx, ": Expected to see SI2quater during startup, but it was not sent"); + return; + } + + var SI2quaterRestOctets rx_data := dec_SI2quaterRestOctets(rx_si2quater.data); + if (match(rx_data, expected_data.si2quater)) { + setverdict(pass); + } else { + setverdict(fail, "received SI2quater does not match expectations: rx ", + rx_data, " -- expected ", expected_data.si2quater); + return; + } + } +} + modulepar { /* IP address at which the BSC can be reached */ charstring mp_bsc_ip := "127.0.0.1"; @@ -652,6 +684,7 @@ deactivate(sysinfo); f_sysinfo_verify_presence(i); + f_sysinfo_verify_data(i); } } diff --git a/bsc/gen_links.sh b/bsc/gen_links.sh index a936ef3..b0f21c7 100755 --- a/bsc/gen_links.sh +++ b/bsc/gen_links.sh @@ -67,7 +67,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn RAN_Adapter.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn RAN_Adapter.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn GSM_RestOctets.ttcn " FILES+="CBSP_Types.ttcn CBSP_Templates.ttcn " FILES+="CBSP_CodecPort.ttcn CBSP_CodecPort_CtrlFunct.ttcn CBSP_CodecPort_CtrlFunctdef.cc CBSP_Adapter.ttcn " gen_links $DIR $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia1736d75839031e90d73dda1d1c267cadc55b702 Gerrit-Change-Number: 19115 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 04:52:12 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jul 2020 04:52:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: verify System Information presence on RSL startup In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 ) Change subject: bsc: verify System Information presence on RSL startup ...................................................................... Patch Set 3: Code-Review-1 (1 comment) Maybe (as Harald said) we should explicitly configure all kinds of SI that we expect (either in the VTY, or in osmo-bsc.cfg), and wait unless we received them all? I mean not just wait for some SI messages, but rather expect only configured ones. Then there would be no need to activate()/deactivate() the altstep I think. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062/3/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062/3/bsc/BSC_Tests.ttcn at 653 PS3, Line 653: deactivate(sysinfo); Again, how can you be sure that you [already] received all SI messages? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 03 Jul 2020 04:52:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 07:16:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jul 2020 07:16:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RestOctets: initial SI2quater Rest Octets definition In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19082 ) Change subject: library/GSM_RestOctets: initial SI2quater Rest Octets definition ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a12c9ee12f8df8b4fc0976dd593152dc1195718 Gerrit-Change-Number: 19082 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jul 2020 07:16:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 07:17:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jul 2020 07:17:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: library/GSM_RestOctets: add SI2quater Rest Octets example for E-... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 ) Change subject: WIP: library/GSM_RestOctets: add SI2quater Rest Octets example for E-UTRAN ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4162cc39ad351f5e96f5941116a424adc44efaa2 Gerrit-Change-Number: 19114 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jul 2020 07:17:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 07:18:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jul 2020 07:18:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: verify data of SI2quater sent from osmo-bsc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19115 ) Change subject: bsc: verify data of SI2quater sent from osmo-bsc ...................................................................... Patch Set 1: how will you deal with segmented SI2quater messages? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia1736d75839031e90d73dda1d1c267cadc55b702 Gerrit-Change-Number: 19115 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 03 Jul 2020 07:18:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Jul 3 07:20:21 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 03 Jul 2020 07:20:21 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Raspbian_9.0/armv7l In-Reply-To: References: Message-ID: <5efedc4ac58d3_6202ab04e6885fc2929a0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Raspbian_9.0/armv7l Package network:osmocom:latest/osmo-e1d failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 727s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_exit' [ 727s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_init' [ 727s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_get_device_descriptor' [ 727s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_free_device_list' [ 727s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_claim_interface' [ 727s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_get_port_numbers' [ 727s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_unref_device' [ 727s] /usr/lib/arm-linux-gnueabihf/libosmousb.so: undefined reference to `libusb_get_device_address' [ 727s] collect2: error: ld returned 1 exit status [ 727s] Makefile:521: recipe for target 'osmo-e1d-pipe' failed [ 727s] make[3]: *** [osmo-e1d-pipe] Error 1 [ 727s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 727s] Makefile:466: recipe for target 'all-recursive' failed [ 727s] make[2]: *** [all-recursive] Error 1 [ 727s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 727s] Makefile:390: recipe for target 'all' failed [ 727s] make[1]: *** [all] Error 2 [ 727s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 727s] dh_auto_build: make -j1 returned exit code 2 [ 727s] debian/rules:45: recipe for target 'build' failed [ 727s] make: *** [build] Error 2 [ 727s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 727s] ### VM INTERACTION START ### [ 730s] [ 700.430429] sysrq: SysRq : Power Off [ 730s] [ 700.459989] reboot: Power down [ 732s] ### VM INTERACTION END ### [ 732s] [ 732s] obs-arm-6 failed "build osmo-e1d_0.1.0.dsc" at Fri Jul 3 07:20:14 UTC 2020. [ 732s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Jul 3 09:55:17 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 3 Jul 2020 09:55:17 +0000 Subject: Change in osmo-bts[master]: bts-trx: Implement ramp up/down during ADM state change In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18967 ) Change subject: bts-trx: Implement ramp up/down during ADM state change ...................................................................... Patch Set 5: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/18967/5/src/osmo-bts-trx/l1_if.c File src/osmo-bts-trx/l1_if.c: https://gerrit.osmocom.org/c/osmo-bts/+/18967/5/src/osmo-bts-trx/l1_if.c at 892 PS5, Line 892: if (mo->procedure_pending) { I see the potential for a race condition here. Do we handle missing OML ACK/NACK? I think we should either NACK here instead of ignoring the state change or update the ramping (if that's possible) to ramp back down/up and ACK. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7a7b0a0c24779349f142215f0bb32b72c86ce70 Gerrit-Change-Number: 18967 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jul 2020 09:55:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 12:57:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jul 2020 12:57:34 +0000 Subject: Change in osmo-bts[master]: bts-trx: Implement ramp up/down during ADM state change In-Reply-To: References: Message-ID: Hello dexter, fixeria, daniel, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/18967 to look at the new patch set (#6). Change subject: bts-trx: Implement ramp up/down during ADM state change ...................................................................... bts-trx: Implement ramp up/down during ADM state change Ramp down when BTS is administratevly locked, and ramp up when it becomes unlocked again. Af ramping down, bts_model_trx_deact_rf is called to make sure all channels are released. power_ramp_start() is dropped from inside bts_model_trx_deact_rf since it's not the proper place. In there we simply want to instantaneously drop RF. Related: SYS#4920 Change-Id: Ib7a7b0a0c24779349f142215f0bb32b72c86ce70 --- M src/osmo-bts-trx/l1_if.c 1 file changed, 75 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/67/18967/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7a7b0a0c24779349f142215f0bb32b72c86ce70 Gerrit-Change-Number: 18967 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 12:57:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jul 2020 12:57:35 +0000 Subject: Change in osmo-bts[master]: pcu_sock: Avoid presenting TS from disabled TRX as available to PCU References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19116 ) Change subject: pcu_sock: Avoid presenting TS from disabled TRX as available to PCU ...................................................................... pcu_sock: Avoid presenting TS from disabled TRX as available to PCU Change-Id: I4b24faf3a8fe5846b9394fea8faf9d37cc0ac9ff --- M src/common/pcu_sock.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/16/19116/1 diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index f4a8c0a..d699d51 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -219,6 +220,13 @@ info_ind->trx[i].pdch_mask = 0; info_ind->trx[i].arfcn = trx->arfcn; info_ind->trx[i].hlayer1 = trx_get_hlayer1(trx); + if (trx->mo.nm_state.operational != NM_OPSTATE_ENABLED || + trx->mo.nm_state.administrative != NM_STATE_UNLOCKED) { + LOGPTRX(trx, DPCU, LOGL_INFO, "unavailable for PCU. op=%s adm=%s\n", + abis_nm_opstate_name(trx->mo.nm_state.operational), + abis_nm_admin_name(trx->mo.nm_state.administrative)); + continue; + } for (j = 0; j < 8; j++) { ts = &trx->ts[j]; if (ts->mo.nm_state.operational == NM_OPSTATE_ENABLED -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4b24faf3a8fe5846b9394fea8faf9d37cc0ac9ff Gerrit-Change-Number: 19116 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 14:00:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jul 2020 14:00:21 +0000 Subject: Change in osmo-bts[master]: gsm_data.h: Use enum type for NM state fields References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19117 ) Change subject: gsm_data.h: Use enum type for NM state fields ...................................................................... gsm_data.h: Use enum type for NM state fields Change-Id: I21fa1688a0c8a3788a5ecedd5912f596a69a1beb --- M include/osmo-bts/gsm_data.h M src/common/oml.c 2 files changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/17/19117/1 diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 7b4d456..97f5cde 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -83,9 +83,9 @@ /* Network Management State */ struct gsm_nm_state { - uint8_t operational; - uint8_t administrative; - uint8_t availability; + enum abis_nm_op_state operational; + enum abis_nm_adm_state administrative; + enum abis_nm_avail_state availability; }; struct gsm_abis_mo { diff --git a/src/common/oml.c b/src/common/oml.c index 5f64d52..63287f0 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -314,6 +314,7 @@ int oml_tx_state_changed(const struct gsm_abis_mo *mo) { struct msgb *nmsg; + uint8_t avail_state; nmsg = oml_msgb_alloc(); if (!nmsg) @@ -323,7 +324,8 @@ msgb_tv_put(nmsg, NM_ATT_OPER_STATE, mo->nm_state.operational); /* 9.4.7 Availability Status */ - msgb_tl16v_put(nmsg, NM_ATT_AVAIL_STATUS, 1, &mo->nm_state.availability); + avail_state = (uint8_t) mo->nm_state.availability; + msgb_tl16v_put(nmsg, NM_ATT_AVAIL_STATUS, 1, &avail_state); /* 9.4.4 Administrative Status -- not in spec but also sent by nanobts */ msgb_tv_put(nmsg, NM_ATT_ADM_STATE, mo->nm_state.administrative); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I21fa1688a0c8a3788a5ecedd5912f596a69a1beb Gerrit-Change-Number: 19117 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 14:00:49 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 3 Jul 2020 14:00:49 +0000 Subject: Change in osmo-bts[master]: bts-trx: Implement ramp up/down during ADM state change In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18967 ) Change subject: bts-trx: Implement ramp up/down during ADM state change ...................................................................... Patch Set 6: Code-Review+1 (1 comment) Calling pcu_tx_info_ind() fixes the pdch as well? https://gerrit.osmocom.org/c/osmo-bts/+/18967/5/src/osmo-bts-trx/l1_if.c File src/osmo-bts-trx/l1_if.c: https://gerrit.osmocom.org/c/osmo-bts/+/18967/5/src/osmo-bts-trx/l1_if.c at 892 PS5, Line 892: if (mo->procedure_pending) { > I see the potential for a race condition here. Do we handle missing OML ACK/NACK? [?] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7a7b0a0c24779349f142215f0bb32b72c86ce70 Gerrit-Change-Number: 18967 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jul 2020 14:00:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 14:02:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jul 2020 14:02:14 +0000 Subject: Change in osmo-bts[master]: bts-trx: Implement ramp up/down during ADM state change In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18967 ) Change subject: bts-trx: Implement ramp up/down during ADM state change ...................................................................... Patch Set 6: > Patch Set 6: Code-Review+1 > > (1 comment) > > Calling pcu_tx_info_ind() fixes the pdch as well? Yes, it updates the list of available TS and presnets it to the PCU, which will subsequently activate/deactivate the channels when they are noticed to appear/dissappear from the list. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7a7b0a0c24779349f142215f0bb32b72c86ce70 Gerrit-Change-Number: 18967 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jul 2020 14:02:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 14:10:51 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 3 Jul 2020 14:10:51 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: use define constant to define max number of E1 subslots References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19118 ) Change subject: mgcp_endp: use define constant to define max number of E1 subslots ...................................................................... mgcp_endp: use define constant to define max number of E1 subslots There are 15 possible subslots (not all at the same time) in one E1 timeslot. Lets use a define constant for that. Change-Id: If7cb74e486946aff09e22abf8a8885bf0693f34e Related: OS#2547 --- M include/osmocom/mgcp/mgcp_endp.h M src/libosmo-mgcp/mgcp_endp.c 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/18/19118/1 diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h index a58053a..879947b 100644 --- a/include/osmocom/mgcp/mgcp_endp.h +++ b/include/osmocom/mgcp/mgcp_endp.h @@ -27,6 +27,9 @@ struct mgcp_conn; struct mgcp_endpoint; +/* Number of E1 subslots (different variants, not all useable at the same time) */ +#define MGCP_ENDP_E1_SUBSLOTS 15 + #define LOGPENDP(endp, cat, level, fmt, args...) \ LOGP(cat, level, "endpoint:%s " fmt, \ endp ? endp->name : "none", \ diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index 82f7732..eac5832 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -119,7 +119,7 @@ endp->type = &ep_typeset.rtp; endp->name = gen_e1_epname(endp, trunk->cfg->domain, trunk->trunk_nr, - index / 15, index % 15); + index / MGCP_ENDP_E1_SUBSLOTS, index % MGCP_ENDP_E1_SUBSLOTS); break; default: osmo_panic("Cannot allocate unimplemented trunk type %d! %s:%d\n", @@ -524,7 +524,7 @@ * endpoint we need to verify, only the overlaps need to be checked. This is * also the reason why the related subslot number is missing from each each * line. */ - const int8_t interlock_tab[15][16] = + const int8_t interlock_tab[MGCP_ENDP_E1_SUBSLOTS][16] = { { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, -1 }, { 0, 3, 4, 7, 8, 9, 10, -1, -1, -1, -1, -1, -1, -1, -1 }, { 0, 5, 6, 11, 12, 13, 14, -1, -1, -1, -1, -1, -1, -1, -1 }, -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If7cb74e486946aff09e22abf8a8885bf0693f34e Gerrit-Change-Number: 19118 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 14:10:52 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 3 Jul 2020 14:10:52 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: remove double check References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19119 ) Change subject: mgcp_trunk: remove double check ...................................................................... mgcp_trunk: remove double check At the moment, the trunk prefix is checked twice. Lets re-arange the code a bit so that the check only happens once. Change-Id: I91fb8cf6e3b077ba8f18fdbcd071275c6fd7cacd Related: OS#2547 --- M src/libosmo-mgcp/mgcp_trunk.c 1 file changed, 3 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/19/19119/1 diff --git a/src/libosmo-mgcp/mgcp_trunk.c b/src/libosmo-mgcp/mgcp_trunk.c index 185f0ee..43abe45 100644 --- a/src/libosmo-mgcp/mgcp_trunk.c +++ b/src/libosmo-mgcp/mgcp_trunk.c @@ -149,7 +149,7 @@ { size_t prefix_len; char epname_lc[MGCP_ENDPOINT_MAXLEN]; - unsigned long int trunk_nr; + int trunk_nr; osmo_str_tolower_buf(epname_lc, sizeof(epname_lc), epname); epname = epname_lc; @@ -159,13 +159,9 @@ return mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); } - prefix_len = sizeof(MGCP_ENDPOINT_PREFIX_E1_TRUNK) - 1; - if (strncmp(epname, MGCP_ENDPOINT_PREFIX_E1_TRUNK, prefix_len) == 0) { - trunk_nr = e1_trunk_nr_from_epname(epname); - if (trunk_nr < 0) - return NULL; + trunk_nr = e1_trunk_nr_from_epname(epname); + if (trunk_nr > 0) return mgcp_trunk_by_num(cfg, MGCP_TRUNK_E1, trunk_nr); - } /* Earlier versions of osmo-mgw were accepting endpoint names * without trunk prefix. This is normally not allowed, each MGCP -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I91fb8cf6e3b077ba8f18fdbcd071275c6fd7cacd Gerrit-Change-Number: 19119 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 14:10:52 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 3 Jul 2020 14:10:52 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: do not access endpoint array elements directly References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19120 ) Change subject: mgcp_test: do not access endpoint array elements directly ...................................................................... mgcp_test: do not access endpoint array elements directly The test assumes that the endpoint "rtpbridge/X at mgw" is at array position X in many places. This does not necessarly have to match. Accessing the array elements directly was the prefered way when the MGW did use integer numbers and not strings to identify endpoints. Since the endpoint name strings are used to access the endpoints the unit-test should also reflect this. Lets replace the integer variable last_endpoint with a string variable and do related verifications based on strings. Change-Id: Ic950c427f23be4a792af94972554637c2b0fbdf2 Related: OS#2659 --- M tests/mgcp/mgcp_test.c 1 file changed, 31 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/20/19120/1 diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 0e87c15..8c084b4 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -592,7 +592,7 @@ return msg; } -static int last_endpoint = -1; +static char last_endpoint[MGCP_ENDPOINT_MAXLEN]; static int mgcp_test_policy_cb(struct mgcp_endpoint *endp, int state, const char *transaction_id) @@ -604,10 +604,10 @@ state, endp->name); trunk = endp->trunk; - last_endpoint = -1; + last_endpoint[0] = '\0'; for (i = 0; i < trunk->vty_number_endpoints; i++) { if (strcmp(endp->name, trunk->endpoints[i]->name) == 0) - last_endpoint = i; + strcpy(last_endpoint, trunk->endpoints[i]->name); } return MGCP_POLICY_CONT; @@ -787,7 +787,7 @@ printf("\n================================================\n"); printf("Testing %s\n", t->name); - last_endpoint = -1; + last_endpoint[0] = '\0'; dummy_packets = 0; osmo_talloc_replace_string(cfg, &trunk->audio_fmtp_extra, @@ -822,8 +822,8 @@ if (dummy_packets) printf("Dummy packets: %d\n", dummy_packets); - if (last_endpoint != -1) { - endp = trunk->endpoints[last_endpoint]; + if (last_endpoint[0] != '\0') { + endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); conn = mgcp_conn_get_rtp(endp, "1"); if (conn) { @@ -878,10 +878,10 @@ /* Check detected payload type */ if (conn && t->ptype != PTYPE_IGNORE) { - OSMO_ASSERT(last_endpoint != -1); - endp = trunk->endpoints[last_endpoint]; + OSMO_ASSERT(last_endpoint[0] != '\0'); + endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); - fprintf(stderr, "endpoint 0x%x: " + fprintf(stderr, "endpoint:%s: " "payload type %d (expected %d)\n", last_endpoint, conn->end.codec->payload_type, t->ptype); @@ -1402,7 +1402,7 @@ mgcp_trunk_alloc_endpts(trunk2); /* Allocate endpoint 1 at mgw with two codecs */ - last_endpoint = -1; + last_endpoint[0] = '\0'; inp = create_msg(CRCX_MULT_1, NULL); resp = mgcp_handle_message(cfg, inp); OSMO_ASSERT(get_conn_id_from_response(resp->data, conn_id, @@ -1410,14 +1410,14 @@ msgb_free(inp); msgb_free(resp); - OSMO_ASSERT(last_endpoint == 1); - endp = trunk->endpoints[last_endpoint]; + OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/1 at mgw") == 0); + endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 18); /* Allocate 2 at mgw with three codecs, last one ignored */ - last_endpoint = -1; + last_endpoint[0] = '\0'; inp = create_msg(CRCX_MULT_2, NULL); resp = mgcp_handle_message(cfg, inp); OSMO_ASSERT(get_conn_id_from_response(resp->data, conn_id, @@ -1425,8 +1425,8 @@ msgb_free(inp); msgb_free(resp); - OSMO_ASSERT(last_endpoint == 2); - endp = trunk->endpoints[last_endpoint]; + OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/2 at mgw") == 0); + endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 18); @@ -1437,7 +1437,7 @@ * it makes and since we already decided in OS#2658 that a missing * LCO should pick a sane default codec, it makes sense to expect * the same behaviour if SDP lacks proper payload type information */ - last_endpoint = -1; + last_endpoint[0] = '\0'; inp = create_msg(CRCX_MULT_3, NULL); resp = mgcp_handle_message(cfg, inp); OSMO_ASSERT(get_conn_id_from_response(resp->data, conn_id, @@ -1445,14 +1445,14 @@ msgb_free(inp); msgb_free(resp); - OSMO_ASSERT(last_endpoint == 3); - endp = trunk->endpoints[last_endpoint]; + OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/3 at mgw") == 0); + endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 0); /* Allocate 4 at mgw with a single codec */ - last_endpoint = -1; + last_endpoint[0] = '\0'; inp = create_msg(CRCX_MULT_4, NULL); resp = mgcp_handle_message(cfg, inp); OSMO_ASSERT(get_conn_id_from_response(resp->data, conn_id, @@ -1460,14 +1460,14 @@ msgb_free(inp); msgb_free(resp); - OSMO_ASSERT(last_endpoint == 4); - endp = trunk->endpoints[last_endpoint]; + OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/4 at mgw") == 0); + endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 18); /* Allocate 5 at mgw and let osmo-mgw pick a codec from the list */ - last_endpoint = -1; + last_endpoint[0] = '\0'; inp = create_msg(CRCX_MULT_GSM_EXACT, NULL); trunk->no_audio_transcoding = 1; resp = mgcp_handle_message(cfg, inp); @@ -1476,19 +1476,19 @@ msgb_free(inp); msgb_free(resp); - OSMO_ASSERT(last_endpoint == 5); - endp = trunk->endpoints[last_endpoint]; + OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/5 at mgw") == 0); + endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 0); inp = create_msg(MDCX_NAT_DUMMY, conn_id); - last_endpoint = -1; + last_endpoint[0] = '\0'; resp = mgcp_handle_message(cfg, inp); msgb_free(inp); msgb_free(resp); - OSMO_ASSERT(last_endpoint == 5); - endp = trunk->endpoints[last_endpoint]; + OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/5 at mgw") == 0); + endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 3); @@ -1508,7 +1508,7 @@ conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(!conn); - last_endpoint = -1; + last_endpoint[0] = '\0'; inp = create_msg(CRCX_MULT_GSM_EXACT, NULL); trunk->no_audio_transcoding = 0; resp = mgcp_handle_message(cfg, inp); @@ -1517,8 +1517,8 @@ msgb_free(inp); msgb_free(resp); - OSMO_ASSERT(last_endpoint == 5); - endp = trunk->endpoints[last_endpoint]; + OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/5 at mgw") == 0); + endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 0); @@ -1543,7 +1543,7 @@ trunk->vty_number_endpoints = 64; mgcp_trunk_alloc_endpts(trunk); - endp = trunk->endpoints[1]; + endp = mgcp_endp_by_name(NULL, "rtpbridge/1 at mgw", cfg); _conn = mgcp_conn_alloc(NULL, endp, MGCP_CONN_TYPE_RTP, "test-connection"); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic950c427f23be4a792af94972554637c2b0fbdf2 Gerrit-Change-Number: 19120 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 14:10:52 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 3 Jul 2020 14:10:52 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: refactor endpoint number configuration References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19121 ) Change subject: mgcp_vty: refactor endpoint number configuration ...................................................................... mgcp_vty: refactor endpoint number configuration At the moment the number of possible E1 endpoints (depends on the number of E1 timeslots that should be used) is hardcoded and the configuration of the number of virtual endpoints has an off-by-one problem. For the E1 timeslots one might choose not to occupy all E1 timeslots of once. A one TRX E1 BTS usually requires 3 E1 timeslots. One as D-Channel timeslot and two to cover the voice channels. The voice channels timeslots need to be set up in osmo-mgw, while the D-Channel timeslot must not be touched. The VTY config needs to be able to reflect that. Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Related: OS#2547 --- M include/osmocom/mgcp/mgcp_trunk.h M src/libosmo-mgcp/mgcp_trunk.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 4 files changed, 85 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/21/19121/1 diff --git a/include/osmocom/mgcp/mgcp_trunk.h b/include/osmocom/mgcp/mgcp_trunk.h index aa6dd29..4caeff9 100644 --- a/include/osmocom/mgcp/mgcp_trunk.h +++ b/include/osmocom/mgcp/mgcp_trunk.h @@ -39,11 +39,23 @@ int rtp_accept_all; unsigned int number_endpoints; - unsigned int vty_number_endpoints; struct mgcp_endpoint **endpoints; /* global rate counters to measure the trunks overall performance and health */ struct mgcp_ratectr_trunk ratectr; + + union { + /* Virtual trunk specific */ + struct { + unsigned int vty_number_endpoints; + } virtual; + /* E1 specific */ + struct { + unsigned int vty_timeslot_first; + unsigned int vty_timeslot_num; + } e1; + }; + }; struct mgcp_trunk *mgcp_trunk_alloc(struct mgcp_config *cfg, enum mgcp_trunk_type ttype, int nr); diff --git a/src/libosmo-mgcp/mgcp_trunk.c b/src/libosmo-mgcp/mgcp_trunk.c index 43abe45..1aadc2c 100644 --- a/src/libosmo-mgcp/mgcp_trunk.c +++ b/src/libosmo-mgcp/mgcp_trunk.c @@ -41,13 +41,16 @@ return NULL; } + /* Set reasonable VTY defaults */ + trunk->virtual.vty_number_endpoints = 32; + trunk->e1.vty_timeslot_first = 1; + trunk->e1.vty_timeslot_num = 2; + trunk->cfg = cfg; trunk->trunk_type = ttype; trunk->trunk_nr = nr; - trunk->audio_send_ptime = 1; trunk->audio_send_name = 1; - trunk->vty_number_endpoints = 33; trunk->omit_rtcp = 0; mgcp_trunk_set_keepalive(trunk, MGCP_KEEPALIVE_ONCE); @@ -67,13 +70,8 @@ { int i; struct mgcp_endpoint *endp; - - /* Make sure the amount of requested endpoints does not execeed - * sane limits. The VTY already limits the possible amount, - * however miss-initalation of the struct or memory corruption - * could still lead to an excessive allocation of endpoints, so - * better stop early if that is the case. */ - OSMO_ASSERT(trunk->vty_number_endpoints < 65534); + unsigned int number_endpoints; + unsigned int offset_endpoints; /* This function is called once on startup by the VTY to allocate the * endpoints. The number of endpoints must not change througout the @@ -81,15 +79,37 @@ OSMO_ASSERT(trunk->number_endpoints == 0); OSMO_ASSERT(trunk->endpoints == NULL); + switch (trunk->trunk_type) { + case MGCP_TRUNK_VIRTUAL: + number_endpoints = trunk->virtual.vty_number_endpoints; + /* Note: due to historical reasons the endpoints on the virtual + * trunk start counting at 1. */ + offset_endpoints = 1; + break; + case MGCP_TRUNK_E1: + number_endpoints = trunk->e1.vty_timeslot_num * MGCP_ENDP_E1_SUBSLOTS; + offset_endpoints = trunk->e1.vty_timeslot_first * MGCP_ENDP_E1_SUBSLOTS; + break; + default: + OSMO_ASSERT(false); + } + + /* Make sure the amount of requested endpoints does not execeed + * sane limits. The VTY already limits the possible amount, + * however miss-initalation of the struct or memory corruption + * could still lead to an excessive allocation of endpoints, so + * better stop early if that is the case. */ + OSMO_ASSERT(number_endpoints < 65534); + /* allocate pointer array for the endpoints */ trunk->endpoints = _talloc_zero_array(trunk->cfg, - sizeof(struct mgcp_endpoint *), trunk->vty_number_endpoints, "endpoints"); + sizeof(struct mgcp_endpoint *), number_endpoints, "endpoints"); if (!trunk->endpoints) return -1; /* create endpoints */ - for (i = 0; i < trunk->vty_number_endpoints; ++i) { - endp = mgcp_endp_alloc(trunk, i); + for (i = 0; i < number_endpoints; i++) { + endp = mgcp_endp_alloc(trunk, i + offset_endpoints); if (!endp) { talloc_free(trunk->endpoints); return -1; @@ -98,7 +118,7 @@ } /* make the endpoints we just created available to the MGW code */ - trunk->number_endpoints = trunk->vty_number_endpoints; + trunk->number_endpoints = number_endpoints; return 0; } diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 683d2ed..2310b6a 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -112,7 +112,7 @@ trunk->audio_send_name ? "" : "no ", VTY_NEWLINE); vty_out(vty, " loop %u%s", ! !trunk->audio_loop, VTY_NEWLINE); vty_out(vty, " number endpoints %u%s", - trunk->vty_number_endpoints - 1, VTY_NEWLINE); + trunk->virtual.vty_number_endpoints, VTY_NEWLINE); vty_out(vty, " %sallow-transcoding%s", trunk->no_audio_transcoding ? "no " : "", VTY_NEWLINE); if (g_cfg->call_agent_addr) @@ -289,7 +289,7 @@ vty_out(vty, "%s trunk %d with %d endpoints:%s", trunk->trunk_type == MGCP_TRUNK_VIRTUAL ? "Virtual" : "E1", - trunk->trunk_nr, trunk->number_endpoints - 1, VTY_NEWLINE); + trunk->trunk_nr, trunk->number_endpoints, VTY_NEWLINE); if (!trunk->endpoints) { vty_out(vty, "No endpoints allocated yet.%s", VTY_NEWLINE); @@ -715,8 +715,7 @@ { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); - /* + 1 as we start counting at one */ - trunk->vty_number_endpoints = atoi(argv[0]) + 1; + trunk->virtual.vty_number_endpoints = atoi(argv[0]); return CMD_SUCCESS; } @@ -934,6 +933,10 @@ trunk->audio_fmtp_extra, VTY_NEWLINE); vty_out(vty, " %sallow-transcoding%s", trunk->no_audio_transcoding ? "no " : "", VTY_NEWLINE); + vty_out(vty, " timeslot first %u%s", + trunk->e1.vty_timeslot_first, VTY_NEWLINE); + vty_out(vty, " timeslot num %u%s", + trunk->e1.vty_timeslot_num, VTY_NEWLINE); } return CMD_SUCCESS; @@ -1160,6 +1163,26 @@ return CMD_SUCCESS; } +DEFUN(cfg_trunk_e1_timeslot_first, + cfg_trunk_e1_timeslot_first_cmd, + "timeslot first <0-31>", + "timeslot options" "First E1 timeslot to be used\n" "E1 timeslot number\n") +{ + struct mgcp_trunk *trunk = vty->index; + trunk->e1.vty_timeslot_first = atoi(argv[0]); + return CMD_SUCCESS; +} + +DEFUN(cfg_trunk_e1_timeslot_num, + cfg_trunk_e1_timeslot_num_cmd, + "timeslot num <0-31>", + "timeslot options" "Number of E1 timeslots to use\n" "E1 timeslot count\n") +{ + struct mgcp_trunk *trunk = vty->index; + trunk->e1.vty_timeslot_num = atoi(argv[0]); + return CMD_SUCCESS; +} + DEFUN(loop_conn, loop_conn_cmd, "loop-endpoint <0-64> NAME (0|1)", @@ -1550,6 +1573,8 @@ install_element(TRUNK_NODE_E1, &cfg_trunk_no_sdp_payload_send_name_cmd); install_element(TRUNK_NODE_E1, &cfg_trunk_allow_transcoding_cmd); install_element(TRUNK_NODE_E1, &cfg_trunk_no_allow_transcoding_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_e1_timeslot_first_cmd); + install_element(TRUNK_NODE_E1, &cfg_trunk_e1_timeslot_num_cmd); return 0; } diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 8c084b4..c0e70d3 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -605,7 +605,7 @@ trunk = endp->trunk; last_endpoint[0] = '\0'; - for (i = 0; i < trunk->vty_number_endpoints; i++) { + for (i = 0; i < trunk->number_endpoints; i++) { if (strcmp(endp->name, trunk->endpoints[i]->name) == 0) strcpy(last_endpoint, trunk->endpoints[i]->name); } @@ -655,7 +655,7 @@ static void mgcp_endpoints_release(struct mgcp_trunk *trunk) { int i; - for (i = 1; i < trunk->number_endpoints; i++) + for (i = 0; i < trunk->number_endpoints; i++) mgcp_endp_release(trunk->endpoints[i]); } @@ -770,7 +770,7 @@ cfg = mgcp_config_alloc(); trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); - trunk->vty_number_endpoints = 64; + trunk->virtual.vty_number_endpoints = 64; mgcp_trunk_alloc_endpts(trunk); cfg->policy_cb = mgcp_test_policy_cb; @@ -912,7 +912,7 @@ cfg = mgcp_config_alloc(); trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); - trunk->vty_number_endpoints = 64; + trunk->virtual.vty_number_endpoints = 64; mgcp_trunk_alloc_endpts(trunk); memset(last_conn_id, 0, sizeof(last_conn_id)); @@ -982,7 +982,7 @@ trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); cfg->rqnt_cb = rqnt_cb; - trunk->vty_number_endpoints = 64; + trunk->virtual.vty_number_endpoints = 64; mgcp_trunk_alloc_endpts(trunk); trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1); @@ -1063,7 +1063,7 @@ endp.cfg = &cfg; endp.type = &ep_typeset.rtp; - trunk.vty_number_endpoints = 1; + trunk.virtual.vty_number_endpoints = 1; trunk.endpoints = endpoints; trunk.endpoints[0] = &endp; endp.trunk = &trunk; @@ -1315,7 +1315,7 @@ endp.cfg = &cfg; endp.type = &ep_typeset.rtp; - trunk.vty_number_endpoints = 1; + trunk.virtual.vty_number_endpoints = 1; trunk.endpoints = endpoints; trunk.endpoints[0] = &endp; trunk.force_constant_ssrc = patch_ssrc; @@ -1394,7 +1394,7 @@ cfg = mgcp_config_alloc(); trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); - trunk->vty_number_endpoints = 64; + trunk->virtual.vty_number_endpoints = 64; mgcp_trunk_alloc_endpts(trunk); cfg->policy_cb = mgcp_test_policy_cb; @@ -1540,7 +1540,7 @@ cfg = mgcp_config_alloc(); trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); - trunk->vty_number_endpoints = 64; + trunk->virtual.vty_number_endpoints = 64; mgcp_trunk_alloc_endpts(trunk); endp = mgcp_endp_by_name(NULL, "rtpbridge/1 at mgw", cfg); @@ -1590,7 +1590,7 @@ cfg = mgcp_config_alloc(); trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); - trunk->vty_number_endpoints = 64; + trunk->virtual.vty_number_endpoints = 64; trunk->audio_send_name = 0; mgcp_trunk_alloc_endpts(trunk); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Gerrit-Change-Number: 19121 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 14:41:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jul 2020 14:41:57 +0000 Subject: Change in osmo-bts[master]: Move nm_state and Mo related code gsm_data.* => oml.* References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19122 ) Change subject: Move nm_state and Mo related code gsm_data.* => oml.* ...................................................................... Move nm_state and Mo related code gsm_data.* => oml.* Change-Id: I57ea9c4ddbe5443b9b6afe3f8e6b38170d0e5a0e --- M include/osmo-bts/gsm_data.h M include/osmo-bts/oml.h M src/common/gsm_data.c M src/common/oml.c 4 files changed, 168 insertions(+), 175 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/22/19122/1 diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 97f5cde..2e8ff46 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -28,6 +28,7 @@ #include #include +#include #define GSM_FR_BITS 260 #define GSM_EFR_BITS 244 @@ -81,30 +82,6 @@ struct pcu_sock_state; struct smscb_msg; -/* Network Management State */ -struct gsm_nm_state { - enum abis_nm_op_state operational; - enum abis_nm_adm_state administrative; - enum abis_nm_avail_state availability; -}; - -struct gsm_abis_mo { - /* A-bis OML Object Class */ - uint8_t obj_class; - /* is there still some procedure pending? */ - uint8_t procedure_pending; - /* A-bis OML Object Instance */ - struct abis_om_obj_inst obj_inst; - /* human-readable name */ - const char *name; - /* NM State */ - struct gsm_nm_state nm_state; - /* Attributes configured in this MO */ - struct tlv_parsed *nm_attr; - /* BTS to which this MO belongs */ - struct gsm_bts *bts; -}; - #define MAX_A5_KEY_LEN (128/8) #define RSL_ENC_ALG_A5(x) (x+1) @@ -762,19 +739,6 @@ return lchan->name; } -void gsm_abis_mo_reset(struct gsm_abis_mo *mo); - -struct gsm_abis_mo * -gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, - const struct abis_om_obj_inst *obj_inst); - -struct gsm_nm_state * -gsm_objclass2nmstate(struct gsm_bts *bts, uint8_t obj_class, - const struct abis_om_obj_inst *obj_inst); -void * -gsm_objclass2obj(struct gsm_bts *bts, uint8_t obj_class, - const struct abis_om_obj_inst *obj_inst); - uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan); uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan, enum gsm_phys_chan_config as_pchan); diff --git a/include/osmo-bts/oml.h b/include/osmo-bts/oml.h index b92a974..484e210 100644 --- a/include/osmo-bts/oml.h +++ b/include/osmo-bts/oml.h @@ -8,6 +8,29 @@ struct msgb; struct gsm_lchan; +/* Network Management State */ +struct gsm_nm_state { + enum abis_nm_op_state operational; + enum abis_nm_adm_state administrative; + enum abis_nm_avail_state availability; +}; + +struct gsm_abis_mo { + /* A-bis OML Object Class */ + uint8_t obj_class; + /* is there still some procedure pending? */ + uint8_t procedure_pending; + /* A-bis OML Object Instance */ + struct abis_om_obj_inst obj_inst; + /* human-readable name */ + const char *name; + /* NM State */ + struct gsm_nm_state nm_state; + /* Attributes configured in this MO */ + struct tlv_parsed *nm_attr; + /* BTS to which this MO belongs */ + struct gsm_bts *bts; +}; int oml_init(struct gsm_abis_mo *mo); int down_oml(struct gsm_bts *bts, struct msgb *msg); @@ -46,4 +69,15 @@ int oml_tx_failure_event_rep(const struct gsm_abis_mo *mo, enum abis_nm_severity severity, uint16_t cause_value, const char *fmt, ...); +void gsm_mo_init(struct gsm_abis_mo *mo, struct gsm_bts *bts, + uint8_t obj_class, uint8_t p1, uint8_t p2, uint8_t p3); + +struct gsm_abis_mo *gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, + const struct abis_om_obj_inst *obj_inst); + +struct gsm_nm_state *gsm_objclass2nmstate(struct gsm_bts *bts, uint8_t obj_class, + const struct abis_om_obj_inst *obj_inst); +void *gsm_objclass2obj(struct gsm_bts *bts, uint8_t obj_class, + const struct abis_om_obj_inst *obj_inst); + #endif // _OML_H */ diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c index 7239440..57f33ae 100644 --- a/src/common/gsm_data.c +++ b/src/common/gsm_data.c @@ -54,24 +54,6 @@ {} }; -void gsm_abis_mo_reset(struct gsm_abis_mo *mo) -{ - mo->nm_state.operational = NM_OPSTATE_NULL; - mo->nm_state.availability = NM_AVSTATE_POWER_OFF; - mo->nm_state.administrative = NM_STATE_LOCKED; -} - -static void gsm_mo_init(struct gsm_abis_mo *mo, struct gsm_bts *bts, - uint8_t obj_class, uint8_t p1, uint8_t p2, uint8_t p3) -{ - mo->bts = bts; - mo->obj_class = obj_class; - mo->obj_inst.bts_nr = p1; - mo->obj_inst.trx_nr = p2; - mo->obj_inst.ts_nr = p3; - gsm_abis_mo_reset(mo); -} - const struct value_string bts_attribute_names[] = { OSMO_VALUE_STRING(BTS_TYPE_VARIANT), OSMO_VALUE_STRING(BTS_SUB_MODEL), @@ -429,126 +411,6 @@ return ts2str; } -/* obtain the MO structure for a given object instance */ -struct gsm_abis_mo * -gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, - const struct abis_om_obj_inst *obj_inst) -{ - struct gsm_bts_trx *trx; - struct gsm_abis_mo *mo = NULL; - - switch (obj_class) { - case NM_OC_BTS: - mo = &bts->mo; - break; - case NM_OC_RADIO_CARRIER: - if (obj_inst->trx_nr >= bts->num_trx) { - return NULL; - } - trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); - mo = &trx->mo; - break; - case NM_OC_BASEB_TRANSC: - if (obj_inst->trx_nr >= bts->num_trx) { - return NULL; - } - trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); - mo = &trx->bb_transc.mo; - break; - case NM_OC_CHANNEL: - if (obj_inst->trx_nr >= bts->num_trx) { - return NULL; - } - trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); - if (obj_inst->ts_nr >= TRX_NR_TS) - return NULL; - mo = &trx->ts[obj_inst->ts_nr].mo; - break; - case NM_OC_SITE_MANAGER: - mo = &bts->site_mgr.mo; - break; - case NM_OC_GPRS_NSE: - mo = &bts->gprs.nse.mo; - break; - case NM_OC_GPRS_CELL: - mo = &bts->gprs.cell.mo; - break; - case NM_OC_GPRS_NSVC: - if (obj_inst->trx_nr >= ARRAY_SIZE(bts->gprs.nsvc)) - return NULL; - mo = &bts->gprs.nsvc[obj_inst->trx_nr].mo; - break; - } - return mo; -} - -/* obtain the gsm_nm_state data structure for a given object instance */ -struct gsm_nm_state * -gsm_objclass2nmstate(struct gsm_bts *bts, uint8_t obj_class, - const struct abis_om_obj_inst *obj_inst) -{ - struct gsm_abis_mo *mo; - - mo = gsm_objclass2mo(bts, obj_class, obj_inst); - if (!mo) - return NULL; - - return &mo->nm_state; -} - -/* obtain the in-memory data structure of a given object instance */ -void * -gsm_objclass2obj(struct gsm_bts *bts, uint8_t obj_class, - const struct abis_om_obj_inst *obj_inst) -{ - struct gsm_bts_trx *trx; - void *obj = NULL; - - switch (obj_class) { - case NM_OC_BTS: - obj = bts; - break; - case NM_OC_RADIO_CARRIER: - if (obj_inst->trx_nr >= bts->num_trx) { - return NULL; - } - trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); - obj = trx; - break; - case NM_OC_BASEB_TRANSC: - if (obj_inst->trx_nr >= bts->num_trx) { - return NULL; - } - trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); - obj = &trx->bb_transc; - break; - case NM_OC_CHANNEL: - if (obj_inst->trx_nr >= bts->num_trx) { - return NULL; - } - trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); - if (obj_inst->ts_nr >= TRX_NR_TS) - return NULL; - obj = &trx->ts[obj_inst->ts_nr]; - break; - case NM_OC_SITE_MANAGER: - obj = &bts->site_mgr; - break; - case NM_OC_GPRS_NSE: - obj = &bts->gprs.nse; - break; - case NM_OC_GPRS_CELL: - obj = &bts->gprs.cell; - break; - case NM_OC_GPRS_NSVC: - if (obj_inst->trx_nr >= ARRAY_SIZE(bts->gprs.nsvc)) - return NULL; - obj = &bts->gprs.nsvc[obj_inst->trx_nr]; - break; - } - return obj; -} - /* See Table 10.5.25 of GSM04.08 */ static uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan, uint8_t ts_nr, uint8_t lchan_nr) diff --git a/src/common/oml.c b/src/common/oml.c index 63287f0..8a88722 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1503,3 +1503,136 @@ return 0; } + +void gsm_mo_init(struct gsm_abis_mo *mo, struct gsm_bts *bts, + uint8_t obj_class, uint8_t p1, uint8_t p2, uint8_t p3) +{ + mo->bts = bts; + mo->obj_class = obj_class; + mo->obj_inst.bts_nr = p1; + mo->obj_inst.trx_nr = p2; + mo->obj_inst.ts_nr = p3; + mo->nm_state.operational = NM_OPSTATE_NULL; + mo->nm_state.availability = NM_AVSTATE_POWER_OFF; + mo->nm_state.administrative = NM_STATE_LOCKED; +} + +/* obtain the MO structure for a given object instance */ +struct gsm_abis_mo * +gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, + const struct abis_om_obj_inst *obj_inst) +{ + struct gsm_bts_trx *trx; + struct gsm_abis_mo *mo = NULL; + + switch (obj_class) { + case NM_OC_BTS: + mo = &bts->mo; + break; + case NM_OC_RADIO_CARRIER: + if (obj_inst->trx_nr >= bts->num_trx) { + return NULL; + } + trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); + mo = &trx->mo; + break; + case NM_OC_BASEB_TRANSC: + if (obj_inst->trx_nr >= bts->num_trx) { + return NULL; + } + trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); + mo = &trx->bb_transc.mo; + break; + case NM_OC_CHANNEL: + if (obj_inst->trx_nr >= bts->num_trx) { + return NULL; + } + trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); + if (obj_inst->ts_nr >= TRX_NR_TS) + return NULL; + mo = &trx->ts[obj_inst->ts_nr].mo; + break; + case NM_OC_SITE_MANAGER: + mo = &bts->site_mgr.mo; + break; + case NM_OC_GPRS_NSE: + mo = &bts->gprs.nse.mo; + break; + case NM_OC_GPRS_CELL: + mo = &bts->gprs.cell.mo; + break; + case NM_OC_GPRS_NSVC: + if (obj_inst->trx_nr >= ARRAY_SIZE(bts->gprs.nsvc)) + return NULL; + mo = &bts->gprs.nsvc[obj_inst->trx_nr].mo; + break; + } + return mo; +} + +/* obtain the gsm_nm_state data structure for a given object instance */ +struct gsm_nm_state * +gsm_objclass2nmstate(struct gsm_bts *bts, uint8_t obj_class, + const struct abis_om_obj_inst *obj_inst) +{ + struct gsm_abis_mo *mo; + + mo = gsm_objclass2mo(bts, obj_class, obj_inst); + if (!mo) + return NULL; + + return &mo->nm_state; +} + +/* obtain the in-memory data structure of a given object instance */ +void * +gsm_objclass2obj(struct gsm_bts *bts, uint8_t obj_class, + const struct abis_om_obj_inst *obj_inst) +{ + struct gsm_bts_trx *trx; + void *obj = NULL; + + switch (obj_class) { + case NM_OC_BTS: + obj = bts; + break; + case NM_OC_RADIO_CARRIER: + if (obj_inst->trx_nr >= bts->num_trx) { + return NULL; + } + trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); + obj = trx; + break; + case NM_OC_BASEB_TRANSC: + if (obj_inst->trx_nr >= bts->num_trx) { + return NULL; + } + trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); + obj = &trx->bb_transc; + break; + case NM_OC_CHANNEL: + if (obj_inst->trx_nr >= bts->num_trx) { + return NULL; + } + trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); + if (obj_inst->ts_nr >= TRX_NR_TS) + return NULL; + obj = &trx->ts[obj_inst->ts_nr]; + break; + case NM_OC_SITE_MANAGER: + obj = &bts->site_mgr; + break; + case NM_OC_GPRS_NSE: + obj = &bts->gprs.nse; + break; + case NM_OC_GPRS_CELL: + obj = &bts->gprs.cell; + break; + case NM_OC_GPRS_NSVC: + if (obj_inst->trx_nr >= ARRAY_SIZE(bts->gprs.nsvc)) + return NULL; + obj = &bts->gprs.nsvc[obj_inst->trx_nr]; + break; + } + return obj; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I57ea9c4ddbe5443b9b6afe3f8e6b38170d0e5a0e Gerrit-Change-Number: 19122 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 14:45:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jul 2020 14:45:21 +0000 Subject: Change in osmo-bts[master]: Move gsm_bts code gsm-data.* => bts.* References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19123 ) Change subject: Move gsm_bts code gsm-data.* => bts.* ...................................................................... Move gsm_bts code gsm-data.* => bts.* bts.h refers to struct gsm_bts object, but we still had a bunch of stuff in bulky gsm_data.* from old days. Let's move stuff where it belongs to start clean up of gsm_data. Change-Id: I0a4219e3f64f625ee8b364bf408b8d2bcc8085c5 --- M include/osmo-bts/bts.h M include/osmo-bts/gsm_data.h M src/common/bts.c M src/common/bts_shutdown_fsm.c M src/common/gsm_data.c M src/common/load_indication.c M src/common/msg_utils.c M src/common/scheduler.c M src/common/sysinfo.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-sysmo/sysmobts_vty.c M src/osmo-bts-trx/trx_vty.c 12 files changed, 350 insertions(+), 341 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/23/19123/1 diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 63412f9..8fb8062 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -24,8 +24,227 @@ BTS_CTR_AGCH_DELETED, }; +/* One BTS */ +struct gsm_bts { + /* list header in net->bts_list */ + struct llist_head list; + + /* number of the BTS in network */ + uint8_t nr; + /* human readable name / description */ + char *description; + /* Cell Identity */ + uint16_t cell_identity; + /* location area code of this BTS */ + uint16_t location_area_code; + /* Base Station Identification Code (BSIC), lower 3 bits is BCC, + * which is used as TSC for the CCCH */ + uint8_t bsic; + /* type of BTS */ + enum gsm_bts_type_variant variant; + enum gsm_band band; + char version[MAX_VERSION_LENGTH]; + char sub_model[MAX_VERSION_LENGTH]; + + /* public features of a given BTS (set/reported via OML) */ + struct bitvec *features; + /* implementation flags of a given BTS (not exposed via OML) */ + uint16_t flags; + + /* Connected PCU version (if any) */ + char pcu_version[MAX_VERSION_LENGTH]; + + /* maximum Tx power that the MS is permitted to use in this cell */ + int ms_max_power; + + /* how do we talk OML with this TRX? */ + struct e1inp_sign_link *oml_link; + struct timespec oml_conn_established_timestamp; + + /* Abis network management O&M handle */ + struct gsm_abis_mo mo; + + /* number of this BTS on given E1 link */ + uint8_t bts_nr; + + /* DTX features of this BTS */ + bool dtxd; + + /* CCCH is on C0 */ + struct gsm_bts_trx *c0; + + struct { + struct gsm_abis_mo mo; + } site_mgr; + + /* bitmask of all SI that are present/valid in si_buf */ + uint32_t si_valid; + /* 3GPP TS 44.018 Table 10.5.2.33b.1 INDEX and COUNT for SI2quater */ + uint8_t si2q_index; /* distinguish individual SI2quater messages */ + uint8_t si2q_count; /* si2q_index for the last (highest indexed) individual SI2quater message */ + /* buffers where we put the pre-computed SI */ + sysinfo_buf_t si_buf[_MAX_SYSINFO_TYPE][SI2Q_MAX_NUM]; + /* offsets used while generating SI2quater */ + size_t e_offset; + size_t u_offset; + /* decoded SI3 rest octets - *unmodified* as received from BSC */ + struct osmo_gsm48_si_ro_info si3_ro_decoded; + /* is SI3 GPRS Indicator currently disabled due to lack of PCU connection? */ + bool si3_gprs_ind_disabled; + + /* ip.access Unit ID's have Site/BTS/TRX layout */ + union { + struct { + uint16_t site_id; + uint16_t bts_id; + uint32_t flags; + uint32_t rsl_ip; + } ip_access; + }; + + /* Not entirely sure how ip.access specific this is */ + struct { + struct { + struct gsm_abis_mo mo; + uint16_t nsei; + uint8_t timer[7]; + } nse; + struct { + struct gsm_abis_mo mo; + uint16_t bvci; + uint8_t timer[11]; + struct gprs_rlc_cfg rlc_cfg; + } cell; + struct gsm_bts_gprs_nsvc nsvc[2]; + uint8_t rac; + } gprs; + + /* transceivers */ + int num_trx; + struct llist_head trx_list; + + struct rate_ctr_group *ctrs; + bool supp_meas_toa256; + + struct { + /* Interference Boundaries for OML */ + int16_t boundary[6]; + uint8_t intave; + } interference; + unsigned int t200_ms[7]; + unsigned int t3105_ms; + struct { + uint8_t overload_period; + struct { + /* Input parameters from OML */ + uint8_t load_ind_thresh; /* percent */ + uint8_t load_ind_period; /* seconds */ + /* Internal data */ + struct osmo_timer_list timer; + unsigned int pch_total; + unsigned int pch_used; + } ccch; + struct { + /* Input parameters from OML */ + int16_t busy_thresh; /* in dBm */ + uint16_t averaging_slots; + /* Internal data */ + unsigned int total; /* total nr */ + unsigned int busy; /* above busy_thresh */ + unsigned int access; /* access bursts */ + } rach; + } load; + uint8_t ny1; + uint8_t max_ta; + + /* AGCH queuing */ + struct { + struct llist_head queue; + int length; + int max_length; + + int thresh_level; /* Cleanup threshold in percent of max len */ + int low_level; /* Low water mark in percent of max len */ + int high_level; /* High water mark in percent of max len */ + + /* TODO: Use a rate counter group instead */ + uint64_t dropped_msgs; + uint64_t merged_msgs; + uint64_t rejected_msgs; + uint64_t agch_msgs; + uint64_t pch_msgs; + } agch_queue; + + struct { + uint8_t *prim_notif; /* ETWS primary notification (NULL if none) */ + ssize_t prim_notif_len; /* Length of prim_notif; expected 56 bytes */ + uint8_t page_size; + uint8_t num_pages; /* total number of pages */ + uint8_t next_page; /* next page number to be sent */ + bool pni; /* Primary Notification Identifier */ + } etws; + + struct paging_state *paging_state; + char *bsc_oml_host; + struct llist_head oml_queue; + unsigned int rtp_jitter_buf_ms; + bool rtp_jitter_adaptive; + + uint16_t rtp_port_range_start; + uint16_t rtp_port_range_end; + uint16_t rtp_port_range_next; + int rtp_ip_dscp; + + struct { + uint8_t ciphers; /* flags A5/1==0x1, A5/2==0x2, A5/3==0x4 */ + } support; + struct { + uint8_t tc4_ctr; + } si; + struct gsm_time gsm_time; + /* frame number statistics (FN in PH-RTS.ind vs. PH-DATA.ind */ + struct { + int32_t min; /* minimum observed */ + int32_t max; /* maximum observed */ + int32_t avg256; /* accumulator */ + uint32_t avg_count; /* number of samples accumulated in avg256 */ + uint32_t avg_window; /* number of averages in avg_count */ + } fn_stats; + /* Radio Link Timeout counter. -1 disables timeout for + * lab/measurement purpose */ + int radio_link_timeout; + + int ul_power_target; /* Uplink Rx power target */ + + /* used by the sysmoBTS to adjust band */ + uint8_t auto_band; + + /* State for SMSCB (Cell Broadcast) for BASIC and EXTENDED channel */ + struct bts_smscb_state smscb_basic; + struct bts_smscb_state smscb_extended; + int smscb_queue_tgt_len; /* ideal/target queue length */ + int smscb_queue_max_len; /* maximum queue length */ + int smscb_queue_hyst; /* hysteresis for CBCH load indications */ + + int16_t min_qual_rach; /* minimum link quality (in centiBels) for Access Bursts */ + int16_t min_qual_norm; /* minimum link quality (in centiBels) for Normal Bursts */ + uint16_t max_ber10k_rach; /* Maximum permitted RACH BER in 0.01% */ + + struct { + char *sock_path; + } pcu; + + struct osmo_fsm_inst *shutdown_fi; /* FSM instance to manage shutdown procedure during process exit */ + struct osmo_tdef *T_defs; /* Timer defines */ + + void *model_priv; /* Allocated by bts_model, contains model specific data pointer */ +}; + extern void *tall_bts_ctx; +struct gsm_bts *gsm_bts_alloc(void *talloc_ctx, uint8_t bts_num); +struct gsm_bts *gsm_bts_num(struct gsm_network *net, int num); + int bts_init(struct gsm_bts *bts); int bts_trx_init(struct gsm_bts_trx *trx); void bts_shutdown(struct gsm_bts *bts, const char *reason); diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 2e8ff46..7847eb8 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -494,226 +494,6 @@ * OML connection will cause a special warning to be logged. */ #define OSMO_BTS_OML_CONN_EARLY_DISCONNECT 10 /* in seconds */ -/* One BTS */ -struct gsm_bts { - /* list header in net->bts_list */ - struct llist_head list; - - /* number of the BTS in network */ - uint8_t nr; - /* human readable name / description */ - char *description; - /* Cell Identity */ - uint16_t cell_identity; - /* location area code of this BTS */ - uint16_t location_area_code; - /* Base Station Identification Code (BSIC), lower 3 bits is BCC, - * which is used as TSC for the CCCH */ - uint8_t bsic; - /* type of BTS */ - enum gsm_bts_type_variant variant; - enum gsm_band band; - char version[MAX_VERSION_LENGTH]; - char sub_model[MAX_VERSION_LENGTH]; - - /* public features of a given BTS (set/reported via OML) */ - struct bitvec *features; - /* implementation flags of a given BTS (not exposed via OML) */ - uint16_t flags; - - /* Connected PCU version (if any) */ - char pcu_version[MAX_VERSION_LENGTH]; - - /* maximum Tx power that the MS is permitted to use in this cell */ - int ms_max_power; - - /* how do we talk OML with this TRX? */ - struct e1inp_sign_link *oml_link; - struct timespec oml_conn_established_timestamp; - - /* Abis network management O&M handle */ - struct gsm_abis_mo mo; - - /* number of this BTS on given E1 link */ - uint8_t bts_nr; - - /* DTX features of this BTS */ - bool dtxd; - - /* CCCH is on C0 */ - struct gsm_bts_trx *c0; - - struct { - struct gsm_abis_mo mo; - } site_mgr; - - /* bitmask of all SI that are present/valid in si_buf */ - uint32_t si_valid; - /* 3GPP TS 44.018 Table 10.5.2.33b.1 INDEX and COUNT for SI2quater */ - uint8_t si2q_index; /* distinguish individual SI2quater messages */ - uint8_t si2q_count; /* si2q_index for the last (highest indexed) individual SI2quater message */ - /* buffers where we put the pre-computed SI */ - sysinfo_buf_t si_buf[_MAX_SYSINFO_TYPE][SI2Q_MAX_NUM]; - /* offsets used while generating SI2quater */ - size_t e_offset; - size_t u_offset; - /* decoded SI3 rest octets - *unmodified* as received from BSC */ - struct osmo_gsm48_si_ro_info si3_ro_decoded; - /* is SI3 GPRS Indicator currently disabled due to lack of PCU connection? */ - bool si3_gprs_ind_disabled; - - /* ip.access Unit ID's have Site/BTS/TRX layout */ - union { - struct { - uint16_t site_id; - uint16_t bts_id; - uint32_t flags; - uint32_t rsl_ip; - } ip_access; - }; - - /* Not entirely sure how ip.access specific this is */ - struct { - struct { - struct gsm_abis_mo mo; - uint16_t nsei; - uint8_t timer[7]; - } nse; - struct { - struct gsm_abis_mo mo; - uint16_t bvci; - uint8_t timer[11]; - struct gprs_rlc_cfg rlc_cfg; - } cell; - struct gsm_bts_gprs_nsvc nsvc[2]; - uint8_t rac; - } gprs; - - /* transceivers */ - int num_trx; - struct llist_head trx_list; - - struct rate_ctr_group *ctrs; - bool supp_meas_toa256; - - struct { - /* Interference Boundaries for OML */ - int16_t boundary[6]; - uint8_t intave; - } interference; - unsigned int t200_ms[7]; - unsigned int t3105_ms; - struct { - uint8_t overload_period; - struct { - /* Input parameters from OML */ - uint8_t load_ind_thresh; /* percent */ - uint8_t load_ind_period; /* seconds */ - /* Internal data */ - struct osmo_timer_list timer; - unsigned int pch_total; - unsigned int pch_used; - } ccch; - struct { - /* Input parameters from OML */ - int16_t busy_thresh; /* in dBm */ - uint16_t averaging_slots; - /* Internal data */ - unsigned int total; /* total nr */ - unsigned int busy; /* above busy_thresh */ - unsigned int access; /* access bursts */ - } rach; - } load; - uint8_t ny1; - uint8_t max_ta; - - /* AGCH queuing */ - struct { - struct llist_head queue; - int length; - int max_length; - - int thresh_level; /* Cleanup threshold in percent of max len */ - int low_level; /* Low water mark in percent of max len */ - int high_level; /* High water mark in percent of max len */ - - /* TODO: Use a rate counter group instead */ - uint64_t dropped_msgs; - uint64_t merged_msgs; - uint64_t rejected_msgs; - uint64_t agch_msgs; - uint64_t pch_msgs; - } agch_queue; - - struct { - uint8_t *prim_notif; /* ETWS primary notification (NULL if none) */ - ssize_t prim_notif_len; /* Length of prim_notif; expected 56 bytes */ - uint8_t page_size; - uint8_t num_pages; /* total number of pages */ - uint8_t next_page; /* next page number to be sent */ - bool pni; /* Primary Notification Identifier */ - } etws; - - struct paging_state *paging_state; - char *bsc_oml_host; - struct llist_head oml_queue; - unsigned int rtp_jitter_buf_ms; - bool rtp_jitter_adaptive; - - uint16_t rtp_port_range_start; - uint16_t rtp_port_range_end; - uint16_t rtp_port_range_next; - int rtp_ip_dscp; - - struct { - uint8_t ciphers; /* flags A5/1==0x1, A5/2==0x2, A5/3==0x4 */ - } support; - struct { - uint8_t tc4_ctr; - } si; - struct gsm_time gsm_time; - /* frame number statistics (FN in PH-RTS.ind vs. PH-DATA.ind */ - struct { - int32_t min; /* minimum observed */ - int32_t max; /* maximum observed */ - int32_t avg256; /* accumulator */ - uint32_t avg_count; /* number of samples accumulated in avg256 */ - uint32_t avg_window; /* number of averages in avg_count */ - } fn_stats; - /* Radio Link Timeout counter. -1 disables timeout for - * lab/measurement purpose */ - int radio_link_timeout; - - int ul_power_target; /* Uplink Rx power target */ - - /* used by the sysmoBTS to adjust band */ - uint8_t auto_band; - - /* State for SMSCB (Cell Broadcast) for BASIC and EXTENDED channel */ - struct bts_smscb_state smscb_basic; - struct bts_smscb_state smscb_extended; - int smscb_queue_tgt_len; /* ideal/target queue length */ - int smscb_queue_max_len; /* maximum queue length */ - int smscb_queue_hyst; /* hysteresis for CBCH load indications */ - - int16_t min_qual_rach; /* minimum link quality (in centiBels) for Access Bursts */ - int16_t min_qual_norm; /* minimum link quality (in centiBels) for Normal Bursts */ - uint16_t max_ber10k_rach; /* Maximum permitted RACH BER in 0.01% */ - - struct { - char *sock_path; - } pcu; - - struct osmo_fsm_inst *shutdown_fi; /* FSM instance to manage shutdown procedure during process exit */ - struct osmo_tdef *T_defs; /* Timer defines */ - - void *model_priv; /* Allocated by bts_model, contains model specific data pointer */ -}; - - -struct gsm_bts *gsm_bts_alloc(void *talloc_ctx, uint8_t bts_num); -struct gsm_bts *gsm_bts_num(struct gsm_network *net, int num); - struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts); struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num); @@ -748,13 +528,7 @@ #define BSIC2BCC(bsic) ((bsic) & 0x3) -static inline uint8_t gsm_ts_tsc(const struct gsm_bts_trx_ts *ts) -{ - if (ts->tsc != -1) - return ts->tsc; - else - return ts->trx->bts->bsic & 7; -} +uint8_t gsm_ts_tsc(const struct gsm_bts_trx_ts *ts); struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr, int *rc); diff --git a/src/common/bts.c b/src/common/bts.c index dccb098..9243983 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -50,6 +51,7 @@ #include #include #include +#include #define MIN_QUAL_RACH 50 /* minimum link quality (in centiBels) for Access Bursts */ #define MIN_QUAL_NORM -5 /* minimum link quality (in centiBels) for Normal Bursts */ @@ -122,6 +124,117 @@ cbch_ctr_desc }; +static struct osmo_tdef bts_T_defs[] = { + /* T-1: FIXME: Ideally should be dynamically calculated per trx at + * shutdown start based on params below, and highest trx value taken: + * + VTY's power-ramp step-interval. + * + Amount of steps needed (taking into account how many dB each step moves). + * + Extra time to get response back for each step. + * For now we simply give 5 mins, which should be enough for any + * acceptable setup, while still ensuring will timeout at some point if + * something fails in the ramp down procedure. + */ + { .T=-1, .default_val=300, .desc="Time after which osmo-bts exits if regular ramp down during shut down process does not finish (s)" }, + { .T=-2, .default_val=3, .desc="Time after which osmo-bts exits if requesting transceivers to stop during shut down process does not finish (s)" }, + {} +}; + +static const uint8_t bts_nse_timer_default[] = { 3, 3, 3, 3, 30, 3, 10 }; +static const uint8_t bts_cell_timer_default[] = + { 3, 3, 3, 3, 3, 10, 3, 10, 3, 10, 3 }; +static const struct gprs_rlc_cfg rlc_cfg_default = { + .parameter = { + [RLC_T3142] = 20, + [RLC_T3169] = 5, + [RLC_T3191] = 5, + [RLC_T3193] = 160, /* 10ms */ + [RLC_T3195] = 5, + [RLC_N3101] = 10, + [RLC_N3103] = 4, + [RLC_N3105] = 8, + [CV_COUNTDOWN] = 15, + [T_DL_TBF_EXT] = 250 * 10, /* ms */ + [T_UL_TBF_EXT] = 250 * 10, /* ms */ + }, + .paging = { + .repeat_time = 5 * 50, /* ms */ + .repeat_count = 3, + }, + .cs_mask = 0x1fff, + .initial_cs = 2, + .initial_mcs = 6, +}; + +struct gsm_bts *gsm_bts_alloc(void *ctx, uint8_t bts_num) +{ + struct gsm_bts *bts = talloc_zero(ctx, struct gsm_bts); + int i; + + if (!bts) + return NULL; + + bts->nr = bts_num; + bts->num_trx = 0; + INIT_LLIST_HEAD(&bts->trx_list); + bts->ms_max_power = 15; /* dBm */ + + bts->T_defs = bts_T_defs; + osmo_tdefs_reset(bts->T_defs); + bts->shutdown_fi = osmo_fsm_inst_alloc(&bts_shutdown_fsm, bts, bts, + LOGL_INFO, NULL); + osmo_fsm_inst_update_id_f(bts->shutdown_fi, "bts%d", bts->nr); + + gsm_mo_init(&bts->mo, bts, NM_OC_BTS, + bts->nr, 0xff, 0xff); + gsm_mo_init(&bts->site_mgr.mo, bts, NM_OC_SITE_MANAGER, + 0xff, 0xff, 0xff); + + for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++) { + bts->gprs.nsvc[i].bts = bts; + bts->gprs.nsvc[i].id = i; + gsm_mo_init(&bts->gprs.nsvc[i].mo, bts, NM_OC_GPRS_NSVC, + bts->nr, i, 0xff); + } + memcpy(&bts->gprs.nse.timer, bts_nse_timer_default, + sizeof(bts->gprs.nse.timer)); + gsm_mo_init(&bts->gprs.nse.mo, bts, NM_OC_GPRS_NSE, + bts->nr, 0xff, 0xff); + memcpy(&bts->gprs.cell.timer, bts_cell_timer_default, + sizeof(bts->gprs.cell.timer)); + gsm_mo_init(&bts->gprs.cell.mo, bts, NM_OC_GPRS_CELL, + bts->nr, 0xff, 0xff); + memcpy(&bts->gprs.cell.rlc_cfg, &rlc_cfg_default, + sizeof(bts->gprs.cell.rlc_cfg)); + + /* create our primary TRX. It will be initialized during bts_init() */ + bts->c0 = gsm_bts_trx_alloc(bts); + if (!bts->c0) { + talloc_free(bts); + return NULL; + } + bts->c0->ts[0].pchan = GSM_PCHAN_CCCH_SDCCH4; + + bts->features = bitvec_alloc(MAX_BTS_FEATURES / 8, bts); + OSMO_ASSERT(bts->features != NULL); + + return bts; +} + +struct gsm_bts *gsm_bts_num(struct gsm_network *net, int num) +{ + struct gsm_bts *bts; + + if (num >= net->num_bts) + return NULL; + + llist_for_each_entry(bts, &net->bts_list, list) { + if (bts->nr == num) + return bts; + } + + return NULL; +} + /* Initialize the BTS data structures, called before config * file reading */ int bts_init(struct gsm_bts *bts) diff --git a/src/common/bts_shutdown_fsm.c b/src/common/bts_shutdown_fsm.c index d55b1cd..c81a4ab 100644 --- a/src/common/bts_shutdown_fsm.c +++ b/src/common/bts_shutdown_fsm.c @@ -28,6 +28,7 @@ #include #include #include +#include #define X(s) (1 << (s)) diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c index 57f33ae..caeb19b 100644 --- a/src/common/gsm_data.c +++ b/src/common/gsm_data.c @@ -30,29 +30,13 @@ #include #include #include -#include #include #include #include #include -#include - -static struct osmo_tdef bts_T_defs[] = { - /* T-1: FIXME: Ideally should be dynamically calculated per trx at - * shutdown start based on params below, and highest trx value taken: - * + VTY's power-ramp step-interval. - * + Amount of steps needed (taking into account how many dB each step moves). - * + Extra time to get response back for each step. - * For now we simply give 5 mins, which should be enough for any - * acceptable setup, while still ensuring will timeout at some point if - * something fails in the ramp down procedure. - */ - { .T=-1, .default_val=300, .desc="Time after which osmo-bts exits if regular ramp down during shut down process does not finish (s)" }, - { .T=-2, .default_val=3, .desc="Time after which osmo-bts exits if requesting transceivers to stop during shut down process does not finish (s)" }, - {} -}; +#include const struct value_string bts_attribute_names[] = { OSMO_VALUE_STRING(BTS_TYPE_VARIANT), @@ -164,21 +148,6 @@ return get_value_string(lchan_s_names, s); } -struct gsm_bts *gsm_bts_num(struct gsm_network *net, int num) -{ - struct gsm_bts *bts; - - if (num >= net->num_bts) - return NULL; - - llist_for_each_entry(bts, &net->bts_list, list) { - if (bts->nr == num) - return bts; - } - - return NULL; -} - struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts) { struct gsm_bts_trx *trx = talloc_zero(bts, struct gsm_bts_trx); @@ -233,88 +202,6 @@ return trx; } - -static const uint8_t bts_nse_timer_default[] = { 3, 3, 3, 3, 30, 3, 10 }; -static const uint8_t bts_cell_timer_default[] = - { 3, 3, 3, 3, 3, 10, 3, 10, 3, 10, 3 }; -static const struct gprs_rlc_cfg rlc_cfg_default = { - .parameter = { - [RLC_T3142] = 20, - [RLC_T3169] = 5, - [RLC_T3191] = 5, - [RLC_T3193] = 160, /* 10ms */ - [RLC_T3195] = 5, - [RLC_N3101] = 10, - [RLC_N3103] = 4, - [RLC_N3105] = 8, - [CV_COUNTDOWN] = 15, - [T_DL_TBF_EXT] = 250 * 10, /* ms */ - [T_UL_TBF_EXT] = 250 * 10, /* ms */ - }, - .paging = { - .repeat_time = 5 * 50, /* ms */ - .repeat_count = 3, - }, - .cs_mask = 0x1fff, - .initial_cs = 2, - .initial_mcs = 6, -}; - -struct gsm_bts *gsm_bts_alloc(void *ctx, uint8_t bts_num) -{ - struct gsm_bts *bts = talloc_zero(ctx, struct gsm_bts); - int i; - - if (!bts) - return NULL; - - bts->nr = bts_num; - bts->num_trx = 0; - INIT_LLIST_HEAD(&bts->trx_list); - bts->ms_max_power = 15; /* dBm */ - - bts->T_defs = bts_T_defs; - osmo_tdefs_reset(bts->T_defs); - bts->shutdown_fi = osmo_fsm_inst_alloc(&bts_shutdown_fsm, bts, bts, - LOGL_INFO, NULL); - osmo_fsm_inst_update_id_f(bts->shutdown_fi, "bts%d", bts->nr); - - gsm_mo_init(&bts->mo, bts, NM_OC_BTS, - bts->nr, 0xff, 0xff); - gsm_mo_init(&bts->site_mgr.mo, bts, NM_OC_SITE_MANAGER, - 0xff, 0xff, 0xff); - - for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++) { - bts->gprs.nsvc[i].bts = bts; - bts->gprs.nsvc[i].id = i; - gsm_mo_init(&bts->gprs.nsvc[i].mo, bts, NM_OC_GPRS_NSVC, - bts->nr, i, 0xff); - } - memcpy(&bts->gprs.nse.timer, bts_nse_timer_default, - sizeof(bts->gprs.nse.timer)); - gsm_mo_init(&bts->gprs.nse.mo, bts, NM_OC_GPRS_NSE, - bts->nr, 0xff, 0xff); - memcpy(&bts->gprs.cell.timer, bts_cell_timer_default, - sizeof(bts->gprs.cell.timer)); - gsm_mo_init(&bts->gprs.cell.mo, bts, NM_OC_GPRS_CELL, - bts->nr, 0xff, 0xff); - memcpy(&bts->gprs.cell.rlc_cfg, &rlc_cfg_default, - sizeof(bts->gprs.cell.rlc_cfg)); - - /* create our primary TRX. It will be initialized during bts_init() */ - bts->c0 = gsm_bts_trx_alloc(bts); - if (!bts->c0) { - talloc_free(bts); - return NULL; - } - bts->c0->ts[0].pchan = GSM_PCHAN_CCCH_SDCCH4; - - bts->features = bitvec_alloc(MAX_BTS_FEATURES / 8, bts); - OSMO_ASSERT(bts->features != NULL); - - return bts; -} - struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num) { struct gsm_bts_trx *trx; @@ -520,6 +407,14 @@ return lchan; } +uint8_t gsm_ts_tsc(const struct gsm_bts_trx_ts *ts) +{ + if (ts->tsc != -1) + return ts->tsc; + else + return ts->trx->bts->bsic & 7; +} + /* determine logical channel based on TRX and channel number IE */ struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr, int *rc) diff --git a/src/common/load_indication.c b/src/common/load_indication.c index 8d9b56f..c9b2645 100644 --- a/src/common/load_indication.c +++ b/src/common/load_indication.c @@ -27,6 +27,7 @@ #include #include #include +#include static void reset_load_counters(struct gsm_bts *bts) { diff --git a/src/common/msg_utils.c b/src/common/msg_utils.c index 52b0566..1817849 100644 --- a/src/common/msg_utils.c +++ b/src/common/msg_utils.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 3068918..7375a1a 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -42,6 +42,7 @@ #include #include #include +#include extern void *tall_bts_ctx; diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c index f5bc3c8..4a86c4e 100644 --- a/src/common/sysinfo.c +++ b/src/common/sysinfo.c @@ -25,6 +25,7 @@ #include #include #include +#include /* properly increment SI2q index and return SI2q data for scheduling */ static inline uint8_t *get_si2q_inc_index(struct gsm_bts *bts) diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c index 0adc8fe..c03b411 100644 --- a/src/osmo-bts-octphy/l1_if.c +++ b/src/osmo-bts-octphy/l1_if.c @@ -43,6 +43,7 @@ #include #include #include +#include #include "l1_if.h" #include "l1_oml.h" diff --git a/src/osmo-bts-sysmo/sysmobts_vty.c b/src/osmo-bts-sysmo/sysmobts_vty.c index 0653f01..7876612 100644 --- a/src/osmo-bts-sysmo/sysmobts_vty.c +++ b/src/osmo-bts-sysmo/sysmobts_vty.c @@ -45,6 +45,7 @@ #include #include #include +#include #include "femtobts.h" #include "l1_if.h" diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index 2e52958..fb75a4e 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -42,6 +42,7 @@ #include #include #include +#include #include "l1_if.h" #include "trx_if.h" -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0a4219e3f64f625ee8b364bf408b8d2bcc8085c5 Gerrit-Change-Number: 19123 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 15:06:02 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jul 2020 15:06:02 +0000 Subject: Change in osmo-bts[master]: Move gsm_bts code gsm-data.* => bts.* In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19123 to look at the new patch set (#2). Change subject: Move gsm_bts code gsm-data.* => bts.* ...................................................................... Move gsm_bts code gsm-data.* => bts.* bts.h refers to struct gsm_bts object, but we still had a bunch of stuff in bulky gsm_data.* from old days. Let's move stuff where it belongs to start clean up of gsm_data. Change-Id: I0a4219e3f64f625ee8b364bf408b8d2bcc8085c5 --- M include/osmo-bts/bts.h M include/osmo-bts/gsm_data.h M src/common/bts.c M src/common/bts_shutdown_fsm.c M src/common/gsm_data.c M src/common/load_indication.c M src/common/msg_utils.c M src/common/scheduler.c M src/common/sysinfo.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-sysmo/sysmobts_vty.c M src/osmo-bts-trx/trx_vty.c 12 files changed, 479 insertions(+), 487 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/23/19123/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0a4219e3f64f625ee8b364bf408b8d2bcc8085c5 Gerrit-Change-Number: 19123 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 15:27:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jul 2020 15:27:58 +0000 Subject: Change in osmo-bts[master]: Move struct gsm_bts_trx: gsm_data.* & bts.* => trx.* References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19124 ) Change subject: Move struct gsm_bts_trx: gsm_data.* & bts.* => trx.* ...................................................................... Move struct gsm_bts_trx: gsm_data.* & bts.* => trx.* Move all struct gsm_bts_trx references from bulky gsm_data to its own file containing all related definitions and implementations. Also move a few functions clearly related to that object which were placed in bts.* Change-Id: Iebaf5b221c48b571f45408af867ce6f9c0cd9f4a --- M include/osmo-bts/Makefile.am M include/osmo-bts/bts.h M include/osmo-bts/gsm_data.h M include/osmo-bts/phy_link.h A include/osmo-bts/trx.h M src/common/Makefile.am M src/common/abis.c M src/common/bts.c M src/common/bts_ctrl_lookup.c M src/common/gsm_data.c M src/common/sysinfo.c A src/common/trx.c M src/common/tx_power.c 13 files changed, 283 insertions(+), 237 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/24/19124/1 diff --git a/include/osmo-bts/Makefile.am b/include/osmo-bts/Makefile.am index 310fce2..6f6b133 100644 --- a/include/osmo-bts/Makefile.am +++ b/include/osmo-bts/Makefile.am @@ -26,4 +26,5 @@ phy_link.h \ dtx_dl_amr_fsm.h \ ta_control.h \ + trx.h \ $(NULL) diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index cb8787f..4e3e41a 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -3,6 +3,10 @@ #include #include +#include + + +struct gsm_bts_trx; enum bts_global_status { BTS_STATUS_RF_ACTIVE, @@ -318,12 +322,9 @@ struct gsm_bts *gsm_bts_num(struct gsm_network *net, int num); int bts_init(struct gsm_bts *bts); -int bts_trx_init(struct gsm_bts_trx *trx); void bts_shutdown(struct gsm_bts *bts, const char *reason); int bts_link_estab(struct gsm_bts *bts); -int trx_link_estab(struct gsm_bts_trx *trx); -int trx_set_available(struct gsm_bts_trx *trx, int avail); int bts_agch_enqueue(struct gsm_bts *bts, struct msgb *msg); struct msgb *bts_agch_dequeue(struct gsm_bts *bts); @@ -337,11 +338,8 @@ int lchan_init_lapdm(struct gsm_lchan *lchan); void load_timer_start(struct gsm_bts *bts); -uint8_t num_agch(struct gsm_bts_trx *trx, const char * arg); void bts_update_status(enum bts_global_status which, int on); -bool trx_ms_pwr_ctrl_is_osmo(struct gsm_bts_trx *trx); - struct gsm_time *get_time(struct gsm_bts *bts); int bts_main(int argc, char **argv); diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 0bb7761..0402f11 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -43,7 +43,6 @@ #define GSM_BTS_AGCH_QUEUE_HIGH_LEVEL_DEFAULT 91 #define LOGPLCHAN(lchan, ss, lvl, fmt, args...) LOGP(ss, lvl, "%s " fmt, gsm_lchan_name(lchan), ## args) -#define LOGPTRX(trx, ss, lvl, fmt, args...) LOGP(ss, lvl, "%s " fmt, gsm_trx_name(trx), ## args) struct gsm_network { struct llist_head bts_list; @@ -339,53 +338,6 @@ struct gsm_lchan lchan[TS_MAX_LCHAN]; }; -/* One TRX in a BTS */ -struct gsm_bts_trx { - /* list header in bts->trx_list */ - struct llist_head list; - - struct gsm_bts *bts; - /* number of this TRX in the BTS */ - uint8_t nr; - /* human readable name / description */ - char *description; - /* how do we talk RSL with this TRX? */ - uint8_t rsl_tei; - struct e1inp_sign_link *rsl_link; - - /* Some BTS (specifically Ericsson RBS) have a per-TRX OML Link */ - struct e1inp_sign_link *oml_link; - - struct gsm_abis_mo mo; - struct tlv_parsed nm_attr; - struct { - struct gsm_abis_mo mo; - } bb_transc; - - uint16_t arfcn; - int nominal_power; /* in dBm */ - unsigned int max_power_red; /* in actual dB */ - uint8_t max_power_backoff_8psk; /* in actual dB OC-2G only */ - uint8_t c0_idle_power_red; /* in actual dB OC-2G only */ - - - struct trx_power_params power_params; - bool ms_pwr_ctl_soft; /* is power control loop done by osmocom software? */ - - struct { - void *l1h; - } role_bts; - - union { - struct { - unsigned int test_state; - uint8_t test_nr; - struct rxlev_stats rxlev_stat; - } ipaccess; - }; - struct gsm_bts_trx_ts ts[TRX_NR_TS]; -}; - #define GSM_LCHAN_SI(lchan, i) (void *)((lchan)->si.buf[i][0]) enum gprs_rlc_par { @@ -424,16 +376,12 @@ * OML connection will cause a special warning to be logged. */ #define OSMO_BTS_OML_CONN_EARLY_DISCONNECT 10 /* in seconds */ -struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts); -struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num); - extern const struct value_string gsm_pchant_names[13]; extern const struct value_string gsm_pchant_descs[13]; const char *gsm_pchan_name(enum gsm_phys_chan_config c); enum gsm_phys_chan_config gsm_pchan_parse(const char *name); const char *gsm_lchant_name(enum gsm_chan_t c); -char *gsm_trx_name(const struct gsm_bts_trx *trx); char *gsm_ts_name(const struct gsm_bts_trx_ts *ts); char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts); char *gsm_lchan_name_compute(const struct gsm_lchan *lchan); @@ -458,7 +406,6 @@ enum gsm_phys_chan_config ts_pchan(struct gsm_bts_trx_ts *ts); uint8_t ts_subslots(struct gsm_bts_trx_ts *ts); bool ts_is_tch(struct gsm_bts_trx_ts *ts); -const char *gsm_trx_unit_id(struct gsm_bts_trx *trx); int lchan2ecu_codec(const struct gsm_lchan *lchan); diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h index 2a53d91..8e75342 100644 --- a/include/osmo-bts/phy_link.h +++ b/include/osmo-bts/phy_link.h @@ -5,11 +5,12 @@ #include #include +#include #include #include "btsconfig.h" -struct gsm_bts_trx; + struct virt_um_inst; enum phy_link_type { diff --git a/include/osmo-bts/trx.h b/include/osmo-bts/trx.h new file mode 100644 index 0000000..ae87528 --- /dev/null +++ b/include/osmo-bts/trx.h @@ -0,0 +1,65 @@ +#pragma once + +#include + +/* One TRX in a BTS */ +struct gsm_bts_trx { + /* list header in bts->trx_list */ + struct llist_head list; + + struct gsm_bts *bts; + /* number of this TRX in the BTS */ + uint8_t nr; + /* human readable name / description */ + char *description; + /* how do we talk RSL with this TRX? */ + uint8_t rsl_tei; + struct e1inp_sign_link *rsl_link; + + /* Some BTS (specifically Ericsson RBS) have a per-TRX OML Link */ + struct e1inp_sign_link *oml_link; + + struct gsm_abis_mo mo; + struct tlv_parsed nm_attr; + struct { + struct gsm_abis_mo mo; + } bb_transc; + + uint16_t arfcn; + int nominal_power; /* in dBm */ + unsigned int max_power_red; /* in actual dB */ + uint8_t max_power_backoff_8psk; /* in actual dB OC-2G only */ + uint8_t c0_idle_power_red; /* in actual dB OC-2G only */ + + + struct trx_power_params power_params; + bool ms_pwr_ctl_soft; /* is power control loop done by osmocom software? */ + + struct { + void *l1h; + } role_bts; + + union { + struct { + unsigned int test_state; + uint8_t test_nr; + struct rxlev_stats rxlev_stat; + } ipaccess; + }; + struct gsm_bts_trx_ts ts[TRX_NR_TS]; +}; + + +struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts); +int bts_trx_init(struct gsm_bts_trx *trx); +struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num); +char *gsm_trx_name(const struct gsm_bts_trx *trx); +const char *gsm_trx_unit_id(struct gsm_bts_trx *trx); + +int trx_link_estab(struct gsm_bts_trx *trx); +int trx_set_available(struct gsm_bts_trx *trx, int avail); + +uint8_t num_agch(struct gsm_bts_trx *trx, const char * arg); +bool trx_ms_pwr_ctrl_is_osmo(struct gsm_bts_trx *trx); + +#define LOGPTRX(trx, ss, lvl, fmt, args...) LOGP(ss, lvl, "%s " fmt, gsm_trx_name(trx), ## args) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 2fa5514..348dd97 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -36,6 +36,7 @@ dtx_dl_amr_fsm.c \ scheduler_mframe.c \ ta_control.c \ + trx.c \ $(NULL) libl1sched_a_SOURCES = scheduler.c diff --git a/src/common/abis.c b/src/common/abis.c index ad6fddc..bac1179 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -49,6 +49,7 @@ #include #include #include +#include static struct gsm_bts *g_bts; diff --git a/src/common/bts.c b/src/common/bts.c index 2f6a700..983f61d 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -383,40 +383,6 @@ return rc; } -/* Initialize the TRX data structures, called before config - * file reading */ -int bts_trx_init(struct gsm_bts_trx *trx) -{ - /* initialize bts data structure */ - struct trx_power_params *tpp = &trx->power_params; - int rc, i; - - for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { - struct gsm_bts_trx_ts *ts = &trx->ts[i]; - int k; - - for (k = 0; k < ARRAY_SIZE(ts->lchan); k++) { - struct gsm_lchan *lchan = &ts->lchan[k]; - INIT_LLIST_HEAD(&lchan->dl_tch_queue); - } - } - /* Default values for the power adjustments */ - tpp->ramp.max_initial_pout_mdBm = to_mdB(0); - tpp->ramp.step_size_mdB = to_mdB(2); - tpp->ramp.step_interval_sec = 1; - - /* IF BTS model doesn't DSP/HW support MS Power Control Loop, enable osmo algo by default: */ - if (!bts_internal_flag_get(trx->bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP)) - trx->ms_pwr_ctl_soft = true; - - rc = bts_model_trx_init(trx); - if (rc < 0) { - llist_del(&trx->list); - return rc; - } - return 0; -} - /* main link is established, send status report */ int bts_link_estab(struct gsm_bts *bts) { @@ -451,55 +417,6 @@ return bts_model_oml_estab(bts); } -/* RSL link is established, send status report */ -int trx_link_estab(struct gsm_bts_trx *trx) -{ - struct e1inp_sign_link *link = trx->rsl_link; - uint8_t radio_state = link ? NM_OPSTATE_ENABLED : NM_OPSTATE_DISABLED; - int rc; - - LOGP(DSUM, LOGL_INFO, "RSL link (TRX %02x) state changed to %s, sending Status'.\n", - trx->nr, link ? "up" : "down"); - - oml_mo_state_chg(&trx->mo, radio_state, NM_AVSTATE_OK); - - if (link) - rc = rsl_tx_rf_res(trx); - else - rc = bts_model_trx_deact_rf(trx); - if (rc < 0) { - oml_tx_failure_event_rep(&trx->bb_transc.mo, NM_SEVER_MAJOR, OSMO_EVT_MAJ_RSL_FAIL, - link ? - "Failed to establish RSL link (%d)" : - "Failed to deactivate RF (%d)", rc); - } - - return 0; -} - -/* set the availability of the TRX (used by PHY driver) */ -int trx_set_available(struct gsm_bts_trx *trx, int avail) -{ - int tn; - - LOGP(DSUM, LOGL_INFO, "TRX(%d): Setting available = %d\n", - trx->nr, avail); - if (avail) { - int op_state = trx->rsl_link ? NM_OPSTATE_ENABLED : NM_OPSTATE_DISABLED; - oml_mo_state_chg(&trx->mo, op_state, NM_AVSTATE_OK); - oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OK); - for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) - oml_mo_state_chg(&trx->ts[tn].mo, op_state, NM_AVSTATE_OK); - } else { - oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); - oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_NOT_INSTALLED); - - for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) - oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); - } - return 0; -} - /* prepare the per-SAPI T200 arrays for a given lchan */ static int t200_by_lchan(int *t200_ms_dcch, int *t200_ms_acch, struct gsm_lchan *lchan) { @@ -899,11 +816,6 @@ return sup > 0; } -bool trx_ms_pwr_ctrl_is_osmo(struct gsm_bts_trx *trx) -{ - return trx->ms_pwr_ctl_soft; -} - struct gsm_time *get_time(struct gsm_bts *bts) { return &bts->gsm_time; diff --git a/src/common/bts_ctrl_lookup.c b/src/common/bts_ctrl_lookup.c index f0157e9..e9b06f4 100644 --- a/src/common/bts_ctrl_lookup.c +++ b/src/common/bts_ctrl_lookup.c @@ -28,6 +28,7 @@ #include #include #include +#include extern vector ctrl_node_vec; diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c index c63793c..d26cb1a 100644 --- a/src/common/gsm_data.c +++ b/src/common/gsm_data.c @@ -37,6 +37,7 @@ #include #include +#include const struct value_string gsm_pchant_names[13] = { { GSM_PCHAN_NONE, "NONE" }, @@ -103,88 +104,8 @@ return get_value_string(lchan_s_names, s); } -struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts) -{ - struct gsm_bts_trx *trx = talloc_zero(bts, struct gsm_bts_trx); - int k; - - if (!trx) - return NULL; - - trx->bts = bts; - trx->nr = bts->num_trx++; - - gsm_mo_init(&trx->mo, bts, NM_OC_RADIO_CARRIER, - bts->nr, trx->nr, 0xff); - - gsm_mo_init(&trx->bb_transc.mo, bts, NM_OC_BASEB_TRANSC, - bts->nr, trx->nr, 0xff); - - for (k = 0; k < TRX_NR_TS; k++) { - struct gsm_bts_trx_ts *ts = &trx->ts[k]; - int l; - - ts->trx = trx; - ts->nr = k; - ts->pchan = GSM_PCHAN_NONE; - ts->dyn.pchan_is = GSM_PCHAN_NONE; - ts->dyn.pchan_want = GSM_PCHAN_NONE; - ts->tsc = -1; - - gsm_mo_init(&ts->mo, bts, NM_OC_CHANNEL, - bts->nr, trx->nr, ts->nr); - - for (l = 0; l < TS_MAX_LCHAN; l++) { - struct gsm_lchan *lchan; - char *name; - lchan = &ts->lchan[l]; - - lchan->ts = ts; - lchan->nr = l; - lchan->type = GSM_LCHAN_NONE; - - name = gsm_lchan_name_compute(lchan); - lchan->name = talloc_strdup(trx, name); - INIT_LLIST_HEAD(&lchan->sapi_cmds); - } - } - - if (trx->nr != 0) - trx->nominal_power = bts->c0->nominal_power; - - llist_add_tail(&trx->list, &bts->trx_list); - - return trx; -} - -struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num) -{ - struct gsm_bts_trx *trx; - - if (num >= bts->num_trx) - return NULL; - - llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->nr == num) - return trx; - } - - return NULL; -} - static char ts2str[255]; -char *gsm_trx_name(const struct gsm_bts_trx *trx) -{ - if (!trx) - snprintf(ts2str, sizeof(ts2str), "(trx=NULL)"); - else - snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d)", - trx->bts->nr, trx->nr); - - return ts2str; -} - char *gsm_ts_name(const struct gsm_bts_trx_ts *ts) { @@ -459,15 +380,6 @@ return pchan_is_tch(ts_pchan(ts)); } -const char *gsm_trx_unit_id(struct gsm_bts_trx *trx) -{ - static char buf[23]; - - snprintf(buf, sizeof(buf), "%u/%u/%u", trx->bts->ip_access.site_id, - trx->bts->ip_access.bts_id, trx->nr); - return buf; -} - const struct value_string lchan_ciph_state_names[] = { { LCHAN_CIPH_NONE, "NONE" }, { LCHAN_CIPH_RX_REQ, "RX_REQ" }, diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c index 4a86c4e..751fb12 100644 --- a/src/common/sysinfo.c +++ b/src/common/sysinfo.c @@ -26,6 +26,7 @@ #include #include #include +#include /* properly increment SI2q index and return SI2q data for scheduling */ static inline uint8_t *get_si2q_inc_index(struct gsm_bts *bts) diff --git a/src/common/trx.c b/src/common/trx.c new file mode 100644 index 0000000..074cb95 --- /dev/null +++ b/src/common/trx.c @@ -0,0 +1,205 @@ +/* (C) 2008-2010 by Harald Welte + * (C) 2020 by sysmocom - s.f.m.c. GmbH + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include +#include +#include + +struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts) +{ + struct gsm_bts_trx *trx = talloc_zero(bts, struct gsm_bts_trx); + int k; + + if (!trx) + return NULL; + + trx->bts = bts; + trx->nr = bts->num_trx++; + + gsm_mo_init(&trx->mo, bts, NM_OC_RADIO_CARRIER, + bts->nr, trx->nr, 0xff); + + gsm_mo_init(&trx->bb_transc.mo, bts, NM_OC_BASEB_TRANSC, + bts->nr, trx->nr, 0xff); + + for (k = 0; k < TRX_NR_TS; k++) { + struct gsm_bts_trx_ts *ts = &trx->ts[k]; + int l; + + ts->trx = trx; + ts->nr = k; + ts->pchan = GSM_PCHAN_NONE; + ts->dyn.pchan_is = GSM_PCHAN_NONE; + ts->dyn.pchan_want = GSM_PCHAN_NONE; + ts->tsc = -1; + + gsm_mo_init(&ts->mo, bts, NM_OC_CHANNEL, + bts->nr, trx->nr, ts->nr); + + for (l = 0; l < TS_MAX_LCHAN; l++) { + struct gsm_lchan *lchan; + char *name; + lchan = &ts->lchan[l]; + + lchan->ts = ts; + lchan->nr = l; + lchan->type = GSM_LCHAN_NONE; + + name = gsm_lchan_name_compute(lchan); + lchan->name = talloc_strdup(trx, name); + INIT_LLIST_HEAD(&lchan->sapi_cmds); + } + } + + if (trx->nr != 0) + trx->nominal_power = bts->c0->nominal_power; + + llist_add_tail(&trx->list, &bts->trx_list); + + return trx; +} + +/* Initialize the TRX data structures, called before config + * file reading */ +int bts_trx_init(struct gsm_bts_trx *trx) +{ + /* initialize bts data structure */ + struct trx_power_params *tpp = &trx->power_params; + int rc, i; + + for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + int k; + + for (k = 0; k < ARRAY_SIZE(ts->lchan); k++) { + struct gsm_lchan *lchan = &ts->lchan[k]; + INIT_LLIST_HEAD(&lchan->dl_tch_queue); + } + } + /* Default values for the power adjustments */ + tpp->ramp.max_initial_pout_mdBm = to_mdB(0); + tpp->ramp.step_size_mdB = to_mdB(2); + tpp->ramp.step_interval_sec = 1; + + /* IF BTS model doesn't DSP/HW support MS Power Control Loop, enable osmo algo by default: */ + if (!bts_internal_flag_get(trx->bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP)) + trx->ms_pwr_ctl_soft = true; + + rc = bts_model_trx_init(trx); + if (rc < 0) { + llist_del(&trx->list); + return rc; + } + return 0; +} + +struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num) +{ + struct gsm_bts_trx *trx; + + if (num >= bts->num_trx) + return NULL; + + llist_for_each_entry(trx, &bts->trx_list, list) { + if (trx->nr == num) + return trx; + } + + return NULL; +} + +static char ts2str[255]; + +char *gsm_trx_name(const struct gsm_bts_trx *trx) +{ + if (!trx) + snprintf(ts2str, sizeof(ts2str), "(trx=NULL)"); + else + snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d)", + trx->bts->nr, trx->nr); + + return ts2str; +} + +const char *gsm_trx_unit_id(struct gsm_bts_trx *trx) +{ + static char buf[23]; + + snprintf(buf, sizeof(buf), "%u/%u/%u", trx->bts->ip_access.site_id, + trx->bts->ip_access.bts_id, trx->nr); + return buf; +} + +/* RSL link is established, send status report */ +int trx_link_estab(struct gsm_bts_trx *trx) +{ + struct e1inp_sign_link *link = trx->rsl_link; + uint8_t radio_state = link ? NM_OPSTATE_ENABLED : NM_OPSTATE_DISABLED; + int rc; + + LOGP(DSUM, LOGL_INFO, "RSL link (TRX %02x) state changed to %s, sending Status'.\n", + trx->nr, link ? "up" : "down"); + + oml_mo_state_chg(&trx->mo, radio_state, NM_AVSTATE_OK); + + if (link) + rc = rsl_tx_rf_res(trx); + else + rc = bts_model_trx_deact_rf(trx); + if (rc < 0) { + oml_tx_failure_event_rep(&trx->bb_transc.mo, NM_SEVER_MAJOR, OSMO_EVT_MAJ_RSL_FAIL, + link ? + "Failed to establish RSL link (%d)" : + "Failed to deactivate RF (%d)", rc); + } + + return 0; +} + +/* set the availability of the TRX (used by PHY driver) */ +int trx_set_available(struct gsm_bts_trx *trx, int avail) +{ + int tn; + + LOGP(DSUM, LOGL_INFO, "TRX(%d): Setting available = %d\n", + trx->nr, avail); + if (avail) { + int op_state = trx->rsl_link ? NM_OPSTATE_ENABLED : NM_OPSTATE_DISABLED; + oml_mo_state_chg(&trx->mo, op_state, NM_AVSTATE_OK); + oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OK); + for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) + oml_mo_state_chg(&trx->ts[tn].mo, op_state, NM_AVSTATE_OK); + } else { + oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); + oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_NOT_INSTALLED); + + for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) + oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); + } + return 0; +} + + +bool trx_ms_pwr_ctrl_is_osmo(struct gsm_bts_trx *trx) +{ + return trx->ms_pwr_ctl_soft; +} diff --git a/src/common/tx_power.c b/src/common/tx_power.c index 8292d9f..3714c99 100644 --- a/src/common/tx_power.c +++ b/src/common/tx_power.c @@ -29,6 +29,7 @@ #include #include #include +#include static int get_pa_drive_level_mdBm(const struct power_amp *pa, int desired_p_out_mdBm, unsigned int arfcn) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iebaf5b221c48b571f45408af867ce6f9c0cd9f4a Gerrit-Change-Number: 19124 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 15:50:12 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jul 2020 15:50:12 +0000 Subject: Change in osmo-bts[master]: bts-trx: Introduce rate counter for scheduler timerfd missed FNs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19107 ) Change subject: bts-trx: Introduce rate counter for scheduler timerfd missed FNs ...................................................................... Patch Set 1: (5 comments) Mostly cosmetic warnings (Neels style). https://gerrit.osmocom.org/c/osmo-bts/+/19107/1/src/osmo-bts-trx/l1_if.h File src/osmo-bts-trx/l1_if.h: https://gerrit.osmocom.org/c/osmo-bts/+/19107/1/src/osmo-bts-trx/l1_if.h at 57 PS1, Line 57: /* bts-trx specific rate counters */ Given that we're in 'osmo-bts-trx' directory, everything is osmo-bts-trx specific here... https://gerrit.osmocom.org/c/osmo-bts/+/19107/1/src/osmo-bts-trx/main.c File src/osmo-bts-trx/main.c: https://gerrit.osmocom.org/c/osmo-bts/+/19107/1/src/osmo-bts-trx/main.c at 65 PS1, Line 65: [BTSTRX_CTR_SCHED_DL_MISS_FN] = {"trx_clk:sched_dl_miss_fn", "Downlink frames scheduled later than expected due to missed timerfd event (due to high system load)"}, Let's please avoid adding long lines. This format: { #NAME, #DESC, } would be more readable. Not critical. https://gerrit.osmocom.org/c/osmo-bts/+/19107/1/src/osmo-bts-trx/main.c at 67 PS1, Line 67: btstrx_ Again, this prefix is redundant. We're not going to add e.g. sysmoBTS specific counters here, right? https://gerrit.osmocom.org/c/osmo-bts/+/19107/1/src/osmo-bts-trx/main.c at 69 PS1, Line 69: OsmoBtsTrx This is very unusual. One place when we mostly use CamelCase is TTCN-3, but here it looks not natural. https://gerrit.osmocom.org/c/osmo-bts/+/19107/1/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/19107/1/src/osmo-bts-trx/scheduler_trx.c at 161 PS1, Line 161: unrelated change -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0051b9ab18ebc9f92db11374d856de94f155efa4 Gerrit-Change-Number: 19107 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jul 2020 15:50:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 15:53:25 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jul 2020 15:53:25 +0000 Subject: Change in osmo-bts[master]: bts_shutdown: Speed up shutdown if no TRX is operational In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19108 ) Change subject: bts_shutdown: Speed up shutdown if no TRX is operational ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie1c7c3a969e7968075b89edcd1ab2227b178a869 Gerrit-Change-Number: 19108 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jul 2020 15:53:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 16:00:21 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jul 2020 16:00:21 +0000 Subject: Change in osmo-bts[master]: pcu_sock: Avoid presenting TS from disabled TRX as available to PCU In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19116 ) Change subject: pcu_sock: Avoid presenting TS from disabled TRX as available to PCU ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/19116/1/src/common/pcu_sock.c File src/common/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bts/+/19116/1/src/common/pcu_sock.c at 225 PS1, Line 225: op=%s adm=%s Would be good to add parentheses around operational/administrative state names. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4b24faf3a8fe5846b9394fea8faf9d37cc0ac9ff Gerrit-Change-Number: 19116 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 03 Jul 2020 16:00:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 16:06:38 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jul 2020 16:06:38 +0000 Subject: Change in osmo-bts[master]: bts-trx: Implement ramp up/down during ADM state change In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18967 ) Change subject: bts-trx: Implement ramp up/down during ADM state change ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7a7b0a0c24779349f142215f0bb32b72c86ce70 Gerrit-Change-Number: 18967 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jul 2020 16:06:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 16:07:44 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jul 2020 16:07:44 +0000 Subject: Change in osmo-bts[master]: gsm_data.h: Use enum type for NM state fields In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19117 ) Change subject: gsm_data.h: Use enum type for NM state fields ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I21fa1688a0c8a3788a5ecedd5912f596a69a1beb Gerrit-Change-Number: 19117 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 03 Jul 2020 16:07:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 16:10:12 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jul 2020 16:10:12 +0000 Subject: Change in osmo-bts[master]: Move nm_state and Mo related code gsm_data.* => oml.* In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19122 ) Change subject: Move nm_state and Mo related code gsm_data.* => oml.* ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/19122/1/src/common/oml.c File src/common/oml.c: https://gerrit.osmocom.org/c/osmo-bts/+/19122/1/src/common/oml.c at 1508 PS1, Line 1508: broken alignment -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I57ea9c4ddbe5443b9b6afe3f8e6b38170d0e5a0e Gerrit-Change-Number: 19122 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 03 Jul 2020 16:10:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 16:14:08 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jul 2020 16:14:08 +0000 Subject: Change in osmo-bts[master]: Move gsm_bts code gsm-data.* => bts.* In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19123 ) Change subject: Move gsm_bts code gsm-data.* => bts.* ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0a4219e3f64f625ee8b364bf408b8d2bcc8085c5 Gerrit-Change-Number: 19123 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 03 Jul 2020 16:14:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 16:18:44 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 3 Jul 2020 16:18:44 +0000 Subject: Change in osmo-bts[master]: Move struct gsm_bts_trx: gsm_data.* & bts.* => trx.* In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19124 ) Change subject: Move struct gsm_bts_trx: gsm_data.* & bts.* => trx.* ...................................................................... Patch Set 1: Not sure if we really want to fragment the code/headers further... What's next, ts.h? lchan.h? I am fine with having everything here, in 'gsm_data.h', but if you really need this split up for the upcoming features, I can add CR+1. For now I am not convinced, sorry. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iebaf5b221c48b571f45408af867ce6f9c0cd9f4a Gerrit-Change-Number: 19124 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 03 Jul 2020 16:18:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 17:10:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jul 2020 17:10:09 +0000 Subject: Change in libosmo-abis[master]: lapd: Replace magic numbers with #defines References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19125 ) Change subject: lapd: Replace magic numbers with #defines ...................................................................... lapd: Replace magic numbers with #defines Related: OS#4644 Change-Id: I2971fb5bb27a7024abac7e2a4414eaf61f27ccb5 --- M src/input/lapd.c 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/25/19125/1 diff --git a/src/input/lapd.c b/src/input/lapd.c index 4bcece5..9bab5a9 100644 --- a/src/input/lapd.c +++ b/src/input/lapd.c @@ -82,6 +82,9 @@ #define LOGSAP(sap, level, fmt, args ...) \ LOGP(DLLAPD, level, "%s: " fmt, (sap)->dl.name, ## args) +#define DLSAP_MSGB_SIZE 56 +#define DLSAP_MSGB_HEADROOM 56 + const struct lapd_profile lapd_profile_isdn = { .k = LAPD_SET_K(7,7), .n200 = 3, @@ -349,7 +352,7 @@ /* Send ACCEPT */ memmove(resp, "\xfe\xff\x03\x0f\x00\x00\x02\x00", 8); resp[7] = (action << 1) | 1; - msg = msgb_alloc_headroom(56, 56, "DL EST"); + msg = msgb_alloc_headroom(DLSAP_MSGB_SIZE, DLSAP_MSGB_HEADROOM, "DL EST"); msg->l2h = msgb_push(msg, 8); memcpy(msg->l2h, resp, 8); @@ -521,7 +524,7 @@ LOGSAP(sap, LOGL_NOTICE, "LAPD DL-ESTABLISH request TEI=%d SAPI=%d\n", tei, sapi); /* prepare prim */ - msg = msgb_alloc_headroom(56, 56, "DL EST"); + msg = msgb_alloc_headroom(DLSAP_MSGB_SIZE, DLSAP_MSGB_HEADROOM, "DL EST"); msg->l3h = msg->data; osmo_prim_init(&dp.oph, 0, PRIM_DL_EST, PRIM_OP_REQUEST, msg); @@ -548,7 +551,7 @@ LOGSAP(sap, LOGL_NOTICE, "LAPD DL-RELEASE request TEI=%d SAPI=%d\n", tei, sapi); /* prepare prim */ - msg = msgb_alloc_headroom(56, 56, "DL REL"); + msg = msgb_alloc_headroom(DLSAP_MSGB_SIZE, DLSAP_MSGB_HEADROOM, "DL REL"); msg->l3h = msg->data; osmo_prim_init(&dp.oph, 0, PRIM_DL_REL, PRIM_OP_REQUEST, msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I2971fb5bb27a7024abac7e2a4414eaf61f27ccb5 Gerrit-Change-Number: 19125 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 17:10:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jul 2020 17:10:09 +0000 Subject: Change in libosmo-abis[master]: input/lapd.c: Enlarge message buffers for DL-SAP primitives References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19126 ) Change subject: input/lapd.c: Enlarge message buffers for DL-SAP primitives ...................................................................... input/lapd.c: Enlarge message buffers for DL-SAP primitives The DL-SAP primitive msgbs are currently allocated to only have headroom but no tailroom. Let's change that Change-Id: Ia476c8a2f70e6579be53230427923885a573f801 Related: OS#4644 --- M src/input/lapd.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/26/19126/1 diff --git a/src/input/lapd.c b/src/input/lapd.c index 9bab5a9..5c0a6b6 100644 --- a/src/input/lapd.c +++ b/src/input/lapd.c @@ -82,7 +82,7 @@ #define LOGSAP(sap, level, fmt, args ...) \ LOGP(DLLAPD, level, "%s: " fmt, (sap)->dl.name, ## args) -#define DLSAP_MSGB_SIZE 56 +#define DLSAP_MSGB_SIZE 128 #define DLSAP_MSGB_HEADROOM 56 const struct lapd_profile lapd_profile_isdn = { -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ia476c8a2f70e6579be53230427923885a573f801 Gerrit-Change-Number: 19126 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 17:10:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jul 2020 17:10:10 +0000 Subject: Change in libosmo-abis[master]: input/dahdi.c: Don't simply read beyond end of msgb References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19127 ) Change subject: input/dahdi.c: Don't simply read beyond end of msgb ...................................................................... input/dahdi.c: Don't simply read beyond end of msgb Let's first add two bytes to the msgb before writing. This way we would assert in case there was no tailroom. As we just added tailroom in the previous patch of this series, we are fine Change-Id: If84b31ea9a3fc7a6c8768918efed2822d1d58427 Closes: OS#4644 --- M src/input/dahdi.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/27/19127/1 diff --git a/src/input/dahdi.c b/src/input/dahdi.c index a461f27..fa16e11 100644 --- a/src/input/dahdi.c +++ b/src/input/dahdi.c @@ -224,7 +224,10 @@ struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; int ret; - ret = write(bfd->fd, msg->data, msg->len + 2); + /* two bytes of space for the FCS added by DAHDI in the kernel */ + msgb_put(msg, 2); + + ret = write(bfd->fd, msg->data, msg->len); msgb_free(msg); if (ret == -1) handle_dahdi_exception(e1i_ts); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If84b31ea9a3fc7a6c8768918efed2822d1d58427 Gerrit-Change-Number: 19127 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 17:26:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jul 2020 17:26:52 +0000 Subject: Change in libosmo-abis[master]: input/dahdi.c: Don't simply read beyond end of msgb In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/19127 to look at the new patch set (#2). Change subject: input/dahdi.c: Don't simply read beyond end of msgb ...................................................................... input/dahdi.c: Don't simply read beyond end of msgb Let's first add two bytes to the msgb before writing. This way we would assert in case there was no tailroom. As we just added tailroom in the previous patch of this series, we are fine Change-Id: If84b31ea9a3fc7a6c8768918efed2822d1d58427 Closes: OS#4644 --- M src/input/dahdi.c 1 file changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/27/19127/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If84b31ea9a3fc7a6c8768918efed2822d1d58427 Gerrit-Change-Number: 19127 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 17:31:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jul 2020 17:31:00 +0000 Subject: Change in libosmocore[master]: lapd_core: Ensure we always have some tailroom References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19128 ) Change subject: lapd_core: Ensure we always have some tailroom ...................................................................... lapd_core: Ensure we always have some tailroom At some points, e.g. when allocating message buffers from the Tx history, we used to allocate them exactly as large as the defined headroom plus the user data. This means that the underlying PH layer (E1 mostly) had no tailroom to add anything to the end of the message. Especially for DAHDI this is a problem, as we need to make space for two more bytes of frame check sequence (FCS). So let's simply make sure we always have some extra space at the end of such buffers. Change-Id: Id362ce131157c7513d744b0248c7f78fb75c590c Related: OS#4644 --- M src/gsm/lapd_core.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/28/19128/1 diff --git a/src/gsm/lapd_core.c b/src/gsm/lapd_core.c index c77b663..cf25f3d 100644 --- a/src/gsm/lapd_core.c +++ b/src/gsm/lapd_core.c @@ -104,6 +104,7 @@ #define CR_NET2USER_RESP 0 #define LAPD_HEADROOM 56 +#define LAPD_TAILROOM 16 #define SBIT(a) (1 << a) #define ALL_STATES 0xffffffff @@ -120,7 +121,7 @@ /* adding space for padding, FIXME: add as an option */ if (length < 21) length = 21; - return msgb_alloc_headroom(length + LAPD_HEADROOM, LAPD_HEADROOM, name); + return msgb_alloc_headroom(length + LAPD_HEADROOM + LAPD_TAILROOM, LAPD_HEADROOM, name); } static inline uint8_t do_mod(uint8_t x, uint8_t m) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id362ce131157c7513d744b0248c7f78fb75c590c Gerrit-Change-Number: 19128 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 17:32:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jul 2020 17:32:32 +0000 Subject: Change in libosmo-abis[master]: lapd: Replace magic numbers with #defines In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19125 ) Change subject: lapd: Replace magic numbers with #defines ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I2971fb5bb27a7024abac7e2a4414eaf61f27ccb5 Gerrit-Change-Number: 19125 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jul 2020 17:32:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 17:32:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jul 2020 17:32:39 +0000 Subject: Change in libosmo-abis[master]: input/lapd.c: Enlarge message buffers for DL-SAP primitives In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19126 ) Change subject: input/lapd.c: Enlarge message buffers for DL-SAP primitives ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ia476c8a2f70e6579be53230427923885a573f801 Gerrit-Change-Number: 19126 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jul 2020 17:32:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 17:32:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jul 2020 17:32:46 +0000 Subject: Change in libosmo-abis[master]: lapd: Replace magic numbers with #defines In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19125 ) Change subject: lapd: Replace magic numbers with #defines ...................................................................... lapd: Replace magic numbers with #defines Related: OS#4644 Change-Id: I2971fb5bb27a7024abac7e2a4414eaf61f27ccb5 --- M src/input/lapd.c 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/input/lapd.c b/src/input/lapd.c index 4bcece5..9bab5a9 100644 --- a/src/input/lapd.c +++ b/src/input/lapd.c @@ -82,6 +82,9 @@ #define LOGSAP(sap, level, fmt, args ...) \ LOGP(DLLAPD, level, "%s: " fmt, (sap)->dl.name, ## args) +#define DLSAP_MSGB_SIZE 56 +#define DLSAP_MSGB_HEADROOM 56 + const struct lapd_profile lapd_profile_isdn = { .k = LAPD_SET_K(7,7), .n200 = 3, @@ -349,7 +352,7 @@ /* Send ACCEPT */ memmove(resp, "\xfe\xff\x03\x0f\x00\x00\x02\x00", 8); resp[7] = (action << 1) | 1; - msg = msgb_alloc_headroom(56, 56, "DL EST"); + msg = msgb_alloc_headroom(DLSAP_MSGB_SIZE, DLSAP_MSGB_HEADROOM, "DL EST"); msg->l2h = msgb_push(msg, 8); memcpy(msg->l2h, resp, 8); @@ -521,7 +524,7 @@ LOGSAP(sap, LOGL_NOTICE, "LAPD DL-ESTABLISH request TEI=%d SAPI=%d\n", tei, sapi); /* prepare prim */ - msg = msgb_alloc_headroom(56, 56, "DL EST"); + msg = msgb_alloc_headroom(DLSAP_MSGB_SIZE, DLSAP_MSGB_HEADROOM, "DL EST"); msg->l3h = msg->data; osmo_prim_init(&dp.oph, 0, PRIM_DL_EST, PRIM_OP_REQUEST, msg); @@ -548,7 +551,7 @@ LOGSAP(sap, LOGL_NOTICE, "LAPD DL-RELEASE request TEI=%d SAPI=%d\n", tei, sapi); /* prepare prim */ - msg = msgb_alloc_headroom(56, 56, "DL REL"); + msg = msgb_alloc_headroom(DLSAP_MSGB_SIZE, DLSAP_MSGB_HEADROOM, "DL REL"); msg->l3h = msg->data; osmo_prim_init(&dp.oph, 0, PRIM_DL_REL, PRIM_OP_REQUEST, msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I2971fb5bb27a7024abac7e2a4414eaf61f27ccb5 Gerrit-Change-Number: 19125 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 17:32:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jul 2020 17:32:46 +0000 Subject: Change in libosmo-abis[master]: input/lapd.c: Enlarge message buffers for DL-SAP primitives In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19126 ) Change subject: input/lapd.c: Enlarge message buffers for DL-SAP primitives ...................................................................... input/lapd.c: Enlarge message buffers for DL-SAP primitives The DL-SAP primitive msgbs are currently allocated to only have headroom but no tailroom. Let's change that Change-Id: Ia476c8a2f70e6579be53230427923885a573f801 Related: OS#4644 --- M src/input/lapd.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/input/lapd.c b/src/input/lapd.c index 9bab5a9..5c0a6b6 100644 --- a/src/input/lapd.c +++ b/src/input/lapd.c @@ -82,7 +82,7 @@ #define LOGSAP(sap, level, fmt, args ...) \ LOGP(DLLAPD, level, "%s: " fmt, (sap)->dl.name, ## args) -#define DLSAP_MSGB_SIZE 56 +#define DLSAP_MSGB_SIZE 128 #define DLSAP_MSGB_HEADROOM 56 const struct lapd_profile lapd_profile_isdn = { -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ia476c8a2f70e6579be53230427923885a573f801 Gerrit-Change-Number: 19126 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 18:23:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jul 2020 18:23:07 +0000 Subject: Change in libosmocore[master]: vty/ports.h: Add VTY port for osmo-e1d In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19038 ) Change subject: vty/ports.h: Add VTY port for osmo-e1d ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia19b870146334b4ab749f12dc87fb628c1cdcca9 Gerrit-Change-Number: 19038 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jul 2020 18:23:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 18:23:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jul 2020 18:23:13 +0000 Subject: Change in libosmocore[master]: vty/ports.h: Add VTY port for osmo-e1d In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19038 ) Change subject: vty/ports.h: Add VTY port for osmo-e1d ...................................................................... vty/ports.h: Add VTY port for osmo-e1d Change-Id: Ia19b870146334b4ab749f12dc87fb628c1cdcca9 --- M include/osmocom/vty/ports.h 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/vty/ports.h b/include/osmocom/vty/ports.h index 56f7307..cda6a55 100644 --- a/include/osmocom/vty/ports.h +++ b/include/osmocom/vty/ports.h @@ -35,4 +35,5 @@ /* 4262-4263 used by control interface */ #define OSMO_VTY_PORT_CBC 4264 #define OSMO_VTY_PORT_UECUPS 4268 +#define OSMO_VTY_PORT_E1D 4269 /* When adding/changing port numbers, keep docs and wiki in sync. See above. */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia19b870146334b4ab749f12dc87fb628c1cdcca9 Gerrit-Change-Number: 19038 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 18:24:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 3 Jul 2020 18:24:10 +0000 Subject: Change in libosmo-abis[master]: move flip_buf_bits() from DAHDI to a shared flip.c In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19070 ) Change subject: move flip_buf_bits() from DAHDI to a shared flip.c ...................................................................... Patch Set 4: 19:19 < tnt> LaF0rge: can't we just replace flip_buf_bits by osmo_revbytebits_buf() from libosmocore ? 20:07 <@LaF0rge> tnt: ah, we probably can, thanks 20:09 <@LaF0rge> tnt: the look-up table approach might be much faster, but it's worth benchmarking ;) 20:10 <@LaF0rge> I'm actually curious 20:10 < tnt> if its is, then it might be worth doing in libosmocore :p 20:10 <@LaF0rge> tnt: obviously 20:11 < tnt> I know there is even vectorized instructions now for parallel LUT lookup. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I8c6dc3eea921a73ebe65540aad0f0c0584d47e5a Gerrit-Change-Number: 19070 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 03 Jul 2020 18:24:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 22:40:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 3 Jul 2020 22:40:52 +0000 Subject: Change in osmo-bts[master]: Move struct gsm_bts_trx: gsm_data.* & bts.* => trx.* In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19124 ) Change subject: Move struct gsm_bts_trx: gsm_data.* & bts.* => trx.* ...................................................................... Patch Set 1: > Patch Set 1: > > Not sure if we really want to fragment the code/headers further... What's next, ts.h? lchan.h? I am fine with having everything here, in 'gsm_data.h', but if you really need this split up for the upcoming features, I can add CR+1. For now I am not convinced, sorry. Yes, next is lchan.h and timeslot.h We already have similar stuff in osmo-bsc and we actually have already an lchan.c with some functions defined in gsm_data.h in this same repository. Code is growing in size over time and if we don't organize this we are adding stuff in random places with no logic and it's already a mess, it will become even worse over time. I really want to clean up as much of possible out of gsm_data.{c,h}, since I think it disturbs more than helps in maintenance of code. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iebaf5b221c48b571f45408af867ce6f9c0cd9f4a Gerrit-Change-Number: 19124 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 03 Jul 2020 22:40:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 23:11:20 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 3 Jul 2020 23:11:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: verify System Information presence on RSL startup In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 ) Change subject: bsc: verify System Information presence on RSL startup ...................................................................... Patch Set 3: (1 comment) > I think what is needed here is to play via VTY with the relevant settings impacting presence and content of the respective SI + verification of that content (+changes). This patch is the first step of SI verification, this first only verifies the presence or absence of data. In the next patch after this, I want to add verification of the SI2quater content. We can add other detailed SI content later. Verifying all SI content would take way more time than the ticket I'm aiming for now, which is about SI2quater alone. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062/2/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062/2/bsc/BSC_Tests.ttcn at 640 PS2, Line 640: deactivate > Maybe we need a timer here? Looks like a potential race condition to me... I'm not familiar with the details of SI during OML/RSL startup, all I know is that I see all the SI in wireshark during the startup phase of each ttcn test, and naively assumed that f_wait_oml(connected) would be sufficient to have seen all SI that the BSC is going to send. So far that worked out well... what would be the proper (TM) way to do this? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 03 Jul 2020 23:11:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 23:12:44 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 3 Jul 2020 23:12:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RestOctets: initial SI2quater Rest Octets definition In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19082 ) Change subject: library/GSM_RestOctets: initial SI2quater Rest Octets definition ...................................................................... library/GSM_RestOctets: initial SI2quater Rest Octets definition This is a very minimalistic (incomplete) implementation of SI2quater Rest Octets as per 3GPP TS 44.018, table 10.5.2.33b.1. Should be enough to decode some of the E-UTRAN specific parameters though. Some BITn fields might need to be replaced with more specific enumerated or integer types. Beware [1], the bit ordering rules are different for integer and bitstring (sub-)types if a field ends up on boundary of the two octets! [1] https://bugs.eclipse.org/bugs/show_bug.cgi?id=562488 Change-Id: I6a12c9ee12f8df8b4fc0976dd593152dc1195718 Related: SYS#4870 --- M library/GSM_RestOctets.ttcn 1 file changed, 505 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn index 531528c..3bc9349 100644 --- a/library/GSM_RestOctets.ttcn +++ b/library/GSM_RestOctets.ttcn @@ -1,6 +1,7 @@ /** * GSM Rest Octets definitions as per 3GPP TS 44.018. * + * (C) 2020 by sysmocom s.f.m.c. GmbH * (C) 2020 Vadim Yanitskiy * All rights reserved. * @@ -15,6 +16,504 @@ import from General_Types all; import from Osmocom_Types all; +/* 10.5.2.33b SI 2quater Rest Octets */ +type record SI2quaterRestOctets { + BIT1 ba_ind, + BIT1 ba_3g_ind, + BIT1 mp_change_mark, + uint4_t si2quater_index, + uint4_t si2quater_count, + + /* Measurement Parameters Description */ + MeasParamsDescOpt meas_params_desc, + /* GPRS specific parameters */ + record { + GPRS_RealTimeDiffDescOpt rt_diff_desc, + GPRS_BSICDescOpt bsic_desc, + GPRS_ReportPrioDescOpt rep_prio_desc, + MeasParamsDescOpt meas_params_desc + } gprs, + /* NC Measurement Parameters Description */ + NCMeasParamsOpt nc_meas_params, + /* SI2quater Extension Information */ + SI2quaterExtInfoOpt ext_info, + + /* 3G Neighbour Cell Description */ + UTRAN_NeighDescOpt utran_neigh_desc, + /* 3G Measurement Parameters Description */ + UTRAN_MeasParamsDescOpt utran_meas_params_desc, + /* GPRS 3G Measurement Parameters Description */ + UTRAN_GPRSMeasParamsDescOpt utran_gprs_meas_params_desc, + + /* SI2quater Rel-{5,6,7,8,9,10} Additions (Matrioshka!) */ + SI2quaterAdditions rel_additions +} with { + /* The TITAN's RAW encoder generates an octet-aligned octetstring, + * so we should make sure that unused bits contain proper padding. */ + variant "PADDING(yes), PADDING_PATTERN('00101011'B)" +}; + +/* Measurement Parameters Description */ +private type record MeasParamsDescOpt { + BIT1 presence, // 0/1 + MeasParamsDesc desc optional +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + +private type record MeasParamsDesc { + BIT1 report_type, + BIT2 serving_band_reporting +} with { variant "" }; + +/* GPRS Real Time Difference Description (not implemented) */ +private type record GPRS_RealTimeDiffDescOpt { + BIT1 presence ('0'B), // 0/1 + bitstring desc optional // TODO +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + +/* GPRS BSIC Description (not implemented) */ +private type record GPRS_BSICDescOpt { + BIT1 presence ('0'B), // 0/1 + bitstring desc optional // TODO +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + +/* GPRS Report Priority Description (not implemented) */ +private type record GPRS_ReportPrioDescOpt { + BIT1 presence ('0'B), // 0/1 + bitstring desc optional // TODO +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + +/* NC (Network Controlled?) Measurement Parameters */ +private type record NCMeasParams { + /* Network Control Order */ + BIT2 nco, + BIT1 p_presence, + NCMeasPeriods p optional +} with { + variant (p) "PRESENCE(p_presence = '1'B)" +}; + +/* NC Measurement Periods */ +private type record NCMeasParamsOpt { + BIT1 presence, // 0/1 + NCMeasParams params optional +} with { + variant (params) "PRESENCE(presence = '1'B)" +}; + +private type record NCMeasPeriods { + BIT3 non_drx_period, + BIT3 rep_period_i, + BIT3 rep_period_t +} with { variant "" }; + +/* SI2quater Extersion Information */ +private type record SI2quaterExtInfoOpt { + BIT1 presence, // 0/1 + SI2quaterExtInfo info optional +} with { + variant (info) "PRESENCE(presence = '1'B)" +}; + +private type record SI2quaterExtInfo { + uint8_t len, + CCNSupportDescOpt ccn_supp_desc optional, + bitstring padding /* Octet alignment? */ +} with { + variant (len) "LENGTHTO(ccn_supp_desc,padding) + 1" + variant (len) "UNIT(bits)" +}; + +/* CCN Support Description */ +private type record CCNSupportDescOpt { + BIT1 presence, // 0/1 + CCNSupportDesc desc optional +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + +private type record CCNSupportDesc { + uint7_t nr_of_cells, + bitstring ccn_supported +} with { + variant (nr_of_cells) "LENGTHTO(ccn_supported)" + variant (nr_of_cells) "UNIT(bits)" +}; + +/* 3G Neighbour Cell Description */ +private type record UTRAN_NeighDescOpt { + BIT1 presence, // 0/1 + UTRAN_NeighDesc desc optional +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + +private type record UTRAN_NeighDesc { + BIT1 idx_start_3g_presence, + uint7_t idx_start_3g optional, + BIT1 abs_idx_start_emr_presence, + uint7_t abs_idx_start_emr optional, + UTRAN_FDDDescOpt fdd_desc, + UTRAN_TDDDescOpt tdd_desc +} with { + variant (idx_start_3g) "PRESENCE(idx_start_3g_presence = '1'B)" + variant (abs_idx_start_emr) "PRESENCE(abs_idx_start_emr_presence = '1'B)" +}; + +/* UTRAN (3G) FDD/TDD Description (not implementaed). + * + * TODO: Repeated UTRAN FDD/TDD Neighbour Cells structure contains a variable length + * field, that needs to be computed using tables (see 9.1.54.1a and 9.1.54.1b) with + * magic numbers. This cannot be described uing TITAN's RAW codec attributes. */ +private type record UTRAN_FDDDescOpt { + BIT1 presence ('0'B), // 0/1 + bitstring desc optional // TODO +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + +private type record UTRAN_TDDDescOpt { + BIT1 presence ('0'B), // 0/1 + bitstring desc optional // TODO +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + +/* 3G Measurement Parameters Description (not implemented) */ +private type record UTRAN_MeasParamsDescOpt { + BIT1 presence ('0'B), // 0/1 + bitstring desc optional // TODO +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + +/* GPRS 3G Measurement Parameters Description (not implemented) */ +private type record UTRAN_GPRSMeasParamsDescOpt { + BIT1 presence ('0'B), // 0/1 + bitstring desc optional // TODO +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + +/* SI2quater Rel-{5,6,7,8,9,10} Additions */ +private type record SI2quaterAdditions { + BIT1 rel5_presence, // L/H + SI2quaterR5Additions rel5 optional +} with { + variant (rel5_presence) "CSN.1 L/H" + variant (rel5) "PRESENCE(rel5_presence = '1'B)" +}; + +/* SI2quater Rel-5 and Rel-{6,7,8,9,10} Additions */ +private type record SI2quaterR5Additions { + UMTS_AddMeasParamsDescOpt umts_add_meas_params_desc, + UMTS_AddMeasParamsDesc2Opt umts_add_meas_params_desc2, + BIT1 rel6_presence, // L/H + SI2quaterR6Additions rel6 optional +} with { + variant (rel6_presence) "CSN.1 L/H" + variant (rel6) "PRESENCE(rel6_presence = '1'B)" +}; + +/* 3G Additional Measurement Parameters Description */ +private type record UMTS_AddMeasParamsDescOpt { + BIT1 presence, // 0/1 + UMTS_AddMeasParamsDesc desc optional +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + +private type record UMTS_AddMeasParamsDesc { + BIT3 fdd_qmin_offset, + BIT4 fdd_rscpmin +} with { variant "" }; + +/* 3G Additional Measurement Parameters Description 2 */ +private type record UMTS_AddMeasParamsDesc2Opt { + BIT1 presence, // 0/1 + UMTS_AddMeasParamsDesc desc optional +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + +private type record UMTS_AddMeasParamsDesc2 { + /* FDD Reporting Threshold 2 */ + BIT1 presence, // 0/1 + uint6_t threshold optional +} with { + variant (threshold) "PRESENCE(presence = '1'B)" +}; + +/* SI2quater Rel-6 and Rel-{7,8,9,10} Additions */ +private type record SI2quaterR6Additions { + BIT1 umts_ccn_active, + BIT1 rel7_presence, // L/H + SI2quaterR7Additions rel7 optional +} with { + variant (rel7_presence) "CSN.1 L/H" + variant (rel7) "PRESENCE(rel7_presence = '1'B)" +}; + +/* SI2quater Rel-7 and Rel-{8,9,10} Additions */ +private type record SI2quaterR7Additions { + Rel7RepOffseThresholdOpt rep700, + Rel7RepOffseThresholdOpt rep810, + BIT1 rel8_presence, // L/H + SI2quaterR8Additions rel8 optional +} with { + variant (rel8_presence) "CSN.1 L/H" + variant (rel8) "PRESENCE(rel8_presence = '1'B)" +}; + +/* Additions in Rel-7: Reporting Offset & Threshold */ +private type record Rel7RepOffseThresholdOpt { + BIT1 presence, // 0/1 + Rel7RepOffseThreshold val optional +} with { + variant (val) "PRESENCE(presence = '1'B)" +}; + +private type record Rel7RepOffseThreshold { + BIT3 offset, + BIT3 threshold +} with { variant "" }; + +/* SI2quater Rel-8 and Rel-{9,10} Additions */ +private type record SI2quaterR8Additions { + Rel8PrioEUTRANParamsDescOpt prio_eutran_params_desc, + Rel8UTRANCSGDescOpt utran_csg_desc, + Rel8EUTRANCSGDescOpt eutran_csg_desc + // TODO: Rel9 Additions (not implemented) +} with { variant "" }; + +/* Additions in Rel-8: Priority and E-UTRAN Parameters Description */ +private type record Rel8PrioEUTRANParamsDescOpt { + BIT1 presence, // 0/1 + Rel8PrioEUTRANParamsDesc desc optional +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + +private type record Rel8PrioEUTRANParamsDesc { + ServingCellPrioParamsDescOpt sc_prio_params_desc, + UTRAN_PrioParamsDescOpt utran_prio_params_desc, + EUTRAN_ParamsDescOpt eutran_params_desc +} with { variant "" }; + +/* Serving Cell Priority Parameters Description */ +private type record ServingCellPrioParamsDescOpt { + BIT1 presence, // 0/1 + ServingCellPrioParamsDesc desc optional +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + +private type record ServingCellPrioParamsDesc { + uint3_t geran_priority, + uint4_t thresh_priority_search, + uint4_t thresh_gsm_low, + uint2_t h_prio, + uint2_t t_reselection +} with { variant "" }; + +/* 3G Priority Parameters Description (not implemented) */ +private type record UTRAN_PrioParamsDescOpt { + BIT1 presence, // 0/1 + bitstring desc optional // TODO +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + +/* E-UTRAN Parameters Description */ +private type record EUTRAN_ParamsDescOpt { + BIT1 presence, // 0/1 + EUTRAN_ParamsDesc desc optional +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + +private type record EUTRAN_ParamsDesc { + BIT1 ccn_active, + BIT1 e_start, + BIT1 e_stop, + + /* E-UTRAN Measurement Parameters Description */ + EUTRAN_MeasParamsDescOpt meas_params_desc, + /* GPRS E-UTRAN Measurement Parameters Description */ + EUTRAN_GPRSMeasParamsDescOpt gprs_meas_params_desc, + + /* { 1 < Repeated E-UTRAN Neighbour Cells > } ** 0 */ + EUTRAN_NeighbourCells neigh_cell_list optional, + BIT1 neigh_cell_list_term ('0'B), + /* { 1 < Repeated E-UTRAN Not Allowed Cells > } ** 0 */ + EUTRAN_NotAllowedCells not_allowed_cell_list optional, + BIT1 not_allowed_cell_list_term ('0'B), + /* { 1 < Repeated E-UTRAN PCID to TA mapping > } ** 0 */ + EUTRAN_PCID2TAMaps pcid2ta_map_list optional, + BIT1 pcid2ta_map_list_term ('0'B) +} with { variant "" }; + +/* E-UTRAN Measurement Parameters Description (not implemented) */ +private type record EUTRAN_MeasParamsDescOpt { + BIT1 presence, // 0/1 + bitstring desc optional // TODO +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + +/* GPRS E-UTRAN Measurement Parameters Description (not implemented) */ +private type record EUTRAN_GPRSMeasParamsDescOpt { + BIT1 presence, // 0/1 + bitstring desc optional // TODO +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + +/* Repeated E-UTRAN Neighbour Cell List */ +private type record of EUTRAN_NeighbourCell EUTRAN_NeighbourCells; +private type record EUTRAN_NeighbourCell { + BIT1 item_ind ('1'B), + /* { 1 < Repeated E-UTRAN Neighbour Cells > } ** 0 */ + EUTRAN_CellDescs cell_desc_list optional, + BIT1 cell_desc_list_term ('0'B), + BIT1 prio_presence, // 0/1 + uint3_t prio optional, + uint5_t thresh_high, + BIT1 thresh_low_presence, // 0/1 + uint5_t thresh_low optional, + BIT1 qrxlevmin_presence, // 0/1 + uint5_t qrxlevmin optional +} with { + variant "PRESENCE(item_ind = '1'B)" + variant (prio) "PRESENCE(prio_presence = '1'B)" + variant (thresh_low) "PRESENCE(thresh_low_presence = '1'B)" + variant (qrxlevmin) "PRESENCE(qrxlevmin_presence = '1'B)" +}; + +/* Repeated E-UTRAN Cell Description (E-ARFCN & Measurement Bandwidth) List */ +private type record of EUTRAN_CellDesc EUTRAN_CellDescs; +private type record EUTRAN_CellDesc { + BIT1 item_ind ('1'B), + uint16_t e_arfcn, + BIT1 meas_bw_presence, // 0/1 + uint3_t meas_bw optional +} with { + variant "PRESENCE(item_ind = '1'B)" + variant (meas_bw) "PRESENCE(meas_bw_presence = '1'B)" +}; + +/* Repeated E-UTRAN Not Allowed Cell List */ +private type record of EUTRAN_NotAllowedCell EUTRAN_NotAllowedCells; +private type record EUTRAN_NotAllowedCell { + BIT1 item_ind ('1'B), + /* FIXME: Not Allowed Cells : < PCID Group IE > (not implemented) */ + BIT1 pcid_group_presence ('0'B), + /* { 1 < Repeated E-UTRAN_FREQUENCY_INDEX > } ** 0 */ + EUTRAN_FreqIndexes freq_idx_list optional, + BIT1 freq_idx_list_term ('0'B) +} with { + variant "PRESENCE(item_ind = '1'B)" +}; + +/* Repeated E-UTRAN PCID to TA mapping List */ +private type record of EUTRAN_PCID2TAMap EUTRAN_PCID2TAMaps; +private type record EUTRAN_PCID2TAMap { + BIT1 item_ind ('1'B), + /* FIXME: PCID to TA mapping : < PCID Group IE > (not implemented) */ + BIT1 pcid_group_presence ('0'B), + /* { 1 < Repeated E-UTRAN_FREQUENCY_INDEX > } ** 0 */ + EUTRAN_FreqIndexes freq_idx_list optional, + BIT1 freq_idx_list_term ('0'B) +} with { + variant "PRESENCE(item_ind = '1'B)" +}; + +/* Repeated E-UTRAN Frequency Index List */ +private type record of EUTRAN_FreqIndex EUTRAN_FreqIndexes; +private type record EUTRAN_FreqIndex { + BIT1 item_ind ('1'B), + uint3_t idx +} with { + variant "PRESENCE(item_ind = '1'B)" +}; + +/* Additions in Rel-8: 3G CSG Description (not implemented) */ +private type record Rel8UTRANCSGDescOpt { + BIT1 presence, // 0/1 + bitstring desc optional // TODO +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + +/* Additions in Rel-8: E-UTRAN CSG Description (not implemented) */ +private type record Rel8EUTRANCSGDescOpt { + BIT1 presence, // 0/1 + bitstring desc optional // TODO +} with { + variant (desc) "PRESENCE(presence = '1'B)" +}; + + +/* Basic any-/omit-matching templates. To be inherited by other templates (see below). + * The point is that you cannot fit everything into 20 octets, so usually several kinds + * of SI2quater are being sub-multiplexed by the BTS. This is achieved using both + * 'si2quater_index' and 'si2quater_count' fields. */ +template SI2quaterRestOctets tra_SI2quaterRestOctets_base := { + ba_ind := ?, + ba_3g_ind := ?, + mp_change_mark := ?, + si2quater_index := ?, + si2quater_count := ?, + + meas_params_desc := { presence := ?, desc := * }, + gprs := { + rt_diff_desc := { presence := ?, desc := * }, + bsic_desc := { presence := ?, desc := * }, + rep_prio_desc := { presence := ?, desc := * }, + meas_params_desc := { presence := ?, desc := * } + }, + nc_meas_params := { presence := ?, params := * }, + ext_info := { presence := ?, info := * }, + + utran_neigh_desc := { presence := ?, desc := * }, + utran_meas_params_desc := { presence := ?, desc := * }, + utran_gprs_meas_params_desc := { presence := ?, desc := * }, + + rel_additions := ? +}; + +template SI2quaterRestOctets tro_SI2quaterRestOctets_base := { + ba_ind := ?, + ba_3g_ind := ?, + mp_change_mark := ?, + si2quater_index := ?, + si2quater_count := ?, + + meas_params_desc := { presence := '0'B, desc := omit }, + gprs := { + rt_diff_desc := { presence := '0'B, desc := omit }, + bsic_desc := { presence := '0'B, desc := omit }, + rep_prio_desc := { presence := '0'B, desc := omit }, + meas_params_desc := { presence := '0'B, desc := omit } + }, + nc_meas_params := { presence := '0'B, params := omit }, + ext_info := { presence := '0'B, info := omit }, + + utran_neigh_desc := { presence := '0'B, desc := omit }, + utran_meas_params_desc := { presence := '0'B, desc := omit }, + utran_gprs_meas_params_desc := { presence := '0'B, desc := omit }, + + rel_additions := { rel5_presence := CSN1_L, rel5 := omit } +}; + + /* 10.5.2.34 SI 3 Rest Octets */ type record SI3RestOctets { SelectionParamsOpt sel_params, @@ -131,6 +630,12 @@ variant (pos) "PRESENCE(presence = '1'B)" }; + +external function enc_SI2quaterRestOctets(in SI2quaterRestOctets ro) return octetstring + with { extension "prototype(convert) encode(RAW)" }; +external function dec_SI2quaterRestOctets(in octetstring stream) return SI2quaterRestOctets + with { extension "prototype(convert) decode(RAW)" }; + external function enc_SI3RestOctets(in SI3RestOctets ro) return octetstring with { extension "prototype(convert) encode(RAW)" }; external function dec_SI3RestOctets(in octetstring stream) return SI3RestOctets -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a12c9ee12f8df8b4fc0976dd593152dc1195718 Gerrit-Change-Number: 19082 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 23:22:06 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 3 Jul 2020 23:22:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: verify System Information presence on RSL startup In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 ) Change subject: bsc: verify System Information presence on RSL startup ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062/2/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062/2/bsc/BSC_Tests.ttcn at 91 PS2, Line 91: type > This type and its sub-types should be private unless you want to use it/them from other modules. Does it make any difference if no other module imports BSC_Tests.ttcn? seems to me there would have to be loads of 'private' added in many places if we paid attention to this... -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 03 Jul 2020 23:22:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 23:28:17 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 3 Jul 2020 23:28:17 +0000 Subject: Change in osmo-msc[master]: refactor: move RESET Osmux TLV parsing to ran_msg_a.c In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19024 ) Change subject: refactor: move RESET Osmux TLV parsing to ran_msg_a.c ...................................................................... Patch Set 4: Code-Review+2 (1 comment) combining +2, open CR will be addressed in separate patch https://gerrit.osmocom.org/c/osmo-msc/+/19024/4/src/libmsc/ran_peer.c File src/libmsc/ran_peer.c: https://gerrit.osmocom.org/c/osmo-msc/+/19024/4/src/libmsc/ran_peer.c at 213 PS4, Line 213: ran_peer_update_osmux_support(rp, supports_osmux); > BY moving call to this function here you are also calling it even if rc return error, which is a bit [?] the rc is actually of enum reset_msg_type, it has no error codes, only enum reset_msg_type { SCCP_RAN_MSG_NON_RESET = 0, SCCP_RAN_MSG_RESET, SCCP_RAN_MSG_RESET_ACK, }; i notice now that this shouldn't be an int at all. will fix in a separate patch Assuming there were an error code returned, then supports_osmux should also always be returned as 0 ( = "no osmux indication") -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1ad4a3f9356216dd4bf8c48fba29fd23438810a7 Gerrit-Change-Number: 19024 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jul 2020 23:28:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 23:29:31 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 3 Jul 2020 23:29:31 +0000 Subject: Change in osmo-msc[master]: refactor: move RESET Osmux TLV parsing to ran_msg_a.c In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19024 ) Change subject: refactor: move RESET Osmux TLV parsing to ran_msg_a.c ...................................................................... refactor: move RESET Osmux TLV parsing to ran_msg_a.c ran_peer.c is not the proper place to parse messages, because it should be RAN agnostic. All parsing and encoding belongs in ran_msg_a.c and ran_msg_iu.c. Move the Osmux TLV parsing into the is_reset_msg op: add supports_osmux out-parameter (and add a logging fi pointer). To be able to modify msg->l3h, also make the msgb arg non-const. In ranap_is_reset_msg(), always return non-support for Osmux. In bssmap_is_reset_msg(), return 0 if no TLVs were parsed, 1/-1 if an Osmux TLV was present/not present. Update the osmux support flag directly where the ConnectionLess message is received, so that there is only one place responsible for that. Related: OS#4595 Change-Id: I1ad4a3f9356216dd4bf8c48fba29fd23438810a7 --- M include/osmocom/msc/ran_msg_a.h M include/osmocom/msc/ran_msg_iu.h M include/osmocom/msc/sccp_ran.h M src/libmsc/ran_msg_a.c M src/libmsc/ran_msg_iu.c M src/libmsc/ran_peer.c 6 files changed, 60 insertions(+), 26 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/include/osmocom/msc/ran_msg_a.h b/include/osmocom/msc/ran_msg_a.h index 3ba081d..2d045b9 100644 --- a/include/osmocom/msc/ran_msg_a.h +++ b/include/osmocom/msc/ran_msg_a.h @@ -35,7 +35,8 @@ int ran_a_decode_l2(struct ran_dec *ran_a, struct msgb *bssap); struct msgb *ran_a_encode(struct osmo_fsm_inst *caller_fi, const struct ran_msg *ran_enc_msg); -enum reset_msg_type bssmap_is_reset_msg(const struct sccp_ran_inst *sri, const struct msgb *l2); +enum reset_msg_type bssmap_is_reset_msg(const struct sccp_ran_inst *sri, struct osmo_fsm_inst *log_fi, + struct msgb *l2, int *supports_osmux); struct msgb *bssmap_make_reset_msg(const struct sccp_ran_inst *sri, enum reset_msg_type type); struct msgb *bssmap_make_paging_msg(const struct sccp_ran_inst *sri, const struct gsm0808_cell_id *page_cell_id, const char *imsi, uint32_t tmsi, enum paging_cause cause); diff --git a/include/osmocom/msc/ran_msg_iu.h b/include/osmocom/msc/ran_msg_iu.h index 316a91c..3f3d61e 100644 --- a/include/osmocom/msc/ran_msg_iu.h +++ b/include/osmocom/msc/ran_msg_iu.h @@ -28,7 +28,8 @@ int ran_iu_decode_l2(struct ran_dec *ran_dec_iu, struct msgb *ranap); struct msgb *ran_iu_encode(struct osmo_fsm_inst *caller_fi, const struct ran_msg *ran_enc_msg); -enum reset_msg_type ranap_is_reset_msg(const struct sccp_ran_inst *sri, const struct msgb *l2); +enum reset_msg_type ranap_is_reset_msg(const struct sccp_ran_inst *sri, struct osmo_fsm_inst *log_fi, + struct msgb *l2, int *supports_osmux); struct msgb *ranap_make_reset_msg(const struct sccp_ran_inst *sri, enum reset_msg_type type); struct msgb *ranap_make_paging_msg(const struct sccp_ran_inst *sri, const struct gsm0808_cell_id *page_cell_id, const char *imsi, uint32_t tmsi, enum paging_cause cause); diff --git a/include/osmocom/msc/sccp_ran.h b/include/osmocom/msc/sccp_ran.h index f84bf61..a4bd4ca 100644 --- a/include/osmocom/msc/sccp_ran.h +++ b/include/osmocom/msc/sccp_ran.h @@ -233,8 +233,11 @@ /* Return whether the given l2_cl message is a RESET, RESET ACKNOWLEDGE, or RESET-unrelated message. * This callback is stored in struct sccp_ran_inst to provide RESET handling to the caller (ran_peer), - * it is not used in sccp_ran.c. */ - enum reset_msg_type (* is_reset_msg )(const struct sccp_ran_inst *sri, const struct msgb *l2_cl); + * it is not used in sccp_ran.c. + * In supports_osmux, return 0 for no information, 1 for support detected, -1 for non-support detected. + */ + enum reset_msg_type (* is_reset_msg )(const struct sccp_ran_inst *sri, struct osmo_fsm_inst *log_fi, + struct msgb *l2_cl, int *supports_osmux); /* Return a RESET or RESET ACK message for this RAN type. * This callback is stored in struct sccp_ran_inst to provide RESET handling to the caller (ran_peer), diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c index ab58526..1fa8ccb 100644 --- a/src/libmsc/ran_msg_a.c +++ b/src/libmsc/ran_msg_a.c @@ -1275,20 +1275,50 @@ return msg; } -/* Return 1 for a RESET, 2 for a RESET ACK message, 0 otherwise */ -enum reset_msg_type bssmap_is_reset_msg(const struct sccp_ran_inst *sri, const struct msgb *l2) +static void cl_parse_osmux(struct osmo_fsm_inst *log_fi, struct msgb *msg, int *supports_osmux) +{ + struct tlv_parsed tp; + int rc; + + if (supports_osmux == NULL) + return; + + rc = tlv_parse(&tp, gsm0808_att_tlvdef(), msgb_l3(msg) + 1, msgb_l3len(msg) - 1, 0, 0); + if (rc < 0) { + LOGPFSMSL(log_fi, DBSSAP, LOGL_ERROR, "BSSMAP: Failed parsing TLV looking for Osmux support\n"); + return; + } + + if (TLVP_PRESENT(&tp, GSM0808_IE_OSMO_OSMUX_SUPPORT)) { + *supports_osmux = true; + } else { + *supports_osmux = false; + } +} + +/* Return 1 for a RESET, 2 for a RESET ACK message, 0 otherwise. + * In supports_osmux, return 0 for no information, 1 for support detected, -1 for non-support detected. */ +enum reset_msg_type bssmap_is_reset_msg(const struct sccp_ran_inst *sri, struct osmo_fsm_inst *log_fi, + struct msgb *l2, int *supports_osmux) { struct bssmap_header *bs = (struct bssmap_header *)msgb_l2(l2); + if (supports_osmux != NULL) + *supports_osmux = 0; + if (!bs || msgb_l2len(l2) < (sizeof(*bs) + 1) || bs->type != BSSAP_MSG_BSS_MANAGEMENT) return SCCP_RAN_MSG_NON_RESET; - switch (l2->l2h[sizeof(*bs)]) { + l2->l3h = l2->l2h + sizeof(struct bssmap_header); + + switch (l2->l3h[0]) { case BSS_MAP_MSG_RESET: + cl_parse_osmux(log_fi, l2, supports_osmux); return SCCP_RAN_MSG_RESET; case BSS_MAP_MSG_RESET_ACKNOWLEDGE: + cl_parse_osmux(log_fi, l2, supports_osmux); return SCCP_RAN_MSG_RESET_ACK; default: return SCCP_RAN_MSG_NON_RESET; diff --git a/src/libmsc/ran_msg_iu.c b/src/libmsc/ran_msg_iu.c index b17aef8..5d13460 100644 --- a/src/libmsc/ran_msg_iu.c +++ b/src/libmsc/ran_msg_iu.c @@ -438,11 +438,15 @@ } } -enum reset_msg_type ranap_is_reset_msg(const struct sccp_ran_inst *sri, const struct msgb *l2) +enum reset_msg_type ranap_is_reset_msg(const struct sccp_ran_inst *sri, struct osmo_fsm_inst *log_fi, + struct msgb *l2, int *supports_osmux) { int ret = SCCP_RAN_MSG_NON_RESET; int rc; + if (supports_osmux != NULL) + *supports_osmux = -1; + rc = ranap_cn_rx_cl(ranap_handle_cl, &ret, msgb_l2(l2), msgb_l2len(l2)); if (rc) return 0; diff --git a/src/libmsc/ran_peer.c b/src/libmsc/ran_peer.c index da88873..80ce558 100644 --- a/src/libmsc/ran_peer.c +++ b/src/libmsc/ran_peer.c @@ -122,25 +122,19 @@ } } -/* TODO: create an sccp_ran_ops.rx_reset(_ack) to handle this differently on 2g and 3G */ -/* We expect RAN peer to provide use with an Osmocom extension TLV in BSSMAP_RESET to - * announce Osmux support */ -static void ran_peer_update_osmux_support(struct ran_peer *rp, struct msgb *msg) +static void ran_peer_update_osmux_support(struct ran_peer *rp, int supports_osmux) { - struct tlv_parsed tp; - int rc; bool old_value = rp->remote_supports_osmux; - OSMO_ASSERT(msg); - msg->l3h = msg->l2h + sizeof(struct bssmap_header); - rc = tlv_parse(&tp, gsm0808_att_tlvdef(), msg->l3h + 1, msgb_l3len(msg) - 1, 0, 0); - if (rc < 0) - LOG_RAN_PEER(rp, LOGL_NOTICE, "Failed parsing TLV looking for Osmux support\n"); - - if (TLVP_PRESENT(&tp, GSM0808_IE_OSMO_OSMUX_SUPPORT)) { + switch (supports_osmux) { + case 1: rp->remote_supports_osmux = true; - } else { + break; + case -1: rp->remote_supports_osmux = false; + break; + default: + return; } if (old_value != rp->remote_supports_osmux) @@ -155,8 +149,6 @@ ran_peer_discard_all_conns(rp); - ran_peer_update_osmux_support(rp, msg); - reset_ack = rp->sri->ran->sccp_ran_ops.make_reset_msg(rp->sri, SCCP_RAN_MSG_RESET_ACK); if (!reset_ack) { @@ -183,7 +175,6 @@ static void ran_peer_rx_reset_ack(struct ran_peer *rp, struct msgb* msg) { ran_peer_state_chg(rp, RAN_PEER_ST_READY); - ran_peer_update_osmux_support(rp, msg); } void ran_peer_reset(struct ran_peer *rp) @@ -213,10 +204,14 @@ struct ran_peer *rp = fi->priv; struct ran_peer_ev_ctx *ctx = data; struct msgb *msg = ctx->msg; + int rc; + int supports_osmux; switch (event) { case RAN_PEER_EV_MSG_UP_CL: - switch (rp->sri->ran->sccp_ran_ops.is_reset_msg(rp->sri, msg)) { + rc = rp->sri->ran->sccp_ran_ops.is_reset_msg(rp->sri, fi, msg, &supports_osmux); + ran_peer_update_osmux_support(rp, supports_osmux); + switch (rc) { case 1: osmo_fsm_inst_dispatch(fi, RAN_PEER_EV_RX_RESET, msg); return; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1ad4a3f9356216dd4bf8c48fba29fd23438810a7 Gerrit-Change-Number: 19024 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 23:29:32 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 3 Jul 2020 23:29:32 +0000 Subject: Change in osmo-msc[master]: sgs_tx_loc_upd_resp_cb(): fix error handling for MI encoding In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19098 ) Change subject: sgs_tx_loc_upd_resp_cb(): fix error handling for MI encoding ...................................................................... sgs_tx_loc_upd_resp_cb(): fix error handling for MI encoding new_id_ptr should be passed as NULL if encoding the TMSI failed, so initialize it accordingly. Also add some bloat to better handle the case of an encoding error, even though from code analysis that should not be possible here: there is enough buffer, the MI is a TMSI encoded from a uint32_t... The problem was introduced by Idfc8e576e10756aeaacf5569f6178068313eb7ea, before which new_id_len was always 0 when no TMSI was present. Related: CID#210894 Change-Id: I800c5dca3fdbdedf70a64d9fd5a1bdfd1397f431 --- M src/libmsc/sgs_iface.c 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/libmsc/sgs_iface.c b/src/libmsc/sgs_iface.c index b792e46..d13449d 100644 --- a/src/libmsc/sgs_iface.c +++ b/src/libmsc/sgs_iface.c @@ -372,7 +372,7 @@ struct vlr_subscr *vsub = response->vsub; struct sgs_mme_ctx *mme; uint8_t new_id[2 + GSM48_TMSI_LEN]; - uint8_t *new_id_ptr = new_id; + uint8_t *new_id_ptr = NULL; int new_id_len = 0; uint8_t resp_msg_type; @@ -403,8 +403,14 @@ .tmsi = vsub->tmsi_new, }; new_id_len = osmo_mobile_identity_encode_buf(new_id, sizeof(new_id), &tmsi_mi, false); - if (new_id_len > 0) + if (new_id_len > 0) { new_id_ptr = new_id; + } else { + /* Failure to encode the TMSI is not actually possible here, this is just for paranoia + * and coverity scan. */ + new_id_len = 0; + LOGPFSMSL(vsub->sgs_fsm, DMM, LOGL_ERROR, "Cannot encode TMSI Mobile Identity\n"); + } } resp = gsm29118_create_lu_ack(vsub->imsi, &vsub->sgs.lai, new_id_ptr, new_id_len); sgs_tx(mme->conn, resp); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I800c5dca3fdbdedf70a64d9fd5a1bdfd1397f431 Gerrit-Change-Number: 19098 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 23:36:02 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 3 Jul 2020 23:36:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: verify conn and VLR cell id in most tests In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18998 ) Change subject: msc: verify conn and VLR cell id in most tests ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18998/1/msc/BSC_ConnectionHandler.ttcn File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18998/1/msc/BSC_ConnectionHandler.ttcn at 62 PS1, Line 62: import from TCCConversion_Functions { function f_strstr }; > oh I thought last discussion we had about this concluded this partial including was not supported in [?] I found this in some ttcn3 explaining PDF, but vadim already told me that partial includes all amount to "all" anyway. I thought it would be nice to indicate why I'm including this file, but if you insist we can make it 'all' https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18998/1/msc/BSC_ConnectionHandler.ttcn at 370 PS1, Line 370: f_verify_vty_lac_ci(verify_vlr := false); > In general I'm for testing stuff in general for all tests, but I'm not really sure we want to run st [?] I didn't see a noticeable change in time the tests take to run. The VTY request and analysis of response is pretty instantaneous AFAICT. Are you having a different experience? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18998/1/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18998/1/msc/MSC_Tests.ttcn at 411 PS1, Line 411: verify_cell_id := mp_enable_cell_id_test and verify_cell_id > So you are actualyl doing what I requested, but you are not checking the var in all places where the [?] I'm not following, doing what you requested?? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie410714a96353f74a52a104c56fa0a08683e0004 Gerrit-Change-Number: 18998 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 03 Jul 2020 23:36:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 3 23:49:57 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 3 Jul 2020 23:49:57 +0000 Subject: Change in osmo-msc[master]: is_reset_msg: use proper enum for rc value References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/19129 ) Change subject: is_reset_msg: use proper enum for rc value ...................................................................... is_reset_msg: use proper enum for rc value Change-Id: I88b6204bc3ffac06f92bfc87639ce503b2da24bc --- M src/libmsc/ran_peer.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/29/19129/1 diff --git a/src/libmsc/ran_peer.c b/src/libmsc/ran_peer.c index 80ce558..385abd1 100644 --- a/src/libmsc/ran_peer.c +++ b/src/libmsc/ran_peer.c @@ -204,14 +204,14 @@ struct ran_peer *rp = fi->priv; struct ran_peer_ev_ctx *ctx = data; struct msgb *msg = ctx->msg; - int rc; + enum reset_msg_type is_reset; int supports_osmux; switch (event) { case RAN_PEER_EV_MSG_UP_CL: - rc = rp->sri->ran->sccp_ran_ops.is_reset_msg(rp->sri, fi, msg, &supports_osmux); + is_reset = rp->sri->ran->sccp_ran_ops.is_reset_msg(rp->sri, fi, msg, &supports_osmux); ran_peer_update_osmux_support(rp, supports_osmux); - switch (rc) { + switch (is_reset) { case 1: osmo_fsm_inst_dispatch(fi, RAN_PEER_EV_RX_RESET, msg); return; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I88b6204bc3ffac06f92bfc87639ce503b2da24bc Gerrit-Change-Number: 19129 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Jul 4 01:39:45 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jul 2020 01:39:45 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5effddede04b6_6202ab04e6885fc457746@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 324s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 324s] /usr/bin/install -c -m 644 libgtp.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 324s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 324s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 324s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 324s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 324s] dh_install [ 324s] dh_installdocs [ 324s] dh_installchangelogs [ 324s] dh_installexamples [ 324s] dh_installman [ 325s] dh_installinit [ 325s] dh_perl [ 325s] dh_link [ 325s] dh_strip_nondeterminism [ 325s] Can't load '/usr/lib/x86_64-linux-gnu/perl/5.28/auto/B/B.so' for module B: /usr/lib/x86_64-linux-gnu/perl/5.28/auto/B/B.so: ELF load command address/offset not properly aligned at /usr/share/perl/5.28/XSLoader.pm line 93. [ 325s] at /usr/lib/x86_64-linux-gnu/perl/5.28/B.pm line 32. [ 325s] BEGIN failed--compilation aborted at /usr/lib/x86_64-linux-gnu/perl/5.28/B.pm line 33. [ 325s] Compilation failed in require at /usr/bin/dh_strip_nondeterminism line 11. [ 325s] BEGIN failed--compilation aborted at /usr/bin/dh_strip_nondeterminism line 11. [ 325s] make: *** [debian/rules:15: binary] Error 255 [ 325s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 325s] ### VM INTERACTION START ### [ 328s] [ 315.911193] sysrq: SysRq : Power Off [ 328s] [ 315.939742] reboot: Power down [ 328s] ### VM INTERACTION END ### [ 328s] [ 328s] lamb04 failed "build osmo-ggsn_1.5.0.36.4e37.dsc" at Sat Jul 4 01:39:40 UTC 2020. [ 328s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Jul 4 06:28:35 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 4 Jul 2020 06:28:35 +0000 Subject: Change in osmo-msc[master]: is_reset_msg: use proper enum for rc value In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19129 ) Change subject: is_reset_msg: use proper enum for rc value ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-msc/+/19129/1/src/libmsc/ran_peer.c File src/libmsc/ran_peer.c: https://gerrit.osmocom.org/c/osmo-msc/+/19129/1/src/libmsc/ran_peer.c at 215 PS1, Line 215: 1 SCCP_RAN_MSG_RESET? https://gerrit.osmocom.org/c/osmo-msc/+/19129/1/src/libmsc/ran_peer.c at 218 PS1, Line 218: 2 SCCP_RAN_MSG_RESET_ACK? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I88b6204bc3ffac06f92bfc87639ce503b2da24bc Gerrit-Change-Number: 19129 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 04 Jul 2020 06:28:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 08:05:40 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Sat, 4 Jul 2020 08:05:40 +0000 Subject: Change in osmo-mgw[master]: trunk: parse E1 trunk number In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/18752 to look at the new patch set (#14). Change subject: trunk: parse E1 trunk number ...................................................................... trunk: parse E1 trunk number The E1 trunk number is currently not parsed, whenever a trunk prefix is detected that indicates an E1 trunk, then the entire request is rejected. Parse the trunk number and select the trunk accordingly Related: OS#2547 Change-Id: Ifdaab953544151e73b58cc3e95d21afdb40765f4 --- M include/osmocom/mgcp/mgcp_trunk.h M src/libosmo-mgcp/mgcp_trunk.c M tests/mgcp/mgcp_test.c 3 files changed, 70 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/52/18752/14 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifdaab953544151e73b58cc3e95d21afdb40765f4 Gerrit-Change-Number: 18752 Gerrit-PatchSet: 14 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 08:05:40 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Sat, 4 Jul 2020 08:05:40 +0000 Subject: Change in osmo-mgw[master]: endp: add typeset for e1-endpoints In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/18755 to look at the new patch set (#10). Change subject: endp: add typeset for e1-endpoints ...................................................................... endp: add typeset for e1-endpoints Add an endpoint typeset for E1 support, also lets add dummy callbacks for the cleanup and rtp dispatch functionality. Related: OS#2547 Change-Id: I68b719a906e8f7251f0ca8c74ceec73bc40376f7 --- M include/osmocom/mgcp/mgcp_endp.h M include/osmocom/mgcp/mgcp_internal.h M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_network.c 4 files changed, 41 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/55/18755/10 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I68b719a906e8f7251f0ca8c74ceec73bc40376f7 Gerrit-Change-Number: 18755 Gerrit-PatchSet: 10 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 08:05:40 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Sat, 4 Jul 2020 08:05:40 +0000 Subject: Change in osmo-mgw[master]: endp: add E1 endpoint interlocking In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/18898 to look at the new patch set (#10). Change subject: endp: add E1 endpoint interlocking ...................................................................... endp: add E1 endpoint interlocking E1 endpoint names also represent different rates, this may mean that some rate / subslot combinations are not possible because they overlap within nthe timeslot. When the equipment (BSC) is properly configured, this will be no problem, however invalid configuration may cause the selection of overlapping endpoints and this needs to be prevented, and logged. Also rate counters need to be in place. Change-Id: I18e90b10648a7e504371179ad144645fc82e1c27 Related: OS#2547 --- M include/osmocom/mgcp/mgcp_endp.h M include/osmocom/mgcp/mgcp_ratectr.h M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_ratectr.c M src/libosmo-mgcp/mgcp_vty.c 6 files changed, 301 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/98/18898/10 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I18e90b10648a7e504371179ad144645fc82e1c27 Gerrit-Change-Number: 18898 Gerrit-PatchSet: 10 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 08:05:40 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Sat, 4 Jul 2020 08:05:40 +0000 Subject: Change in osmo-mgw[master]: endp: require domain name also for E1 endpoints In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19074 to look at the new patch set (#5). Change subject: endp: require domain name also for E1 endpoints ...................................................................... endp: require domain name also for E1 endpoints RFC3435 requires an MGW domain name appeneded to every endpoints. When defining endpoint names in Appendix E, the domain name is is not mentioned for digital trunks, however, this does not mean that digital trunks do not have a domain appended. Osmo-mgw currently violates the spec because it explicitly checks if the domain name is _NOT_ present for E1 endpoints. Change-Id: Ibb800b689e090b97b58d0206959b660890acd967 --- M src/libosmo-mgcp/mgcp_endp.c 1 file changed, 14 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/74/19074/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibb800b689e090b97b58d0206959b660890acd967 Gerrit-Change-Number: 19074 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 08:05:40 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Sat, 4 Jul 2020 08:05:40 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: add function to generate e1-endpoint names In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19075 to look at the new patch set (#5). Change subject: mgcp_client: add function to generate e1-endpoint names ...................................................................... mgcp_client: add function to generate e1-endpoint names mgcp_client.h offers functions to generate endpoint names for wildcarded request. This is used in osmo-bsc, lets now also add a function that can generate e1-endpoint names. Related: OS#2547 Change-Id: Iec35b5bae8a7b07ddb3559f7114a24dcd10e8f14 --- M include/osmocom/mgcp_client/mgcp_client.h M src/libosmo-mgcp-client/mgcp_client.c 2 files changed, 62 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/75/19075/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iec35b5bae8a7b07ddb3559f7114a24dcd10e8f14 Gerrit-Change-Number: 19075 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 08:05:40 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Sat, 4 Jul 2020 08:05:40 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: pick trunk by number and type In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19102 to look at the new patch set (#4). Change subject: mgcp_trunk: pick trunk by number and type ...................................................................... mgcp_trunk: pick trunk by number and type The function mgcp_trunk_by_num() is used to directly pick a specific trunk that is known by its id number (sometimes called "index"). Traditionally the virtual trunk will reside under id number 0 and all consecutively created E1 trunks will be created under number 1 to 64. This works fine, but puts a limitation on us should we ever introduce an aditional trunk type (e.g. T1). Since the numbers must be unique regardless of the trunk type one could not have an E1 trunk number 1 and e.g. a T1 trunk number 1 at the same time. So we should pick the trunk not only by its number, but also by its type to allow different trunk types to carry the same number. The trunks will still be distinguishable by its type along with the respective endpoint prefix. Change-Id: I7af1e9ce601babd4a51e88201a98319e03945f83 Related: OS#2659 --- M include/osmocom/mgcp/mgcp_trunk.h M src/libosmo-mgcp/mgcp_osmux.c M src/libosmo-mgcp/mgcp_trunk.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 5 files changed, 49 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/02/19102/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I7af1e9ce601babd4a51e88201a98319e03945f83 Gerrit-Change-Number: 19102 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 08:05:40 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Sat, 4 Jul 2020 08:05:40 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: be more specific about E1 trunks In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19103 to look at the new patch set (#4). Change subject: mgcp_vty: be more specific about E1 trunks ...................................................................... mgcp_vty: be more specific about E1 trunks Currently only E1 trunks can be crated using the node "trunk". However, should we ever introduce another trunk type we will not be able to distinguish the new trunk type. Lets rename "trunk" to "trunk-e1" along with its underlying constants and function names so that we can easily add another "trunk-t1" for example without making old configs incompatible with the old concept. Related: OS#2659 Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e --- M include/osmocom/mgcp/vty.h M src/libosmo-mgcp/mgcp_vty.c M src/osmo-mgw/mgw_main.c 3 files changed, 34 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/03/19103/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e Gerrit-Change-Number: 19103 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 08:05:40 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Sat, 4 Jul 2020 08:05:40 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: use define constant to define max number of E1 subslots In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19118 to look at the new patch set (#2). Change subject: mgcp_endp: use define constant to define max number of E1 subslots ...................................................................... mgcp_endp: use define constant to define max number of E1 subslots There are 15 possible subslots (not all at the same time) in one E1 timeslot. Lets use a define constant for that. Change-Id: If7cb74e486946aff09e22abf8a8885bf0693f34e Related: OS#2547 --- M include/osmocom/mgcp/mgcp_endp.h M src/libosmo-mgcp/mgcp_endp.c 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/18/19118/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If7cb74e486946aff09e22abf8a8885bf0693f34e Gerrit-Change-Number: 19118 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 08:05:40 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Sat, 4 Jul 2020 08:05:40 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: remove double check In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19119 to look at the new patch set (#2). Change subject: mgcp_trunk: remove double check ...................................................................... mgcp_trunk: remove double check At the moment, the trunk prefix is checked twice. Lets re-arange the code a bit so that the check only happens once. Change-Id: I91fb8cf6e3b077ba8f18fdbcd071275c6fd7cacd Related: OS#2547 --- M src/libosmo-mgcp/mgcp_trunk.c 1 file changed, 3 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/19/19119/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I91fb8cf6e3b077ba8f18fdbcd071275c6fd7cacd Gerrit-Change-Number: 19119 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 08:05:40 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Sat, 4 Jul 2020 08:05:40 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: do not access endpoint array elements directly In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19120 to look at the new patch set (#2). Change subject: mgcp_test: do not access endpoint array elements directly ...................................................................... mgcp_test: do not access endpoint array elements directly The test assumes that the endpoint "rtpbridge/X at mgw" is at array position X in many places. This does not necessarly have to match. Accessing the array elements directly was the prefered way when the MGW did use integer numbers and not strings to identify endpoints. Since the endpoint name strings are used to access the endpoints the unit-test should also reflect this. Lets replace the integer variable last_endpoint with a string variable and do related verifications based on strings. Change-Id: Ic950c427f23be4a792af94972554637c2b0fbdf2 Related: OS#2659 --- M tests/mgcp/mgcp_test.c 1 file changed, 31 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/20/19120/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic950c427f23be4a792af94972554637c2b0fbdf2 Gerrit-Change-Number: 19120 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 08:05:40 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Sat, 4 Jul 2020 08:05:40 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: refactor endpoint number configuration In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 to look at the new patch set (#2). Change subject: mgcp_vty: refactor endpoint number configuration ...................................................................... mgcp_vty: refactor endpoint number configuration At the moment the number of possible E1 endpoints (depends on the number of E1 timeslots that should be used) is hardcoded and the configuration of the number of virtual endpoints has an off-by-one problem. For the E1 timeslots one might choose not to occupy all E1 timeslots of once. A one TRX E1 BTS usually requires 3 E1 timeslots. One as D-Channel timeslot and two to cover the voice channels. The voice channels timeslots need to be set up in osmo-mgw, while the D-Channel timeslot must not be touched. The VTY config needs to be able to reflect that. Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Related: OS#2547 --- M include/osmocom/mgcp/mgcp_trunk.h M src/libosmo-mgcp/mgcp_trunk.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 4 files changed, 85 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/21/19121/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Gerrit-Change-Number: 19121 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 08:55:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 4 Jul 2020 08:55:37 +0000 Subject: Change in libosmocore[master]: lapd_core: After calling into L3, check if the state has changed References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19130 ) Change subject: lapd_core: After calling into L3, check if the state has changed ...................................................................... lapd_core: After calling into L3, check if the state has changed While processing an I-frame we may deliver its payload to L3. After returning from L3 procesing, we run some additional code, assuming the LAPD/DL state has not changed meanwhile. However, if the application destroys the LAPD/DL meanwhile, our state might be NULL again, and in this state we should not perform any further action. This is one of the cases where synchronous in-line dispatch across various layers is hitting us. L3 should have an input queue, and only start processing after all L2 work has completed and we're about to go back to sleep in select(). Change-Id: I026b64503511002c13c0f4117648c366c48ecc62 Related: OS#1761 Closes: OS#4646 --- M src/gsm/lapd_core.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/30/19130/1 diff --git a/src/gsm/lapd_core.c b/src/gsm/lapd_core.c index cf25f3d..6a56572 100644 --- a/src/gsm/lapd_core.c +++ b/src/gsm/lapd_core.c @@ -1578,6 +1578,10 @@ msgb_free(msg); } + /* the L3 or higher (called in-line above via send_dl_l3) might have destroyed the + * data link meanwhile. See OS#1761 */ + if (dl->state == LAPD_STATE_NULL) + return 0; } else LOGDL(dl, LOGL_INFO, "I frame ignored during own receiver busy condition\n"); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I026b64503511002c13c0f4117648c366c48ecc62 Gerrit-Change-Number: 19130 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 09:20:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 4 Jul 2020 09:20:48 +0000 Subject: Change in libosmo-abis[master]: WIP: trau_frame: New API In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/18249 to look at the new patch set (#7). Change subject: WIP: trau_frame: New API ...................................................................... WIP: trau_frame: New API The old TRAU frame code in src/trau_frame.c (which is for some strange reason part of libosmo-abis, and not libosmo-trau!) was introduced more than a decade ago for the needs of bs11_abis AKA OpenBSC aka OsmoNITB. It is too constrained to implement TRAU frame parsing in a generic way, including: * no way to add support for 8k sub-slots * no way to handle CRC bits or UFI (i.e. no AMR) * no real API design, it was just ripped out from OsmoNITB and moved into a library (even the wrong one) For those reasons, let's introduce a new API for TRAU frame encoding/decoding - one that supports all the relevant use cases. This is marked WIP until the part handling T-bits is properly implemented. Change-Id: I5cf42e6c445d9224be18503cebc7584b3beba08c --- M include/Makefile.am A include/osmocom/trau/trau_frame.h M src/Makefile.am A src/trau/trau_frame.c 4 files changed, 1,473 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/49/18249/7 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/18249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I5cf42e6c445d9224be18503cebc7584b3beba08c Gerrit-Change-Number: 18249 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 09:20:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 4 Jul 2020 09:20:48 +0000 Subject: Change in libosmo-abis[master]: WIP: Add new TRAU frame sync code In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/18250 to look at the new patch set (#8). Change subject: WIP: Add new TRAU frame sync code ...................................................................... WIP: Add new TRAU frame sync code This code is able to detect and sync against a variety of TRAU frame sync patterns. Focus is so far on those patterns present on 16k sub-slots, but 8k sub-slots are expected to be supported soon, too. A new codebase for this is required as the old OsmoNITB code had conflated a 16k sub-slot multiplexer with TRAU frame synchronization, so there was no way to separate those two parts and hence no way to support 8k sub-slots. Change-Id: Ia6fe6228b0b8b9a27999f37ce1115ed5558881ea --- M include/Makefile.am A include/osmocom/trau/trau_sync.h M src/Makefile.am A src/trau/trau_sync.c A src/trau/ubit_buf.h M tests/Makefile.am M tests/testsuite.at A tests/trau_sync/trau_sync_test.c A tests/trau_sync/trau_sync_test.err A tests/trau_sync/trau_sync_test.ok 10 files changed, 702 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/50/18250/8 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/18250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ia6fe6228b0b8b9a27999f37ce1115ed5558881ea Gerrit-Change-Number: 18250 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 09:20:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 4 Jul 2020 09:20:48 +0000 Subject: Change in libosmo-abis[master]: e1_input: Support I.460 timeslot type In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/18933 to look at the new patch set (#2). Change subject: e1_input: Support I.460 timeslot type ...................................................................... e1_input: Support I.460 timeslot type Unlike the legacy TRAU mode, this only adds I460 mux/demux, without any TRAU frame synchronization. The user must still be adding the actual sub-channels using osmo_i460_subchan_add() depending on his requirements. Change-Id: I44da6dfec77ef475adb35001a0e4fa11d549aa02 --- M include/osmocom/abis/e1_input.h M src/e1_input.c M src/input/dahdi.c M src/input/e1d.c M src/input/misdn.c 5 files changed, 41 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/33/18933/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/18933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I44da6dfec77ef475adb35001a0e4fa11d549aa02 Gerrit-Change-Number: 18933 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 09:20:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 4 Jul 2020 09:20:50 +0000 Subject: Change in libosmo-abis[master]: subchan_demux: Fix out-of-bounds write References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19131 ) Change subject: subchan_demux: Fix out-of-bounds write ...................................................................... subchan_demux: Fix out-of-bounds write We cannot blindly append two ubits to the 320-ubit sized buffer. In the end, we may already fill the buffer after the first ubit, causing a buffer overflow with the second ubit. Lets check if the buffer is full after every bit. Avoid copy+pasting but move the code repeated per bit to a new function. Change-Id: I58d946265372278051e4f29301d4f201ab98c0fc Closes: OS#4648 --- M src/subchan_demux.c 1 file changed, 25 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/31/19131/1 diff --git a/src/subchan_demux.c b/src/subchan_demux.c index 55503db..a3a44d9 100644 --- a/src/subchan_demux.c +++ b/src/subchan_demux.c @@ -92,6 +92,29 @@ return 0; } +static void append_bit_resync_out(struct subch_demux *dmx, int c, ubit_t bit) +{ + struct demux_subch *sch = &dmx->subch[c]; + append_bit(sch, bit); + + if (sync_hdr_complete(sch, bit)) + resync_to_here(sch); + + /* FIXME: verify the first bit in octet 2, 4, 6, ... + * according to TS 08.60 4.8.1 */ + + /* once we have reached TRAU_FRAME_BITS, call + * the TRAU frame handler callback function */ + if (sch->out_idx >= TRAU_FRAME_BITS) { + if (sch->in_sync) { + dmx->out_cb(dmx, c, sch->out_bitbuf, + sch->out_idx, dmx->data); + sch->in_sync = 0; + } + sch->out_idx = 0; + } +} + /*! \brief Input some data from the 64k full-slot into subchannel demux * \param[in] dmx subchannel demuxer * \param[in] data pointer to buffer containing input data @@ -108,7 +131,6 @@ uint8_t inbyte = data[i]; for (c = 0; c < NR_SUBCH; c++) { - struct demux_subch *sch = &dmx->subch[c]; uint8_t inbits; uint8_t bit; @@ -123,33 +145,13 @@ bit = 1; else bit = 0; - append_bit(sch, bit); - - if (sync_hdr_complete(sch, bit)) - resync_to_here(sch); + append_bit_resync_out(dmx, c, bit); if (inbits & 0x02) bit = 1; else bit = 0; - append_bit(sch, bit); - - if (sync_hdr_complete(sch, bit)) - resync_to_here(sch); - - /* FIXME: verify the first bit in octet 2, 4, 6, ... - * according to TS 08.60 4.8.1 */ - - /* once we have reached TRAU_FRAME_BITS, call - * the TRAU frame handler callback function */ - if (sch->out_idx >= TRAU_FRAME_BITS) { - if (sch->in_sync) { - dmx->out_cb(dmx, c, sch->out_bitbuf, - sch->out_idx, dmx->data); - sch->in_sync = 0; - } - sch->out_idx = 0; - } + append_bit_resync_out(dmx, c, bit); } } return i; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I58d946265372278051e4f29301d4f201ab98c0fc Gerrit-Change-Number: 19131 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 09:22:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 4 Jul 2020 09:22:49 +0000 Subject: Change in libosmocore[master]: lapd_core: Ensure we always have some tailroom In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19128 ) Change subject: lapd_core: Ensure we always have some tailroom ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id362ce131157c7513d744b0248c7f78fb75c590c Gerrit-Change-Number: 19128 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 04 Jul 2020 09:22:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 09:22:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 4 Jul 2020 09:22:58 +0000 Subject: Change in libosmocore[master]: lapd_core: After calling into L3, check if the state has changed In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19130 ) Change subject: lapd_core: After calling into L3, check if the state has changed ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I026b64503511002c13c0f4117648c366c48ecc62 Gerrit-Change-Number: 19130 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 04 Jul 2020 09:22:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 09:23:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 4 Jul 2020 09:23:01 +0000 Subject: Change in libosmocore[master]: lapd_core: Ensure we always have some tailroom In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19128 ) Change subject: lapd_core: Ensure we always have some tailroom ...................................................................... lapd_core: Ensure we always have some tailroom At some points, e.g. when allocating message buffers from the Tx history, we used to allocate them exactly as large as the defined headroom plus the user data. This means that the underlying PH layer (E1 mostly) had no tailroom to add anything to the end of the message. Especially for DAHDI this is a problem, as we need to make space for two more bytes of frame check sequence (FCS). So let's simply make sure we always have some extra space at the end of such buffers. Change-Id: Id362ce131157c7513d744b0248c7f78fb75c590c Related: OS#4644 --- M src/gsm/lapd_core.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gsm/lapd_core.c b/src/gsm/lapd_core.c index c77b663..cf25f3d 100644 --- a/src/gsm/lapd_core.c +++ b/src/gsm/lapd_core.c @@ -104,6 +104,7 @@ #define CR_NET2USER_RESP 0 #define LAPD_HEADROOM 56 +#define LAPD_TAILROOM 16 #define SBIT(a) (1 << a) #define ALL_STATES 0xffffffff @@ -120,7 +121,7 @@ /* adding space for padding, FIXME: add as an option */ if (length < 21) length = 21; - return msgb_alloc_headroom(length + LAPD_HEADROOM, LAPD_HEADROOM, name); + return msgb_alloc_headroom(length + LAPD_HEADROOM + LAPD_TAILROOM, LAPD_HEADROOM, name); } static inline uint8_t do_mod(uint8_t x, uint8_t m) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id362ce131157c7513d744b0248c7f78fb75c590c Gerrit-Change-Number: 19128 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 09:23:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 4 Jul 2020 09:23:02 +0000 Subject: Change in libosmocore[master]: lapd_core: After calling into L3, check if the state has changed In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19130 ) Change subject: lapd_core: After calling into L3, check if the state has changed ...................................................................... lapd_core: After calling into L3, check if the state has changed While processing an I-frame we may deliver its payload to L3. After returning from L3 procesing, we run some additional code, assuming the LAPD/DL state has not changed meanwhile. However, if the application destroys the LAPD/DL meanwhile, our state might be NULL again, and in this state we should not perform any further action. This is one of the cases where synchronous in-line dispatch across various layers is hitting us. L3 should have an input queue, and only start processing after all L2 work has completed and we're about to go back to sleep in select(). Change-Id: I026b64503511002c13c0f4117648c366c48ecc62 Related: OS#1761 Closes: OS#4646 --- M src/gsm/lapd_core.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gsm/lapd_core.c b/src/gsm/lapd_core.c index cf25f3d..6a56572 100644 --- a/src/gsm/lapd_core.c +++ b/src/gsm/lapd_core.c @@ -1578,6 +1578,10 @@ msgb_free(msg); } + /* the L3 or higher (called in-line above via send_dl_l3) might have destroyed the + * data link meanwhile. See OS#1761 */ + if (dl->state == LAPD_STATE_NULL) + return 0; } else LOGDL(dl, LOGL_INFO, "I frame ignored during own receiver busy condition\n"); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I026b64503511002c13c0f4117648c366c48ecc62 Gerrit-Change-Number: 19130 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 09:24:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 4 Jul 2020 09:24:04 +0000 Subject: Change in libosmo-abis[master]: input/dahdi.c: Don't simply read beyond end of msgb In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19127 ) Change subject: input/dahdi.c: Don't simply read beyond end of msgb ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If84b31ea9a3fc7a6c8768918efed2822d1d58427 Gerrit-Change-Number: 19127 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sat, 04 Jul 2020 09:24:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 09:24:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 4 Jul 2020 09:24:16 +0000 Subject: Change in libosmo-abis[master]: subchan_demux: Fix out-of-bounds write In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19131 ) Change subject: subchan_demux: Fix out-of-bounds write ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I58d946265372278051e4f29301d4f201ab98c0fc Gerrit-Change-Number: 19131 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 04 Jul 2020 09:24:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 09:24:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 4 Jul 2020 09:24:23 +0000 Subject: Change in libosmo-abis[master]: input/dahdi.c: Don't simply read beyond end of msgb In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19127 ) Change subject: input/dahdi.c: Don't simply read beyond end of msgb ...................................................................... input/dahdi.c: Don't simply read beyond end of msgb Let's first add two bytes to the msgb before writing. This way we would assert in case there was no tailroom. As we just added tailroom in the previous patch of this series, we are fine Change-Id: If84b31ea9a3fc7a6c8768918efed2822d1d58427 Closes: OS#4644 --- M src/input/dahdi.c 1 file changed, 20 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/input/dahdi.c b/src/input/dahdi.c index a461f27..8cebac3 100644 --- a/src/input/dahdi.c +++ b/src/input/dahdi.c @@ -224,7 +224,16 @@ struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; int ret; - ret = write(bfd->fd, msg->data, msg->len + 2); + if (msgb_tailroom(msg) >= 2) { + /* two bytes of space for the FCS added by DAHDI in the kernel */ + msgb_put(msg, 2); + ret = write(bfd->fd, msg->data, msg->len); + } else { + /* work-around for code that sends us messages with no tailroom (OS#4644) */ + uint8_t buf[msg->len + 2]; + memcpy(buf, msg->data, msg->len); + ret = write(bfd->fd, buf, sizeof(buf)); + } msgb_free(msg); if (ret == -1) handle_dahdi_exception(e1i_ts); @@ -273,7 +282,16 @@ if (!msg) return; - ret = write(bfd->fd, msg->data, msg->len + 2); + if (msgb_tailroom(msg) >= 2) { + /* two bytes of space for the FCS added by DAHDI in the kernel */ + msgb_put(msg, 2); + ret = write(bfd->fd, msg->data, msg->len); + } else { + /* work-around for code that sends us messages with no tailroom (OS#4644) */ + uint8_t buf[msg->len + 2]; + memcpy(buf, msg->data, msg->len); + ret = write(bfd->fd, buf, sizeof(buf)); + } msgb_free(msg); if (ret == -1) handle_dahdi_exception(e1i_ts); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If84b31ea9a3fc7a6c8768918efed2822d1d58427 Gerrit-Change-Number: 19127 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 09:24:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 4 Jul 2020 09:24:23 +0000 Subject: Change in libosmo-abis[master]: subchan_demux: Fix out-of-bounds write In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19131 ) Change subject: subchan_demux: Fix out-of-bounds write ...................................................................... subchan_demux: Fix out-of-bounds write We cannot blindly append two ubits to the 320-ubit sized buffer. In the end, we may already fill the buffer after the first ubit, causing a buffer overflow with the second ubit. Lets check if the buffer is full after every bit. Avoid copy+pasting but move the code repeated per bit to a new function. Change-Id: I58d946265372278051e4f29301d4f201ab98c0fc Closes: OS#4648 --- M src/subchan_demux.c 1 file changed, 25 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/subchan_demux.c b/src/subchan_demux.c index 55503db..a3a44d9 100644 --- a/src/subchan_demux.c +++ b/src/subchan_demux.c @@ -92,6 +92,29 @@ return 0; } +static void append_bit_resync_out(struct subch_demux *dmx, int c, ubit_t bit) +{ + struct demux_subch *sch = &dmx->subch[c]; + append_bit(sch, bit); + + if (sync_hdr_complete(sch, bit)) + resync_to_here(sch); + + /* FIXME: verify the first bit in octet 2, 4, 6, ... + * according to TS 08.60 4.8.1 */ + + /* once we have reached TRAU_FRAME_BITS, call + * the TRAU frame handler callback function */ + if (sch->out_idx >= TRAU_FRAME_BITS) { + if (sch->in_sync) { + dmx->out_cb(dmx, c, sch->out_bitbuf, + sch->out_idx, dmx->data); + sch->in_sync = 0; + } + sch->out_idx = 0; + } +} + /*! \brief Input some data from the 64k full-slot into subchannel demux * \param[in] dmx subchannel demuxer * \param[in] data pointer to buffer containing input data @@ -108,7 +131,6 @@ uint8_t inbyte = data[i]; for (c = 0; c < NR_SUBCH; c++) { - struct demux_subch *sch = &dmx->subch[c]; uint8_t inbits; uint8_t bit; @@ -123,33 +145,13 @@ bit = 1; else bit = 0; - append_bit(sch, bit); - - if (sync_hdr_complete(sch, bit)) - resync_to_here(sch); + append_bit_resync_out(dmx, c, bit); if (inbits & 0x02) bit = 1; else bit = 0; - append_bit(sch, bit); - - if (sync_hdr_complete(sch, bit)) - resync_to_here(sch); - - /* FIXME: verify the first bit in octet 2, 4, 6, ... - * according to TS 08.60 4.8.1 */ - - /* once we have reached TRAU_FRAME_BITS, call - * the TRAU frame handler callback function */ - if (sch->out_idx >= TRAU_FRAME_BITS) { - if (sch->in_sync) { - dmx->out_cb(dmx, c, sch->out_bitbuf, - sch->out_idx, dmx->data); - sch->in_sync = 0; - } - sch->out_idx = 0; - } + append_bit_resync_out(dmx, c, bit); } } return i; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I58d946265372278051e4f29301d4f201ab98c0fc Gerrit-Change-Number: 19131 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 09:29:47 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sat, 4 Jul 2020 09:29:47 +0000 Subject: Change in libosmo-abis[master]: e1_input_vty: Fix VTY help strings In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19104 ) Change subject: e1_input_vty: Fix VTY help strings ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I4a5e503676618171e59550774892816b61adecae Gerrit-Change-Number: 19104 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sat, 04 Jul 2020 09:29:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 09:31:02 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sat, 4 Jul 2020 09:31:02 +0000 Subject: Change in libosmo-abis[master]: move flip_buf_bits() from DAHDI to a shared flip.c In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19070 ) Change subject: move flip_buf_bits() from DAHDI to a shared flip.c ...................................................................... Patch Set 5: As mentioned on IRC, replace with libosmocore implementation (possibly using LUT in libosmocore) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I8c6dc3eea921a73ebe65540aad0f0c0584d47e5a Gerrit-Change-Number: 19070 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: tnt Gerrit-Comment-Date: Sat, 04 Jul 2020 09:31:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 09:36:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 4 Jul 2020 09:36:11 +0000 Subject: Change in osmo-bsc[master]: Don't print 'bogus channel load samplpe' message if total == 0 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19132 ) Change subject: Don't print 'bogus channel load samplpe' message if total == 0 ...................................................................... Don't print 'bogus channel load samplpe' message if total == 0 Change-Id: I857fecc76dc16ba4431f3c0142bb0d798a9f73dc Closes: OS#4614 --- M src/osmo-bsc/chan_alloc.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/32/19132/1 diff --git a/src/osmo-bsc/chan_alloc.c b/src/osmo-bsc/chan_alloc.c index f23a982..9b80df3 100644 --- a/src/osmo-bsc/chan_alloc.c +++ b/src/osmo-bsc/chan_alloc.c @@ -203,9 +203,11 @@ } /* Check for invalid samples (shouldn't happen). */ - if (total == 0 || used > total) { + if (used > total) { LOG_BTS(bts, DRLL, LOGL_NOTICE, "bogus channel load sample (used=%"PRIu64" / total=%"PRIu32")\n", used, total); + } + if (total == 0 || used > total) { bts->T3122 = 0; /* disable override of network-wide default value */ bts->chan_load_samples_idx = 0; /* invalidate other samples collected so far */ return; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I857fecc76dc16ba4431f3c0142bb0d798a9f73dc Gerrit-Change-Number: 19132 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 12:55:26 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sat, 4 Jul 2020 12:55:26 +0000 Subject: Change in osmo-bsc[master]: Don't print 'bogus channel load samplpe' message if total == 0 In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19132 ) Change subject: Don't print 'bogus channel load samplpe' message if total == 0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I857fecc76dc16ba4431f3c0142bb0d798a9f73dc Gerrit-Change-Number: 19132 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sat, 04 Jul 2020 12:55:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 13:00:28 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 4 Jul 2020 13:00:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: verify System Information presence on RSL startup In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 ) Change subject: bsc: verify System Information presence on RSL startup ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062/2/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062/2/bsc/BSC_Tests.ttcn at 640 PS2, Line 640: deactivate > I'm not familiar with the details of SI during OML/RSL startup, [?] An important thing that should be noted first is that the OML link and the RSL link(s) are separate TCP/IP connections. The OML link is established first, then the BSC configures all transceivers and timeslots, and after that the BSC indicates remote IP/port for the RSL link(s). All System Information messages are sent over the RSL link of C0. A BTS is considered "connected" when all its OML Managed Objects are "UNLOCKED", and all its transceivers have established the RSL connections. See all_trx_rsl_connected_unlocked(). I guess it works fine for you because we have TCP_NODELAY in the recent libosmo-abis. There is still a chance that not all System Information messages would arrive when f_wait_oml() returns and as_catch_RSL_sysinfo() gets deactivated. This would result in sporadic test case failures. The simplest, not elegant solution would be to call f_sleep(1.0) before deactivating as_catch_RSL_sysinfo(). The proper (IMO) solution would be to have a list of expected (not empty) System Information messages somewhere in the module parameters (in accordance with osmo-bsc.cfg), so you know what you're waiting for in the 'alt' statement, 'repeat' unless all expected kinds of SI are received, and fail if a timer expires. I am now also wondering whether we really need to expect/collect/check the SI messages here and thus in every test case, or exclusively in those ones that actually aimed to verify the SI. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 04 Jul 2020 13:00:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 14:40:00 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 4 Jul 2020 14:40:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: cosmetic: mark private test case functions as such References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19133 ) Change subject: BTS_Tests: cosmetic: mark private test case functions as such ...................................................................... BTS_Tests: cosmetic: mark private test case functions as such Change-Id: I173e42dbe1694a10b54f95a730df2e64f2c65d17 --- M bts/BTS_Tests.ttcn 1 file changed, 45 insertions(+), 45 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/19133/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 132e13e..1b6c9b2 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -674,7 +674,7 @@ ***********************************************************************/ /* Stress test: Do 500 channel activations/deactivations in rapid succession */ -function f_TC_chan_act_stress(charstring id) runs on ConnHdlr { +private function f_TC_chan_act_stress(charstring id) runs on ConnHdlr { for (var integer i := 0; i < 500; i := i+1) { f_rsl_chan_act(g_pars.chan_mode); f_rsl_chan_deact(); @@ -691,7 +691,7 @@ } /* Test if re-activation of an already active channel fails as expected */ -function f_TC_chan_act_react(charstring id) runs on ConnHdlr { +private function f_TC_chan_act_react(charstring id) runs on ConnHdlr { f_rsl_chan_act(g_pars.chan_mode); /* attempt to activate the same lchan again -> expect reject */ RSL.send(ts_RSL_CHAN_ACT(g_chan_nr, g_pars.chan_mode)); @@ -715,7 +715,7 @@ } /* Attempt to de-activate a channel that's not active */ -function f_TC_chan_deact_not_active(charstring id) runs on ConnHdlr { +private function f_TC_chan_deact_not_active(charstring id) runs on ConnHdlr { timer T := 3.0; RSL.send(ts_RSL_RF_CHAN_REL(g_chan_nr)); T.start; @@ -737,7 +737,7 @@ } /* attempt to activate channel with wrong RSL Channel Nr IE; expect NACK */ -function f_TC_chan_act_wrong_nr(charstring id) runs on ConnHdlr { +private function f_TC_chan_act_wrong_nr(charstring id) runs on ConnHdlr { RSL.send(ts_RSL_CHAN_ACT(g_chan_nr, g_pars.chan_mode)); alt { [] RSL.receive(tr_RSL_CHAN_ACT_ACK(g_chan_nr)) { @@ -1571,7 +1571,7 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } -function f_TC_ho_rach(charstring id) runs on ConnHdlr { +private function f_TC_ho_rach(charstring id) runs on ConnHdlr { var GsmFrameNumber fn; var RSL_Message rm; @@ -2000,7 +2000,7 @@ } /* establish DChan, verify existance + contents of measurement reports */ -function f_TC_meas_res_periodic(charstring id) runs on ConnHdlr { +private function f_TC_meas_res_periodic(charstring id) runs on ConnHdlr { f_l1_tune(L1CTL); RSL.clear; @@ -2168,7 +2168,7 @@ } /* Verify Tx power reduction and ramping up during BTS bring up */ -function f_TC_tx_power_start_ramp_up_bcch(charstring id) runs on ConnHdlr { +private function f_TC_tx_power_start_ramp_up_bcch(charstring id) runs on ConnHdlr { f_l1_tune(L1CTL); RSL.clear; @@ -2188,7 +2188,7 @@ } /* Verify Tx power reduction and ramping downd uring BTS bring shutdown due to Abis link failure */ -function f_TC_tx_power_start_ramp_down_bcch(charstring id) runs on ConnHdlr { +private function f_TC_tx_power_start_ramp_down_bcch(charstring id) runs on ConnHdlr { f_connhdlr_init_vty_bsc(); f_l1_tune(L1CTL); @@ -2218,7 +2218,7 @@ * + ramping down during ADM state UNLOCKED->LOCKED * + ramping up during ADM state LOCKED->UNLOCKED */ -function f_TC_tx_power_ramp_adm_state_change(charstring id) runs on ConnHdlr { +private function f_TC_tx_power_ramp_adm_state_change(charstring id) runs on ConnHdlr { var L1ctlDlMessage l1_dl; var integer last_rx_lvl; @@ -2290,7 +2290,7 @@ /* see if the rsl meas res contains our expeced bs power level bs power set during assignment */ -function f_TC_rsl_bs_pwr_static_ass(charstring id) runs on ConnHdlr { +private function f_TC_rsl_bs_pwr_static_ass(charstring id) runs on ConnHdlr { f_l1_tune(L1CTL); RSL.clear; @@ -2313,7 +2313,7 @@ /* see if the rsl meas res contains our expeced bs power level bs power set after assignment */ -function f_TC_rsl_bs_pwr_static_power_control(charstring id) runs on ConnHdlr { +private function f_TC_rsl_bs_pwr_static_power_control(charstring id) runs on ConnHdlr { f_l1_tune(L1CTL); RSL.clear; @@ -2364,7 +2364,7 @@ /* target level -100, first rssi -90, ms power 7, expected increase to 7+6 within 6 seconds, second rssi -110, ms power 7+6, expected decrease to 7 within 6 seconds, These power levels are valid for all bands and require no special handling */ -function f_TC_rsl_ms_pwr_dyn_ass_updown(charstring id) runs on ConnHdlr { +private function f_TC_rsl_ms_pwr_dyn_ass_updown(charstring id) runs on ConnHdlr { var uint5_t pwr_var := 7; var L1ctlDlMessage l1_dl; @@ -2432,7 +2432,7 @@ } /* check that we do not exceed the max power */ -function f_TC_rsl_ms_pwr_dyn_max(charstring id) runs on ConnHdlr { +private function f_TC_rsl_ms_pwr_dyn_max(charstring id) runs on ConnHdlr { var uint5_t pwr_var := 7; var L1ctlDlMessage l1_dl; @@ -2474,7 +2474,7 @@ } /* see if we reach the band max power */ -function f_TC_rsl_ms_pwr_dyn_up(charstring id) runs on ConnHdlr { +private function f_TC_rsl_ms_pwr_dyn_up(charstring id) runs on ConnHdlr { var L1ctlDlMessage l1_dl; var uint5_t pwr_var := 15; var uint5_t pwr_max_var := f_get_max_power_from_band(); @@ -2524,7 +2524,7 @@ } /* see if we reach the band min power */ -function f_TC_rsl_ms_pwr_dyn_down(charstring id) runs on ConnHdlr { +private function f_TC_rsl_ms_pwr_dyn_down(charstring id) runs on ConnHdlr { var L1ctlDlMessage l1_dl; /* set a high value to ensure power decreases */ @@ -2575,7 +2575,7 @@ /* see if we change the power level without receiving power parameters, which should not happen rsl chan act WITHOUT power parameters */ -function f_TC_rsl_ms_pwr_dyn_active(charstring id) runs on ConnHdlr { +private function f_TC_rsl_ms_pwr_dyn_active(charstring id) runs on ConnHdlr { var L1ctlDlMessage l1_dl; /* set a high value to ensure power decreases */ @@ -2616,7 +2616,7 @@ /* see if we change the power level without receiving power parameters, which should not happen ms power control WITHOUT power parameters */ -function f_TC_rsl_ms_pwr_dyn_active2(charstring id) runs on ConnHdlr { +private function f_TC_rsl_ms_pwr_dyn_active2(charstring id) runs on ConnHdlr { var L1ctlDlMessage l1_dl; /* set a high value to ensure power decreases */ @@ -2902,7 +2902,7 @@ /* establish DChan, and send MS POWER CONTROL messages via RSL, verify that * the BTS is forwarding those values to the MS via the SACCH L1 header. */ -function f_tc_rsl_ms_pwr_ctrl(charstring id) runs on ConnHdlr { +private function f_tc_rsl_ms_pwr_ctrl(charstring id) runs on ConnHdlr { var L1ctlDlMessage l1_dl; var RSL_IE_MS_Power ms_power; var RSL_Message rsl; @@ -2973,7 +2973,7 @@ /* establish DChan, verify that the BTS sets the TA in the first SACCH L1 header. TA for the IMM ASS messages is still controlled by g_pars.l1_pars.ms_actual_ta! */ -function f_tc_rsl_chan_initial_ta(charstring id) runs on ConnHdlr { +private function f_tc_rsl_chan_initial_ta(charstring id) runs on ConnHdlr { var L1ctlDlMessage l1_dl; var uint5_t ta_to_test := 16; @@ -3022,7 +3022,7 @@ } /* establish DChan, verify that the BTS sets MS power in the first SACCH L1 header. */ -function f_tc_rsl_chan_initial_ms_pwr(charstring id) runs on ConnHdlr { +private function f_tc_rsl_chan_initial_ms_pwr(charstring id) runs on ConnHdlr { var L1ctlDlMessage l1_dl; var uint5_t ms_power_level := 7; @@ -3900,7 +3900,7 @@ /* helper function: Set given SI via RSL + validate scheduling. * CALLER MUST MAKE SURE TO CHANGE GLOBAL si_cfg! */ -function f_TC_si_sched() runs on test_CT { +private function f_TC_si_sched() runs on test_CT { var SystemInformationVectorPerTc si_per_tc; f_init_l1ctl(); f_l1_tune(L1CTL); @@ -4068,14 +4068,14 @@ } /* Send messages with wrong message type */ -function f_TC_wrong_msg_type_dchan(charstring id) runs on ConnHdlr { +private function f_TC_wrong_msg_type_dchan(charstring id) runs on ConnHdlr { var template (value) RSL_Message rsl_tx; rsl_tx := ts_RSL_CHAN_ACT(g_chan_nr, g_pars.chan_mode); rsl_tx.msg_type := RSL_MT_NOT_CMD; RSL.send(rsl_tx); f_rslem_unregister(0, g_chan_nr); } -function f_TC_wrong_msg_type_rll(charstring id) runs on ConnHdlr { +private function f_TC_wrong_msg_type_rll(charstring id) runs on ConnHdlr { var template (value) RSL_Message rsl_tx; /* we first have to activate the dedicated channel */ f_rsl_chan_act(g_pars.chan_mode); @@ -4120,7 +4120,7 @@ } /* Send messages in wrong sequence (RLL to an inactive lchan) */ -function f_TC_err_rep_wrong_sequence(charstring id) runs on ConnHdlr { +private function f_TC_err_rep_wrong_sequence(charstring id) runs on ConnHdlr { RSL.send(ts_RSL_UNITDATA_REQ(g_chan_nr, ts_RslLinkID_DCCH(0), '0102'O)); f_rslem_unregister(0, g_chan_nr); } @@ -4141,7 +4141,7 @@ ***********************************************************************/ /* Send IPA DLCX to inactive lchan */ -function f_TC_ipa_dlcx_not_active(charstring id) runs on ConnHdlr { +private function f_TC_ipa_dlcx_not_active(charstring id) runs on ConnHdlr { f_rsl_transceive(ts_RSL_IPA_DLCX(g_chan_nr, 0), tr_RSL_IPA_DLCX_ACK(g_chan_nr, ?, ?), "IPA DLCX ACK"); } @@ -4153,7 +4153,7 @@ } /* Send IPA CRCX twice to inactive lchan */ -function f_TC_ipa_crcx_twice_not_active(charstring id) runs on ConnHdlr { +private function f_TC_ipa_crcx_twice_not_active(charstring id) runs on ConnHdlr { f_rsl_transceive(ts_RSL_IPA_CRCX(g_chan_nr), tr_RSL_IPA_CRCX_ACK(g_chan_nr, ?, ?, ?), "IPA CRCX ACK"); f_rsl_transceive(ts_RSL_IPA_CRCX(g_chan_nr), tr_RSL_IPA_CRCX_NACK(g_chan_nr, RSL_ERR_RES_UNAVAIL), @@ -4167,7 +4167,7 @@ } /* Regular sequence of CRCX/MDCX/DLCX */ -function f_TC_ipa_crcx_mdcx_dlcx_not_active(charstring id) runs on ConnHdlr { +private function f_TC_ipa_crcx_mdcx_dlcx_not_active(charstring id) runs on ConnHdlr { f_rsl_transceive(ts_RSL_IPA_CRCX(g_chan_nr), tr_RSL_IPA_CRCX_ACK(g_chan_nr, ?, ?, ?), "IPA CRCX ACK"); var uint32_t remote_ip := f_rnd_int(c_UINT32_MAX); @@ -4188,7 +4188,7 @@ } /* Sequence of CRCX, 2x MDCX, DLCX */ -function f_TC_ipa_crcx_mdcx_mdcx_dlcx_not_active(charstring id) runs on ConnHdlr { +private function f_TC_ipa_crcx_mdcx_mdcx_dlcx_not_active(charstring id) runs on ConnHdlr { f_rsl_transceive(ts_RSL_IPA_CRCX(g_chan_nr), tr_RSL_IPA_CRCX_ACK(g_chan_nr, ?, ?, ?), "IPA CRCX ACK"); var uint32_t remote_ip := f_rnd_int(c_UINT32_MAX); @@ -4215,7 +4215,7 @@ } /* IPA CRCX on SDCCH/4 and SDCCH/8 (doesn't make sense) */ -function f_TC_ipa_crcx_sdcch_not_active(charstring id) runs on ConnHdlr { +private function f_TC_ipa_crcx_sdcch_not_active(charstring id) runs on ConnHdlr { f_rsl_transceive(ts_RSL_IPA_CRCX(g_chan_nr), tr_RSL_IPA_CRCX_NACK(g_chan_nr, ?), "IPA CRCX NACK"); } @@ -5415,7 +5415,7 @@ } /* Activate Osmocom-style dynamic PDCH from BSC side */ -function f_TC_dyn_osmo_pdch_act_deact(charstring id) runs on ConnHdlr { +private function f_TC_dyn_osmo_pdch_act_deact(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; var integer ts_nr := g_chan_nr.tn; var integer trx_nr := 0; @@ -5440,7 +5440,7 @@ } /* send a RF CHAN REL for PDCH on an osmocom dynamci PDCH that's already inactive */ -function f_TC_dyn_osmo_pdch_unsol_deact(charstring id) runs on ConnHdlr { +private function f_TC_dyn_osmo_pdch_unsol_deact(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; var integer pcu_conn_id := -1; @@ -5462,7 +5462,7 @@ } /* try to RSL CHAN ACT a PDCH on an osmocom-style PDCH that's already active */ -function f_TC_dyn_osmo_pdch_double_act(charstring id) runs on ConnHdlr { +private function f_TC_dyn_osmo_pdch_double_act(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; var integer ts_nr := g_chan_nr.tn; var integer trx_nr := 0; @@ -5488,7 +5488,7 @@ } /* try to RSL CHAN ACT a TCH/F on an osmocom-style PDCH */ -function f_TC_dyn_osmo_pdch_tchf_act(charstring id) runs on ConnHdlr { +private function f_TC_dyn_osmo_pdch_tchf_act(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; var integer ts_nr := g_chan_nr.tn; var integer trx_nr := 0; @@ -5516,7 +5516,7 @@ } /* try to RSL CHAN ACT the TCH/H on an osmocom-style PDCH */ -function f_TC_dyn_osmo_pdch_tchh_act(charstring id) runs on ConnHdlr { +private function f_TC_dyn_osmo_pdch_tchh_act(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; var integer ts_nr := g_chan_nr.tn; var integer trx_nr := 0; @@ -5615,7 +5615,7 @@ } /* Activate and de-activate an IPA-style dynamic TCH/F + PDCH */ -function f_TC_dyn_ipa_pdch_act_deact(charstring id) runs on ConnHdlr { +private function f_TC_dyn_ipa_pdch_act_deact(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; var integer ts_nr := g_chan_nr.tn; var integer trx_nr := 0; @@ -5642,7 +5642,7 @@ } /* try to RSL CHAN ACT a TCH/F on an IPA-style PDCH */ -function f_TC_dyn_ipa_pdch_tchf_act(charstring id) runs on ConnHdlr { +private function f_TC_dyn_ipa_pdch_tchf_act(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; var integer ts_nr := g_chan_nr.tn; var integer trx_nr := 0; @@ -5668,7 +5668,7 @@ } /* Activate IPA style dyn PDCH as TCH/F and then illegally try to activate it as PDCH, too */ -function f_TC_dyn_ipa_pdch_tchf_act_pdch_act_nack(charstring id) runs on ConnHdlr { +private function f_TC_dyn_ipa_pdch_tchf_act_pdch_act_nack(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; var integer ts_nr := g_chan_nr.tn; var integer trx_nr := 0; @@ -5704,7 +5704,7 @@ } /* try to RSL CHAN ACT a TCH/F on an IPA-style PDCH that's already in PDCH mode; expect NACK */ -function f_TC_dyn_ipa_pdch_act_tchf_act_nack(charstring id) runs on ConnHdlr { +private function f_TC_dyn_ipa_pdch_act_tchf_act_nack(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; var integer ts_nr := g_chan_nr.tn; var integer trx_nr := 0; @@ -6217,7 +6217,7 @@ } /* Test channel activation with A5/n right from the beginning (like in assignment + hand-over) */ -function f_TC_chan_act_encr(charstring id) runs on ConnHdlr { +private function f_TC_chan_act_encr(charstring id) runs on ConnHdlr { f_l1_tune(L1CTL); f_est_dchan(true); @@ -6256,7 +6256,7 @@ /* Test channel activation with A5/n right from the beginning and RSL MODE MODIFY which should break the en/decryption on purpose by supplying a new key that is unknown to the MS*/ -function f_TC_rsl_modify_encr(charstring id) runs on ConnHdlr { +private function f_TC_rsl_modify_encr(charstring id) runs on ConnHdlr { f_l1_tune(L1CTL); f_est_dchan(true); @@ -6321,7 +6321,7 @@ } /* Test unencrypted channel activation followed by explicit ENCR CMD later */ -function f_TC_encr_cmd(charstring id) runs on ConnHdlr { +private function f_TC_encr_cmd(charstring id) runs on ConnHdlr { /* L3 payload doesn't matter, as it is passed transparently */ var BIT3 l3_alg_id := f_alg_id_to_l3(g_pars.encr.alg_id); var octetstring l3 := enc_PDU_ML3_NW_MS(valueof(ts_RRM_CiphModeCmd(l3_alg_id))); @@ -6445,7 +6445,7 @@ g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,7))); } -function f_test_l2_fill_frames(boolean dtxd) runs on ConnHdlr { +private function f_test_l2_fill_frames(boolean dtxd) runs on ConnHdlr { var L1ctlDlMessage dl; var octetstring l2_fill_frame := '0303012B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B'O; var octetstring l2_fill_frame_sacch := substr(l2_fill_frame, 0, lengthof(l2_fill_frame) - 2); @@ -6583,15 +6583,15 @@ } } -function f_TC_tch_sign_l2_fill_frame(charstring id) runs on ConnHdlr { +private function f_TC_tch_sign_l2_fill_frame(charstring id) runs on ConnHdlr { f_test_l2_fill_frames(false); } -function f_TC_tch_sign_l2_fill_frame_dtxd(charstring id) runs on ConnHdlr { +private function f_TC_tch_sign_l2_fill_frame_dtxd(charstring id) runs on ConnHdlr { f_test_l2_fill_frames(true); } -function f_tch_sign_l2_fill_frame(boolean dtxd) runs on test_CT { +private function f_tch_sign_l2_fill_frame(boolean dtxd) runs on test_CT { var ConnHdlr vc_conn; var ConnHdlrPars pars; pars.t_guard := 60.0; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I173e42dbe1694a10b54f95a730df2e64f2c65d17 Gerrit-Change-Number: 19133 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 14:40:01 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 4 Jul 2020 14:40:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: cosmetic: mark private types / functions as such References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19134 ) Change subject: BTS_Tests: cosmetic: mark private types / functions as such ...................................................................... BTS_Tests: cosmetic: mark private types / functions as such Change-Id: I99ccf398130c7e5c2aac1932ebb83f158fed281d --- M bts/BTS_Tests.ttcn 1 file changed, 93 insertions(+), 63 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/34/19134/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 1b6c9b2..a42f628 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -187,7 +187,7 @@ port PCUIF_CODEC_PT PCU; } -function f_init_rsl(charstring id) runs on test_CT { +private function f_init_rsl(charstring id) runs on test_CT { var bitstring trx_mask := '00000000'B; var integer trx_count := 0; var RSLEm_Event ev; @@ -250,11 +250,11 @@ } /* Test-specific parameters */ -type union TestSpecUnion { +private type union TestSpecUnion { RllTestCase rll } -template (value) RachControlParameters ts_RachCtrl_default := { +private template (value) RachControlParameters ts_RachCtrl_default := { max_retrans := RACH_MAX_RETRANS_7, tx_integer := '1001'B, /* 12 slots */ cell_barr_access := false, @@ -262,7 +262,7 @@ acc := '0000010000000000'B }; -template (value) CellSelectionParameters ts_CellSelPar_default := { +private template (value) CellSelectionParameters ts_CellSelPar_default := { cell_resel_hyst_2dB := 2, ms_txpwr_max_cch := mp_ms_power_level_exp, acs := '0'B, @@ -270,7 +270,7 @@ rxlev_access_min := 0 } -template (value) LocationAreaIdentification ts_LAI_default := { +private template (value) LocationAreaIdentification ts_LAI_default := { mcc_mnc := '262F42'H, lac := 42 } @@ -297,7 +297,7 @@ } /* Default SYSTEM INFORMATION 3 */ -template (value) SystemInformation ts_SI3_default := { +private template (value) SystemInformation ts_SI3_default := { header := ts_RrHeader(SYSTEM_INFORMATION_TYPE_3, 18), payload := { si3 := { @@ -327,7 +327,7 @@ } } -template (value) SystemInformation ts_SI2_default := { +private template (value) SystemInformation ts_SI2_default := { header := ts_RrHeader(SYSTEM_INFORMATION_TYPE_2, 22), payload := { si2 := { @@ -338,7 +338,7 @@ } } -template (value) SystemInformation ts_SI4_default := { +private template (value) SystemInformation ts_SI4_default := { header := ts_RrHeader(SYSTEM_INFORMATION_TYPE_4, 12), /* no CBCH / restoct */ payload := { si4 := { @@ -352,13 +352,13 @@ } } -function f_rsl_bcch_fill_raw(RSL_IE_SysinfoType rsl_si_type, octetstring si_enc) +private function f_rsl_bcch_fill_raw(RSL_IE_SysinfoType rsl_si_type, octetstring si_enc) runs on test_CT { log("Setting ", rsl_si_type, ": ", si_enc); RSL_CCHAN.send(ts_ASP_RSL_UD(ts_RSL_BCCH_INFO(rsl_si_type, si_enc))); } -function f_rsl_bcch_fill(RSL_IE_SysinfoType rsl_si_type, template (value) SystemInformation si_dec) +private function f_rsl_bcch_fill(RSL_IE_SysinfoType rsl_si_type, template (value) SystemInformation si_dec) runs on test_CT { var octetstring si_enc := enc_SystemInformation(valueof(si_dec)); log("Setting ", rsl_si_type, ": ", si_dec); @@ -508,7 +508,7 @@ f_connect_reset(L1CTL); } -type function void_fn(charstring id) runs on ConnHdlr; +private type function void_fn(charstring id) runs on ConnHdlr; /* create a new test component */ function f_start_handler(void_fn fn, ConnHdlrPars pars, @@ -581,8 +581,8 @@ fn.apply(id); } -function f_rsl_transceive_ret(template RSL_Message tx, template RSL_Message exp_rx, charstring id, - boolean ignore_other := false) +private function f_rsl_transceive_ret(template RSL_Message tx, template RSL_Message exp_rx, + charstring id, boolean ignore_other := false) runs on ConnHdlr return RSL_Message { var RSL_Message rx; timer T := 3.0; @@ -1644,7 +1644,7 @@ * Measurement Processing / Reporting ***********************************************************************/ -template LapdmAddressField ts_LapdmAddr(LapdmSapi sapi, boolean c_r) := { +private template LapdmAddressField ts_LapdmAddr(LapdmSapi sapi, boolean c_r) := { spare := '0'B, lpd := 0, sapi := sapi, @@ -1652,7 +1652,7 @@ ea := true } -template LapdmFrameAB ts_LAPDm_AB(LapdmSapi sapi, boolean c_r, boolean p, octetstring pl) := { +private template LapdmFrameAB ts_LAPDm_AB(LapdmSapi sapi, boolean c_r, boolean p, octetstring pl) := { addr := ts_LapdmAddr(sapi, c_r), ctrl := ts_LapdmCtrlUI(p), len := 0, /* overwritten */ @@ -1662,7 +1662,7 @@ } /* handle incoming downlink SACCH and respond with uplink SACCH (meas res) */ -altstep as_l1_sacch() runs on ConnHdlr { +private altstep as_l1_sacch() runs on ConnHdlr { var L1ctlDlMessage l1_dl; [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { log("SACCH received: ", l1_dl.payload.data_ind.payload); @@ -1683,7 +1683,7 @@ } } -altstep as_l1_dcch() runs on ConnHdlr { +private altstep as_l1_dcch() runs on ConnHdlr { var L1ctlDlMessage l1_dl; [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_DCCH(?))) -> value l1_dl { log("DCCH received: ", l1_dl.payload.data_ind.payload); @@ -1694,17 +1694,17 @@ } } -type record MeasElem { +private type record MeasElem { uint6_t rxlev, uint3_t rxqual } -type record MeasElemFS { +private type record MeasElemFS { MeasElem full, MeasElem sub } -type record ConnL1Pars { +private type record ConnL1Pars { boolean dtx_enabled, boolean toa256_enabled, MeasElemFS meas_ul, @@ -1834,7 +1834,7 @@ } /* verify we regularly receive measurement reports with incrementing numbers */ -altstep as_meas_res(boolean verify_meas := true) runs on ConnHdlr { +private altstep as_meas_res(boolean verify_meas := true) runs on ConnHdlr { var RSL_Message rsl; var boolean chan_est := false; @@ -2268,7 +2268,7 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } -function f_check_meas_bs_power_level(integer level) runs on ConnHdlr { +private function f_check_meas_bs_power_level(integer level) runs on ConnHdlr { timer T := 8.0; T.start; var RSL_Message rsl; @@ -2658,7 +2658,7 @@ } -function f_wait_for_l1_power_level(integer level) runs on ConnHdlr { +private function f_wait_for_l1_power_level(integer level) runs on ConnHdlr { var L1ctlDlMessage l1_dl; timer T0 := 10.0; T0.start; @@ -2712,7 +2712,7 @@ } type charstring BtsBand ("GSM450","GSM480","GSM750","GSM810","GSM850","GSM900","DCS1800","PCS1900"); -template charstring BtsBand_allGSM:= pattern "GSM???"; +private template charstring BtsBand_allGSM := pattern "GSM???"; private function f_power_from_band(in BtsBand band, out IntegerRecord min_dbm_level, out IntegerRecord max_dbm_level) return IntegerRecord { // 45.005 4.1.1 var IntegerRecord gsm_power :={31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, @@ -3099,7 +3099,7 @@ * Paging ***********************************************************************/ -function tmsi_is_dummy(TMSIP_TMSI_V tmsi) return boolean { +private function tmsi_is_dummy(TMSIP_TMSI_V tmsi) return boolean { if (tmsi == 'FFFFFFFF'O) { return true; } else { @@ -3107,16 +3107,16 @@ } } -type record allowedFn { integer frame_nr } -template allowedFn bs_ag_blks_res_0 := { frame_nr := (6, 12, 16, 22, 26, 32, 36, 42, 46) } -template allowedFn bs_ag_blks_res_1 := { frame_nr := (12, 16, 22, 26, 32, 36, 42, 46) } -template allowedFn bs_ag_blks_res_2 := { frame_nr := (16, 22, 26, 32, 36, 42, 46) } -template allowedFn bs_ag_blks_res_3 := { frame_nr := (22, 26, 32, 36, 42, 46) } -template allowedFn bs_ag_blks_res_4 := { frame_nr := (26, 32, 36, 42, 46) } -template allowedFn bs_ag_blks_res_5 := { frame_nr := (32, 36, 42, 46) } -template allowedFn bs_ag_blks_res_6 := { frame_nr := (36, 42, 46) } -template allowedFn bs_ag_blks_res_7 := { frame_nr := (42, 46) } -function check_pch_fn(integer frame_nr, integer bs_ag_blks_res) runs on test_CT +private type record allowedFn { integer frame_nr } +private template allowedFn bs_ag_blks_res_0 := { frame_nr := (6, 12, 16, 22, 26, 32, 36, 42, 46) } +private template allowedFn bs_ag_blks_res_1 := { frame_nr := (12, 16, 22, 26, 32, 36, 42, 46) } +private template allowedFn bs_ag_blks_res_2 := { frame_nr := (16, 22, 26, 32, 36, 42, 46) } +private template allowedFn bs_ag_blks_res_3 := { frame_nr := (22, 26, 32, 36, 42, 46) } +private template allowedFn bs_ag_blks_res_4 := { frame_nr := (26, 32, 36, 42, 46) } +private template allowedFn bs_ag_blks_res_5 := { frame_nr := (32, 36, 42, 46) } +private template allowedFn bs_ag_blks_res_6 := { frame_nr := (36, 42, 46) } +private template allowedFn bs_ag_blks_res_7 := { frame_nr := (42, 46) } +private function check_pch_fn(integer frame_nr, integer bs_ag_blks_res) runs on test_CT { var integer frame_nr_51; frame_nr_51 := frame_nr mod 51 @@ -3158,7 +3158,9 @@ return; } -altstep as_l1_count_paging(inout integer num_paging_rcv_msgs, inout integer num_paging_rcv_ids, PagingTestCfg cfg) +private altstep as_l1_count_paging(inout integer num_paging_rcv_msgs, + inout integer num_paging_rcv_ids, + PagingTestCfg cfg) runs on test_CT { var L1ctlDlMessage dl; [] L1CTL.receive(tr_L1CTL_DATA_IND(t_RslChanNr_PCH_AGCH(0), ?, c_DummyUI)) { @@ -3210,7 +3212,7 @@ } } -type record PagingTestCfg { +private type record PagingTestCfg { boolean combined_ccch, integer bs_ag_blks_res, float load_factor, @@ -3219,7 +3221,7 @@ boolean use_tmsi } -type record PagingTestState { +private type record PagingTestState { integer num_paging_sent, integer num_paging_rcv_msgs, integer num_paging_rcv_ids, @@ -3439,8 +3441,9 @@ ma := ''B } -template (value) ChannelDescription ts_ChanDescH0(template (value) RslChannelNr chan_nr, uint3_t tsc := 7, - uint12_t arfcn := mp_trx0_arfcn) := { +private template (value) ChannelDescription ts_ChanDescH0(template (value) RslChannelNr chan_nr, + template (value) uint3_t tsc := 7, + template (value) uint12_t arfcn := mp_trx0_arfcn) := { chan_nr := chan_nr, tsc := tsc, h := false, @@ -3448,8 +3451,9 @@ maio_hsn := omit } -template (value) ChannelDescription ts_ChanDescH1(template (value) RslChannelNr chan_nr, uint3_t tsc := 7, - template (value) MaioHsn maio_hsn) := { +private template (value) ChannelDescription ts_ChanDescH1(template (value) RslChannelNr chan_nr, + template (value) uint3_t tsc := 7, + template (value) MaioHsn maio_hsn) := { chan_nr := chan_nr, tsc := tsc, h := true, @@ -3544,19 +3548,22 @@ ***********************************************************************/ /* tuple of Frame Number + decoded SI */ -type record SystemInformationFn { +private type record SystemInformationFn { GsmFrameNumber frame_number, SystemInformation si } /* an arbitrary-length vector of decoded SI + gsmtap header */ -type record of SystemInformationFn SystemInformationVector; +private type record of SystemInformationFn SystemInformationVector; /* an array of SI-vectors indexed by TC value */ -type SystemInformationVector SystemInformationVectorPerTc[8]; +private type SystemInformationVector SystemInformationVectorPerTc[8]; /* determine if a given SI vector contains given SI type at least once */ -function f_si_vecslot_contains(SystemInformationVector arr, RrMessageType key, boolean bcch_ext := false) return boolean { +private function f_si_vecslot_contains(SystemInformationVector arr, + RrMessageType key, + boolean bcch_ext := false) +return boolean { for (var integer i:= 0; i< sizeof(arr); i := i + 1) { var integer fn_mod51 := arr[i].frame_number mod 51; if (not bcch_ext and fn_mod51 == 2 or @@ -3570,14 +3577,19 @@ } /* ensure a given TC slot of the SI vector contains given SI type at least once at TC */ -function f_ensure_si_vec_contains(SystemInformationVectorPerTc arr, integer tc, RrMessageType key, boolean ext_bcch := false) { +private function f_ensure_si_vec_contains(SystemInformationVectorPerTc arr, + integer tc, RrMessageType key, + boolean ext_bcch := false) +{ if (not f_si_vecslot_contains(arr[tc], key, ext_bcch)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("No ", key, " in TC=", tc, "!")); } } /* check if a given SI vector contains given SI type at least once on any TC */ -function f_si_vec_contains(SystemInformationVectorPerTc arr, RrMessageType key) return boolean { +private function f_si_vec_contains(SystemInformationVectorPerTc arr, + RrMessageType key) +return boolean { for (var integer tc:= 0; tc < sizeof(arr); tc := tc + 1) { if (f_si_vecslot_contains(arr[tc], key) or f_si_vecslot_contains(arr[tc], key, true)) { @@ -3588,7 +3600,11 @@ } /* determine if a given SI vector contains given SI type at least N of M times */ -function f_si_vecslot_contains_n_of_m(SystemInformationVector arr, RrMessageType key, boolean bcch_ext := false, integer n := 1, integer m := 4) return boolean { +private function f_si_vecslot_contains_n_of_m(SystemInformationVector arr, + RrMessageType key, + boolean bcch_ext := false, + integer n := 1, integer m := 4) +return boolean { var integer count := 0; if (sizeof(arr) < m) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Error: Insufficient SI in array"); @@ -3610,14 +3626,21 @@ } /* ensure a given TC slot of the SI vector contains given SI type at least N out of M times at TC */ -function f_ensure_si_vec_contains_n_of_m(SystemInformationVectorPerTc arr, integer tc, RrMessageType key, boolean ext_bcch := false, integer n, integer m) { +private function f_ensure_si_vec_contains_n_of_m(SystemInformationVectorPerTc arr, + integer tc, RrMessageType key, + boolean ext_bcch := false, + integer n, integer m) +{ if (not f_si_vecslot_contains_n_of_m(arr[tc], key, ext_bcch, n, m)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Not ", n, "/", m, " of ", key, " in TC=", tc, "!")); } } /* determine if a given SI vector contains given SI type at least once */ -function f_si_vecslot_contains_only(SystemInformationVector arr, RrMessageType key, boolean bcch_ext := false) return boolean { +private function f_si_vecslot_contains_only(SystemInformationVector arr, + RrMessageType key, + boolean bcch_ext := false) +return boolean { for (var integer i:= 0; i< sizeof(arr); i := i + 1) { var integer fn_mod51 := arr[i].frame_number mod 51; if (not bcch_ext and fn_mod51 == 2 or @@ -3631,14 +3654,17 @@ } /* ensure a given TC slot of the SI vector contains only given SI type */ -function f_ensure_si_vec_contains_only(SystemInformationVectorPerTc arr, integer tc, RrMessageType key, boolean ext_bcch := false) { +private function f_ensure_si_vec_contains_only(SystemInformationVectorPerTc arr, + integer tc, RrMessageType key, + boolean ext_bcch := false) +{ if (not f_si_vecslot_contains_only(arr[tc], key, ext_bcch)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Not all ", key, " in TC=", tc, "!")); } } /* SI configuration of cell, against which we validate actual SI messages */ -type set SystemInformationConfig { +private type set SystemInformationConfig { boolean bcch_extended, boolean si1_present, boolean si2bis_present, @@ -3658,7 +3684,9 @@ } /* validate the SI scheduling according to TS 45.002 version 14.1.0 Release 14, Section 6.3.1.3 */ -function f_validate_si_scheduling(SystemInformationConfig cfg, SystemInformationVectorPerTc si_per_tc) { +private function f_validate_si_scheduling(SystemInformationConfig cfg, + SystemInformationVectorPerTc si_per_tc) +{ var integer i; for (i := 0; i < sizeof(si_per_tc); i := i + 1) { if (sizeof(si_per_tc[i]) == 0) { @@ -3856,7 +3884,8 @@ } /* sample Systme Information for specified duration via L1CTL */ -function f_l1_sample_si(L1CTL_PT pt, float duration := 8.0) return SystemInformationVectorPerTc { +private function f_l1_sample_si(L1CTL_PT pt, float duration := 8.0) +return SystemInformationVectorPerTc { timer T := duration; var SystemInformationVectorPerTc si_per_tc; var L1ctlDlMessage l1_dl; @@ -5756,14 +5785,15 @@ } } -type record RllTestCase { +private type record RllTestCase { uint3_t sapi, RslLinkId link_id, octetstring l3, boolean exp } -type record of RllTestCase RllTestCases; -template RllTestCase t_EITC(uint3_t sapi, RslLinkId id, octetstring l3, boolean exp) := { +private type record of RllTestCase RllTestCases; +private template RllTestCase t_EITC(uint3_t sapi, RslLinkId id, + octetstring l3, boolean exp) := { sapi := sapi, link_id := id, l3 := l3, @@ -6152,7 +6182,7 @@ ***********************************************************************/ /* send UNITDATA_REQ from BTS to MS and expect it to arrive */ -function f_unitdata_mt(RslLinkId link_id, octetstring l3) runs on ConnHdlr { +private function f_unitdata_mt(RslLinkId link_id, octetstring l3) runs on ConnHdlr { RSL.send(ts_RSL_UNITDATA_REQ(g_chan_nr, link_id, l3)); if (link_id.c == SACCH) { f_l1_exp_lapdm(tr_LAPDm_B4_UI(link_id.sapi, cr_MT_CMD, l3)); @@ -6418,23 +6448,23 @@ ***********************************************************************/ /* XXX These functions must be kept in sync with g_AllChannels defined on test_CT. */ -function f_g_chan_is_tchf() runs on ConnHdlr return boolean { +private function f_g_chan_is_tchf() runs on ConnHdlr return boolean { return (g_chan_nr == valueof(ts_RslChanNr_Bm(1)) or g_chan_nr == valueof(ts_RslChanNr_Bm(2)) or g_chan_nr == valueof(ts_RslChanNr_Bm(3)) or g_chan_nr == valueof(ts_RslChanNr_Bm(4))); } -function f_g_chan_is_tchh() runs on ConnHdlr return boolean { +private function f_g_chan_is_tchh() runs on ConnHdlr return boolean { return (g_chan_nr == valueof(ts_RslChanNr_Lm(5,0)) or g_chan_nr == valueof(ts_RslChanNr_Lm(5,1))); } -function f_g_chan_is_sdcch4() runs on ConnHdlr return boolean { +private function f_g_chan_is_sdcch4() runs on ConnHdlr return boolean { return (g_chan_nr == valueof(ts_RslChanNr_SDCCH4(0,0)) or g_chan_nr == valueof(ts_RslChanNr_SDCCH4(0,1)) or g_chan_nr == valueof(ts_RslChanNr_SDCCH4(0,2)) or g_chan_nr == valueof(ts_RslChanNr_SDCCH4(0,3))); } -function f_g_chan_is_sdcch8() runs on ConnHdlr return boolean { +private function f_g_chan_is_sdcch8() runs on ConnHdlr return boolean { return (g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,0)) or g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,1)) or g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,2)) or -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I99ccf398130c7e5c2aac1932ebb83f158fed281d Gerrit-Change-Number: 19134 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 14:40:01 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 4 Jul 2020 14:40:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: cosmetic: mark friend types / functions as such References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19135 ) Change subject: BTS_Tests: cosmetic: mark friend types / functions as such ...................................................................... BTS_Tests: cosmetic: mark friend types / functions as such Change-Id: I53296b0d66594c198251526c8433a07348d821b1 --- M bts/BTS_Tests.ttcn 1 file changed, 13 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/19135/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index a42f628..15b0730 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -429,7 +429,7 @@ } /* global init function */ -function f_init() runs on test_CT { +friend function f_init() runs on test_CT { var charstring id := testcasename(); g_AllChannels := { /* TS 1..4: TCH/F */ @@ -503,7 +503,7 @@ } /* Attach L1CTL to master test_CT (classic tests, non-handler mode) */ -function f_init_l1ctl() runs on test_CT { +friend function f_init_l1ctl() runs on test_CT { map(self:L1CTL, system:L1CTL); f_connect_reset(L1CTL); } @@ -511,9 +511,9 @@ private type function void_fn(charstring id) runs on ConnHdlr; /* create a new test component */ -function f_start_handler(void_fn fn, ConnHdlrPars pars, - boolean pcu_comp := false, - boolean trxc_comp := false) +friend function f_start_handler(void_fn fn, ConnHdlrPars pars, + boolean pcu_comp := false, + boolean trxc_comp := false) runs on test_CT return ConnHdlr { var charstring id := testcasename(); var ConnHdlr vc_conn; @@ -607,14 +607,17 @@ return rx; } -function f_rsl_transceive(template RSL_Message tx, template RSL_Message exp_rx, charstring id, - boolean ignore_other := false) +friend function f_rsl_transceive(template RSL_Message tx, template RSL_Message exp_rx, + charstring id, boolean ignore_other := false) runs on ConnHdlr { var RSL_Message rx := f_rsl_transceive_ret(tx, exp_rx, id, ignore_other); } -function f_rsl_chan_act(RSL_IE_ChannelMode mode, boolean encr_enable := false, RSL_IE_List more_ies := {}, - RSL_IE_ActivationType act_type := t_RSL_IE_ActType_IA) runs on ConnHdlr { +friend function f_rsl_chan_act(RSL_IE_ChannelMode mode, + boolean encr_enable := false, + RSL_IE_List more_ies := {}, + RSL_IE_ActivationType act_type := t_RSL_IE_ActType_IA) +runs on ConnHdlr { var RSL_Message ch_act := valueof(ts_RSL_CHAN_ACT(g_chan_nr, mode, act_type)); if (encr_enable) { /* append encryption related IEs, if requested */ @@ -627,7 +630,7 @@ f_rsl_transceive(ch_act, tr_RSL_CHAN_ACT_ACK(g_chan_nr), "RSL CHAN ACT"); } -function f_rsl_chan_deact() runs on ConnHdlr { +friend function f_rsl_chan_deact() runs on ConnHdlr { f_rsl_transceive(ts_RSL_RF_CHAN_REL(g_chan_nr), tr_RSL_RF_CHAN_REL_ACK(g_chan_nr), "RF CHAN REL", true); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I53296b0d66594c198251526c8433a07348d821b1 Gerrit-Change-Number: 19135 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 14:40:01 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 4 Jul 2020 14:40:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: move ts_RRM_GprsSuspReq to L3_Templates.ttcn References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19136 ) Change subject: BTS_Tests: move ts_RRM_GprsSuspReq to L3_Templates.ttcn ...................................................................... BTS_Tests: move ts_RRM_GprsSuspReq to L3_Templates.ttcn Change-Id: Ib1aa0053cfca8ccd6ff613ab3b1c4f5afbd27534 --- M bts/BTS_Tests.ttcn M library/L3_Templates.ttcn 2 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/36/19136/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 15b0730..c4d1c26 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5089,26 +5089,6 @@ setverdict(pass); } -template (value) PDU_ML3_MS_NW ts_RRM_GprsSuspReq(template (value) OCT4 tlli, - template (value) RoutingAreaIdentificationV rai, - template (value) OCT1 cause) := { - discriminator := '0000'B, /* overwritten */ - tiOrSkip := { - skipIndicator := '0000'B - }, - msgs := { - rrm := { - gPRS_suspensionRequest := { - messageType := '00110100'B, - tLLI := tlli, - routingAreaIdentification := rai, - suspensionCause := cause, - service_Support := omit - } - } - } -} - /* test for forwarding of RR SUSPEND from CS lchan to PCU via PCU socket */ private function f_TC_rr_suspend_req(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 8b09572..1bfcec0 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -3241,6 +3241,26 @@ } } +template (value) PDU_ML3_MS_NW ts_RRM_GprsSuspReq(template (value) OCT4 tlli, + template (value) RoutingAreaIdentificationV rai, + template (value) OCT1 cause) := { + discriminator := '0000'B, /* overwritten */ + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + rrm := { + gPRS_suspensionRequest := { + messageType := '00110100'B, + tLLI := tlli, + routingAreaIdentification := rai, + suspensionCause := cause, + service_Support := omit + } + } + } +} + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib1aa0053cfca8ccd6ff613ab3b1c4f5afbd27534 Gerrit-Change-Number: 19136 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 14:40:02 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 4 Jul 2020 14:40:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: mark both TC_rll_data_{req, ind} as TODO References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19137 ) Change subject: BTS_Tests: mark both TC_rll_data_{req,ind} as TODO ...................................................................... BTS_Tests: mark both TC_rll_data_{req,ind} as TODO Change-Id: I55d8dbc3a5cb3b0422cb6329b2bd60dd7b7fad6a --- M bts/BTS_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/19137/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index c4d1c26..374228a 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -6069,11 +6069,11 @@ f_rll_testmatrix(tcs, refers(f_TC_rll_rel_req)); } -/* test if RLL DATA REQ triggers I-frames on Um (TS 48.058 3.5) */ +/* TODO: test if RLL DATA REQ triggers I-frames on Um (TS 48.058 3.5) */ testcase TC_rll_data_req() runs on test_CT { } -/* test if I-frames on Um trigger RLL DATA IND (TS 48.058 3.6) */ +/* TODO: test if I-frames on Um trigger RLL DATA IND (TS 48.058 3.6) */ testcase TC_rll_data_ind() runs on test_CT { } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I55d8dbc3a5cb3b0422cb6329b2bd60dd7b7fad6a Gerrit-Change-Number: 19137 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 14:54:24 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 4 Jul 2020 14:54:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: verify System Information presence on RSL startup In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 ) Change subject: bsc: verify System Information presence on RSL startup ...................................................................... Patch Set 3: ok. I'll split SI off into separate tests. There we'll be free to add some arbitrary f_sleep(), because if we expect a certain SI to not appear at all (with or without SI payload data), in case of error we might get that unwanted SI after the expected SIs and could miss that, too. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 04 Jul 2020 14:54:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 4 14:57:22 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 4 Jul 2020 14:57:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: verify data of SI2quater sent from osmo-bsc In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19115 ) Change subject: bsc: verify data of SI2quater sent from osmo-bsc ...................................................................... Patch Set 1: > how will you deal with segmented SI2quater messages? probably add several SI2quater to the list of expected SI and succeed if any one of them matches ... this will be refactored a bit so I'll see where it goes -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia1736d75839031e90d73dda1d1c267cadc55b702 Gerrit-Change-Number: 19115 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 04 Jul 2020 14:57:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Jul 4 15:51:28 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jul 2020 15:51:28 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f00a5965613d_6202ab04e6885fc5205ee@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 84s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 84s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 84s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 84s] | | [ 84s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 84s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 84s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 84s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 84s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 84s] 2425 | MHD_start_daemon (unsigned int flags, [ 84s] | ^~~~~~~~~~~~~~~~ [ 84s] cc1: all warnings being treated as errors [ 84s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 84s] make[3]: *** Waiting for unfinished jobs.... [ 84s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 84s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 84s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 84s] make[1]: *** [Makefile:166: all] Error 2 [ 84s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 84s] dh_auto_build: error: cd build && make -j6 "INSTALL=install --strip-program=true" returned exit code 2 [ 84s] make: *** [debian/rules:9: build] Error 25 [ 84s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 84s] ### VM INTERACTION START ### [ 87s] [ 77.362435] sysrq: SysRq : Power Off [ 87s] [ 77.366879] reboot: Power down [ 87s] ### VM INTERACTION END ### [ 87s] [ 87s] sheep87 failed "build ulfius_2.5.2-4.1.dsc" at Sat Jul 4 15:51:26 UTC 2020. [ 87s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 4 15:52:02 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jul 2020 15:52:02 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f00a5b61199c_6202ab04e6885fc5207d4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 115s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 115s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 115s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 115s] | | [ 115s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 115s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 115s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 115s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 115s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 115s] 2425 | MHD_start_daemon (unsigned int flags, [ 115s] | ^~~~~~~~~~~~~~~~ [ 115s] cc1: all warnings being treated as errors [ 115s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 115s] make[3]: *** Waiting for unfinished jobs.... [ 116s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 116s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 116s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 116s] make[1]: *** [Makefile:166: all] Error 2 [ 116s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 116s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 116s] make: *** [debian/rules:9: build] Error 25 [ 116s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 116s] ### VM INTERACTION START ### [ 119s] [ 106.636610] sysrq: SysRq : Power Off [ 119s] [ 106.641718] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] lamb14 failed "build ulfius_2.5.2-4.1.dsc" at Sat Jul 4 15:52:01 UTC 2020. [ 119s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 4 15:52:37 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 04 Jul 2020 15:52:37 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f00a5d45a770_6202ab04e6885fc521071@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 152s] [2086/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -c ../src/mme/s1ap-build.c [ 152s] [2087/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o' -c ../src/mme/s1ap-sm.c [ 152s] [2088/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -c ../lib/sbi/server.c [ 152s] FAILED: lib/sbi/9848b6c@@ogssbi at sha/server.c.o [ 152s] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -c ../lib/sbi/server.c [ 152s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 152s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 152s] 268 | access_handler, server, [ 152s] | ^~~~~~~~~~~~~~ [ 152s] | | [ 152s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 152s] In file included from ../lib/sbi/server.c:23: [ 152s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 152s] 2425 | MHD_start_daemon (unsigned int flags, [ 152s] | ^~~~~~~~~~~~~~~~ [ 152s] cc1: some warnings being treated as errors [ 152s] [2089/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 153s] [2090/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 153s] ninja: build stopped: subcommand failed. [ 153s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j3 -v returned exit code 1 [ 153s] make: *** [debian/rules:11: binary] Error 25 [ 153s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 153s] ### VM INTERACTION START ### [ 156s] [ 147.524570] sysrq: SysRq : Power Off [ 156s] [ 147.526012] reboot: Power down [ 156s] ### VM INTERACTION END ### [ 156s] [ 156s] build81 failed "build open5gs_1.3.0.20200704.dsc" at Sat Jul 4 15:52:33 UTC 2020. [ 156s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 5 01:45:26 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jul 2020 01:45:26 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f0130c93ba28_6202ab04e6885fc585124@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/xUbuntu_18.04/i586 Package network:osmocom:nightly/open5gs failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 425s] Build dir: /usr/src/packages/BUILD/obj-i686-linux-gnu [ 425s] Build type: native build [ 425s] [ 425s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 425s] [ 425s] A full log can be found at /usr/src/packages/BUILD/obj-i686-linux-gnu/meson-logs/meson-log.txt [ 425s] cd obj-i686-linux-gnu && tail -v -n \+0 meson-logs/meson-log.txt [ 425s] ==> meson-logs/meson-log.txt <== [ 425s] Build started at 2020-07-05T01:45:12.101753 [ 425s] Main binary: /usr/bin/python3 [ 425s] Python system: Linux [ 425s] The Meson build system [ 425s] Version: 0.45.1 [ 425s] Source dir: /usr/src/packages/BUILD [ 425s] Build dir: /usr/src/packages/BUILD/obj-i686-linux-gnu [ 425s] Build type: native build [ 425s] [ 425s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 425s] dh_auto_configure: cd obj-i686-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/i386-linux-gnu --libexecdir=lib/i386-linux-gnu returned exit code 1 [ 425s] debian/rules:11: recipe for target 'binary' failed [ 425s] make: *** [binary] Error 2 [ 425s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 425s] ### VM INTERACTION START ### [ 428s] [ 401.333556] sysrq: SysRq : Power Off [ 428s] [ 401.353291] reboot: Power down [ 428s] ### VM INTERACTION END ### [ 428s] [ 428s] lamb22 failed "build open5gs_1.3.0.20200705.dsc" at Sun Jul 5 01:45:16 UTC 2020. [ 428s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 5 01:51:45 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jul 2020 01:51:45 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f013235aea7f_6202ab04e6885fc585940@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 159s] FAILED: lib/sbi/9848b6c@@ogssbi at sha/server.c.o [ 159s] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -c ../lib/sbi/server.c [ 159s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 159s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 159s] 268 | access_handler, server, [ 159s] | ^~~~~~~~~~~~~~ [ 159s] | | [ 159s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 159s] In file included from ../lib/sbi/server.c:23: [ 159s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 159s] 2425 | MHD_start_daemon (unsigned int flags, [ 159s] | ^~~~~~~~~~~~~~~~ [ 159s] cc1: some warnings being treated as errors [ 159s] [2088/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o' -c ../src/mme/s1ap-sm.c [ 159s] [2089/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -c ../lib/sbi/nnrf-build.c [ 159s] [2090/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 159s] [2091/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -c ../src/mme/s1ap-build.c [ 161s] [2092/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 161s] ninja: build stopped: subcommand failed. [ 161s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j6 -v returned exit code 1 [ 161s] make: *** [debian/rules:11: binary] Error 25 [ 161s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 161s] ### VM INTERACTION START ### [ 164s] [ 153.190682] sysrq: SysRq : Power Off [ 164s] [ 153.193313] reboot: Power down [ 164s] ### VM INTERACTION END ### [ 164s] [ 164s] sheep88 failed "build open5gs_1.3.0.20200705.dsc" at Sun Jul 5 01:51:38 UTC 2020. [ 164s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 5 01:58:53 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jul 2020 01:58:53 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5f0133f6e6dbc_6202ab04e6885fc5869bc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/open5gs failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 556s] Build dir: /usr/src/packages/BUILD/obj-x86_64-linux-gnu [ 556s] Build type: native build [ 556s] [ 556s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 556s] [ 556s] A full log can be found at /usr/src/packages/BUILD/obj-x86_64-linux-gnu/meson-logs/meson-log.txt [ 556s] cd obj-x86_64-linux-gnu && tail -v -n \+0 meson-logs/meson-log.txt [ 556s] ==> meson-logs/meson-log.txt <== [ 556s] Build started at 2020-07-05T01:58:46.736867 [ 556s] Main binary: /usr/bin/python3 [ 556s] Python system: Linux [ 556s] The Meson build system [ 556s] Version: 0.45.1 [ 556s] Source dir: /usr/src/packages/BUILD [ 556s] Build dir: /usr/src/packages/BUILD/obj-x86_64-linux-gnu [ 556s] Build type: native build [ 556s] [ 556s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 556s] dh_auto_configure: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 556s] debian/rules:11: recipe for target 'binary' failed [ 556s] make: *** [binary] Error 2 [ 556s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 556s] ### VM INTERACTION START ### [ 559s] [ 529.830999] sysrq: SysRq : Power Off [ 560s] [ 529.847611] reboot: Power down [ 560s] ### VM INTERACTION END ### [ 560s] [ 560s] lamb03 failed "build open5gs_1.3.0.20200705.dsc" at Sun Jul 5 01:58:51 UTC 2020. [ 560s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 5 03:02:03 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jul 2020 03:02:03 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0142c48148a_6202ab04e6885fc5942ee@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 531s] [2088/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/contrib_multipart_parser.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/contrib_multipart_parser.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/contrib_multipart_parser.c.o' -c ../lib/sbi/contrib/multipart_parser.c [ 531s] [2089/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -c ../lib/sbi/server.c [ 531s] FAILED: lib/sbi/9848b6c@@ogssbi at sha/server.c.o [ 531s] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -c ../lib/sbi/server.c [ 531s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 531s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 531s] 268 | access_handler, server, [ 531s] | ^~~~~~~~~~~~~~ [ 531s] | | [ 531s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 531s] In file included from ../lib/sbi/server.c:23: [ 531s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 531s] 2425 | MHD_start_daemon (unsigned int flags, [ 531s] | ^~~~~~~~~~~~~~~~ [ 531s] cc1: some warnings being treated as errors [ 532s] [2090/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -c ../lib/sbi/nnrf-build.c [ 532s] [2091/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 534s] [2092/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 534s] ninja: build stopped: subcommand failed. [ 534s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j4 -v returned exit code 1 [ 534s] make: *** [debian/rules:11: binary] Error 25 [ 534s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 534s] ### VM INTERACTION START ### [ 537s] [ 511.813712] sysrq: SysRq : Power Off [ 537s] [ 511.865635] reboot: Power down [ 538s] ### VM INTERACTION END ### [ 538s] [ 538s] cloud108 failed "build open5gs_1.3.0.20200705.dsc" at Sun Jul 5 03:01:59 UTC 2020. [ 538s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 5 03:03:10 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jul 2020 03:03:10 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0142fa7d01a_6202ab04e6885fc5943ed@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 133s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 133s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 133s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 133s] | | [ 133s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 133s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 133s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 133s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 133s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 133s] 2425 | MHD_start_daemon (unsigned int flags, [ 133s] | ^~~~~~~~~~~~~~~~ [ 134s] cc1: all warnings being treated as errors [ 134s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 134s] make[3]: *** Waiting for unfinished jobs.... [ 134s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 134s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 134s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 134s] make[1]: *** [Makefile:166: all] Error 2 [ 134s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 134s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 134s] make: *** [debian/rules:9: build] Error 25 [ 134s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 134s] ### VM INTERACTION START ### [ 137s] [ 123.258709] sysrq: SysRq : Power Off [ 137s] [ 123.273245] reboot: Power down [ 137s] ### VM INTERACTION END ### [ 137s] [ 137s] lamb26 failed "build ulfius_2.5.2-4.1.dsc" at Sun Jul 5 03:02:56 UTC 2020. [ 137s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 5 06:50:41 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jul 2020 06:50:41 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f017853129bb_6202ab04e6885fc630021@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 115s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 115s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 115s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 115s] | | [ 115s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 115s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 115s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 115s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 115s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 115s] 2425 | MHD_start_daemon (unsigned int flags, [ 115s] | ^~~~~~~~~~~~~~~~ [ 115s] cc1: all warnings being treated as errors [ 115s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 115s] make[3]: *** Waiting for unfinished jobs.... [ 116s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 116s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 116s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 116s] make[1]: *** [Makefile:166: all] Error 2 [ 116s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 116s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 116s] make: *** [debian/rules:9: build] Error 25 [ 116s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 116s] ### VM INTERACTION START ### [ 119s] [ 96.045879] sysrq: SysRq : Power Off [ 119s] [ 96.049805] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] cloud117 failed "build ulfius_2.5.2-4.1.dsc" at Sun Jul 5 06:50:26 UTC 2020. [ 119s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Jul 5 08:37:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jul 2020 08:37:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: cosmetic: mark private test case functions as such In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19133 ) Change subject: BTS_Tests: cosmetic: mark private test case functions as such ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I173e42dbe1694a10b54f95a730df2e64f2c65d17 Gerrit-Change-Number: 19133 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 05 Jul 2020 08:37:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 08:37:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jul 2020 08:37:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: cosmetic: mark private types / functions as such In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19134 ) Change subject: BTS_Tests: cosmetic: mark private types / functions as such ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I99ccf398130c7e5c2aac1932ebb83f158fed281d Gerrit-Change-Number: 19134 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 05 Jul 2020 08:37:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 08:37:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jul 2020 08:37:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: cosmetic: mark friend types / functions as such In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19135 ) Change subject: BTS_Tests: cosmetic: mark friend types / functions as such ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I53296b0d66594c198251526c8433a07348d821b1 Gerrit-Change-Number: 19135 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 05 Jul 2020 08:37:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 08:37:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jul 2020 08:37:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: move ts_RRM_GprsSuspReq to L3_Templates.ttcn In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19136 ) Change subject: BTS_Tests: move ts_RRM_GprsSuspReq to L3_Templates.ttcn ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib1aa0053cfca8ccd6ff613ab3b1c4f5afbd27534 Gerrit-Change-Number: 19136 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 05 Jul 2020 08:37:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 08:38:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jul 2020 08:38:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: mark both TC_rll_data_{req, ind} as TODO In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19137 ) Change subject: BTS_Tests: mark both TC_rll_data_{req,ind} as TODO ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I55d8dbc3a5cb3b0422cb6329b2bd60dd7b7fad6a Gerrit-Change-Number: 19137 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 05 Jul 2020 08:38:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 08:38:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jul 2020 08:38:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: cosmetic: mark private test case functions as such In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19133 ) Change subject: BTS_Tests: cosmetic: mark private test case functions as such ...................................................................... BTS_Tests: cosmetic: mark private test case functions as such Change-Id: I173e42dbe1694a10b54f95a730df2e64f2c65d17 --- M bts/BTS_Tests.ttcn 1 file changed, 45 insertions(+), 45 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 132e13e..1b6c9b2 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -674,7 +674,7 @@ ***********************************************************************/ /* Stress test: Do 500 channel activations/deactivations in rapid succession */ -function f_TC_chan_act_stress(charstring id) runs on ConnHdlr { +private function f_TC_chan_act_stress(charstring id) runs on ConnHdlr { for (var integer i := 0; i < 500; i := i+1) { f_rsl_chan_act(g_pars.chan_mode); f_rsl_chan_deact(); @@ -691,7 +691,7 @@ } /* Test if re-activation of an already active channel fails as expected */ -function f_TC_chan_act_react(charstring id) runs on ConnHdlr { +private function f_TC_chan_act_react(charstring id) runs on ConnHdlr { f_rsl_chan_act(g_pars.chan_mode); /* attempt to activate the same lchan again -> expect reject */ RSL.send(ts_RSL_CHAN_ACT(g_chan_nr, g_pars.chan_mode)); @@ -715,7 +715,7 @@ } /* Attempt to de-activate a channel that's not active */ -function f_TC_chan_deact_not_active(charstring id) runs on ConnHdlr { +private function f_TC_chan_deact_not_active(charstring id) runs on ConnHdlr { timer T := 3.0; RSL.send(ts_RSL_RF_CHAN_REL(g_chan_nr)); T.start; @@ -737,7 +737,7 @@ } /* attempt to activate channel with wrong RSL Channel Nr IE; expect NACK */ -function f_TC_chan_act_wrong_nr(charstring id) runs on ConnHdlr { +private function f_TC_chan_act_wrong_nr(charstring id) runs on ConnHdlr { RSL.send(ts_RSL_CHAN_ACT(g_chan_nr, g_pars.chan_mode)); alt { [] RSL.receive(tr_RSL_CHAN_ACT_ACK(g_chan_nr)) { @@ -1571,7 +1571,7 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } -function f_TC_ho_rach(charstring id) runs on ConnHdlr { +private function f_TC_ho_rach(charstring id) runs on ConnHdlr { var GsmFrameNumber fn; var RSL_Message rm; @@ -2000,7 +2000,7 @@ } /* establish DChan, verify existance + contents of measurement reports */ -function f_TC_meas_res_periodic(charstring id) runs on ConnHdlr { +private function f_TC_meas_res_periodic(charstring id) runs on ConnHdlr { f_l1_tune(L1CTL); RSL.clear; @@ -2168,7 +2168,7 @@ } /* Verify Tx power reduction and ramping up during BTS bring up */ -function f_TC_tx_power_start_ramp_up_bcch(charstring id) runs on ConnHdlr { +private function f_TC_tx_power_start_ramp_up_bcch(charstring id) runs on ConnHdlr { f_l1_tune(L1CTL); RSL.clear; @@ -2188,7 +2188,7 @@ } /* Verify Tx power reduction and ramping downd uring BTS bring shutdown due to Abis link failure */ -function f_TC_tx_power_start_ramp_down_bcch(charstring id) runs on ConnHdlr { +private function f_TC_tx_power_start_ramp_down_bcch(charstring id) runs on ConnHdlr { f_connhdlr_init_vty_bsc(); f_l1_tune(L1CTL); @@ -2218,7 +2218,7 @@ * + ramping down during ADM state UNLOCKED->LOCKED * + ramping up during ADM state LOCKED->UNLOCKED */ -function f_TC_tx_power_ramp_adm_state_change(charstring id) runs on ConnHdlr { +private function f_TC_tx_power_ramp_adm_state_change(charstring id) runs on ConnHdlr { var L1ctlDlMessage l1_dl; var integer last_rx_lvl; @@ -2290,7 +2290,7 @@ /* see if the rsl meas res contains our expeced bs power level bs power set during assignment */ -function f_TC_rsl_bs_pwr_static_ass(charstring id) runs on ConnHdlr { +private function f_TC_rsl_bs_pwr_static_ass(charstring id) runs on ConnHdlr { f_l1_tune(L1CTL); RSL.clear; @@ -2313,7 +2313,7 @@ /* see if the rsl meas res contains our expeced bs power level bs power set after assignment */ -function f_TC_rsl_bs_pwr_static_power_control(charstring id) runs on ConnHdlr { +private function f_TC_rsl_bs_pwr_static_power_control(charstring id) runs on ConnHdlr { f_l1_tune(L1CTL); RSL.clear; @@ -2364,7 +2364,7 @@ /* target level -100, first rssi -90, ms power 7, expected increase to 7+6 within 6 seconds, second rssi -110, ms power 7+6, expected decrease to 7 within 6 seconds, These power levels are valid for all bands and require no special handling */ -function f_TC_rsl_ms_pwr_dyn_ass_updown(charstring id) runs on ConnHdlr { +private function f_TC_rsl_ms_pwr_dyn_ass_updown(charstring id) runs on ConnHdlr { var uint5_t pwr_var := 7; var L1ctlDlMessage l1_dl; @@ -2432,7 +2432,7 @@ } /* check that we do not exceed the max power */ -function f_TC_rsl_ms_pwr_dyn_max(charstring id) runs on ConnHdlr { +private function f_TC_rsl_ms_pwr_dyn_max(charstring id) runs on ConnHdlr { var uint5_t pwr_var := 7; var L1ctlDlMessage l1_dl; @@ -2474,7 +2474,7 @@ } /* see if we reach the band max power */ -function f_TC_rsl_ms_pwr_dyn_up(charstring id) runs on ConnHdlr { +private function f_TC_rsl_ms_pwr_dyn_up(charstring id) runs on ConnHdlr { var L1ctlDlMessage l1_dl; var uint5_t pwr_var := 15; var uint5_t pwr_max_var := f_get_max_power_from_band(); @@ -2524,7 +2524,7 @@ } /* see if we reach the band min power */ -function f_TC_rsl_ms_pwr_dyn_down(charstring id) runs on ConnHdlr { +private function f_TC_rsl_ms_pwr_dyn_down(charstring id) runs on ConnHdlr { var L1ctlDlMessage l1_dl; /* set a high value to ensure power decreases */ @@ -2575,7 +2575,7 @@ /* see if we change the power level without receiving power parameters, which should not happen rsl chan act WITHOUT power parameters */ -function f_TC_rsl_ms_pwr_dyn_active(charstring id) runs on ConnHdlr { +private function f_TC_rsl_ms_pwr_dyn_active(charstring id) runs on ConnHdlr { var L1ctlDlMessage l1_dl; /* set a high value to ensure power decreases */ @@ -2616,7 +2616,7 @@ /* see if we change the power level without receiving power parameters, which should not happen ms power control WITHOUT power parameters */ -function f_TC_rsl_ms_pwr_dyn_active2(charstring id) runs on ConnHdlr { +private function f_TC_rsl_ms_pwr_dyn_active2(charstring id) runs on ConnHdlr { var L1ctlDlMessage l1_dl; /* set a high value to ensure power decreases */ @@ -2902,7 +2902,7 @@ /* establish DChan, and send MS POWER CONTROL messages via RSL, verify that * the BTS is forwarding those values to the MS via the SACCH L1 header. */ -function f_tc_rsl_ms_pwr_ctrl(charstring id) runs on ConnHdlr { +private function f_tc_rsl_ms_pwr_ctrl(charstring id) runs on ConnHdlr { var L1ctlDlMessage l1_dl; var RSL_IE_MS_Power ms_power; var RSL_Message rsl; @@ -2973,7 +2973,7 @@ /* establish DChan, verify that the BTS sets the TA in the first SACCH L1 header. TA for the IMM ASS messages is still controlled by g_pars.l1_pars.ms_actual_ta! */ -function f_tc_rsl_chan_initial_ta(charstring id) runs on ConnHdlr { +private function f_tc_rsl_chan_initial_ta(charstring id) runs on ConnHdlr { var L1ctlDlMessage l1_dl; var uint5_t ta_to_test := 16; @@ -3022,7 +3022,7 @@ } /* establish DChan, verify that the BTS sets MS power in the first SACCH L1 header. */ -function f_tc_rsl_chan_initial_ms_pwr(charstring id) runs on ConnHdlr { +private function f_tc_rsl_chan_initial_ms_pwr(charstring id) runs on ConnHdlr { var L1ctlDlMessage l1_dl; var uint5_t ms_power_level := 7; @@ -3900,7 +3900,7 @@ /* helper function: Set given SI via RSL + validate scheduling. * CALLER MUST MAKE SURE TO CHANGE GLOBAL si_cfg! */ -function f_TC_si_sched() runs on test_CT { +private function f_TC_si_sched() runs on test_CT { var SystemInformationVectorPerTc si_per_tc; f_init_l1ctl(); f_l1_tune(L1CTL); @@ -4068,14 +4068,14 @@ } /* Send messages with wrong message type */ -function f_TC_wrong_msg_type_dchan(charstring id) runs on ConnHdlr { +private function f_TC_wrong_msg_type_dchan(charstring id) runs on ConnHdlr { var template (value) RSL_Message rsl_tx; rsl_tx := ts_RSL_CHAN_ACT(g_chan_nr, g_pars.chan_mode); rsl_tx.msg_type := RSL_MT_NOT_CMD; RSL.send(rsl_tx); f_rslem_unregister(0, g_chan_nr); } -function f_TC_wrong_msg_type_rll(charstring id) runs on ConnHdlr { +private function f_TC_wrong_msg_type_rll(charstring id) runs on ConnHdlr { var template (value) RSL_Message rsl_tx; /* we first have to activate the dedicated channel */ f_rsl_chan_act(g_pars.chan_mode); @@ -4120,7 +4120,7 @@ } /* Send messages in wrong sequence (RLL to an inactive lchan) */ -function f_TC_err_rep_wrong_sequence(charstring id) runs on ConnHdlr { +private function f_TC_err_rep_wrong_sequence(charstring id) runs on ConnHdlr { RSL.send(ts_RSL_UNITDATA_REQ(g_chan_nr, ts_RslLinkID_DCCH(0), '0102'O)); f_rslem_unregister(0, g_chan_nr); } @@ -4141,7 +4141,7 @@ ***********************************************************************/ /* Send IPA DLCX to inactive lchan */ -function f_TC_ipa_dlcx_not_active(charstring id) runs on ConnHdlr { +private function f_TC_ipa_dlcx_not_active(charstring id) runs on ConnHdlr { f_rsl_transceive(ts_RSL_IPA_DLCX(g_chan_nr, 0), tr_RSL_IPA_DLCX_ACK(g_chan_nr, ?, ?), "IPA DLCX ACK"); } @@ -4153,7 +4153,7 @@ } /* Send IPA CRCX twice to inactive lchan */ -function f_TC_ipa_crcx_twice_not_active(charstring id) runs on ConnHdlr { +private function f_TC_ipa_crcx_twice_not_active(charstring id) runs on ConnHdlr { f_rsl_transceive(ts_RSL_IPA_CRCX(g_chan_nr), tr_RSL_IPA_CRCX_ACK(g_chan_nr, ?, ?, ?), "IPA CRCX ACK"); f_rsl_transceive(ts_RSL_IPA_CRCX(g_chan_nr), tr_RSL_IPA_CRCX_NACK(g_chan_nr, RSL_ERR_RES_UNAVAIL), @@ -4167,7 +4167,7 @@ } /* Regular sequence of CRCX/MDCX/DLCX */ -function f_TC_ipa_crcx_mdcx_dlcx_not_active(charstring id) runs on ConnHdlr { +private function f_TC_ipa_crcx_mdcx_dlcx_not_active(charstring id) runs on ConnHdlr { f_rsl_transceive(ts_RSL_IPA_CRCX(g_chan_nr), tr_RSL_IPA_CRCX_ACK(g_chan_nr, ?, ?, ?), "IPA CRCX ACK"); var uint32_t remote_ip := f_rnd_int(c_UINT32_MAX); @@ -4188,7 +4188,7 @@ } /* Sequence of CRCX, 2x MDCX, DLCX */ -function f_TC_ipa_crcx_mdcx_mdcx_dlcx_not_active(charstring id) runs on ConnHdlr { +private function f_TC_ipa_crcx_mdcx_mdcx_dlcx_not_active(charstring id) runs on ConnHdlr { f_rsl_transceive(ts_RSL_IPA_CRCX(g_chan_nr), tr_RSL_IPA_CRCX_ACK(g_chan_nr, ?, ?, ?), "IPA CRCX ACK"); var uint32_t remote_ip := f_rnd_int(c_UINT32_MAX); @@ -4215,7 +4215,7 @@ } /* IPA CRCX on SDCCH/4 and SDCCH/8 (doesn't make sense) */ -function f_TC_ipa_crcx_sdcch_not_active(charstring id) runs on ConnHdlr { +private function f_TC_ipa_crcx_sdcch_not_active(charstring id) runs on ConnHdlr { f_rsl_transceive(ts_RSL_IPA_CRCX(g_chan_nr), tr_RSL_IPA_CRCX_NACK(g_chan_nr, ?), "IPA CRCX NACK"); } @@ -5415,7 +5415,7 @@ } /* Activate Osmocom-style dynamic PDCH from BSC side */ -function f_TC_dyn_osmo_pdch_act_deact(charstring id) runs on ConnHdlr { +private function f_TC_dyn_osmo_pdch_act_deact(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; var integer ts_nr := g_chan_nr.tn; var integer trx_nr := 0; @@ -5440,7 +5440,7 @@ } /* send a RF CHAN REL for PDCH on an osmocom dynamci PDCH that's already inactive */ -function f_TC_dyn_osmo_pdch_unsol_deact(charstring id) runs on ConnHdlr { +private function f_TC_dyn_osmo_pdch_unsol_deact(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; var integer pcu_conn_id := -1; @@ -5462,7 +5462,7 @@ } /* try to RSL CHAN ACT a PDCH on an osmocom-style PDCH that's already active */ -function f_TC_dyn_osmo_pdch_double_act(charstring id) runs on ConnHdlr { +private function f_TC_dyn_osmo_pdch_double_act(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; var integer ts_nr := g_chan_nr.tn; var integer trx_nr := 0; @@ -5488,7 +5488,7 @@ } /* try to RSL CHAN ACT a TCH/F on an osmocom-style PDCH */ -function f_TC_dyn_osmo_pdch_tchf_act(charstring id) runs on ConnHdlr { +private function f_TC_dyn_osmo_pdch_tchf_act(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; var integer ts_nr := g_chan_nr.tn; var integer trx_nr := 0; @@ -5516,7 +5516,7 @@ } /* try to RSL CHAN ACT the TCH/H on an osmocom-style PDCH */ -function f_TC_dyn_osmo_pdch_tchh_act(charstring id) runs on ConnHdlr { +private function f_TC_dyn_osmo_pdch_tchh_act(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; var integer ts_nr := g_chan_nr.tn; var integer trx_nr := 0; @@ -5615,7 +5615,7 @@ } /* Activate and de-activate an IPA-style dynamic TCH/F + PDCH */ -function f_TC_dyn_ipa_pdch_act_deact(charstring id) runs on ConnHdlr { +private function f_TC_dyn_ipa_pdch_act_deact(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; var integer ts_nr := g_chan_nr.tn; var integer trx_nr := 0; @@ -5642,7 +5642,7 @@ } /* try to RSL CHAN ACT a TCH/F on an IPA-style PDCH */ -function f_TC_dyn_ipa_pdch_tchf_act(charstring id) runs on ConnHdlr { +private function f_TC_dyn_ipa_pdch_tchf_act(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; var integer ts_nr := g_chan_nr.tn; var integer trx_nr := 0; @@ -5668,7 +5668,7 @@ } /* Activate IPA style dyn PDCH as TCH/F and then illegally try to activate it as PDCH, too */ -function f_TC_dyn_ipa_pdch_tchf_act_pdch_act_nack(charstring id) runs on ConnHdlr { +private function f_TC_dyn_ipa_pdch_tchf_act_pdch_act_nack(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; var integer ts_nr := g_chan_nr.tn; var integer trx_nr := 0; @@ -5704,7 +5704,7 @@ } /* try to RSL CHAN ACT a TCH/F on an IPA-style PDCH that's already in PDCH mode; expect NACK */ -function f_TC_dyn_ipa_pdch_act_tchf_act_nack(charstring id) runs on ConnHdlr { +private function f_TC_dyn_ipa_pdch_act_tchf_act_nack(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; var integer ts_nr := g_chan_nr.tn; var integer trx_nr := 0; @@ -6217,7 +6217,7 @@ } /* Test channel activation with A5/n right from the beginning (like in assignment + hand-over) */ -function f_TC_chan_act_encr(charstring id) runs on ConnHdlr { +private function f_TC_chan_act_encr(charstring id) runs on ConnHdlr { f_l1_tune(L1CTL); f_est_dchan(true); @@ -6256,7 +6256,7 @@ /* Test channel activation with A5/n right from the beginning and RSL MODE MODIFY which should break the en/decryption on purpose by supplying a new key that is unknown to the MS*/ -function f_TC_rsl_modify_encr(charstring id) runs on ConnHdlr { +private function f_TC_rsl_modify_encr(charstring id) runs on ConnHdlr { f_l1_tune(L1CTL); f_est_dchan(true); @@ -6321,7 +6321,7 @@ } /* Test unencrypted channel activation followed by explicit ENCR CMD later */ -function f_TC_encr_cmd(charstring id) runs on ConnHdlr { +private function f_TC_encr_cmd(charstring id) runs on ConnHdlr { /* L3 payload doesn't matter, as it is passed transparently */ var BIT3 l3_alg_id := f_alg_id_to_l3(g_pars.encr.alg_id); var octetstring l3 := enc_PDU_ML3_NW_MS(valueof(ts_RRM_CiphModeCmd(l3_alg_id))); @@ -6445,7 +6445,7 @@ g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,7))); } -function f_test_l2_fill_frames(boolean dtxd) runs on ConnHdlr { +private function f_test_l2_fill_frames(boolean dtxd) runs on ConnHdlr { var L1ctlDlMessage dl; var octetstring l2_fill_frame := '0303012B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B'O; var octetstring l2_fill_frame_sacch := substr(l2_fill_frame, 0, lengthof(l2_fill_frame) - 2); @@ -6583,15 +6583,15 @@ } } -function f_TC_tch_sign_l2_fill_frame(charstring id) runs on ConnHdlr { +private function f_TC_tch_sign_l2_fill_frame(charstring id) runs on ConnHdlr { f_test_l2_fill_frames(false); } -function f_TC_tch_sign_l2_fill_frame_dtxd(charstring id) runs on ConnHdlr { +private function f_TC_tch_sign_l2_fill_frame_dtxd(charstring id) runs on ConnHdlr { f_test_l2_fill_frames(true); } -function f_tch_sign_l2_fill_frame(boolean dtxd) runs on test_CT { +private function f_tch_sign_l2_fill_frame(boolean dtxd) runs on test_CT { var ConnHdlr vc_conn; var ConnHdlrPars pars; pars.t_guard := 60.0; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I173e42dbe1694a10b54f95a730df2e64f2c65d17 Gerrit-Change-Number: 19133 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 08:38:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jul 2020 08:38:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: cosmetic: mark private types / functions as such In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19134 ) Change subject: BTS_Tests: cosmetic: mark private types / functions as such ...................................................................... BTS_Tests: cosmetic: mark private types / functions as such Change-Id: I99ccf398130c7e5c2aac1932ebb83f158fed281d --- M bts/BTS_Tests.ttcn 1 file changed, 93 insertions(+), 63 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 1b6c9b2..a42f628 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -187,7 +187,7 @@ port PCUIF_CODEC_PT PCU; } -function f_init_rsl(charstring id) runs on test_CT { +private function f_init_rsl(charstring id) runs on test_CT { var bitstring trx_mask := '00000000'B; var integer trx_count := 0; var RSLEm_Event ev; @@ -250,11 +250,11 @@ } /* Test-specific parameters */ -type union TestSpecUnion { +private type union TestSpecUnion { RllTestCase rll } -template (value) RachControlParameters ts_RachCtrl_default := { +private template (value) RachControlParameters ts_RachCtrl_default := { max_retrans := RACH_MAX_RETRANS_7, tx_integer := '1001'B, /* 12 slots */ cell_barr_access := false, @@ -262,7 +262,7 @@ acc := '0000010000000000'B }; -template (value) CellSelectionParameters ts_CellSelPar_default := { +private template (value) CellSelectionParameters ts_CellSelPar_default := { cell_resel_hyst_2dB := 2, ms_txpwr_max_cch := mp_ms_power_level_exp, acs := '0'B, @@ -270,7 +270,7 @@ rxlev_access_min := 0 } -template (value) LocationAreaIdentification ts_LAI_default := { +private template (value) LocationAreaIdentification ts_LAI_default := { mcc_mnc := '262F42'H, lac := 42 } @@ -297,7 +297,7 @@ } /* Default SYSTEM INFORMATION 3 */ -template (value) SystemInformation ts_SI3_default := { +private template (value) SystemInformation ts_SI3_default := { header := ts_RrHeader(SYSTEM_INFORMATION_TYPE_3, 18), payload := { si3 := { @@ -327,7 +327,7 @@ } } -template (value) SystemInformation ts_SI2_default := { +private template (value) SystemInformation ts_SI2_default := { header := ts_RrHeader(SYSTEM_INFORMATION_TYPE_2, 22), payload := { si2 := { @@ -338,7 +338,7 @@ } } -template (value) SystemInformation ts_SI4_default := { +private template (value) SystemInformation ts_SI4_default := { header := ts_RrHeader(SYSTEM_INFORMATION_TYPE_4, 12), /* no CBCH / restoct */ payload := { si4 := { @@ -352,13 +352,13 @@ } } -function f_rsl_bcch_fill_raw(RSL_IE_SysinfoType rsl_si_type, octetstring si_enc) +private function f_rsl_bcch_fill_raw(RSL_IE_SysinfoType rsl_si_type, octetstring si_enc) runs on test_CT { log("Setting ", rsl_si_type, ": ", si_enc); RSL_CCHAN.send(ts_ASP_RSL_UD(ts_RSL_BCCH_INFO(rsl_si_type, si_enc))); } -function f_rsl_bcch_fill(RSL_IE_SysinfoType rsl_si_type, template (value) SystemInformation si_dec) +private function f_rsl_bcch_fill(RSL_IE_SysinfoType rsl_si_type, template (value) SystemInformation si_dec) runs on test_CT { var octetstring si_enc := enc_SystemInformation(valueof(si_dec)); log("Setting ", rsl_si_type, ": ", si_dec); @@ -508,7 +508,7 @@ f_connect_reset(L1CTL); } -type function void_fn(charstring id) runs on ConnHdlr; +private type function void_fn(charstring id) runs on ConnHdlr; /* create a new test component */ function f_start_handler(void_fn fn, ConnHdlrPars pars, @@ -581,8 +581,8 @@ fn.apply(id); } -function f_rsl_transceive_ret(template RSL_Message tx, template RSL_Message exp_rx, charstring id, - boolean ignore_other := false) +private function f_rsl_transceive_ret(template RSL_Message tx, template RSL_Message exp_rx, + charstring id, boolean ignore_other := false) runs on ConnHdlr return RSL_Message { var RSL_Message rx; timer T := 3.0; @@ -1644,7 +1644,7 @@ * Measurement Processing / Reporting ***********************************************************************/ -template LapdmAddressField ts_LapdmAddr(LapdmSapi sapi, boolean c_r) := { +private template LapdmAddressField ts_LapdmAddr(LapdmSapi sapi, boolean c_r) := { spare := '0'B, lpd := 0, sapi := sapi, @@ -1652,7 +1652,7 @@ ea := true } -template LapdmFrameAB ts_LAPDm_AB(LapdmSapi sapi, boolean c_r, boolean p, octetstring pl) := { +private template LapdmFrameAB ts_LAPDm_AB(LapdmSapi sapi, boolean c_r, boolean p, octetstring pl) := { addr := ts_LapdmAddr(sapi, c_r), ctrl := ts_LapdmCtrlUI(p), len := 0, /* overwritten */ @@ -1662,7 +1662,7 @@ } /* handle incoming downlink SACCH and respond with uplink SACCH (meas res) */ -altstep as_l1_sacch() runs on ConnHdlr { +private altstep as_l1_sacch() runs on ConnHdlr { var L1ctlDlMessage l1_dl; [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { log("SACCH received: ", l1_dl.payload.data_ind.payload); @@ -1683,7 +1683,7 @@ } } -altstep as_l1_dcch() runs on ConnHdlr { +private altstep as_l1_dcch() runs on ConnHdlr { var L1ctlDlMessage l1_dl; [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_DCCH(?))) -> value l1_dl { log("DCCH received: ", l1_dl.payload.data_ind.payload); @@ -1694,17 +1694,17 @@ } } -type record MeasElem { +private type record MeasElem { uint6_t rxlev, uint3_t rxqual } -type record MeasElemFS { +private type record MeasElemFS { MeasElem full, MeasElem sub } -type record ConnL1Pars { +private type record ConnL1Pars { boolean dtx_enabled, boolean toa256_enabled, MeasElemFS meas_ul, @@ -1834,7 +1834,7 @@ } /* verify we regularly receive measurement reports with incrementing numbers */ -altstep as_meas_res(boolean verify_meas := true) runs on ConnHdlr { +private altstep as_meas_res(boolean verify_meas := true) runs on ConnHdlr { var RSL_Message rsl; var boolean chan_est := false; @@ -2268,7 +2268,7 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } -function f_check_meas_bs_power_level(integer level) runs on ConnHdlr { +private function f_check_meas_bs_power_level(integer level) runs on ConnHdlr { timer T := 8.0; T.start; var RSL_Message rsl; @@ -2658,7 +2658,7 @@ } -function f_wait_for_l1_power_level(integer level) runs on ConnHdlr { +private function f_wait_for_l1_power_level(integer level) runs on ConnHdlr { var L1ctlDlMessage l1_dl; timer T0 := 10.0; T0.start; @@ -2712,7 +2712,7 @@ } type charstring BtsBand ("GSM450","GSM480","GSM750","GSM810","GSM850","GSM900","DCS1800","PCS1900"); -template charstring BtsBand_allGSM:= pattern "GSM???"; +private template charstring BtsBand_allGSM := pattern "GSM???"; private function f_power_from_band(in BtsBand band, out IntegerRecord min_dbm_level, out IntegerRecord max_dbm_level) return IntegerRecord { // 45.005 4.1.1 var IntegerRecord gsm_power :={31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, @@ -3099,7 +3099,7 @@ * Paging ***********************************************************************/ -function tmsi_is_dummy(TMSIP_TMSI_V tmsi) return boolean { +private function tmsi_is_dummy(TMSIP_TMSI_V tmsi) return boolean { if (tmsi == 'FFFFFFFF'O) { return true; } else { @@ -3107,16 +3107,16 @@ } } -type record allowedFn { integer frame_nr } -template allowedFn bs_ag_blks_res_0 := { frame_nr := (6, 12, 16, 22, 26, 32, 36, 42, 46) } -template allowedFn bs_ag_blks_res_1 := { frame_nr := (12, 16, 22, 26, 32, 36, 42, 46) } -template allowedFn bs_ag_blks_res_2 := { frame_nr := (16, 22, 26, 32, 36, 42, 46) } -template allowedFn bs_ag_blks_res_3 := { frame_nr := (22, 26, 32, 36, 42, 46) } -template allowedFn bs_ag_blks_res_4 := { frame_nr := (26, 32, 36, 42, 46) } -template allowedFn bs_ag_blks_res_5 := { frame_nr := (32, 36, 42, 46) } -template allowedFn bs_ag_blks_res_6 := { frame_nr := (36, 42, 46) } -template allowedFn bs_ag_blks_res_7 := { frame_nr := (42, 46) } -function check_pch_fn(integer frame_nr, integer bs_ag_blks_res) runs on test_CT +private type record allowedFn { integer frame_nr } +private template allowedFn bs_ag_blks_res_0 := { frame_nr := (6, 12, 16, 22, 26, 32, 36, 42, 46) } +private template allowedFn bs_ag_blks_res_1 := { frame_nr := (12, 16, 22, 26, 32, 36, 42, 46) } +private template allowedFn bs_ag_blks_res_2 := { frame_nr := (16, 22, 26, 32, 36, 42, 46) } +private template allowedFn bs_ag_blks_res_3 := { frame_nr := (22, 26, 32, 36, 42, 46) } +private template allowedFn bs_ag_blks_res_4 := { frame_nr := (26, 32, 36, 42, 46) } +private template allowedFn bs_ag_blks_res_5 := { frame_nr := (32, 36, 42, 46) } +private template allowedFn bs_ag_blks_res_6 := { frame_nr := (36, 42, 46) } +private template allowedFn bs_ag_blks_res_7 := { frame_nr := (42, 46) } +private function check_pch_fn(integer frame_nr, integer bs_ag_blks_res) runs on test_CT { var integer frame_nr_51; frame_nr_51 := frame_nr mod 51 @@ -3158,7 +3158,9 @@ return; } -altstep as_l1_count_paging(inout integer num_paging_rcv_msgs, inout integer num_paging_rcv_ids, PagingTestCfg cfg) +private altstep as_l1_count_paging(inout integer num_paging_rcv_msgs, + inout integer num_paging_rcv_ids, + PagingTestCfg cfg) runs on test_CT { var L1ctlDlMessage dl; [] L1CTL.receive(tr_L1CTL_DATA_IND(t_RslChanNr_PCH_AGCH(0), ?, c_DummyUI)) { @@ -3210,7 +3212,7 @@ } } -type record PagingTestCfg { +private type record PagingTestCfg { boolean combined_ccch, integer bs_ag_blks_res, float load_factor, @@ -3219,7 +3221,7 @@ boolean use_tmsi } -type record PagingTestState { +private type record PagingTestState { integer num_paging_sent, integer num_paging_rcv_msgs, integer num_paging_rcv_ids, @@ -3439,8 +3441,9 @@ ma := ''B } -template (value) ChannelDescription ts_ChanDescH0(template (value) RslChannelNr chan_nr, uint3_t tsc := 7, - uint12_t arfcn := mp_trx0_arfcn) := { +private template (value) ChannelDescription ts_ChanDescH0(template (value) RslChannelNr chan_nr, + template (value) uint3_t tsc := 7, + template (value) uint12_t arfcn := mp_trx0_arfcn) := { chan_nr := chan_nr, tsc := tsc, h := false, @@ -3448,8 +3451,9 @@ maio_hsn := omit } -template (value) ChannelDescription ts_ChanDescH1(template (value) RslChannelNr chan_nr, uint3_t tsc := 7, - template (value) MaioHsn maio_hsn) := { +private template (value) ChannelDescription ts_ChanDescH1(template (value) RslChannelNr chan_nr, + template (value) uint3_t tsc := 7, + template (value) MaioHsn maio_hsn) := { chan_nr := chan_nr, tsc := tsc, h := true, @@ -3544,19 +3548,22 @@ ***********************************************************************/ /* tuple of Frame Number + decoded SI */ -type record SystemInformationFn { +private type record SystemInformationFn { GsmFrameNumber frame_number, SystemInformation si } /* an arbitrary-length vector of decoded SI + gsmtap header */ -type record of SystemInformationFn SystemInformationVector; +private type record of SystemInformationFn SystemInformationVector; /* an array of SI-vectors indexed by TC value */ -type SystemInformationVector SystemInformationVectorPerTc[8]; +private type SystemInformationVector SystemInformationVectorPerTc[8]; /* determine if a given SI vector contains given SI type at least once */ -function f_si_vecslot_contains(SystemInformationVector arr, RrMessageType key, boolean bcch_ext := false) return boolean { +private function f_si_vecslot_contains(SystemInformationVector arr, + RrMessageType key, + boolean bcch_ext := false) +return boolean { for (var integer i:= 0; i< sizeof(arr); i := i + 1) { var integer fn_mod51 := arr[i].frame_number mod 51; if (not bcch_ext and fn_mod51 == 2 or @@ -3570,14 +3577,19 @@ } /* ensure a given TC slot of the SI vector contains given SI type at least once at TC */ -function f_ensure_si_vec_contains(SystemInformationVectorPerTc arr, integer tc, RrMessageType key, boolean ext_bcch := false) { +private function f_ensure_si_vec_contains(SystemInformationVectorPerTc arr, + integer tc, RrMessageType key, + boolean ext_bcch := false) +{ if (not f_si_vecslot_contains(arr[tc], key, ext_bcch)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("No ", key, " in TC=", tc, "!")); } } /* check if a given SI vector contains given SI type at least once on any TC */ -function f_si_vec_contains(SystemInformationVectorPerTc arr, RrMessageType key) return boolean { +private function f_si_vec_contains(SystemInformationVectorPerTc arr, + RrMessageType key) +return boolean { for (var integer tc:= 0; tc < sizeof(arr); tc := tc + 1) { if (f_si_vecslot_contains(arr[tc], key) or f_si_vecslot_contains(arr[tc], key, true)) { @@ -3588,7 +3600,11 @@ } /* determine if a given SI vector contains given SI type at least N of M times */ -function f_si_vecslot_contains_n_of_m(SystemInformationVector arr, RrMessageType key, boolean bcch_ext := false, integer n := 1, integer m := 4) return boolean { +private function f_si_vecslot_contains_n_of_m(SystemInformationVector arr, + RrMessageType key, + boolean bcch_ext := false, + integer n := 1, integer m := 4) +return boolean { var integer count := 0; if (sizeof(arr) < m) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Error: Insufficient SI in array"); @@ -3610,14 +3626,21 @@ } /* ensure a given TC slot of the SI vector contains given SI type at least N out of M times at TC */ -function f_ensure_si_vec_contains_n_of_m(SystemInformationVectorPerTc arr, integer tc, RrMessageType key, boolean ext_bcch := false, integer n, integer m) { +private function f_ensure_si_vec_contains_n_of_m(SystemInformationVectorPerTc arr, + integer tc, RrMessageType key, + boolean ext_bcch := false, + integer n, integer m) +{ if (not f_si_vecslot_contains_n_of_m(arr[tc], key, ext_bcch, n, m)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Not ", n, "/", m, " of ", key, " in TC=", tc, "!")); } } /* determine if a given SI vector contains given SI type at least once */ -function f_si_vecslot_contains_only(SystemInformationVector arr, RrMessageType key, boolean bcch_ext := false) return boolean { +private function f_si_vecslot_contains_only(SystemInformationVector arr, + RrMessageType key, + boolean bcch_ext := false) +return boolean { for (var integer i:= 0; i< sizeof(arr); i := i + 1) { var integer fn_mod51 := arr[i].frame_number mod 51; if (not bcch_ext and fn_mod51 == 2 or @@ -3631,14 +3654,17 @@ } /* ensure a given TC slot of the SI vector contains only given SI type */ -function f_ensure_si_vec_contains_only(SystemInformationVectorPerTc arr, integer tc, RrMessageType key, boolean ext_bcch := false) { +private function f_ensure_si_vec_contains_only(SystemInformationVectorPerTc arr, + integer tc, RrMessageType key, + boolean ext_bcch := false) +{ if (not f_si_vecslot_contains_only(arr[tc], key, ext_bcch)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Not all ", key, " in TC=", tc, "!")); } } /* SI configuration of cell, against which we validate actual SI messages */ -type set SystemInformationConfig { +private type set SystemInformationConfig { boolean bcch_extended, boolean si1_present, boolean si2bis_present, @@ -3658,7 +3684,9 @@ } /* validate the SI scheduling according to TS 45.002 version 14.1.0 Release 14, Section 6.3.1.3 */ -function f_validate_si_scheduling(SystemInformationConfig cfg, SystemInformationVectorPerTc si_per_tc) { +private function f_validate_si_scheduling(SystemInformationConfig cfg, + SystemInformationVectorPerTc si_per_tc) +{ var integer i; for (i := 0; i < sizeof(si_per_tc); i := i + 1) { if (sizeof(si_per_tc[i]) == 0) { @@ -3856,7 +3884,8 @@ } /* sample Systme Information for specified duration via L1CTL */ -function f_l1_sample_si(L1CTL_PT pt, float duration := 8.0) return SystemInformationVectorPerTc { +private function f_l1_sample_si(L1CTL_PT pt, float duration := 8.0) +return SystemInformationVectorPerTc { timer T := duration; var SystemInformationVectorPerTc si_per_tc; var L1ctlDlMessage l1_dl; @@ -5756,14 +5785,15 @@ } } -type record RllTestCase { +private type record RllTestCase { uint3_t sapi, RslLinkId link_id, octetstring l3, boolean exp } -type record of RllTestCase RllTestCases; -template RllTestCase t_EITC(uint3_t sapi, RslLinkId id, octetstring l3, boolean exp) := { +private type record of RllTestCase RllTestCases; +private template RllTestCase t_EITC(uint3_t sapi, RslLinkId id, + octetstring l3, boolean exp) := { sapi := sapi, link_id := id, l3 := l3, @@ -6152,7 +6182,7 @@ ***********************************************************************/ /* send UNITDATA_REQ from BTS to MS and expect it to arrive */ -function f_unitdata_mt(RslLinkId link_id, octetstring l3) runs on ConnHdlr { +private function f_unitdata_mt(RslLinkId link_id, octetstring l3) runs on ConnHdlr { RSL.send(ts_RSL_UNITDATA_REQ(g_chan_nr, link_id, l3)); if (link_id.c == SACCH) { f_l1_exp_lapdm(tr_LAPDm_B4_UI(link_id.sapi, cr_MT_CMD, l3)); @@ -6418,23 +6448,23 @@ ***********************************************************************/ /* XXX These functions must be kept in sync with g_AllChannels defined on test_CT. */ -function f_g_chan_is_tchf() runs on ConnHdlr return boolean { +private function f_g_chan_is_tchf() runs on ConnHdlr return boolean { return (g_chan_nr == valueof(ts_RslChanNr_Bm(1)) or g_chan_nr == valueof(ts_RslChanNr_Bm(2)) or g_chan_nr == valueof(ts_RslChanNr_Bm(3)) or g_chan_nr == valueof(ts_RslChanNr_Bm(4))); } -function f_g_chan_is_tchh() runs on ConnHdlr return boolean { +private function f_g_chan_is_tchh() runs on ConnHdlr return boolean { return (g_chan_nr == valueof(ts_RslChanNr_Lm(5,0)) or g_chan_nr == valueof(ts_RslChanNr_Lm(5,1))); } -function f_g_chan_is_sdcch4() runs on ConnHdlr return boolean { +private function f_g_chan_is_sdcch4() runs on ConnHdlr return boolean { return (g_chan_nr == valueof(ts_RslChanNr_SDCCH4(0,0)) or g_chan_nr == valueof(ts_RslChanNr_SDCCH4(0,1)) or g_chan_nr == valueof(ts_RslChanNr_SDCCH4(0,2)) or g_chan_nr == valueof(ts_RslChanNr_SDCCH4(0,3))); } -function f_g_chan_is_sdcch8() runs on ConnHdlr return boolean { +private function f_g_chan_is_sdcch8() runs on ConnHdlr return boolean { return (g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,0)) or g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,1)) or g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,2)) or -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I99ccf398130c7e5c2aac1932ebb83f158fed281d Gerrit-Change-Number: 19134 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 08:38:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jul 2020 08:38:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: cosmetic: mark friend types / functions as such In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19135 ) Change subject: BTS_Tests: cosmetic: mark friend types / functions as such ...................................................................... BTS_Tests: cosmetic: mark friend types / functions as such Change-Id: I53296b0d66594c198251526c8433a07348d821b1 --- M bts/BTS_Tests.ttcn 1 file changed, 13 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index a42f628..15b0730 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -429,7 +429,7 @@ } /* global init function */ -function f_init() runs on test_CT { +friend function f_init() runs on test_CT { var charstring id := testcasename(); g_AllChannels := { /* TS 1..4: TCH/F */ @@ -503,7 +503,7 @@ } /* Attach L1CTL to master test_CT (classic tests, non-handler mode) */ -function f_init_l1ctl() runs on test_CT { +friend function f_init_l1ctl() runs on test_CT { map(self:L1CTL, system:L1CTL); f_connect_reset(L1CTL); } @@ -511,9 +511,9 @@ private type function void_fn(charstring id) runs on ConnHdlr; /* create a new test component */ -function f_start_handler(void_fn fn, ConnHdlrPars pars, - boolean pcu_comp := false, - boolean trxc_comp := false) +friend function f_start_handler(void_fn fn, ConnHdlrPars pars, + boolean pcu_comp := false, + boolean trxc_comp := false) runs on test_CT return ConnHdlr { var charstring id := testcasename(); var ConnHdlr vc_conn; @@ -607,14 +607,17 @@ return rx; } -function f_rsl_transceive(template RSL_Message tx, template RSL_Message exp_rx, charstring id, - boolean ignore_other := false) +friend function f_rsl_transceive(template RSL_Message tx, template RSL_Message exp_rx, + charstring id, boolean ignore_other := false) runs on ConnHdlr { var RSL_Message rx := f_rsl_transceive_ret(tx, exp_rx, id, ignore_other); } -function f_rsl_chan_act(RSL_IE_ChannelMode mode, boolean encr_enable := false, RSL_IE_List more_ies := {}, - RSL_IE_ActivationType act_type := t_RSL_IE_ActType_IA) runs on ConnHdlr { +friend function f_rsl_chan_act(RSL_IE_ChannelMode mode, + boolean encr_enable := false, + RSL_IE_List more_ies := {}, + RSL_IE_ActivationType act_type := t_RSL_IE_ActType_IA) +runs on ConnHdlr { var RSL_Message ch_act := valueof(ts_RSL_CHAN_ACT(g_chan_nr, mode, act_type)); if (encr_enable) { /* append encryption related IEs, if requested */ @@ -627,7 +630,7 @@ f_rsl_transceive(ch_act, tr_RSL_CHAN_ACT_ACK(g_chan_nr), "RSL CHAN ACT"); } -function f_rsl_chan_deact() runs on ConnHdlr { +friend function f_rsl_chan_deact() runs on ConnHdlr { f_rsl_transceive(ts_RSL_RF_CHAN_REL(g_chan_nr), tr_RSL_RF_CHAN_REL_ACK(g_chan_nr), "RF CHAN REL", true); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I53296b0d66594c198251526c8433a07348d821b1 Gerrit-Change-Number: 19135 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 08:38:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jul 2020 08:38:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: move ts_RRM_GprsSuspReq to L3_Templates.ttcn In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19136 ) Change subject: BTS_Tests: move ts_RRM_GprsSuspReq to L3_Templates.ttcn ...................................................................... BTS_Tests: move ts_RRM_GprsSuspReq to L3_Templates.ttcn Change-Id: Ib1aa0053cfca8ccd6ff613ab3b1c4f5afbd27534 --- M bts/BTS_Tests.ttcn M library/L3_Templates.ttcn 2 files changed, 20 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 15b0730..c4d1c26 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5089,26 +5089,6 @@ setverdict(pass); } -template (value) PDU_ML3_MS_NW ts_RRM_GprsSuspReq(template (value) OCT4 tlli, - template (value) RoutingAreaIdentificationV rai, - template (value) OCT1 cause) := { - discriminator := '0000'B, /* overwritten */ - tiOrSkip := { - skipIndicator := '0000'B - }, - msgs := { - rrm := { - gPRS_suspensionRequest := { - messageType := '00110100'B, - tLLI := tlli, - routingAreaIdentification := rai, - suspensionCause := cause, - service_Support := omit - } - } - } -} - /* test for forwarding of RR SUSPEND from CS lchan to PCU via PCU socket */ private function f_TC_rr_suspend_req(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 8b09572..1bfcec0 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -3241,6 +3241,26 @@ } } +template (value) PDU_ML3_MS_NW ts_RRM_GprsSuspReq(template (value) OCT4 tlli, + template (value) RoutingAreaIdentificationV rai, + template (value) OCT1 cause) := { + discriminator := '0000'B, /* overwritten */ + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + rrm := { + gPRS_suspensionRequest := { + messageType := '00110100'B, + tLLI := tlli, + routingAreaIdentification := rai, + suspensionCause := cause, + service_Support := omit + } + } + } +} + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib1aa0053cfca8ccd6ff613ab3b1c4f5afbd27534 Gerrit-Change-Number: 19136 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 08:38:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 5 Jul 2020 08:38:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: mark both TC_rll_data_{req, ind} as TODO In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19137 ) Change subject: BTS_Tests: mark both TC_rll_data_{req,ind} as TODO ...................................................................... BTS_Tests: mark both TC_rll_data_{req,ind} as TODO Change-Id: I55d8dbc3a5cb3b0422cb6329b2bd60dd7b7fad6a --- M bts/BTS_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index c4d1c26..374228a 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -6069,11 +6069,11 @@ f_rll_testmatrix(tcs, refers(f_TC_rll_rel_req)); } -/* test if RLL DATA REQ triggers I-frames on Um (TS 48.058 3.5) */ +/* TODO: test if RLL DATA REQ triggers I-frames on Um (TS 48.058 3.5) */ testcase TC_rll_data_req() runs on test_CT { } -/* test if I-frames on Um trigger RLL DATA IND (TS 48.058 3.6) */ +/* TODO: test if I-frames on Um trigger RLL DATA IND (TS 48.058 3.6) */ testcase TC_rll_data_ind() runs on test_CT { } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I55d8dbc3a5cb3b0422cb6329b2bd60dd7b7fad6a Gerrit-Change-Number: 19137 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Jul 5 08:56:41 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jul 2020 08:56:41 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0195d7b1669_6202ab04e6885fc661589@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 62s] /usr/src/packages/BUILD/src/ulfius.c: In function 'ulfius_run_mhd_daemon': [ 62s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 62s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 62s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 62s] | | [ 62s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 62s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 62s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 62s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 62s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 62s] 2425 | MHD_start_daemon (unsigned int flags, [ 62s] | ^~~~~~~~~~~~~~~~ [ 62s] cc1: all warnings being treated as errors [ 62s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 62s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 62s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 62s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 62s] make[1]: *** [Makefile:166: all] Error 2 [ 62s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 62s] dh_auto_build: error: cd build && make -j3 "INSTALL=install --strip-program=true" returned exit code 2 [ 62s] make: *** [debian/rules:9: build] Error 25 [ 62s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 62s] ### VM INTERACTION START ### [ 65s] [ 57.391782] sysrq: SysRq : Power Off [ 65s] [ 57.392868] reboot: Power down [ 65s] ### VM INTERACTION END ### [ 65s] [ 65s] build71 failed "build ulfius_2.5.2-4.1.dsc" at Sun Jul 5 08:56:33 UTC 2020. [ 65s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 5 08:57:15 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jul 2020 08:57:15 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0195f85d562_6202ab04e6885fc6616e7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 112s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 112s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 112s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 112s] | | [ 112s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 112s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 112s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 112s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 112s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 112s] 2425 | MHD_start_daemon (unsigned int flags, [ 112s] | ^~~~~~~~~~~~~~~~ [ 112s] cc1: all warnings being treated as errors [ 112s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 112s] make[3]: *** Waiting for unfinished jobs.... [ 113s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 113s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 113s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 113s] make[1]: *** [Makefile:166: all] Error 2 [ 113s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 113s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 113s] make: *** [debian/rules:9: build] Error 25 [ 113s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 113s] ### VM INTERACTION START ### [ 116s] [ 99.530853] sysrq: SysRq : Power Off [ 116s] [ 99.536103] reboot: Power down [ 116s] ### VM INTERACTION END ### [ 116s] [ 116s] cloud108 failed "build ulfius_2.5.2-4.1.dsc" at Sun Jul 5 08:57:12 UTC 2020. [ 116s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 5 08:57:49 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jul 2020 08:57:49 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0196127c98c_6202ab04e6885fc6618f7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 278s] [2089/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 278s] [2090/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -c ../lib/sbi/server.c [ 278s] FAILED: lib/sbi/9848b6c@@ogssbi at sha/server.c.o [ 278s] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -c ../lib/sbi/server.c [ 278s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 278s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 278s] 268 | access_handler, server, [ 278s] | ^~~~~~~~~~~~~~ [ 278s] | | [ 278s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 278s] In file included from ../lib/sbi/server.c:23: [ 278s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 278s] 2425 | MHD_start_daemon (unsigned int flags, [ 278s] | ^~~~~~~~~~~~~~~~ [ 278s] cc1: some warnings being treated as errors [ 278s] [2091/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -c ../lib/sbi/nnrf-build.c [ 278s] [2092/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-handler.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-handler.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-handler.c.o' -c ../lib/sbi/nnrf-handler.c [ 280s] [2093/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 280s] ninja: build stopped: subcommand failed. [ 280s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j4 -v returned exit code 1 [ 280s] make: *** [debian/rules:11: binary] Error 25 [ 280s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 280s] ### VM INTERACTION START ### [ 283s] [ 260.769928] sysrq: SysRq : Power Off [ 283s] [ 260.789778] reboot: Power down [ 283s] ### VM INTERACTION END ### [ 283s] [ 283s] cloud121 failed "build open5gs_1.3.0.20200705.dsc" at Sun Jul 5 08:57:47 UTC 2020. [ 283s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Jul 5 09:27:33 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 5 Jul 2020 09:27:33 +0000 Subject: Change in libosmocore[master]: vty: add a define CMD_IPV46 to require a IPv4/6 address References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19139 ) Change subject: vty: add a define CMD_IPV46 to require a IPv4/6 address ...................................................................... vty: add a define CMD_IPV46 to require a IPv4/6 address Allow to use this define in vty definitions when a IPV4/6 address is required as argument. Change-Id: I86e399aea86b68b48e627f11e1de48fdfad16525 --- M include/osmocom/vty/command.h 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/39/19139/1 diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h index 88490f7..932acfe 100644 --- a/include/osmocom/vty/command.h +++ b/include/osmocom/vty/command.h @@ -304,6 +304,8 @@ #define CMD_IPV6(S) ((strcmp ((S), "X:X::X:X") == 0)) #define CMD_IPV6_PREFIX(S) ((strcmp ((S), "X:X::X:X/M") == 0)) +#define CMD_IPV46 "(A.B.C.D|X:X::X:X)" + /* Common descriptions. */ #define SHOW_STR "Show running system information\n" #define IP_STR "IP information\n" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I86e399aea86b68b48e627f11e1de48fdfad16525 Gerrit-Change-Number: 19139 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 09:27:33 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 5 Jul 2020 09:27:33 +0000 Subject: Change in libosmocore[master]: gprs_ns.h: add missing prototype gprs_ns_rcvmsg() References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19138 ) Change subject: gprs_ns.h: add missing prototype gprs_ns_rcvmsg() ...................................................................... gprs_ns.h: add missing prototype gprs_ns_rcvmsg() gprs_ns_rcvmsg is already exported, but never declared. Change-Id: I7edc5f4fb6e1fda059e35ea0988d0ef42208aa50 --- M include/osmocom/gprs/gprs_ns.h 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/38/19138/1 diff --git a/include/osmocom/gprs/gprs_ns.h b/include/osmocom/gprs/gprs_ns.h index 65c7df3..af25825 100644 --- a/include/osmocom/gprs/gprs_ns.h +++ b/include/osmocom/gprs/gprs_ns.h @@ -188,6 +188,11 @@ /* main function for higher layers (BSSGP) to send NS messages */ int gprs_ns_sendmsg(struct gprs_ns_inst *nsi, struct msgb *msg); +/* Receive incoming NS message from underlying transport layer */ +int gprs_ns_rcvmsg(struct gprs_ns_inst *nsi, struct msgb *msg, + struct sockaddr_in *saddr, enum gprs_ns_ll ll); + + int gprs_ns_tx_alive(struct gprs_nsvc *nsvc); int gprs_ns_tx_alive_ack(struct gprs_nsvc *nsvc); int gprs_ns_tx_reset(struct gprs_nsvc *nsvc, uint8_t cause); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7edc5f4fb6e1fda059e35ea0988d0ef42208aa50 Gerrit-Change-Number: 19138 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 09:27:34 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 5 Jul 2020 09:27:34 +0000 Subject: Change in libosmocore[master]: socket.h: introduce osmo_sockaddr to hold v4 and v6 endpoints References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19141 ) Change subject: socket.h: introduce osmo_sockaddr to hold v4 and v6 endpoints ...................................................................... socket.h: introduce osmo_sockaddr to hold v4 and v6 endpoints When dealing with IPv4 and IPv6 address, the struct sockaddr allows to hold IPv4 and IPv6. However even when struct sockaddr is being used, a cast to the IPv4 or IPv6 family must happen. To work around this additional code, use a union for the most common types. Change-Id: If80172373735193401af872b18e1ff00c93880e7 --- M include/osmocom/core/socket.h 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/41/19141/1 diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 129612c..bc60dfc 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -22,6 +22,15 @@ struct sockaddr; struct osmo_fd; +struct osmo_sockaddr { + union { + struct sockaddr sa; + struct sockaddr_storage sas; + struct sockaddr_in sin; + struct sockaddr_in6 sin6; + } u; +}; + /* flags for osmo_sock_init. */ /*! connect the socket to a remote peer */ #define OSMO_SOCK_F_CONNECT (1 << 0) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If80172373735193401af872b18e1ff00c93880e7 Gerrit-Change-Number: 19141 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 09:27:33 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 5 Jul 2020 09:27:33 +0000 Subject: Change in libosmocore[master]: osmo_sock_init2: improve support for AF_UNSPEC References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19140 ) Change subject: osmo_sock_init2: improve support for AF_UNSPEC ...................................................................... osmo_sock_init2: improve support for AF_UNSPEC osmo_sock_init2 abstract two calls of getaddrinfo into one. While there aren't problems with AF_INET or AF_INET6. When using AF_UNSPEC there are corner cases when this fails. E.g. calling local_host with "" and remote_host with an IPv6 only address results in setting up a local socket with AF_INET while trying to connect from there towards AF_INET6 will most likely fail. To prevent such cases with AF_UNSPEC, search prio calling any syscalls if local and remote site supports AF_INET or AF_INET6. In case both supported, prefer AF_INET6 Change-Id: I397c633931fd00d4f083955a3c49a40fb002d766 --- M src/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.ok 3 files changed, 99 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/40/19140/1 diff --git a/src/socket.c b/src/socket.c index 503ceaf..359e24d 100644 --- a/src/socket.c +++ b/src/socket.c @@ -260,22 +260,81 @@ const char *local_host, uint16_t local_port, const char *remote_host, uint16_t remote_port, unsigned int flags) { - struct addrinfo *result, *rp; + struct addrinfo *local = NULL, *remote = NULL, *rp; int sfd = -1, rc, on = 1; + bool local_ipv4 = false, local_ipv6 = false; + bool remote_ipv4 = false, remote_ipv6 = false; + if ((flags & (OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT)) == 0) { LOGP(DLGLOBAL, LOGL_ERROR, "invalid: you have to specify either " "BIND or CONNECT flags\n"); return -EINVAL; } + /* figure out local address infos */ + if (flags & OSMO_SOCK_F_BIND) { + local = addrinfo_helper(family, type, proto, local_host, local_port, true); + if (!local) + return -EINVAL; + } + + /* figure out remote address infos */ + if (flags & OSMO_SOCK_F_CONNECT) { + remote = addrinfo_helper(family, type, proto, remote_host, remote_port, false); + if (!remote) { + if (local) + freeaddrinfo(local); + + return -EINVAL; + } + } + + /* It must do a full run to ensure AF_UNSPEC does not fail. + * In case first local valid entry is IPv4 and only remote valid entry + * is IPv6 or vice versa */ + if (family == AF_UNSPEC) { + for (rp = local; rp != NULL; rp = rp->ai_next) { + switch (rp->ai_family) { + case AF_INET: + local_ipv4 = true; + break; + case AF_INET6: + local_ipv6 = true; + break; + } + } + + for (rp = remote; rp != NULL; rp = rp->ai_next) { + switch (rp->ai_family) { + case AF_INET: + remote_ipv4 = true; + break; + case AF_INET6: + remote_ipv6 = true; + break; + } + } + + /* priotize ipv6 as per RFC */ + if (local_ipv6 && remote_ipv6) + family = AF_INET6; + else if (local_ipv4 && remote_ipv4) + family = AF_INET; + else { + LOGP(DLGLOBAL, LOGL_ERROR, "Unable to find a common protocol (IPv4 or IPv6) for local host: %s and remote host: %s.\n", + local_host, remote_host); + return -ENODEV; + } + } + /* figure out local side of socket */ if (flags & OSMO_SOCK_F_BIND) { - result = addrinfo_helper(family, type, proto, local_host, local_port, true); - if (!result) - return -EINVAL; + for (rp = local; rp != NULL; rp = rp->ai_next) { + /* When called with AF_UNSPEC, family will set to IPv4 or IPv6 */ + if (rp->ai_family != family) + continue; - for (rp = result; rp != NULL; rp = rp->ai_next) { sfd = socket_helper(rp, flags); if (sfd < 0) continue; @@ -302,8 +361,11 @@ } break; } - freeaddrinfo(result); + + freeaddrinfo(local); if (rp == NULL) { + if (remote) + freeaddrinfo(remote); LOGP(DLGLOBAL, LOGL_ERROR, "no suitable local addr found for: %s:%u\n", local_host, local_port); return -ENODEV; @@ -316,14 +378,11 @@ /* figure out remote side of socket */ if (flags & OSMO_SOCK_F_CONNECT) { - result = addrinfo_helper(family, type, proto, remote_host, remote_port, false); - if (!result) { - if (sfd >= 0) - close(sfd); - return -EINVAL; - } + for (rp = remote; rp != NULL; rp = rp->ai_next) { + /* When called with AF_UNSPEC, family will set to IPv4 or IPv6 */ + if (rp->ai_family != family) + continue; - for (rp = result; rp != NULL; rp = rp->ai_next) { if (sfd < 0) { sfd = socket_helper(rp, flags); if (sfd < 0) @@ -343,7 +402,8 @@ } break; } - freeaddrinfo(result); + + freeaddrinfo(remote); if (rp == NULL) { LOGP(DLGLOBAL, LOGL_ERROR, "no suitable remote addr found for: %s:%u\n", remote_host, remote_port); diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c index 37e0281..e68243c 100644 --- a/tests/socket/socket_test.c +++ b/tests/socket/socket_test.c @@ -120,6 +120,27 @@ * FreeBSD 10 or 11 VM at home */ OSMO_ASSERT(!strncmp(name, "(r=127.0.0.1:53<->l=127.0.0.1", 29)); #endif + + printf("Checking osmo_sock_init2(AF_UNSPEC) must fail on mixed IPv4 & IPv6\n"); + fd = osmo_sock_init2(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, "127.0.0.1", 0, "::1", 53, + OSMO_SOCK_F_BIND|OSMO_SOCK_F_CONNECT); + OSMO_ASSERT(fd < 0); + + printf("Checking osmo_sock_init2(AF_UNSPEC) must fail on mixed IPv6 & IPv4\n"); + fd = osmo_sock_init2(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, "::1", 0, "127.0.0.1", 53, + OSMO_SOCK_F_BIND|OSMO_SOCK_F_CONNECT); + OSMO_ASSERT(fd < 0); + + printf("Checking osmo_sock_init2(AF_UNSPEC) BIND + CONNECT on IPv4\n"); + fd = osmo_sock_init2(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, "127.0.0.1", 0, "127.0.0.1", 53, + OSMO_SOCK_F_BIND|OSMO_SOCK_F_CONNECT); + OSMO_ASSERT(fd >= 0); + + printf("Checking osmo_sock_init2(AF_UNSPEC) BIND + CONNECT on IPv6\n"); + fd = osmo_sock_init2(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, "::1", 0, "::1", 53, + OSMO_SOCK_F_BIND|OSMO_SOCK_F_CONNECT); + OSMO_ASSERT(fd >= 0); + talloc_free(name); return 0; diff --git a/tests/socket/socket_test.ok b/tests/socket/socket_test.ok index 4b24fbc..4265be8 100644 --- a/tests/socket/socket_test.ok +++ b/tests/socket/socket_test.ok @@ -5,3 +5,7 @@ Checking osmo_sock_init2() for OSMO_SOCK_F_NONBLOCK Checking osmo_sock_init2() for invalid flags Checking osmo_sock_init2() for combined BIND + CONNECT +Checking osmo_sock_init2(AF_UNSPEC) must fail on mixed IPv4 & IPv6 +Checking osmo_sock_init2(AF_UNSPEC) must fail on mixed IPv6 & IPv4 +Checking osmo_sock_init2(AF_UNSPEC) BIND + CONNECT on IPv4 +Checking osmo_sock_init2(AF_UNSPEC) BIND + CONNECT on IPv6 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I397c633931fd00d4f083955a3c49a40fb002d766 Gerrit-Change-Number: 19140 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 09:27:36 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 5 Jul 2020 09:27:36 +0000 Subject: Change in libosmocore[master]: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19143 ) Change subject: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd ...................................................................... socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd osmo_sock_init3() takes osmo_sockaddr* as local and remote endpoints to setup a socket. Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 124 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/19143/1 diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index bc60dfc..6bfcc4c 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -66,6 +66,15 @@ const char *local_host, uint16_t local_port, const char *remote_host, uint16_t remote_port, unsigned int flags); +int osmo_sock_init3(uint16_t type, uint8_t proto, + const struct osmo_sockaddr *local, + const struct osmo_sockaddr *remote, + unsigned int flags); + +int osmo_sock_init3_ofd(struct osmo_fd *ofd, int type, int proto, + const struct osmo_sockaddr *local, + const struct osmo_sockaddr *remote, unsigned int flags); + int osmo_sock_init_sa(struct sockaddr *ss, uint16_t type, uint8_t proto, unsigned int flags); diff --git a/src/socket.c b/src/socket.c index 359e24d..c7fd28b 100644 --- a/src/socket.c +++ b/src/socket.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -153,6 +154,28 @@ return sfd; } +static int socket_helper_sa(const struct osmo_sockaddr *addr, uint16_t type, uint8_t proto, unsigned int flags) +{ + int sfd, on = 1; + + sfd = socket(addr->u.sa.sa_family, type, proto); + if (sfd == -1) { + LOGP(DLGLOBAL, LOGL_ERROR, + "unable to create socket: %s\n", strerror(errno)); + return sfd; + } + if (flags & OSMO_SOCK_F_NONBLOCK) { + if (ioctl(sfd, FIONBIO, (unsigned char *)&on) < 0) { + LOGP(DLGLOBAL, LOGL_ERROR, + "cannot set this socket unblocking: %s\n", + strerror(errno)); + close(sfd); + sfd = -EINVAL; + } + } + return sfd; +} + #ifdef HAVE_LIBSCTP /* Fill buf with a string representation of the address set, in the form: * buf_len == 0: "()" @@ -422,6 +445,91 @@ return sfd; } +#define OSMO_SOCKADDR_TO_STR(sockaddr) \ + struct osmo_sockaddr_str sastr; \ + rc = osmo_sockaddr_str_from_sockaddr(&sastr, &sockaddr->u.sas); \ + if (rc) \ + strcpy(sastr.ip, "Invalid IP") + +int osmo_sock_init3(uint16_t type, uint8_t proto, + const struct osmo_sockaddr *local, + const struct osmo_sockaddr *remote, + unsigned int flags) +{ + int sfd = -1, rc, on = 1; + + if ((flags & (OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT)) == 0) { + LOGP(DLGLOBAL, LOGL_ERROR, "invalid: you have to specify either " + "BIND or CONNECT flags\n"); + return -EINVAL; + } + + /* figure out local side of socket */ + if (flags & OSMO_SOCK_F_BIND) { + sfd = socket_helper_sa(local, type, proto, flags); + if (sfd < 0) { + OSMO_SOCKADDR_TO_STR(local); + LOGP(DLGLOBAL, LOGL_ERROR, "no suitable local addr found for: %s:%u\n", + sastr.ip, sastr.port); + return -ENODEV; + } + + if (proto != IPPROTO_UDP || flags & OSMO_SOCK_F_UDP_REUSEADDR) { + rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, + &on, sizeof(on)); + if (rc < 0) { + OSMO_SOCKADDR_TO_STR(local); + LOGP(DLGLOBAL, LOGL_ERROR, + "cannot setsockopt socket:" + " %s:%u: %s\n", + sastr.ip, sastr.port, + strerror(errno)); + close(sfd); + return rc; + } + } + + if (bind(sfd, &local->u.sa, sizeof(struct osmo_sockaddr)) == -1) { + OSMO_SOCKADDR_TO_STR(local); + LOGP(DLGLOBAL, LOGL_ERROR, "unable to bind socket: %s:%u: %s\n", + sastr.ip, sastr.port, strerror(errno)); + close(sfd); + } + } + + /* Reached this point, if OSMO_SOCK_F_BIND then sfd is valid (>=0) or it + was already closed and func returned. If OSMO_SOCK_F_BIND is not + set, then sfd = -1 */ + + /* figure out remote side of socket */ + if (flags & OSMO_SOCK_F_CONNECT) { + if (sfd < 0) { + sfd = socket_helper_sa(remote, type, proto, flags); + if (sfd < 0) { + return sfd; + } + } + + rc = connect(sfd, &remote->u.sa, sizeof(struct osmo_sockaddr)); + if (rc != 0 && errno != EINPROGRESS) { + OSMO_SOCKADDR_TO_STR(local); + LOGP(DLGLOBAL, LOGL_ERROR, "unable to connect socket: %s:%u: %s\n", + sastr.ip, sastr.port, strerror(errno)); + close(sfd); + return rc; + } + } + + + rc = osmo_sock_init_tail(sfd, type, flags); + if (rc < 0) { + close(sfd); + sfd = -1; + } + + return sfd; +} + #ifdef HAVE_LIBSCTP @@ -809,6 +917,13 @@ local_port, remote_host, remote_port, flags)); } +int osmo_sock_init3_ofd(struct osmo_fd *ofd, int type, int proto, + const struct osmo_sockaddr *local, + const struct osmo_sockaddr *remote, unsigned int flags) +{ + return osmo_fd_init_ofd(ofd, osmo_sock_init3(type, proto, local, remote, flags)); +} + /*! Initialize a socket and fill \ref sockaddr * \param[out] ss socket address (will be filled in) * \param[in] type Socket type like SOCK_DGRAM, SOCK_STREAM -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 09:27:36 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 5 Jul 2020 09:27:36 +0000 Subject: Change in libosmocore[master]: socket.c add osmo_sockaddr_valid() References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19144 ) Change subject: socket.c add osmo_sockaddr_valid() ...................................................................... socket.c add osmo_sockaddr_valid() osmo_sockaddr_valid() is a validator of osmo_sockaddr. It ensure the sock_addr has address and port set. Change-Id: Ib6fb050e1bfe3f3a8d8bbe5e762351ce6b7cc48c --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/19144/1 diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 6bfcc4c..161691c 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -110,4 +110,6 @@ int osmo_sock_local_ip(char *local_ip, const char *remote_ip); +int osmo_sockaddr_valid(struct osmo_sockaddr *addr); + /*! @} */ diff --git a/src/socket.c b/src/socket.c index c7fd28b..1d5d1a5 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1512,6 +1512,30 @@ return 0; } +/*! Determine the if address is valid to start a bind or connect. + * \param[in] addr the address to be tested + * \returns 0 if osmo_sockaddr is valid + */ +int osmo_sockaddr_valid(struct osmo_sockaddr *addr) +{ + struct in6_addr zero = { 0 }; + if (addr == NULL) + return -EINVAL; + + if (addr->u.sas.ss_family == AF_INET) { + struct sockaddr_in *sin = &addr->u.sin; + return !(sin->sin_addr.s_addr > 0 && sin->sin_port > 0); + } else if (addr->u.sas.ss_family == AF_INET6) { + struct sockaddr_in6 *sin6 = &addr->u.sin6; + if (sin6->sin6_port == 0) + return 1; + if (memcmp(&sin6->sin6_addr, &zero, sizeof(struct in6_addr)) == 0) + return 1; + } + + return -ENOTSUP; +} + #endif /* HAVE_SYS_SOCKET_H */ /*! @} */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib6fb050e1bfe3f3a8d8bbe5e762351ce6b7cc48c Gerrit-Change-Number: 19144 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 09:27:35 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 5 Jul 2020 09:27:35 +0000 Subject: Change in libosmocore[master]: sockaddr_str: add osmo_sockaddr_str_from_str2() which doesn't set the... References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19142 ) Change subject: sockaddr_str: add osmo_sockaddr_str_from_str2() which doesn't set the port ...................................................................... sockaddr_str: add osmo_sockaddr_str_from_str2() which doesn't set the port In case the port isn't known at the time osmo_sockaddr_str_from_str2() parse only the ip and don't touch the port. This is the case when a user has different vty commands for ip and port. Change-Id: Ifd4e282586b8bd40b912a9f1c25f9e8208420106 --- M include/osmocom/core/sockaddr_str.h M src/sockaddr_str.c 2 files changed, 34 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/19142/1 diff --git a/include/osmocom/core/sockaddr_str.h b/include/osmocom/core/sockaddr_str.h index e42216a..d96b743 100644 --- a/include/osmocom/core/sockaddr_str.h +++ b/include/osmocom/core/sockaddr_str.h @@ -74,6 +74,7 @@ int osmo_sockaddr_str_cmp(const struct osmo_sockaddr_str *a, const struct osmo_sockaddr_str *b); int osmo_sockaddr_str_from_str(struct osmo_sockaddr_str *sockaddr_str, const char *ip, uint16_t port); +int osmo_sockaddr_str_from_str2(struct osmo_sockaddr_str *sockaddr_str, const char *ip); int osmo_sockaddr_str_from_in_addr(struct osmo_sockaddr_str *sockaddr_str, const struct in_addr *addr, uint16_t port); int osmo_sockaddr_str_from_in6_addr(struct osmo_sockaddr_str *sockaddr_str, const struct in6_addr *addr, uint16_t port); diff --git a/src/sockaddr_str.c b/src/sockaddr_str.c index c38a05c..f5508a0 100644 --- a/src/sockaddr_str.c +++ b/src/sockaddr_str.c @@ -188,6 +188,34 @@ return AF_UNSPEC; } +/*! Safely copy the given ip string to sockaddr_str, classify to AF_INET or AF_INET6. + * Data will be written to sockaddr_str even if an error is returned. + * \param[out] sockaddr_str The instance to copy to. + * \param[in] ip Valid IP address string. + * \return 0 on success, negative if copying the address string failed (e.g. too long), if the address family could + * not be detected (i.e. if osmo_ip_str_type() returned AF_UNSPEC), or if sockaddr_str is NULL. + */ +int osmo_sockaddr_str_from_str2(struct osmo_sockaddr_str *sockaddr_str, const char *ip) +{ + int rc; + if (!sockaddr_str) + return -ENOSPC; + if (!ip) + ip = ""; + sockaddr_str->af = osmo_ip_str_type(ip); + /* to be compatible with previous behaviour, zero the full IP field. + * Allow the usage of memcmp(&sockaddr_str, ...) */ + memset(sockaddr_str->ip, 0x0, sizeof(sockaddr_str->ip)); + rc = osmo_strlcpy(sockaddr_str->ip, ip, sizeof(sockaddr_str->ip)); + if (rc <= 0) + return -EIO; + if (rc >= sizeof(sockaddr_str->ip)) + return -ENOSPC; + if (sockaddr_str->af == AF_UNSPEC) + return -EINVAL; + return 0; +} + /*! Safely copy the given ip string to sockaddr_str, classify to AF_INET or AF_INET6, and set the port. * Data will be written to sockaddr_str even if an error is returned. * \param[out] sockaddr_str The instance to copy to. @@ -201,20 +229,11 @@ int rc; if (!sockaddr_str) return -ENOSPC; - if (!ip) - ip = ""; - *sockaddr_str = (struct osmo_sockaddr_str){ - .af = osmo_ip_str_type(ip), - .port = port, - }; - rc = osmo_strlcpy(sockaddr_str->ip, ip, sizeof(sockaddr_str->ip)); - if (rc <= 0) - return -EIO; - if (rc >= sizeof(sockaddr_str->ip)) - return -ENOSPC; - if (sockaddr_str->af == AF_UNSPEC) - return -EINVAL; - return 0; + + rc = osmo_sockaddr_str_from_str2(sockaddr_str, ip); + sockaddr_str->port = port; + + return rc; } /*! Convert IPv4 address to osmo_sockaddr_str, and set port. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifd4e282586b8bd40b912a9f1c25f9e8208420106 Gerrit-Change-Number: 19142 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 09:27:36 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 5 Jul 2020 09:27:36 +0000 Subject: Change in libosmocore[master]: bts_features: add feature BTS_FEAT_IPV6_NSVC References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19145 ) Change subject: bts_features: add feature BTS_FEAT_IPV6_NSVC ...................................................................... bts_features: add feature BTS_FEAT_IPV6_NSVC A bts with BTS_FEAT_IPV6_NSVC supports IPV6 for NSVC (PCUSGSN). The NSVC remote address is transfered via OML using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG which supports IPv4 and IPv6. Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 --- M include/osmocom/gsm/bts_features.h M src/gsm/bts_features.c 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/19145/1 diff --git a/include/osmocom/gsm/bts_features.h b/include/osmocom/gsm/bts_features.h index 22461a6..341ba40 100644 --- a/include/osmocom/gsm/bts_features.h +++ b/include/osmocom/gsm/bts_features.h @@ -25,6 +25,7 @@ BTS_FEAT_SPEECH_H_AMR, BTS_FEAT_ETWS_PN, BTS_FEAT_PAGING_COORDINATION, /* BTS hands CS paging to PCU/PACCH */ + BTS_FEAT_IPV6_NSVC, _NUM_BTS_FEAT }; diff --git a/src/gsm/bts_features.c b/src/gsm/bts_features.c index 5a4b7f6..4efc8df 100644 --- a/src/gsm/bts_features.c +++ b/src/gsm/bts_features.c @@ -40,6 +40,7 @@ { BTS_FEAT_SPEECH_H_AMR, "Halfrate speech AMR" }, { BTS_FEAT_ETWS_PN, "ETWS Primary Notification via PCH" }, { BTS_FEAT_PAGING_COORDINATION, "BSS Paging Coordination" }, + { BTS_FEAT_IPV6_NSVC, "NSVC IPV6" }, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 Gerrit-Change-Number: 19145 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 09:27:37 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 5 Jul 2020 09:27:37 +0000 Subject: Change in libosmocore[master]: gsm 12.21: add osmocom specific NM_ATT_OSMO_NS_LINK_CFG References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19146 ) Change subject: gsm 12.21: add osmocom specific NM_ATT_OSMO_NS_LINK_CFG ...................................................................... gsm 12.21: add osmocom specific NM_ATT_OSMO_NS_LINK_CFG The sysmobts uses the same OML attributes as IP.access. Because the IP.access attribute only supports IPv4 as NSVC configuration, add an own attribute. Change-Id: Ic261bc43a07fa741b97a9c6ec5a9ed6f5ecae588 --- M include/osmocom/gsm/protocol/gsm_12_21.h M src/gsm/abis_nm.c 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/19146/1 diff --git a/include/osmocom/gsm/protocol/gsm_12_21.h b/include/osmocom/gsm/protocol/gsm_12_21.h index 86d12ea..06755c9 100644 --- a/include/osmocom/gsm/protocol/gsm_12_21.h +++ b/include/osmocom/gsm/protocol/gsm_12_21.h @@ -511,6 +511,7 @@ /* osmocom (osmo-bts) specific attributes, used in combination * with the "org.osmocom" manufacturer identification */ + NM_ATT_OSMO_NS_LINK_CFG = 0xfd, /* osmocom version supports IPv4 & IPv6 in difference to IPACC */ NM_ATT_OSMO_REDUCEPOWER = 0xfe, /* TLV_TYPE_TV */ }; #define NM_ATT_BS11_FILE_DATA NM_ATT_EVENT_TYPE diff --git a/src/gsm/abis_nm.c b/src/gsm/abis_nm.c index 3fb8f0f..c4c7b97 100644 --- a/src/gsm/abis_nm.c +++ b/src/gsm/abis_nm.c @@ -512,6 +512,7 @@ [NM_ATT_IPACC_SEC_POSSIBLE] = { TLV_TYPE_TL16V }, [NM_ATT_IPACC_IML_SSL_STATE] = { TLV_TYPE_TL16V }, [NM_ATT_IPACC_REVOC_DATE] = { TLV_TYPE_TL16V }, + [NM_ATT_OSMO_NS_LINK_CFG] = { TLV_TYPE_TL16V }, }, }; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic261bc43a07fa741b97a9c6ec5a9ed6f5ecae588 Gerrit-Change-Number: 19146 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 10:45:00 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 5 Jul 2020 10:45:00 +0000 Subject: Change in libosmocore[master]: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19143 to look at the new patch set (#2). Change subject: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd ...................................................................... socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd osmo_sock_init3() takes osmo_sockaddr* as local and remote endpoints to setup a socket. Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 --- M include/osmocom/core/socket.h M src/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.ok 4 files changed, 268 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/19143/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 10:45:01 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 5 Jul 2020 10:45:01 +0000 Subject: Change in libosmocore[master]: socket.c: fix osmo_sock_get_ip_and_port for IPv6 References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19147 ) Change subject: socket.c: fix osmo_sock_get_ip_and_port for IPv6 ...................................................................... socket.c: fix osmo_sock_get_ip_and_port for IPv6 The struct sockaddr is too small for IPv6. IPv6 has a 16 byte address, while struct sockaddr is only 14 byte big (+ family). Change-Id: I4e69d814367168c05f0da161ec9b705db36ad096 --- M src/socket.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/19147/1 diff --git a/src/socket.c b/src/socket.c index e303906..4febbb6 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1175,16 +1175,16 @@ */ int osmo_sock_get_ip_and_port(int fd, char *ip, size_t ip_len, char *port, size_t port_len, bool local) { - struct sockaddr sa; + struct osmo_sockaddr sa; socklen_t len = sizeof(sa); char ipbuf[INET6_ADDRSTRLEN], portbuf[6]; int rc; - rc = local ? getsockname(fd, &sa, &len) : getpeername(fd, &sa, &len); + rc = local ? getsockname(fd, &sa.u.sa, &len) : getpeername(fd, &sa.u.sa, &len); if (rc < 0) return rc; - rc = getnameinfo(&sa, len, ipbuf, sizeof(ipbuf), + rc = getnameinfo(&sa.u.sa, len, ipbuf, sizeof(ipbuf), portbuf, sizeof(portbuf), NI_NUMERICHOST | NI_NUMERICSERV); if (rc < 0) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4e69d814367168c05f0da161ec9b705db36ad096 Gerrit-Change-Number: 19147 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 10:48:51 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 5 Jul 2020 10:48:51 +0000 Subject: Change in libosmocore[master]: osmo_sock_init2: improve support for AF_UNSPEC In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19140 ) Change subject: osmo_sock_init2: improve support for AF_UNSPEC ...................................................................... Patch Set 1: jenkins fails because it doesn't have a IPv6 address (not even ::1) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I397c633931fd00d4f083955a3c49a40fb002d766 Gerrit-Change-Number: 19140 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sun, 05 Jul 2020 10:48:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 11:03:49 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 5 Jul 2020 11:03:49 +0000 Subject: Change in libosmocore[master]: gprs_ns.h: add missing prototype gprs_ns_rcvmsg() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19138 ) Change subject: gprs_ns.h: add missing prototype gprs_ns_rcvmsg() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7edc5f4fb6e1fda059e35ea0988d0ef42208aa50 Gerrit-Change-Number: 19138 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 05 Jul 2020 11:03:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 11:22:10 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 5 Jul 2020 11:22:10 +0000 Subject: Change in libosmocore[master]: vty: add a define CMD_IPV46 to require a IPv4/6 address In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19139 ) Change subject: vty: add a define CMD_IPV46 to require a IPv4/6 address ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19139/1/include/osmocom/vty/command.h File include/osmocom/vty/command.h: https://gerrit.osmocom.org/c/libosmocore/+/19139/1/include/osmocom/vty/command.h at 307 PS1, Line 307: CMD_IPV46 It may be confusing given that other CMD_* macros accept an argument and match it against some pattern. Maybe rather call it 'CMD_IPV46_STR'? Moreover, you can define both CMD_IPV4_STR and CMD_IPV6_STR separately, so they can be reused like this: #define CMD_IPV46_STR "(" CMD_IPV4_STR "|" CMD_IPV6_STR ")" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I86e399aea86b68b48e627f11e1de48fdfad16525 Gerrit-Change-Number: 19139 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 05 Jul 2020 11:22:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 12:55:51 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sun, 5 Jul 2020 12:55:51 +0000 Subject: Change in libosmocore[master]: vty: add a define CMD_IPV46 to require a IPv4/6 address In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19139 ) Change subject: vty: add a define CMD_IPV46 to require a IPv4/6 address ...................................................................... Patch Set 1: I'm unsure if this is really needed and if it makes the code more readable or not. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I86e399aea86b68b48e627f11e1de48fdfad16525 Gerrit-Change-Number: 19139 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sun, 05 Jul 2020 12:55:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Jul 5 15:10:19 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jul 2020 15:10:19 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f01ed644f7c4_6202ab04e6885fc7313d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: s] [2096/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -c ../src/mme/emm-build.c [ 106s] [2097/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -c ../src/mme/s1ap-build.c [ 106s] [2098/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-sm.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-sm.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-sm.c.o' -c ../src/mme/mme-sm.c [ 106s] [2099/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o' -MF 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o' -c ../src/mme/esm-sm.c [ 106s] [2100/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-gtp-path.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-gtp-path.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-gtp-path.c.o' -c ../src/mme/mme-gtp-path.c [ 106s] [2101/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-s11-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-s11-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-s11-build.c.o' -c ../src/mme/mme-s11-build.c [ 106s] [2102/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -c ../src/mme/emm-handler.c [ 106s] [2103/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-s11-handler.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-s11-handler.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-s11-handler.c.o' -c ../src/mme/mme-s11-handler.c [ 106s] [2104/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-handler.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-handler.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-handler.c.o' -c ../src/mme/s1ap-handler.c [ 106s] [2105/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 106s] ninja: build stopped: subcommand failed. [ 106s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j16 -v returned exit code 1 [ 106s] make: *** [debian/rules:11: binary] Error 25 [ 106s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 106s] ### VM INTERACTION START ### [ 110s] [ 100.590379] sysrq: SysRq : Power Off [ 110s] [ 100.596651] reboot: Power down [ 110s] ### VM INTERACTION END ### [ 110s] [ 110s] goat19 failed "build open5gs_1.3.0.20200705.dsc" at Sun Jul 5 15:10:13 UTC 2020. [ 110s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 5 15:12:19 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jul 2020 15:12:19 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f01eddc5806d_6202ab04e6885fc731862@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 108s] /usr/src/packages/BUILD/src/ulfius.c: In function 'ulfius_run_mhd_daemon': [ 108s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 108s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 108s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 108s] | | [ 108s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 108s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 108s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 108s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 108s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 108s] 2425 | MHD_start_daemon (unsigned int flags, [ 108s] | ^~~~~~~~~~~~~~~~ [ 109s] cc1: all warnings being treated as errors [ 109s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 109s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 109s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 109s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 109s] make[1]: *** [Makefile:166: all] Error 2 [ 109s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 109s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 109s] make: *** [debian/rules:9: build] Error 25 [ 109s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 109s] ### VM INTERACTION START ### [ 112s] [ 94.834902] sysrq: SysRq : Power Off [ 112s] [ 94.838666] reboot: Power down [ 112s] ### VM INTERACTION END ### [ 112s] [ 112s] cloud115 failed "build ulfius_2.5.2-4.1.dsc" at Sun Jul 5 15:12:11 UTC 2020. [ 112s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 5 15:13:11 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jul 2020 15:13:11 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f01ee16df66e_6202ab04e6885fc732141@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 118s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 118s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 118s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 118s] | | [ 118s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 118s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 118s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 118s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 118s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 118s] 2425 | MHD_start_daemon (unsigned int flags, [ 118s] | ^~~~~~~~~~~~~~~~ [ 119s] cc1: all warnings being treated as errors [ 119s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 119s] make[3]: *** Waiting for unfinished jobs.... [ 119s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 119s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 119s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 119s] make[1]: *** [Makefile:166: all] Error 2 [ 119s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 119s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 119s] make: *** [debian/rules:9: build] Error 25 [ 119s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 119s] ### VM INTERACTION START ### [ 122s] [ 110.228686] sysrq: SysRq : Power Off [ 122s] [ 110.235706] reboot: Power down [ 122s] ### VM INTERACTION END ### [ 122s] [ 122s] lamb02 failed "build ulfius_2.5.2-4.1.dsc" at Sun Jul 5 15:12:56 UTC 2020. [ 122s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Jul 5 15:52:19 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 5 Jul 2020 15:52:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: verify conn and VLR cell id in most tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18998 ) Change subject: msc: verify conn and VLR cell id in most tests ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18998/1/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18998/1/msc/MSC_Tests.ttcn at 411 PS1, Line 411: verify_cell_id := mp_enable_cell_id_test and verify_cell_id > I'm not following, doing what you requested?? "s/what I requested/what I'm requesting/g" I mean having a var stating whether the test (VTY) is made, and only enable it in a few tests. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie410714a96353f74a52a104c56fa0a08683e0004 Gerrit-Change-Number: 18998 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 05 Jul 2020 15:52:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 15:53:12 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 5 Jul 2020 15:53:12 +0000 Subject: Change in osmo-mgw[master]: trunk: parse E1 trunk number In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18752 ) Change subject: trunk: parse E1 trunk number ...................................................................... Patch Set 14: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifdaab953544151e73b58cc3e95d21afdb40765f4 Gerrit-Change-Number: 18752 Gerrit-PatchSet: 14 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 05 Jul 2020 15:53:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 15:55:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 5 Jul 2020 15:55:52 +0000 Subject: Change in libosmo-abis[master]: e1_input: Support I.460 timeslot type In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/18933 ) Change subject: e1_input: Support I.460 timeslot type ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/18933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I44da6dfec77ef475adb35001a0e4fa11d549aa02 Gerrit-Change-Number: 18933 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 05 Jul 2020 15:55:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 16:10:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 5 Jul 2020 16:10:03 +0000 Subject: Change in osmo-bts[master]: bts-trx: Introduce rate counter for scheduler timerfd missed FNs In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19107 ) Change subject: bts-trx: Introduce rate counter for scheduler timerfd missed FNs ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-bts/+/19107/1/src/osmo-bts-trx/l1_if.h File src/osmo-bts-trx/l1_if.h: https://gerrit.osmocom.org/c/osmo-bts/+/19107/1/src/osmo-bts-trx/l1_if.h at 57 PS1, Line 57: /* bts-trx specific rate counters */ > Given that we're in 'osmo-bts-trx' directory, everything is osmo-bts-trx specific here... We should drop all comments containing "osmo-bts-trx" then? or what? It's already there 3 lines above. I don't see a problem with having it there. https://gerrit.osmocom.org/c/osmo-bts/+/19107/1/src/osmo-bts-trx/main.c File src/osmo-bts-trx/main.c: https://gerrit.osmocom.org/c/osmo-bts/+/19107/1/src/osmo-bts-trx/main.c at 67 PS1, Line 67: btstrx_ > Again, this prefix is redundant. We're not going to add e.g. [?] I prefer having that way than having them unnamed, this way it's easy to understand everything in general but specific to osmo-bts-trx fits here. https://gerrit.osmocom.org/c/osmo-bts/+/19107/1/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/19107/1/src/osmo-bts-trx/scheduler_trx.c at 161 PS1, Line 161: > unrelated change It's in the same block being changed anyway, and it's cosmetic since I'm adding stuff on the line below, so i think it fits here. It would be the same as if I add {} or a new conditional block and I need to indent stuff around. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0051b9ab18ebc9f92db11374d856de94f155efa4 Gerrit-Change-Number: 19107 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 05 Jul 2020 16:10:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 16:18:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 5 Jul 2020 16:18:29 +0000 Subject: Change in osmo-bts[master]: bts-trx: Introduce rate counter for scheduler timerfd missed FNs In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19107 to look at the new patch set (#2). Change subject: bts-trx: Introduce rate counter for scheduler timerfd missed FNs ...................................................................... bts-trx: Introduce rate counter for scheduler timerfd missed FNs This should provide a quick way to check if the system is frequently overloaded over time and hence downlink FNs are scheduled later than expected. Change-Id: I0051b9ab18ebc9f92db11374d856de94f155efa4 --- M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 3 files changed, 25 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/07/19107/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0051b9ab18ebc9f92db11374d856de94f155efa4 Gerrit-Change-Number: 19107 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 16:18:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 5 Jul 2020 16:18:29 +0000 Subject: Change in osmo-bts[master]: pcu_sock: Avoid presenting TS from disabled TRX as available to PCU In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19116 to look at the new patch set (#2). Change subject: pcu_sock: Avoid presenting TS from disabled TRX as available to PCU ...................................................................... pcu_sock: Avoid presenting TS from disabled TRX as available to PCU Change-Id: I4b24faf3a8fe5846b9394fea8faf9d37cc0ac9ff --- M src/common/pcu_sock.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/16/19116/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4b24faf3a8fe5846b9394fea8faf9d37cc0ac9ff Gerrit-Change-Number: 19116 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 16:18:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 5 Jul 2020 16:18:29 +0000 Subject: Change in osmo-bts[master]: Move nm_state and Mo related code gsm_data.* => oml.* In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19122 to look at the new patch set (#2). Change subject: Move nm_state and Mo related code gsm_data.* => oml.* ...................................................................... Move nm_state and Mo related code gsm_data.* => oml.* Change-Id: I57ea9c4ddbe5443b9b6afe3f8e6b38170d0e5a0e --- M include/osmo-bts/gsm_data.h M include/osmo-bts/oml.h M src/common/gsm_data.c M src/common/oml.c 4 files changed, 168 insertions(+), 175 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/22/19122/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I57ea9c4ddbe5443b9b6afe3f8e6b38170d0e5a0e Gerrit-Change-Number: 19122 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 5 17:31:42 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 5 Jul 2020 17:31:42 +0000 Subject: Change in osmo-bts[master]: bts-trx: Introduce rate counter for scheduler timerfd missed FNs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19107 ) Change subject: bts-trx: Introduce rate counter for scheduler timerfd missed FNs ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/19107/1/src/osmo-bts-trx/l1_if.h File src/osmo-bts-trx/l1_if.h: https://gerrit.osmocom.org/c/osmo-bts/+/19107/1/src/osmo-bts-trx/l1_if.h at 57 PS1, Line 57: /* bts-trx specific rate counters */ > We should drop all comments containing "osmo-bts-trx" then? or what? It's already there 3 lines abov [?] Ideally, there should be no such comments every three lines in a directory/file/structure that is all about osmo-bts-trx. Otherwise it raises a question like: is there anything e.g. sysmo-bts specific in this file/structure? I also don't see a problem, neither I am blocking this change with CR-1. It's just a cosmetic comment. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0051b9ab18ebc9f92db11374d856de94f155efa4 Gerrit-Change-Number: 19107 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 05 Jul 2020 17:31:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Jul 5 22:14:39 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jul 2020 22:14:39 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0250dcf37b5_6202ab04e6885fc78145@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 114s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 114s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 114s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 114s] | | [ 114s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 114s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 114s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 114s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 114s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 114s] 2425 | MHD_start_daemon (unsigned int flags, [ 114s] | ^~~~~~~~~~~~~~~~ [ 115s] cc1: all warnings being treated as errors [ 115s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 115s] make[3]: *** Waiting for unfinished jobs.... [ 115s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 115s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 115s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 115s] make[1]: *** [Makefile:166: all] Error 2 [ 115s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 115s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 115s] make: *** [debian/rules:9: build] Error 25 [ 115s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 115s] ### VM INTERACTION START ### [ 118s] [ 106.088955] sysrq: SysRq : Power Off [ 118s] [ 106.096195] reboot: Power down [ 118s] ### VM INTERACTION END ### [ 118s] [ 118s] lamb22 failed "build ulfius_2.5.2-4.1.dsc" at Sun Jul 5 22:14:31 UTC 2020. [ 118s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 5 22:14:39 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Jul 2020 22:14:39 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0250dd7b88e_6202ab04e6885fc7815a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 121s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 121s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 121s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 121s] | | [ 121s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 121s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 121s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 121s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 121s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 121s] 2425 | MHD_start_daemon (unsigned int flags, [ 121s] | ^~~~~~~~~~~~~~~~ [ 121s] cc1: all warnings being treated as errors [ 121s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 121s] make[3]: *** Waiting for unfinished jobs.... [ 121s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 121s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 121s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 121s] make[1]: *** [Makefile:166: all] Error 2 [ 121s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 121s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 121s] make: *** [debian/rules:9: build] Error 25 [ 121s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 121s] ### VM INTERACTION START ### [ 124s] [ 111.754798] sysrq: SysRq : Power Off [ 124s] [ 111.761251] reboot: Power down [ 124s] ### VM INTERACTION END ### [ 124s] [ 124s] lamb65 failed "build ulfius_2.5.2-4.1.dsc" at Sun Jul 5 22:14:38 UTC 2020. [ 124s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Jul 6 00:51:31 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 00:51:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148 ) Change subject: GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets ...................................................................... GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets Change-Id: I3f00dd0b4863582fc5edf08149103150b8b5e97b --- M library/GSM_SystemInformation.ttcn 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/19148/1 diff --git a/library/GSM_SystemInformation.ttcn b/library/GSM_SystemInformation.ttcn index 758ad1c..0639eef 100644 --- a/library/GSM_SystemInformation.ttcn +++ b/library/GSM_SystemInformation.ttcn @@ -15,6 +15,7 @@ import from General_Types all; import from GSM_Types all; import from GSM_RR_Types all; + import from GSM_RestOctets all; import from Osmocom_Types all; type union ArfcnOrMaio { @@ -150,7 +151,7 @@ CellOptions cell_options, CellSelectionParameters cell_sel_par, RachControlParameters rach_control, - RestOctets rest_octets length(0..4) + SI3RestOctets rest_octets } with { variant "" }; template SystemInformationType3 t_SI3 := { @@ -171,7 +172,7 @@ RachControlParameters rach_control, ChannelDescriptionTV cbch_chan_desc optional, MobileAllocationT cbch_mobile_alloc optional, - RestOctets rest_octets length(0..10) /* see 10.5.2.35 */ + SI4RestOctets rest_octets /* see 10.5.2.35 */ } with { variant "TAG(cbch_chan_desc, iei = '64'O; cbch_mobile_alloc, iei = '72'O)" }; /* 44.018 9.1.37 */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f00dd0b4863582fc5edf08149103150b8b5e97b Gerrit-Change-Number: 19148 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 00:51:33 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 00:51:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_SystemInformation: add SI2quater References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 ) Change subject: GSM_SystemInformation: add SI2quater ...................................................................... GSM_SystemInformation: add SI2quater Change-Id: I879c37eb51ece55d79346c6bf1a4951c3f11c77e --- M library/GSM_SystemInformation.ttcn 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/19149/1 diff --git a/library/GSM_SystemInformation.ttcn b/library/GSM_SystemInformation.ttcn index 0639eef..45f55bb 100644 --- a/library/GSM_SystemInformation.ttcn +++ b/library/GSM_SystemInformation.ttcn @@ -143,6 +143,10 @@ RestOctets rest_octets length(0..4) } with { variant "" }; + type record SystemInformationType2quater { + SI2quaterRestOctets rest_octets + } with { variant "" }; + /* 44.018 9.1.35 */ type record SystemInformationType3 { SysinfoCellIdentity cell_id, @@ -204,6 +208,7 @@ SystemInformationType2 si2, SystemInformationType2bis si2bis, SystemInformationType2ter si2ter, + SystemInformationType2quater si2quater, SystemInformationType3 si3, SystemInformationType4 si4, SystemInformationType5 si5, @@ -220,6 +225,7 @@ si2, header.message_type = SYSTEM_INFORMATION_TYPE_2; si2bis, header.message_type = SYSTEM_INFORMATION_TYPE_2bis; si2ter, header.message_type = SYSTEM_INFORMATION_TYPE_2ter; + si2quater, header.message_type = SYSTEM_INFORMATION_TYPE_2quater; si3, header.message_type = SYSTEM_INFORMATION_TYPE_3; si4, header.message_type = SYSTEM_INFORMATION_TYPE_4; si5, header.message_type = SYSTEM_INFORMATION_TYPE_5; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I879c37eb51ece55d79346c6bf1a4951c3f11c77e Gerrit-Change-Number: 19149 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 00:51:34 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 00:51:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: split f_init_bts() from f_init() References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19150 ) Change subject: split f_init_bts() from f_init() ...................................................................... split f_init_bts() from f_init() For SI tests, it is necessary to first startup the VTY, then issue some config commands, and only then start up the BTSes. By this separation that can be done by: f_init(nr_bts := 0); f_vty_transceive(...); f_init_bts(nr_bts := 1); Will be used in upcoming SI2quater tests. Change-Id: I24afb07735c3827f52760214fcb7a239190c3402 --- M bsc/BSC_Tests.ttcn 1 file changed, 12 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/19150/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index f25c75d..f6e1b2c 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -433,7 +433,6 @@ function f_init(integer nr_bts := NUM_BTS, boolean handler_mode := false, boolean allow_osmux := false, integer nr_msc := 1, float guard_timeout := 30.0) runs on test_CT { var integer bssap_idx; - var integer i; if (g_initialized) { return; @@ -469,15 +468,20 @@ f_init_mgcp("VirtMSC"); - for (i := 0; i < nr_bts; i := i+1) { - /* wait until osmo-bts-omldummy has respawned */ - f_wait_oml(i, "degraded", 5.0); - /* start RSL connection */ - f_ipa_rsl_start(bts[i].rsl, mp_bsc_ip, mp_bsc_rsl_port, i, handler_mode); - /* wait until BSC tells us "connected" */ - f_wait_oml(i, "connected", 5.0); + for (var integer i := 0; i < nr_bts; i := i+1) { + f_init_bts(i, handler_mode); } +} +function f_init_bts(integer bts_idx := 0, boolean handler_mode := false) +runs on test_CT { + /* wait until osmo-bts-omldummy has respawned */ + f_wait_oml(bts_idx, "degraded", 5.0); + + /* start RSL connection */ + f_ipa_rsl_start(bts[bts_idx].rsl, mp_bsc_ip, mp_bsc_rsl_port, bts_idx, handler_mode); + /* wait until BSC tells us "connected" */ + f_wait_oml(bts_idx, "connected", 5.0); } /* expect to receive a RSL message matching a specified template on a given BTS / stream */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I24afb07735c3827f52760214fcb7a239190c3402 Gerrit-Change-Number: 19150 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 00:51:34 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 00:51:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: change f_bts_0_cfg() to take a VTY port arg References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19151 ) Change subject: change f_bts_0_cfg() to take a VTY port arg ...................................................................... change f_bts_0_cfg() to take a VTY port arg Remove the 'runs on' clause, add a VTY port argument. That allows using this function also on the test_CT. Will be used by upcoming SI2quater tests. Change-Id: Ib059d9690f92f5f76025bca2b84496716a2a4cf0 --- M bsc/BSC_Tests.ttcn 1 file changed, 16 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/19151/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index f6e1b2c..784375a 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -3020,7 +3020,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); f_establish_fully(ass_cmd, exp_compl); - f_bts_0_cfg({"neighbor bts 1"}); + f_bts_0_cfg(BSCVTY, {"neighbor bts 1"}); var HandoverState hs := { rr_ho_cmpl_seen := false, @@ -3102,7 +3102,7 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); f_establish_fully(ass_req, exp_compl); - f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"}); + f_bts_0_cfg(BSCVTY, {"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -3169,7 +3169,7 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); f_establish_fully(ass_req, exp_compl); - f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"}); + f_bts_0_cfg(BSCVTY, {"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -3216,7 +3216,7 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); f_establish_fully(ass_req, exp_compl); - f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"}); + f_bts_0_cfg(BSCVTY, {"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -3301,7 +3301,7 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); f_establish_fully(ass_req, exp_compl); - f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"}); + f_bts_0_cfg(BSCVTY, {"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -3760,13 +3760,13 @@ type record of charstring Commands; -private function f_bts_0_cfg(Commands cmds := {}) runs on MSC_ConnHdlr +private function f_bts_0_cfg(TELNETasp_PT pt, Commands cmds := {}) { - f_vty_enter_cfg_bts(BSCVTY, 0); + f_vty_enter_cfg_bts(pt, 0); for (var integer i := 0; i < sizeof(cmds); i := i+1) { - f_vty_transceive(BSCVTY, cmds[i]); + f_vty_transceive(pt, cmds[i]); } - f_vty_transceive(BSCVTY, "end"); + f_vty_transceive(pt, "end"); } private function f_cs7_inst_0_cfg(TELNETasp_PT pt, Commands cmds := {}) @@ -3920,7 +3920,7 @@ */ log("f_tc_ho_neighbor_config: 1. No 'neighbor' config"); - f_bts_0_cfg({"no neighbors"}); + f_bts_0_cfg(BSCVTY, {"no neighbors"}); f_probe_for_handover("1.a", "HO to bts 1 works, implicitly listed as neighbor (legacy behavior when none are configured)", "handover any to arfcn 871 bsic 11", true); @@ -3948,7 +3948,7 @@ */ log("f_tc_ho_neighbor_config: 2. explicit local neighbor: 'neighbor bts 1'"); - f_bts_0_cfg({"neighbor bts 1"}); + f_bts_0_cfg(BSCVTY, {"neighbor bts 1"}); f_sleep(0.5); f_probe_for_handover("2.a", "HO to bts 1 works, explicitly listed as neighbor", @@ -3970,7 +3970,7 @@ */ log("f_tc_ho_neighbor_config: 3. explicit local neighbor: 'neighbor bts 2'"); - f_bts_0_cfg({"no neighbors", "neighbor bts 2"}); + f_bts_0_cfg(BSCVTY, {"no neighbors", "neighbor bts 2"}); f_sleep(0.5); f_probe_for_handover("3.a", "HO to bts 1 doesn't work, not listed as neighbor", @@ -3991,7 +3991,7 @@ */ log("f_tc_ho_neighbor_config: 4. explicit remote neighbor: 'neighbor lac 99 arfcn 123 bsic 45'"); - f_bts_0_cfg({"no neighbors", "neighbor lac 99 arfcn 123 bsic 45"}); + f_bts_0_cfg(BSCVTY, {"no neighbors", "neighbor lac 99 arfcn 123 bsic 45"}); f_sleep(0.5); f_probe_for_handover("4.a", "HO to bts 1 doesn't work, not listed as neighbor", @@ -4015,7 +4015,7 @@ */ log("f_tc_ho_neighbor_config: 5. explicit remote neighbor re-using ARFCN+BSIC: 'neighbor lac 99 arfcn 871 bsic 12'"); - f_bts_0_cfg({"no neighbors", "neighbor lac 99 arfcn 871 bsic 12"}); + f_bts_0_cfg(BSCVTY, {"no neighbors", "neighbor lac 99 arfcn 871 bsic 12"}); f_sleep(0.5); f_probe_for_handover("5.a", "HO to 871-12 triggers inter-BSC HO (ignoring local cells with same ARFCN+BSIC)", @@ -4034,7 +4034,7 @@ log("f_tc_ho_neighbor_config: 6. config error: explicit local and remote neighbors with ambiguous ARFCN+BSIC:" & " 'neighbor bts 2; neighbor lac 99 arfcn 871 bsic 12'"); - f_bts_0_cfg({"no neighbors", "neighbor bts 2", "neighbor lac 99 arfcn 871 bsic 12"}); + f_bts_0_cfg(BSCVTY, {"no neighbors", "neighbor bts 2", "neighbor lac 99 arfcn 871 bsic 12"}); f_sleep(0.5); f_probe_for_handover("6.a", "HO to 871-12 is ambiguous = error", @@ -4053,7 +4053,7 @@ log("f_tc_ho_neighbor_config: 7. explicit local and remote neighbors:" & " 'neighbor bts 2; neighbor lac 99 arfcn 123 bsic 45'"); - f_bts_0_cfg({"no neighbors", "neighbor bts 2", "neighbor lac 99 arfcn 123 bsic 45"}); + f_bts_0_cfg(BSCVTY, {"no neighbors", "neighbor bts 2", "neighbor lac 99 arfcn 123 bsic 45"}); f_sleep(0.5); f_probe_for_handover("7.a", "HO to 871-12 does HO to bts 2", -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib059d9690f92f5f76025bca2b84496716a2a4cf0 Gerrit-Change-Number: 19151 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 00:51:35 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 00:51:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add SI2quater tests for multiple EARFCNs References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 ) Change subject: bsc: add SI2quater tests for multiple EARFCNs ...................................................................... bsc: add SI2quater tests for multiple EARFCNs Shows bug OS#4652 in osmo-bsc, fixed by I5df269f713456a6ccbb874d6b7faac4a6f123c67 Change-Id: I45382f88686ca60e68569e93569fc4cfb63a0e0d --- M bsc/BSC_Tests.ttcn 1 file changed, 1,388 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/19152/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 912b46c..1d157fd 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1832,6 +1832,1389 @@ f_init_bts_and_check_sysinfo(0, expect_si := SystemInformationConfig_default); } +function f_test_si2quater(integer additional_earfcns, template SystemInformationConfig expect_si) runs on test_CT { + + f_init(0); + + for (var integer i := 0; i < additional_earfcns; i := i + 1) { + f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list add earfcn " & int2str(23 + i) & " thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3"}); + } + + f_init_bts_and_check_sysinfo(0, expect_si := expect_si); + + for (var integer i := 0; i < additional_earfcns; i := i + 1) { + f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list del earfcn " & int2str(23 + i)}); + } +} + +testcase TC_si2quater_2_earfcns() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + sic.si2quater := { + { + ba_ind := '0'B, + ba_3g_ind := '1'B, + mp_change_mark := '0'B, + si2quater_index := 0, + si2quater_count := 0, + meas_params_desc := { + presence := '0'B, + desc := omit + }, + gprs := { + rt_diff_desc := { + presence := '0'B, + desc := omit + }, + bsic_desc := { + presence := '0'B, + desc := omit + }, + rep_prio_desc := { + presence := '0'B, + desc := omit + }, + meas_params_desc := { + presence := '0'B, + desc := omit + } + }, + nc_meas_params := { + presence := '0'B, + params := omit + }, + ext_info := { + presence := '0'B, + info := omit + }, + utran_neigh_desc := { + presence := '0'B, + desc := omit + }, + utran_meas_params_desc := { + presence := '0'B, + desc := omit + }, + utran_gprs_meas_params_desc := { + presence := '0'B, + desc := omit + }, + rel_additions := { + rel5_presence := '1'B, + rel5 := { + umts_add_meas_params_desc := { + presence := '0'B, + desc := omit + }, + umts_add_meas_params_desc2 := { + presence := '0'B, + desc := omit + }, + rel6_presence := '1'B, + rel6 := { + umts_ccn_active := '0'B, + rel7_presence := '1'B, + rel7 := { + rep700 := { + presence := '0'B, + val := omit + }, + rep810 := { + presence := '0'B, + val := omit + }, + rel8_presence := '1'B, + rel8 := { + prio_eutran_params_desc := { + presence := '1'B, + desc := { + sc_prio_params_desc := { + presence := '1'B, + desc := { + geran_priority := 0, + thresh_priority_search := 0, + thresh_gsm_low := 0, + h_prio := 0, + t_reselection := 0 + } + }, + utran_prio_params_desc := { + presence := '0'B, + desc := omit + }, + eutran_params_desc := { + presence := '1'B, + desc := { + ccn_active := '0'B, + e_start := '1'B, + e_stop := '1'B, + meas_params_desc := { + presence := '0'B, + desc := omit + }, + gprs_meas_params_desc := { + presence := '0'B, + desc := omit + }, + neigh_cell_list := { + { + item_ind := '1'B, + cell_desc_list := { + { + item_ind := '1'B, + e_arfcn := 111, + meas_bw_presence := '1'B, + meas_bw := 3 + }, + { + item_ind := '1'B, + e_arfcn := 23, + meas_bw_presence := '1'B, + meas_bw := 3 + } + }, + cell_desc_list_term := '0'B, + prio_presence := '1'B, + prio := 3, + thresh_high := 20, + thresh_low_presence := '1'B, + thresh_low := 10, + qrxlevmin_presence := '1'B, + qrxlevmin := 22 + } + }, + neigh_cell_list_term := '0'B, + not_allowed_cell_list := omit, + not_allowed_cell_list_term := '0'B, + pcid2ta_map_list := omit, + pcid2ta_map_list_term := '0'B + } + } + } + }, + utran_csg_desc := { + presence := '0'B, + desc := omit + }, + eutran_csg_desc := { + presence := '0'B, + desc := omit + } + } + } + } + } + } + } + }; + f_test_si2quater(1, sic); +} + +testcase TC_si2quater_3_earfcns() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + sic.si2quater := { + { + ba_ind := '0'B, + ba_3g_ind := '1'B, + mp_change_mark := '0'B, + si2quater_index := 0, + si2quater_count := 0, + meas_params_desc := { + presence := '0'B, + desc := omit + }, + gprs := { + rt_diff_desc := { + presence := '0'B, + desc := omit + }, + bsic_desc := { + presence := '0'B, + desc := omit + }, + rep_prio_desc := { + presence := '0'B, + desc := omit + }, + meas_params_desc := { + presence := '0'B, + desc := omit + } + }, + nc_meas_params := { + presence := '0'B, + params := omit + }, + ext_info := { + presence := '0'B, + info := omit + }, + utran_neigh_desc := { + presence := '0'B, + desc := omit + }, + utran_meas_params_desc := { + presence := '0'B, + desc := omit + }, + utran_gprs_meas_params_desc := { + presence := '0'B, + desc := omit + }, + rel_additions := { + rel5_presence := '1'B, + rel5 := { + umts_add_meas_params_desc := { + presence := '0'B, + desc := omit + }, + umts_add_meas_params_desc2 := { + presence := '0'B, + desc := omit + }, + rel6_presence := '1'B, + rel6 := { + umts_ccn_active := '0'B, + rel7_presence := '1'B, + rel7 := { + rep700 := { + presence := '0'B, + val := omit + }, + rep810 := { + presence := '0'B, + val := omit + }, + rel8_presence := '1'B, + rel8 := { + prio_eutran_params_desc := { + presence := '1'B, + desc := { + sc_prio_params_desc := { + presence := '1'B, + desc := { + geran_priority := 0, + thresh_priority_search := 0, + thresh_gsm_low := 0, + h_prio := 0, + t_reselection := 0 + } + }, + utran_prio_params_desc := { + presence := '0'B, + desc := omit + }, + eutran_params_desc := { + presence := '1'B, + desc := { + ccn_active := '0'B, + e_start := '1'B, + e_stop := '1'B, + meas_params_desc := { + presence := '0'B, + desc := omit + }, + gprs_meas_params_desc := { + presence := '0'B, + desc := omit + }, + neigh_cell_list := { + { + item_ind := '1'B, + cell_desc_list := { + { + item_ind := '1'B, + e_arfcn := 111, + meas_bw_presence := '1'B, + meas_bw := 3 + }, + { + item_ind := '1'B, + e_arfcn := 23, + meas_bw_presence := '1'B, + meas_bw := 3 + }, + { + item_ind := '1'B, + e_arfcn := 24, + meas_bw_presence := '1'B, + meas_bw := 3 + } + }, + cell_desc_list_term := '0'B, + prio_presence := '1'B, + prio := 3, + thresh_high := 20, + thresh_low_presence := '1'B, + thresh_low := 10, + qrxlevmin_presence := '1'B, + qrxlevmin := 22 + } + }, + neigh_cell_list_term := '0'B, + not_allowed_cell_list := omit, + not_allowed_cell_list_term := '0'B, + pcid2ta_map_list := omit, + pcid2ta_map_list_term := '0'B + } + } + } + }, + utran_csg_desc := { + presence := '0'B, + desc := omit + }, + eutran_csg_desc := { + presence := '0'B, + desc := omit + } + } + } + } + } + } + } + }; + f_test_si2quater(2, sic); +} + +testcase TC_si2quater_4_earfcns() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + sic.si2quater := { + { + ba_ind := '0'B, + ba_3g_ind := '1'B, + mp_change_mark := '0'B, + si2quater_index := 0, + si2quater_count := 1, + meas_params_desc := { + presence := '0'B, + desc := omit + }, + gprs := { + rt_diff_desc := { + presence := '0'B, + desc := omit + }, + bsic_desc := { + presence := '0'B, + desc := omit + }, + rep_prio_desc := { + presence := '0'B, + desc := omit + }, + meas_params_desc := { + presence := '0'B, + desc := omit + } + }, + nc_meas_params := { + presence := '0'B, + params := omit + }, + ext_info := { + presence := '0'B, + info := omit + }, + utran_neigh_desc := { + presence := '0'B, + desc := omit + }, + utran_meas_params_desc := { + presence := '0'B, + desc := omit + }, + utran_gprs_meas_params_desc := { + presence := '0'B, + desc := omit + }, + rel_additions := { + rel5_presence := '1'B, + rel5 := { + umts_add_meas_params_desc := { + presence := '0'B, + desc := omit + }, + umts_add_meas_params_desc2 := { + presence := '0'B, + desc := omit + }, + rel6_presence := '1'B, + rel6 := { + umts_ccn_active := '0'B, + rel7_presence := '1'B, + rel7 := { + rep700 := { + presence := '0'B, + val := omit + }, + rep810 := { + presence := '0'B, + val := omit + }, + rel8_presence := '1'B, + rel8 := { + prio_eutran_params_desc := { + presence := '1'B, + desc := { + sc_prio_params_desc := { + presence := '1'B, + desc := { + geran_priority := 0, + thresh_priority_search := 0, + thresh_gsm_low := 0, + h_prio := 0, + t_reselection := 0 + } + }, + utran_prio_params_desc := { + presence := '0'B, + desc := omit + }, + eutran_params_desc := { + presence := '1'B, + desc := { + ccn_active := '0'B, + e_start := '1'B, + e_stop := '1'B, + meas_params_desc := { + presence := '0'B, + desc := omit + }, + gprs_meas_params_desc := { + presence := '0'B, + desc := omit + }, + neigh_cell_list := { + { + item_ind := '1'B, + cell_desc_list := { + { + item_ind := '1'B, + e_arfcn := 111, + meas_bw_presence := '1'B, + meas_bw := 3 + }, + { + item_ind := '1'B, + e_arfcn := 23, + meas_bw_presence := '1'B, + meas_bw := 3 + }, + { + item_ind := '1'B, + e_arfcn := 24, + meas_bw_presence := '1'B, + meas_bw := 3 + } + }, + cell_desc_list_term := '0'B, + prio_presence := '1'B, + prio := 3, + thresh_high := 20, + thresh_low_presence := '1'B, + thresh_low := 10, + qrxlevmin_presence := '1'B, + qrxlevmin := 22 + } + }, + neigh_cell_list_term := '0'B, + not_allowed_cell_list := omit, + not_allowed_cell_list_term := '0'B, + pcid2ta_map_list := omit, + pcid2ta_map_list_term := '0'B + } + } + } + }, + utran_csg_desc := { + presence := '0'B, + desc := omit + }, + eutran_csg_desc := { + presence := '0'B, + desc := omit + } + } + } + } + } + } + }, + { + ba_ind := '0'B, + ba_3g_ind := '1'B, + mp_change_mark := '0'B, + si2quater_index := 1, + si2quater_count := 1, + meas_params_desc := { + presence := '0'B, + desc := omit + }, + gprs := { + rt_diff_desc := { + presence := '0'B, + desc := omit + }, + bsic_desc := { + presence := '0'B, + desc := omit + }, + rep_prio_desc := { + presence := '0'B, + desc := omit + }, + meas_params_desc := { + presence := '0'B, + desc := omit + } + }, + nc_meas_params := { + presence := '0'B, + params := omit + }, + ext_info := { + presence := '0'B, + info := omit + }, + utran_neigh_desc := { + presence := '0'B, + desc := omit + }, + utran_meas_params_desc := { + presence := '0'B, + desc := omit + }, + utran_gprs_meas_params_desc := { + presence := '0'B, + desc := omit + }, + rel_additions := { + rel5_presence := '1'B, + rel5 := { + umts_add_meas_params_desc := { + presence := '0'B, + desc := omit + }, + umts_add_meas_params_desc2 := { + presence := '0'B, + desc := omit + }, + rel6_presence := '1'B, + rel6 := { + umts_ccn_active := '0'B, + rel7_presence := '1'B, + rel7 := { + rep700 := { + presence := '0'B, + val := omit + }, + rep810 := { + presence := '0'B, + val := omit + }, + rel8_presence := '1'B, + rel8 := { + prio_eutran_params_desc := { + presence := '1'B, + desc := { + sc_prio_params_desc := { + presence := '1'B, + desc := { + geran_priority := 0, + thresh_priority_search := 0, + thresh_gsm_low := 0, + h_prio := 0, + t_reselection := 0 + } + }, + utran_prio_params_desc := { + presence := '0'B, + desc := omit + }, + eutran_params_desc := { + presence := '1'B, + desc := { + ccn_active := '0'B, + e_start := '1'B, + e_stop := '1'B, + meas_params_desc := { + presence := '0'B, + desc := omit + }, + gprs_meas_params_desc := { + presence := '0'B, + desc := omit + }, + neigh_cell_list := { + { + item_ind := '1'B, + cell_desc_list := { + { + item_ind := '1'B, + e_arfcn := 25, + meas_bw_presence := '1'B, + meas_bw := 3 + } + }, + cell_desc_list_term := '0'B, + prio_presence := '1'B, + prio := 3, + thresh_high := 20, + thresh_low_presence := '1'B, + thresh_low := 10, + qrxlevmin_presence := '1'B, + qrxlevmin := 22 + } + }, + neigh_cell_list_term := '0'B, + not_allowed_cell_list := omit, + not_allowed_cell_list_term := '0'B, + pcid2ta_map_list := omit, + pcid2ta_map_list_term := '0'B + } + } + } + }, + utran_csg_desc := { + presence := '0'B, + desc := omit + }, + eutran_csg_desc := { + presence := '0'B, + desc := omit + } + } + } + } + } + } + } + }; + /* + sic.si2quater := { + tra_SI2quaterRestOctets_EUTRAN(neigh_list := { + { + item_ind := '1'B, + cell_desc_list := { + { + item_ind := '1'B, + e_arfcn := 111, + meas_bw_presence := '1'B, + meas_bw := 3 + }, + { + item_ind := '1'B, + e_arfcn := 23, + meas_bw_presence := '1'B, + meas_bw := 3 + }, + { + item_ind := '1'B, + e_arfcn := 24, + meas_bw_presence := '1'B, + meas_bw := 3 + } + }, + cell_desc_list_term := '0'B, + prio_presence := '1'B, + prio := 3, + thresh_high := 20, + thresh_low_presence := '1'B, + thresh_low := 10, + qrxlevmin_presence := '1'B, + qrxlevmin := 22 + } + }, + meas_params := { + presence := '0'B, + desc := omit + } + ), + tra_SI2quaterRestOctets_EUTRAN(neigh_list := { + { + item_ind := '1'B, + cell_desc_list := { + { + item_ind := '1'B, + e_arfcn := 25, + meas_bw_presence := '1'B, + meas_bw := 3 + } + }, + cell_desc_list_term := '0'B, + prio_presence := '1'B, + prio := 3, + thresh_high := 20, + thresh_low_presence := '1'B, + thresh_low := 10, + qrxlevmin_presence := '1'B, + qrxlevmin := 22 + } + }, + meas_params := { + presence := '0'B, + desc := omit + } + ) + }; + */ + f_test_si2quater(3, sic); +} + +testcase TC_si2quater_5_earfcns() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + sic.si2quater := { + { + ba_ind := '0'B, + ba_3g_ind := '1'B, + mp_change_mark := '0'B, + si2quater_index := 0, + si2quater_count := 1, + meas_params_desc := { + presence := '0'B, + desc := omit + }, + gprs := { + rt_diff_desc := { + presence := '0'B, + desc := omit + }, + bsic_desc := { + presence := '0'B, + desc := omit + }, + rep_prio_desc := { + presence := '0'B, + desc := omit + }, + meas_params_desc := { + presence := '0'B, + desc := omit + } + }, + nc_meas_params := { + presence := '0'B, + params := omit + }, + ext_info := { + presence := '0'B, + info := omit + }, + utran_neigh_desc := { + presence := '0'B, + desc := omit + }, + utran_meas_params_desc := { + presence := '0'B, + desc := omit + }, + utran_gprs_meas_params_desc := { + presence := '0'B, + desc := omit + }, + rel_additions := { + rel5_presence := '1'B, + rel5 := { + umts_add_meas_params_desc := { + presence := '0'B, + desc := omit + }, + umts_add_meas_params_desc2 := { + presence := '0'B, + desc := omit + }, + rel6_presence := '1'B, + rel6 := { + umts_ccn_active := '0'B, + rel7_presence := '1'B, + rel7 := { + rep700 := { + presence := '0'B, + val := omit + }, + rep810 := { + presence := '0'B, + val := omit + }, + rel8_presence := '1'B, + rel8 := { + prio_eutran_params_desc := { + presence := '1'B, + desc := { + sc_prio_params_desc := { + presence := '1'B, + desc := { + geran_priority := 0, + thresh_priority_search := 0, + thresh_gsm_low := 0, + h_prio := 0, + t_reselection := 0 + } + }, + utran_prio_params_desc := { + presence := '0'B, + desc := omit + }, + eutran_params_desc := { + presence := '1'B, + desc := { + ccn_active := '0'B, + e_start := '1'B, + e_stop := '1'B, + meas_params_desc := { + presence := '0'B, + desc := omit + }, + gprs_meas_params_desc := { + presence := '0'B, + desc := omit + }, + neigh_cell_list := { + { + item_ind := '1'B, + cell_desc_list := { + { + item_ind := '1'B, + e_arfcn := 111, + meas_bw_presence := '1'B, + meas_bw := 3 + }, + { + item_ind := '1'B, + e_arfcn := 23, + meas_bw_presence := '1'B, + meas_bw := 3 + }, + { + item_ind := '1'B, + e_arfcn := 24, + meas_bw_presence := '1'B, + meas_bw := 3 + } + }, + cell_desc_list_term := '0'B, + prio_presence := '1'B, + prio := 3, + thresh_high := 20, + thresh_low_presence := '1'B, + thresh_low := 10, + qrxlevmin_presence := '1'B, + qrxlevmin := 22 + } + }, + neigh_cell_list_term := '0'B, + not_allowed_cell_list := omit, + not_allowed_cell_list_term := '0'B, + pcid2ta_map_list := omit, + pcid2ta_map_list_term := '0'B + } + } + } + }, + utran_csg_desc := { + presence := '0'B, + desc := omit + }, + eutran_csg_desc := { + presence := '0'B, + desc := omit + } + } + } + } + } + } + }, + { + ba_ind := '0'B, + ba_3g_ind := '1'B, + mp_change_mark := '0'B, + si2quater_index := 1, + si2quater_count := 1, + meas_params_desc := { + presence := '0'B, + desc := omit + }, + gprs := { + rt_diff_desc := { + presence := '0'B, + desc := omit + }, + bsic_desc := { + presence := '0'B, + desc := omit + }, + rep_prio_desc := { + presence := '0'B, + desc := omit + }, + meas_params_desc := { + presence := '0'B, + desc := omit + } + }, + nc_meas_params := { + presence := '0'B, + params := omit + }, + ext_info := { + presence := '0'B, + info := omit + }, + utran_neigh_desc := { + presence := '0'B, + desc := omit + }, + utran_meas_params_desc := { + presence := '0'B, + desc := omit + }, + utran_gprs_meas_params_desc := { + presence := '0'B, + desc := omit + }, + rel_additions := { + rel5_presence := '1'B, + rel5 := { + umts_add_meas_params_desc := { + presence := '0'B, + desc := omit + }, + umts_add_meas_params_desc2 := { + presence := '0'B, + desc := omit + }, + rel6_presence := '1'B, + rel6 := { + umts_ccn_active := '0'B, + rel7_presence := '1'B, + rel7 := { + rep700 := { + presence := '0'B, + val := omit + }, + rep810 := { + presence := '0'B, + val := omit + }, + rel8_presence := '1'B, + rel8 := { + prio_eutran_params_desc := { + presence := '1'B, + desc := { + sc_prio_params_desc := { + presence := '1'B, + desc := { + geran_priority := 0, + thresh_priority_search := 0, + thresh_gsm_low := 0, + h_prio := 0, + t_reselection := 0 + } + }, + utran_prio_params_desc := { + presence := '0'B, + desc := omit + }, + eutran_params_desc := { + presence := '1'B, + desc := { + ccn_active := '0'B, + e_start := '1'B, + e_stop := '1'B, + meas_params_desc := { + presence := '0'B, + desc := omit + }, + gprs_meas_params_desc := { + presence := '0'B, + desc := omit + }, + neigh_cell_list := { + { + item_ind := '1'B, + cell_desc_list := { + { + item_ind := '1'B, + e_arfcn := 25, + meas_bw_presence := '1'B, + meas_bw := 3 + }, + { + item_ind := '1'B, + e_arfcn := 26, + meas_bw_presence := '1'B, + meas_bw := 3 + } + }, + cell_desc_list_term := '0'B, + prio_presence := '1'B, + prio := 3, + thresh_high := 20, + thresh_low_presence := '1'B, + thresh_low := 10, + qrxlevmin_presence := '1'B, + qrxlevmin := 22 + } + }, + neigh_cell_list_term := '0'B, + not_allowed_cell_list := omit, + not_allowed_cell_list_term := '0'B, + pcid2ta_map_list := omit, + pcid2ta_map_list_term := '0'B + } + } + } + }, + utran_csg_desc := { + presence := '0'B, + desc := omit + }, + eutran_csg_desc := { + presence := '0'B, + desc := omit + } + } + } + } + } + } + } + }; + f_test_si2quater(4, sic); +} + +testcase TC_si2quater_6_earfcns() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + sic.si2quater := { + { + ba_ind := '0'B, + ba_3g_ind := '1'B, + mp_change_mark := '0'B, + si2quater_index := 0, + si2quater_count := 1, + meas_params_desc := { + presence := '0'B, + desc := omit + }, + gprs := { + rt_diff_desc := { + presence := '0'B, + desc := omit + }, + bsic_desc := { + presence := '0'B, + desc := omit + }, + rep_prio_desc := { + presence := '0'B, + desc := omit + }, + meas_params_desc := { + presence := '0'B, + desc := omit + } + }, + nc_meas_params := { + presence := '0'B, + params := omit + }, + ext_info := { + presence := '0'B, + info := omit + }, + utran_neigh_desc := { + presence := '0'B, + desc := omit + }, + utran_meas_params_desc := { + presence := '0'B, + desc := omit + }, + utran_gprs_meas_params_desc := { + presence := '0'B, + desc := omit + }, + rel_additions := { + rel5_presence := '1'B, + rel5 := { + umts_add_meas_params_desc := { + presence := '0'B, + desc := omit + }, + umts_add_meas_params_desc2 := { + presence := '0'B, + desc := omit + }, + rel6_presence := '1'B, + rel6 := { + umts_ccn_active := '0'B, + rel7_presence := '1'B, + rel7 := { + rep700 := { + presence := '0'B, + val := omit + }, + rep810 := { + presence := '0'B, + val := omit + }, + rel8_presence := '1'B, + rel8 := { + prio_eutran_params_desc := { + presence := '1'B, + desc := { + sc_prio_params_desc := { + presence := '1'B, + desc := { + geran_priority := 0, + thresh_priority_search := 0, + thresh_gsm_low := 0, + h_prio := 0, + t_reselection := 0 + } + }, + utran_prio_params_desc := { + presence := '0'B, + desc := omit + }, + eutran_params_desc := { + presence := '1'B, + desc := { + ccn_active := '0'B, + e_start := '1'B, + e_stop := '1'B, + meas_params_desc := { + presence := '0'B, + desc := omit + }, + gprs_meas_params_desc := { + presence := '0'B, + desc := omit + }, + neigh_cell_list := { + { + item_ind := '1'B, + cell_desc_list := { + { + item_ind := '1'B, + e_arfcn := 111, + meas_bw_presence := '1'B, + meas_bw := 3 + }, + { + item_ind := '1'B, + e_arfcn := 23, + meas_bw_presence := '1'B, + meas_bw := 3 + }, + { + item_ind := '1'B, + e_arfcn := 24, + meas_bw_presence := '1'B, + meas_bw := 3 + } + }, + cell_desc_list_term := '0'B, + prio_presence := '1'B, + prio := 3, + thresh_high := 20, + thresh_low_presence := '1'B, + thresh_low := 10, + qrxlevmin_presence := '1'B, + qrxlevmin := 22 + } + }, + neigh_cell_list_term := '0'B, + not_allowed_cell_list := omit, + not_allowed_cell_list_term := '0'B, + pcid2ta_map_list := omit, + pcid2ta_map_list_term := '0'B + } + } + } + }, + utran_csg_desc := { + presence := '0'B, + desc := omit + }, + eutran_csg_desc := { + presence := '0'B, + desc := omit + } + } + } + } + } + } + }, + { + ba_ind := '0'B, + ba_3g_ind := '1'B, + mp_change_mark := '0'B, + si2quater_index := 1, + si2quater_count := 1, + meas_params_desc := { + presence := '0'B, + desc := omit + }, + gprs := { + rt_diff_desc := { + presence := '0'B, + desc := omit + }, + bsic_desc := { + presence := '0'B, + desc := omit + }, + rep_prio_desc := { + presence := '0'B, + desc := omit + }, + meas_params_desc := { + presence := '0'B, + desc := omit + } + }, + nc_meas_params := { + presence := '0'B, + params := omit + }, + ext_info := { + presence := '0'B, + info := omit + }, + utran_neigh_desc := { + presence := '0'B, + desc := omit + }, + utran_meas_params_desc := { + presence := '0'B, + desc := omit + }, + utran_gprs_meas_params_desc := { + presence := '0'B, + desc := omit + }, + rel_additions := { + rel5_presence := '1'B, + rel5 := { + umts_add_meas_params_desc := { + presence := '0'B, + desc := omit + }, + umts_add_meas_params_desc2 := { + presence := '0'B, + desc := omit + }, + rel6_presence := '1'B, + rel6 := { + umts_ccn_active := '0'B, + rel7_presence := '1'B, + rel7 := { + rep700 := { + presence := '0'B, + val := omit + }, + rep810 := { + presence := '0'B, + val := omit + }, + rel8_presence := '1'B, + rel8 := { + prio_eutran_params_desc := { + presence := '1'B, + desc := { + sc_prio_params_desc := { + presence := '1'B, + desc := { + geran_priority := 0, + thresh_priority_search := 0, + thresh_gsm_low := 0, + h_prio := 0, + t_reselection := 0 + } + }, + utran_prio_params_desc := { + presence := '0'B, + desc := omit + }, + eutran_params_desc := { + presence := '1'B, + desc := { + ccn_active := '0'B, + e_start := '1'B, + e_stop := '1'B, + meas_params_desc := { + presence := '0'B, + desc := omit + }, + gprs_meas_params_desc := { + presence := '0'B, + desc := omit + }, + neigh_cell_list := { + { + item_ind := '1'B, + cell_desc_list := { + { + item_ind := '1'B, + e_arfcn := 25, + meas_bw_presence := '1'B, + meas_bw := 3 + }, + { + item_ind := '1'B, + e_arfcn := 26, + meas_bw_presence := '1'B, + meas_bw := 3 + }, + { + item_ind := '1'B, + e_arfcn := 27, + meas_bw_presence := '1'B, + meas_bw := 3 + } + }, + cell_desc_list_term := '0'B, + prio_presence := '1'B, + prio := 3, + thresh_high := 20, + thresh_low_presence := '1'B, + thresh_low := 10, + qrxlevmin_presence := '1'B, + qrxlevmin := 22 + } + }, + neigh_cell_list_term := '0'B, + not_allowed_cell_list := omit, + not_allowed_cell_list_term := '0'B, + pcid2ta_map_list := omit, + pcid2ta_map_list_term := '0'B + } + } + } + }, + utran_csg_desc := { + presence := '0'B, + desc := omit + }, + eutran_csg_desc := { + presence := '0'B, + desc := omit + } + } + } + } + } + } + } + }; + f_test_si2quater(5, sic); +} + + testcase TC_ctrl_msc_connection_status() runs on test_CT { var charstring ctrl_resp; @@ -5794,6 +7177,11 @@ } execute( TC_si_default() ); + execute( TC_si2quater_2_earfcns() ); + execute( TC_si2quater_3_earfcns() ); + execute( TC_si2quater_4_earfcns() ); + execute( TC_si2quater_5_earfcns() ); + execute( TC_si2quater_6_earfcns() ); /* RSL DCHAN Channel ACtivation / Deactivation */ execute( TC_chan_act_noreply() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I45382f88686ca60e68569e93569fc4cfb63a0e0d Gerrit-Change-Number: 19152 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 00:51:42 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 00:51:42 +0000 Subject: Change in osmo-bsc[master]: si2quater: fix budget calculation for multiple EARFCNs References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19153 ) Change subject: si2quater: fix budget calculation for multiple EARFCNs ...................................................................... si2quater: fix budget calculation for multiple EARFCNs In rest_octets.c append_earfcn(), the unconditional bits added are 40, not 25. Removing only 25 bits from the budget resulted in malformed SI2quater starting with 4 configured EARFCNs, by adding more EARFCNs than fit in 20 bits. These malformed SI2quater were also expected in gsm0408_test.c. Update the expected SI2quater to what is being generated now. This patch passes the ttcn3 testing added in I45382f88686ca60e68569e93569fc4cfb63a0e0d, which provides some confidence that the coding expected in gsm0408_test.c is now correct. Related: OS#4652 Change-Id: I5df269f713456a6ccbb874d6b7faac4a6f123c67 --- M src/osmo-bsc/rest_octets.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 91 insertions(+), 67 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/53/19153/1 diff --git a/src/osmo-bsc/rest_octets.c b/src/osmo-bsc/rest_octets.c index 2238b08..0d806f3 100644 --- a/src/osmo-bsc/rest_octets.c +++ b/src/osmo-bsc/rest_octets.c @@ -162,7 +162,7 @@ { bool appended; unsigned int old = bv->cur_bit; /* save current position to make rollback possible */ - int rem = budget - 25; + int rem = ((int)budget) - 40; if (rem <= 0) return; @@ -190,6 +190,8 @@ /* Priority and E-UTRAN Parameters Description */ bitvec_set_bit(bv, 1); + /* budget: 10 bits used above */ + /* Serving Cell Priority Parameters Descr. is Present, * see also: 3GPP TS 44.018, Table 10.5.2.33b.1 */ bitvec_set_bit(bv, 1); @@ -209,6 +211,8 @@ /* T_Reselection */ bitvec_set_uint(bv, 0, 2); + /* budget: 26 bits used above */ + /* No 3G Priority Parameters Description */ bitvec_set_bit(bv, 0); /* E-UTRAN Parameters Description */ @@ -232,12 +236,16 @@ /* Repeated E-UTRAN Neighbour Cells */ bitvec_set_bit(bv, 1); + /* budget: 34 bits used above */ + appended = append_eutran_neib_cell(bv, bts, rem); if (!appended) { /* appending is impossible within current budget: rollback */ bv->cur_bit = old; return; } + /* budget: further 6 bits used below, totalling 40 bits */ + /* stop bit - end of Repeated E-UTRAN Neighbour Cells sequence: */ bitvec_set_bit(bv, 0); diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index bad8aef..7e054f4 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -80,13 +80,14 @@ added EARFCN 1945 - generating SI2quater for 4 EARFCNs and 0 UARFCNs... generated valid SI2quater [00/00]: [23] 59 06 07 40 00 04 87 00 00 b3 07 7d 98 3c 62 0f 23 50 79 90 50 0b 2b added EARFCN 1965 - generating SI2quater for 5 EARFCNs and 0 UARFCNs... -generated valid SI2quater [00/00]: [23] 59 06 07 40 00 04 87 00 00 b3 07 7d 98 3c 62 0f 23 50 79 94 1e b4 14 +generated valid SI2quater [00/01]: [23] 59 06 07 40 20 04 87 00 00 b3 07 7d 98 3c 62 0f 23 50 79 90 50 0b 2b +generated valid SI2quater [01/01]: [23] 59 06 07 42 20 04 87 00 00 b3 07 ad 05 01 2b 2b 2b 2b 2b 2b 2b 2b 2b added EARFCN 1967 - generating SI2quater for 6 EARFCNs and 0 UARFCNs... -generated valid SI2quater [00/01]: [23] 59 06 07 40 20 04 87 00 00 b3 07 7d 98 3c 62 0f 23 50 79 94 1e b4 14 -generated valid SI2quater [01/01]: [23] 59 06 07 42 20 04 87 00 00 b3 07 af c0 a0 2b 2b 2b 2b 2b 2b 2b 2b 2b +generated valid SI2quater [00/01]: [23] 59 06 07 40 20 04 87 00 00 b3 07 7d 98 3c 62 0f 23 50 79 90 50 0b 2b +generated valid SI2quater [01/01]: [23] 59 06 07 42 20 04 87 00 00 b3 07 ad 41 eb f0 28 0b 2b 2b 2b 2b 2b 2b added EARFCN 1982 - generating SI2quater for 7 EARFCNs and 0 UARFCNs... -generated valid SI2quater [00/01]: [23] 59 06 07 40 20 04 87 00 00 b3 07 7d 98 3c 62 0f 23 50 79 94 1e b4 14 -generated valid SI2quater [01/01]: [23] 59 06 07 42 20 04 87 00 00 b3 07 af c8 3d f5 85 01 2b 2b 2b 2b 2b 2b +generated valid SI2quater [00/01]: [23] 59 06 07 40 20 04 87 00 00 b3 07 7d 98 3c 62 0f 23 50 79 90 50 0b 2b +generated valid SI2quater [01/01]: [23] 59 06 07 42 20 04 87 00 00 b3 07 ad 41 eb f2 0f 7d 61 40 2b 2b 2b 2b BTS deallocated OK in test_si2q_e() BTS allocation OK in test_si2q_u() Testing SYSINFO_TYPE_2quater UARFCN generation: @@ -135,77 +136,92 @@ BTS allocation OK in test_si2q_long() Testing SYSINFO_TYPE_2quater combined EARFCN & UARFCN generation: generating SI2quater for 17 EARFCNs and 1 UARFCNs... -generated valid SI2quater [00/04]: [23] 59 06 07 40 80 25 0f 70 0c 1a 10 9c 00 02 cc 1e 09 07 82 39 76 56 0b -generated valid SI2quater [01/04]: [23] 59 06 07 42 80 04 87 00 00 b3 07 84 d8 3c 1e c1 e1 76 10 7f ae 5d 95 -generated valid SI2quater [02/04]: [23] 59 06 07 44 80 04 87 00 00 b3 08 40 c8 42 0d c2 10 aa 10 a7 ae 5d 95 -generated valid SI2quater [03/04]: [23] 59 06 07 46 80 04 87 00 00 b3 08 54 c8 42 ad c2 15 aa 10 93 ae 5d 95 -generated valid SI2quater [04/04]: [23] 59 06 07 48 80 04 87 00 00 b3 08 4a c8 42 5d c2 13 29 cb b2 b0 2b 2b +generated valid SI2quater [00/05]: [23] 59 06 07 40 a0 25 0f 70 0c 1a 10 9c 00 02 cc 1e 09 07 82 39 76 56 0b +generated valid SI2quater [01/05]: [23] 59 06 07 42 a0 04 87 00 00 b3 07 84 d8 3c 1e c1 e1 75 cb b2 b0 2b 2b +generated valid SI2quater [02/05]: [23] 59 06 07 44 a0 04 87 00 00 b3 08 3f d8 42 06 42 10 6d cb b2 b0 2b 2b +generated valid SI2quater [03/05]: [23] 59 06 07 46 a0 04 87 00 00 b3 08 42 a8 42 9e c2 15 31 cb b2 b0 2b 2b +generated valid SI2quater [04/05]: [23] 59 06 07 48 a0 04 87 00 00 b3 08 55 b8 42 b5 42 12 75 cb b2 b0 2b 2b +generated valid SI2quater [05/05]: [23] 59 06 07 4a a0 04 87 00 00 b3 08 4a c8 42 5d c2 13 29 cb b2 b0 2b 2b generating SI2quater for 17 EARFCNs and 2 UARFCNs... -generated valid SI2quater [00/04]: [23] 59 06 07 40 80 25 0f 70 14 4d e7 00 46 00 01 66 0f 04 83 c1 1c bb 2b -generated valid SI2quater [01/04]: [23] 59 06 07 42 80 04 87 00 00 b3 07 84 d8 3c 1e c1 e1 76 10 7f ae 5d 95 -generated valid SI2quater [02/04]: [23] 59 06 07 44 80 04 87 00 00 b3 08 40 c8 42 0d c2 10 aa 10 a7 ae 5d 95 -generated valid SI2quater [03/04]: [23] 59 06 07 46 80 04 87 00 00 b3 08 54 c8 42 ad c2 15 aa 10 93 ae 5d 95 -generated valid SI2quater [04/04]: [23] 59 06 07 48 80 04 87 00 00 b3 08 4a c8 42 5d c2 13 29 cb b2 b0 2b 2b +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 14 4d e7 00 46 00 01 66 0f 04 72 ec ac 0b 2b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e1 36 0f 07 ae 5d 95 83 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 85 d8 41 fe c2 10 31 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 41 b8 42 15 42 14 f5 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 54 c8 42 ad c2 15 a9 cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 49 d8 42 56 42 12 ed cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4c a7 2e ca c1 2b 2b 2b 2b 2b 2b 2b generating SI2quater for 17 EARFCNs and 3 UARFCNs... -generated valid SI2quater [00/04]: [23] 59 06 07 40 80 25 0f 70 1c 4d e7 03 04 87 00 00 b3 07 82 41 e0 8e 5d -generated valid SI2quater [01/04]: [23] 59 06 07 42 80 04 87 00 00 b3 07 84 d8 3c 1e c1 e1 76 10 7f ae 5d 95 -generated valid SI2quater [02/04]: [23] 59 06 07 44 80 04 87 00 00 b3 08 40 c8 42 0d c2 10 aa 10 a7 ae 5d 95 -generated valid SI2quater [03/04]: [23] 59 06 07 46 80 04 87 00 00 b3 08 54 c8 42 ad c2 15 aa 10 93 ae 5d 95 -generated valid SI2quater [04/04]: [23] 59 06 07 48 80 04 87 00 00 b3 08 4a c8 42 5d c2 13 29 cb b2 b0 2b 2b +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 1c 4d e7 03 04 87 00 00 b3 07 82 39 76 56 0b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e1 36 0f 07 ae 5d 95 83 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 85 d8 41 fe c2 10 31 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 41 b8 42 15 42 14 f5 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 54 c8 42 ad c2 15 a9 cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 49 d8 42 56 42 12 ed cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4c a7 2e ca c1 2b 2b 2b 2b 2b 2b 2b generating SI2quater for 17 EARFCNs and 4 UARFCNs... -generated valid SI2quater [00/04]: [23] 59 06 07 40 80 25 0f 70 24 59 fa 26 73 84 87 00 00 b3 07 82 39 76 56 -generated valid SI2quater [01/04]: [23] 59 06 07 42 80 04 87 00 00 b3 07 82 41 e1 36 0f 07 b0 78 5d 72 ec ac -generated valid SI2quater [02/04]: [23] 59 06 07 44 80 04 87 00 00 b3 08 3f d8 42 06 42 10 6e 10 85 4e 5d 95 -generated valid SI2quater [03/04]: [23] 59 06 07 46 80 04 87 00 00 b3 08 53 d8 42 a6 42 15 6e 10 ad 4e 5d 95 -generated valid SI2quater [04/04]: [23] 59 06 07 48 80 04 87 00 00 b3 08 49 d8 42 56 42 12 ee 10 99 4e 5d 95 +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 24 59 fa 26 73 84 87 00 00 b2 e5 d9 58 2b 2b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e0 90 78 4d 72 ec ac 0b 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8 3c 2e c2 0f f5 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8 42 0d c2 10 a9 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8 42 a6 42 15 6d cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b1 cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8 42 65 39 76 56 0b 2b 2b 2b 2b generating SI2quater for 17 EARFCNs and 5 UARFCNs... -generated valid SI2quater [00/04]: [23] 59 06 07 40 80 25 0f 70 2c 59 fa 30 73 f6 04 87 00 00 b3 07 82 39 76 -generated valid SI2quater [01/04]: [23] 59 06 07 42 80 04 87 00 00 b3 07 82 41 e1 36 0f 07 b0 78 5d 72 ec ac -generated valid SI2quater [02/04]: [23] 59 06 07 44 80 04 87 00 00 b3 08 3f d8 42 06 42 10 6e 10 85 4e 5d 95 -generated valid SI2quater [03/04]: [23] 59 06 07 46 80 04 87 00 00 b3 08 53 d8 42 a6 42 15 6e 10 ad 4e 5d 95 -generated valid SI2quater [04/04]: [23] 59 06 07 48 80 04 87 00 00 b3 08 49 d8 42 56 42 12 ee 10 99 4e 5d 95 +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 2c 59 fa 30 73 f6 04 87 00 00 b2 e5 d9 58 2b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e0 90 78 4d 72 ec ac 0b 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8 3c 2e c2 0f f5 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8 42 0d c2 10 a9 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8 42 a6 42 15 6d cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b1 cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8 42 65 39 76 56 0b 2b 2b 2b 2b generating SI2quater for 17 EARFCNs and 6 UARFCNs... -generated valid SI2quater [00/05]: [23] 59 06 07 40 a0 25 0f 70 34 f1 ae 15 f3 f4 83 04 87 00 00 b2 e5 d9 58 -generated valid SI2quater [01/05]: [23] 59 06 07 42 a0 04 87 00 00 b3 07 82 41 e0 90 78 4d 83 c1 eb 97 65 60 -generated valid SI2quater [02/05]: [23] 59 06 07 44 a0 04 87 00 00 b3 07 85 d8 41 fe c2 10 32 10 83 6e 5d 95 -generated valid SI2quater [03/05]: [23] 59 06 07 46 a0 04 87 00 00 b3 08 42 a8 42 9e c2 15 32 10 ab 6e 5d 95 -generated valid SI2quater [04/05]: [23] 59 06 07 48 a0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b2 10 97 6e 5d 95 -generated valid SI2quater [05/05]: [23] 59 06 07 4a a0 04 87 00 00 b3 08 4c a7 2e ca c1 2b 2b 2b 2b 2b 2b 2b +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 34 f1 ae 15 f3 f4 83 03 2b 2b 2b 2b 2b 2b 2b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e0 90 78 4d 72 ec ac 0b 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8 3c 2e c2 0f f5 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8 42 0d c2 10 a9 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8 42 a6 42 15 6d cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b1 cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8 42 65 39 76 56 0b 2b 2b 2b 2b generating SI2quater for 17 EARFCNs and 7 UARFCNs... -generated valid SI2quater [00/05]: [23] 59 06 07 40 a0 25 0f 70 3c f1 ae 15 f3 f4 83 01 84 87 00 00 b2 e5 d9 -generated valid SI2quater [01/05]: [23] 59 06 07 42 a0 04 87 00 00 b3 07 82 41 e0 90 78 4d 83 c1 eb 97 65 60 -generated valid SI2quater [02/05]: [23] 59 06 07 44 a0 04 87 00 00 b3 07 85 d8 41 fe c2 10 32 10 83 6e 5d 95 -generated valid SI2quater [03/05]: [23] 59 06 07 46 a0 04 87 00 00 b3 08 42 a8 42 9e c2 15 32 10 ab 6e 5d 95 -generated valid SI2quater [04/05]: [23] 59 06 07 48 a0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b2 10 97 6e 5d 95 -generated valid SI2quater [05/05]: [23] 59 06 07 4a a0 04 87 00 00 b3 08 4c a7 2e ca c1 2b 2b 2b 2b 2b 2b 2b +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 3c f1 ae 15 f3 f4 83 01 83 2b 2b 2b 2b 2b 2b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e0 90 78 4d 72 ec ac 0b 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8 3c 2e c2 0f f5 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8 42 0d c2 10 a9 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8 42 a6 42 15 6d cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b1 cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8 42 65 39 76 56 0b 2b 2b 2b 2b generating SI2quater for 17 EARFCNs and 8 UARFCNs... -generated valid SI2quater [00/05]: [23] 59 06 07 40 a0 25 0f 70 45 19 a0 0d 7d 7e a6 19 e7 0b 2b 2b 2b 2b 2b -generated valid SI2quater [01/05]: [23] 59 06 07 42 a0 04 87 00 00 b3 07 82 41 e0 90 78 4d 83 c1 eb 97 65 60 -generated valid SI2quater [02/05]: [23] 59 06 07 44 a0 04 87 00 00 b3 07 85 d8 41 fe c2 10 32 10 83 6e 5d 95 -generated valid SI2quater [03/05]: [23] 59 06 07 46 a0 04 87 00 00 b3 08 42 a8 42 9e c2 15 32 10 ab 6e 5d 95 -generated valid SI2quater [04/05]: [23] 59 06 07 48 a0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b2 10 97 6e 5d 95 -generated valid SI2quater [05/05]: [23] 59 06 07 4a a0 04 87 00 00 b3 08 4c a7 2e ca c1 2b 2b 2b 2b 2b 2b 2b +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 45 19 a0 0d 7d 7e a6 19 e7 0b 2b 2b 2b 2b 2b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e0 90 78 4d 72 ec ac 0b 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8 3c 2e c2 0f f5 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8 42 0d c2 10 a9 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8 42 a6 42 15 6d cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b1 cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8 42 65 39 76 56 0b 2b 2b 2b 2b generating SI2quater for 17 EARFCNs and 9 UARFCNs... -generated valid SI2quater [00/05]: [23] 59 06 07 40 a0 25 0f 70 4d 19 a0 26 fd 66 a6 03 e7 fa 0b 2b 2b 2b 2b -generated valid SI2quater [01/05]: [23] 59 06 07 42 a0 04 87 00 00 b3 07 82 41 e0 90 78 4d 83 c1 eb 97 65 60 -generated valid SI2quater [02/05]: [23] 59 06 07 44 a0 04 87 00 00 b3 07 85 d8 41 fe c2 10 32 10 83 6e 5d 95 -generated valid SI2quater [03/05]: [23] 59 06 07 46 a0 04 87 00 00 b3 08 42 a8 42 9e c2 15 32 10 ab 6e 5d 95 -generated valid SI2quater [04/05]: [23] 59 06 07 48 a0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b2 10 97 6e 5d 95 -generated valid SI2quater [05/05]: [23] 59 06 07 4a a0 04 87 00 00 b3 08 4c a7 2e ca c1 2b 2b 2b 2b 2b 2b 2b +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 4d 19 a0 26 fd 66 a6 03 e7 fa 0b 2b 2b 2b 2b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e0 90 78 4d 72 ec ac 0b 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8 3c 2e c2 0f f5 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8 42 0d c2 10 a9 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8 42 a6 42 15 6d cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b1 cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8 42 65 39 76 56 0b 2b 2b 2b 2b generating SI2quater for 17 EARFCNs and 10 UARFCNs... -generated valid SI2quater [00/05]: [23] 59 06 07 40 a0 25 0f 70 55 47 89 1e fd 7c b0 00 e7 9b b0 2b 2b 2b 2b -generated valid SI2quater [01/05]: [23] 59 06 07 42 a0 04 87 00 00 b3 07 82 41 e0 90 78 4d 83 c1 eb 97 65 60 -generated valid SI2quater [02/05]: [23] 59 06 07 44 a0 04 87 00 00 b3 07 85 d8 41 fe c2 10 32 10 83 6e 5d 95 -generated valid SI2quater [03/05]: [23] 59 06 07 46 a0 04 87 00 00 b3 08 42 a8 42 9e c2 15 32 10 ab 6e 5d 95 -generated valid SI2quater [04/05]: [23] 59 06 07 48 a0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b2 10 97 6e 5d 95 -generated valid SI2quater [05/05]: [23] 59 06 07 4a a0 04 87 00 00 b3 08 4c a7 2e ca c1 2b 2b 2b 2b 2b 2b 2b +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 55 47 89 1e fd 7c b0 00 e7 9b b0 2b 2b 2b 2b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e0 90 78 4d 72 ec ac 0b 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8 3c 2e c2 0f f5 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8 42 0d c2 10 a9 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8 42 a6 42 15 6d cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b1 cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8 42 65 39 76 56 0b 2b 2b 2b 2b generating SI2quater for 17 EARFCNs and 11 UARFCNs... -generated valid SI2quater [00/05]: [23] 59 06 07 40 a0 25 0f 70 5d 47 89 1e fd 7c b0 01 67 9b b3 f8 2b 2b 2b -generated valid SI2quater [01/05]: [23] 59 06 07 42 a0 04 87 00 00 b3 07 82 41 e0 90 78 4d 83 c1 eb 97 65 60 -generated valid SI2quater [02/05]: [23] 59 06 07 44 a0 04 87 00 00 b3 07 85 d8 41 fe c2 10 32 10 83 6e 5d 95 -generated valid SI2quater [03/05]: [23] 59 06 07 46 a0 04 87 00 00 b3 08 42 a8 42 9e c2 15 32 10 ab 6e 5d 95 -generated valid SI2quater [04/05]: [23] 59 06 07 48 a0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b2 10 97 6e 5d 95 -generated valid SI2quater [05/05]: [23] 59 06 07 4a a0 04 87 00 00 b3 08 4c a7 2e ca c1 2b 2b 2b 2b 2b 2b 2b +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 5d 47 89 1e fd 7c b0 01 67 9b b3 f8 2b 2b 2b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e0 90 78 4d 72 ec ac 0b 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8 3c 2e c2 0f f5 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8 42 0d c2 10 a9 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8 42 a6 42 15 6d cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b1 cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8 42 65 39 76 56 0b 2b 2b 2b 2b BTS deallocated OK in test_si2q_long() BTS allocation OK in test_si_ba_ind() Testing if BA-IND is set as expected in SI2xxx and SI5xxx -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5df269f713456a6ccbb874d6b7faac4a6f123c67 Gerrit-Change-Number: 19153 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 00:58:39 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 00:58:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148 ) Change subject: GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets ...................................................................... Patch Set 1: works in BSC_Tests, but BTS_Tests needs adjusting -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f00dd0b4863582fc5edf08149103150b8b5e97b Gerrit-Change-Number: 19148 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Mon, 06 Jul 2020 00:58:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 01:10:37 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 01:10:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148 to look at the new patch set (#2). Change subject: GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets ...................................................................... GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets Change-Id: I3f00dd0b4863582fc5edf08149103150b8b5e97b --- M bts/BTS_Tests.ttcn M library/GSM_SystemInformation.ttcn 2 files changed, 7 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/19148/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f00dd0b4863582fc5edf08149103150b8b5e97b Gerrit-Change-Number: 19148 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 01:10:37 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 01:10:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: split f_init_bts() from f_init() In-Reply-To: References: Message-ID: neels has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19150 ) Change subject: bsc: split f_init_bts() from f_init() ...................................................................... bsc: split f_init_bts() from f_init() For SI tests, it is necessary to first startup the VTY, then issue some config commands, and only then start up the BTSes. By this separation that can be done by: f_init(nr_bts := 0); f_vty_transceive(...); f_init_bts(bts_idx := 0); Will be used by upcoming System Information tests. Change-Id: I24afb07735c3827f52760214fcb7a239190c3402 --- M bsc/BSC_Tests.ttcn 1 file changed, 12 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/19150/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I24afb07735c3827f52760214fcb7a239190c3402 Gerrit-Change-Number: 19150 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 01:10:37 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 01:10:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: change f_bts_0_cfg() to take a VTY port arg In-Reply-To: References: Message-ID: neels has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19151 ) Change subject: bsc: change f_bts_0_cfg() to take a VTY port arg ...................................................................... bsc: change f_bts_0_cfg() to take a VTY port arg Remove the 'runs on' clause, add a VTY port argument. That allows using this function also on the test_CT. Will be used by upcoming System Information tests. Change-Id: Ib059d9690f92f5f76025bca2b84496716a2a4cf0 --- M bsc/BSC_Tests.ttcn 1 file changed, 16 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/19151/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib059d9690f92f5f76025bca2b84496716a2a4cf0 Gerrit-Change-Number: 19151 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Jul 6 01:33:13 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jul 2020 01:33:13 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5f027f7485f27_6202ab04e6885fc79272@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/open5gs failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 116s] Build dir: /usr/src/packages/BUILD/obj-x86_64-linux-gnu [ 116s] Build type: native build [ 116s] [ 116s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 116s] [ 116s] A full log can be found at /usr/src/packages/BUILD/obj-x86_64-linux-gnu/meson-logs/meson-log.txt [ 116s] cd obj-x86_64-linux-gnu && tail -v -n \+0 meson-logs/meson-log.txt [ 116s] ==> meson-logs/meson-log.txt <== [ 116s] Build started at 2020-07-06T01:32:58.574292 [ 116s] Main binary: /usr/bin/python3 [ 116s] Python system: Linux [ 116s] The Meson build system [ 116s] Version: 0.45.1 [ 116s] Source dir: /usr/src/packages/BUILD [ 116s] Build dir: /usr/src/packages/BUILD/obj-x86_64-linux-gnu [ 116s] Build type: native build [ 116s] [ 116s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 116s] dh_auto_configure: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 116s] debian/rules:11: recipe for target 'binary' failed [ 116s] make: *** [binary] Error 2 [ 116s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 116s] ### VM INTERACTION START ### [ 119s] [ 110.043065] sysrq: SysRq : Power Off [ 119s] [ 110.046998] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] lamb15 failed "build open5gs_1.3.0.20200706.dsc" at Mon Jul 6 01:33:02 UTC 2020. [ 119s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jul 6 01:33:13 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jul 2020 01:33:13 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f027f742cb7d_6202ab04e6885fc7926a5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/xUbuntu_18.04/i586 Package network:osmocom:nightly/open5gs failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 111s] Build dir: /usr/src/packages/BUILD/obj-i686-linux-gnu [ 111s] Build type: native build [ 111s] [ 111s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 111s] [ 111s] A full log can be found at /usr/src/packages/BUILD/obj-i686-linux-gnu/meson-logs/meson-log.txt [ 112s] cd obj-i686-linux-gnu && tail -v -n \+0 meson-logs/meson-log.txt [ 112s] ==> meson-logs/meson-log.txt <== [ 112s] Build started at 2020-07-06T01:32:52.835165 [ 112s] Main binary: /usr/bin/python3 [ 112s] Python system: Linux [ 112s] The Meson build system [ 112s] Version: 0.45.1 [ 112s] Source dir: /usr/src/packages/BUILD [ 112s] Build dir: /usr/src/packages/BUILD/obj-i686-linux-gnu [ 112s] Build type: native build [ 112s] [ 112s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 112s] dh_auto_configure: cd obj-i686-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/i386-linux-gnu --libexecdir=lib/i386-linux-gnu returned exit code 1 [ 112s] debian/rules:11: recipe for target 'binary' failed [ 112s] make: *** [binary] Error 2 [ 112s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 112s] ### VM INTERACTION START ### [ 115s] [ 106.170068] sysrq: SysRq : Power Off [ 115s] [ 106.176287] reboot: Power down [ 115s] ### VM INTERACTION END ### [ 115s] [ 115s] lamb19 failed "build open5gs_1.3.0.20200706.dsc" at Mon Jul 6 01:32:56 UTC 2020. [ 115s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jul 6 01:35:13 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jul 2020 01:35:13 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f027fd8da327_6202ab04e6885fc792942@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 199s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 199s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 199s] 268 | access_handler, server, [ 199s] | ^~~~~~~~~~~~~~ [ 199s] | | [ 199s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 199s] In file included from ../lib/sbi/server.c:23: [ 199s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 199s] 2425 | MHD_start_daemon (unsigned int flags, [ 199s] | ^~~~~~~~~~~~~~~~ [ 199s] cc1: some warnings being treated as errors [ 199s] [2091/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o' -c ../lib/sbi/path.c [ 199s] [2092/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 199s] [2093/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -c ../src/mme/s1ap-build.c [ 199s] [2094/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -c ../src/mme/emm-build.c [ 199s] [2095/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o' -MF 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o' -c ../src/mme/esm-sm.c [ 199s] [2096/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -c ../src/mme/emm-handler.c [ 200s] [2097/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 200s] ninja: build stopped: subcommand failed. [ 200s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j8 -v returned exit code 1 [ 200s] make: *** [debian/rules:11: binary] Error 25 [ 200s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 200s] ### VM INTERACTION START ### [ 203s] [ 191.267652] sysrq: SysRq : Power Off [ 203s] [ 191.272460] reboot: Power down [ 203s] ### VM INTERACTION END ### [ 203s] [ 204s] lamb74 failed "build open5gs_1.3.0.20200706.dsc" at Mon Jul 6 01:35:01 UTC 2020. [ 204s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Jul 6 01:38:21 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 01:38:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148 to look at the new patch set (#3). Change subject: GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets ...................................................................... GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets Change-Id: I3f00dd0b4863582fc5edf08149103150b8b5e97b --- M bts/BTS_Tests.ttcn M library/GSM_SystemInformation.ttcn M sysinfo/gen_links.sh 3 files changed, 8 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/19148/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f00dd0b4863582fc5edf08149103150b8b5e97b Gerrit-Change-Number: 19148 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 01:40:36 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 01:40:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add first test to verify System Information on RSL startup In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 ) Change subject: bsc: add first test to verify System Information on RSL startup ...................................................................... Patch Set 6: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 06 Jul 2020 01:40:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 01:42:19 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 01:42:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: verify data of SI2quater sent from osmo-bsc In-Reply-To: References: Message-ID: neels has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19115 ) Change subject: bsc: verify data of SI2quater sent from osmo-bsc ...................................................................... Abandoned instead see https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia1736d75839031e90d73dda1d1c267cadc55b702 Gerrit-Change-Number: 19115 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 01:49:20 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 01:49:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148 ) Change subject: GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets ...................................................................... Patch Set 3: I haven't verified that all SI related ttcn tests work with this. Compilation works now. I'd like to merge this and then let jenkins test and help me see whether there is any fallout. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f00dd0b4863582fc5edf08149103150b8b5e97b Gerrit-Change-Number: 19148 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Mon, 06 Jul 2020 01:49:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 01:57:42 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 01:57:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: verify conn and VLR cell id in most tests In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18998 ) Change subject: msc: verify conn and VLR cell id in most tests ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18998/1/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18998/1/msc/MSC_Tests.ttcn at 411 PS1, Line 411: verify_cell_id := mp_enable_cell_id_test and verify_cell_id > "s/what I requested/what I'm requesting/g" [?] sorry, either you're not clear or I'm being thick, I can't figure out what should be changed. I want to verify the cell ID in almost all tests. mp_enable_cell_id_test is for disabling cell id verification in the 'latest' build where the cell id is not stored properly. The verify_cell_id flag is for disabling the cell id verification in tests that have no successful Compl L3. That's exactly what I'm aiming for. What exactly should change in your opinion? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie410714a96353f74a52a104c56fa0a08683e0004 Gerrit-Change-Number: 18998 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 01:57:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Jul 6 02:51:48 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jul 2020 02:51:48 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f0291c797f07_6202ab04e6885fc7954e7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Testing/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 83s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 83s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 83s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 83s] | | [ 83s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 83s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 83s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 83s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 83s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 83s] 2425 | MHD_start_daemon (unsigned int flags, [ 83s] | ^~~~~~~~~~~~~~~~ [ 83s] cc1: all warnings being treated as errors [ 83s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 83s] make[3]: *** Waiting for unfinished jobs.... [ 83s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 83s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 83s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 83s] make[1]: *** [Makefile:166: all] Error 2 [ 83s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 83s] dh_auto_build: error: cd build && make -j6 "INSTALL=install --strip-program=true" returned exit code 2 [ 83s] make: *** [debian/rules:9: build] Error 25 [ 83s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 83s] ### VM INTERACTION START ### [ 86s] [ 78.120714] sysrq: SysRq : Power Off [ 86s] [ 78.125154] reboot: Power down [ 86s] ### VM INTERACTION END ### [ 86s] [ 86s] sheep87 failed "build ulfius_2.5.2-4.1.dsc" at Mon Jul 6 02:51:30 UTC 2020. [ 86s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jul 6 02:52:22 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jul 2020 02:52:22 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f02920012086_6202ab04e6885fc795577@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Testing/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 116s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 116s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 116s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 116s] | | [ 116s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 116s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 116s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 116s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 116s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 116s] 2425 | MHD_start_daemon (unsigned int flags, [ 116s] | ^~~~~~~~~~~~~~~~ [ 116s] cc1: all warnings being treated as errors [ 116s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 116s] make[3]: *** Waiting for unfinished jobs.... [ 116s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 116s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 116s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 116s] make[1]: *** [Makefile:166: all] Error 2 [ 116s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 116s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 116s] make: *** [debian/rules:9: build] Error 25 [ 116s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 116s] ### VM INTERACTION START ### [ 120s] [ 108.644559] sysrq: SysRq : Power Off [ 120s] [ 108.650470] reboot: Power down [ 120s] ### VM INTERACTION END ### [ 120s] [ 120s] lamb61 failed "build ulfius_2.5.2-4.1.dsc" at Mon Jul 6 02:52:08 UTC 2020. [ 120s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jul 6 02:53:30 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jul 2020 02:53:30 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f0292401ea3e_6202ab04e6885fc79587d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Testing/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 188s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 188s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 188s] 268 | access_handler, server, [ 188s] | ^~~~~~~~~~~~~~ [ 188s] | | [ 188s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 188s] In file included from ../lib/sbi/server.c:23: [ 188s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 188s] 2425 | MHD_start_daemon (unsigned int flags, [ 188s] | ^~~~~~~~~~~~~~~~ [ 188s] cc1: some warnings being treated as errors [ 188s] [2092/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -c ../src/mme/s1ap-build.c [ 189s] [2093/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/esm-handler.c.o' -MF 'src/mme/e6d01c5@@mme at sta/esm-handler.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/esm-handler.c.o' -c ../src/mme/esm-handler.c [ 189s] [2094/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -c ../src/mme/emm-build.c [ 189s] [2095/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o' -MF 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o' -c ../src/mme/esm-sm.c [ 189s] [2096/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -c ../src/mme/emm-handler.c [ 189s] [2097/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 190s] [2098/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 190s] ninja: build stopped: subcommand failed. [ 190s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j8 -v returned exit code 1 [ 190s] make: *** [debian/rules:11: binary] Error 25 [ 190s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 190s] ### VM INTERACTION START ### [ 193s] [ 181.785947] sysrq: SysRq : Power Off [ 193s] [ 181.793203] reboot: Power down [ 193s] ### VM INTERACTION END ### [ 193s] [ 193s] lamb17 failed "build open5gs_1.3.0.20200706.dsc" at Mon Jul 6 02:53:20 UTC 2020. [ 193s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jul 6 02:58:56 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jul 2020 02:58:56 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f029388bad92_6202ab04e6885fc796461@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 238s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 238s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 238s] 268 | access_handler, server, [ 238s] | ^~~~~~~~~~~~~~ [ 238s] | | [ 238s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 238s] In file included from ../lib/sbi/server.c:23: [ 238s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 238s] 2425 | MHD_start_daemon (unsigned int flags, [ 238s] | ^~~~~~~~~~~~~~~~ [ 238s] cc1: some warnings being treated as errors [ 238s] [2091/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -c ../lib/sbi/nnrf-build.c [ 238s] [2092/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -c ../src/mme/s1ap-build.c [ 238s] [2093/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 239s] [2094/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o' -MF 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o' -c ../src/mme/esm-sm.c [ 239s] [2095/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -c ../src/mme/emm-build.c [ 239s] [2096/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -c ../src/mme/emm-handler.c [ 240s] [2097/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 240s] ninja: build stopped: subcommand failed. [ 240s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j8 -v returned exit code 1 [ 240s] make: *** [debian/rules:11: binary] Error 25 [ 240s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 240s] ### VM INTERACTION START ### [ 243s] [ 222.741620] sysrq: SysRq : Power Off [ 243s] [ 222.747755] reboot: Power down [ 243s] ### VM INTERACTION END ### [ 243s] [ 243s] lamb04 failed "build open5gs_1.3.0.20200706.dsc" at Mon Jul 6 02:58:45 UTC 2020. [ 243s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jul 6 02:59:48 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jul 2020 02:59:48 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0293a9ead2a_6202ab04e6885fc7965b9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 68s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 68s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 68s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 68s] | | [ 68s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 68s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 68s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 68s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 68s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 68s] 2425 | MHD_start_daemon (unsigned int flags, [ 68s] | ^~~~~~~~~~~~~~~~ [ 68s] cc1: all warnings being treated as errors [ 68s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 68s] make[3]: *** Waiting for unfinished jobs.... [ 68s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 68s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 68s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 68s] make[1]: *** [Makefile:166: all] Error 2 [ 68s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 68s] dh_auto_build: error: cd build && make -j16 "INSTALL=install --strip-program=true" returned exit code 2 [ 68s] make: *** [debian/rules:9: build] Error 25 [ 68s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 68s] ### VM INTERACTION START ### [ 71s] [ 63.202477] sysrq: SysRq : Power Off [ 71s] [ 63.208644] reboot: Power down [ 71s] ### VM INTERACTION END ### [ 71s] [ 71s] goat09 failed "build ulfius_2.5.2-4.1.dsc" at Mon Jul 6 02:59:33 UTC 2020. [ 71s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jul 6 03:00:05 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Jul 2020 03:00:05 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0293c463f73_6202ab04e6885fc796631@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 81s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 81s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 81s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 81s] | | [ 81s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 81s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 81s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 81s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 81s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 81s] 2425 | MHD_start_daemon (unsigned int flags, [ 81s] | ^~~~~~~~~~~~~~~~ [ 81s] cc1: all warnings being treated as errors [ 81s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 81s] make[3]: *** Waiting for unfinished jobs.... [ 81s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 81s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 81s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 81s] make[1]: *** [Makefile:166: all] Error 2 [ 81s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 81s] dh_auto_build: error: cd build && make -j6 "INSTALL=install --strip-program=true" returned exit code 2 [ 81s] make: *** [debian/rules:9: build] Error 25 [ 81s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 81s] ### VM INTERACTION START ### [ 84s] [ 74.846444] sysrq: SysRq : Power Off [ 84s] [ 74.850391] reboot: Power down [ 84s] ### VM INTERACTION END ### [ 84s] [ 84s] sheep87 failed "build ulfius_2.5.2-4.1.dsc" at Mon Jul 6 02:59:51 UTC 2020. [ 84s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Jul 6 06:04:57 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 06:04:57 +0000 Subject: Change in osmo-bsc[master]: si2quater: fix budget calculation for multiple EARFCNs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19153 ) Change subject: si2quater: fix budget calculation for multiple EARFCNs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5df269f713456a6ccbb874d6b7faac4a6f123c67 Gerrit-Change-Number: 19153 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 06 Jul 2020 06:04:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 08:24:09 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 08:24:09 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: use define constant to define max number of E1 subslots In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19118 ) Change subject: mgcp_endp: use define constant to define max number of E1 subslots ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If7cb74e486946aff09e22abf8a8885bf0693f34e Gerrit-Change-Number: 19118 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 08:24:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 08:25:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 08:25:07 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: remove double check In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19119 ) Change subject: mgcp_trunk: remove double check ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I91fb8cf6e3b077ba8f18fdbcd071275c6fd7cacd Gerrit-Change-Number: 19119 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 08:25:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 08:26:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 08:26:58 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: do not access endpoint array elements directly In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19120 ) Change subject: mgcp_test: do not access endpoint array elements directly ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic950c427f23be4a792af94972554637c2b0fbdf2 Gerrit-Change-Number: 19120 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 08:26:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 08:34:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 08:34:20 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: refactor endpoint number configuration In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19121 ) Change subject: mgcp_vty: refactor endpoint number configuration ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Gerrit-Change-Number: 19121 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 08:34:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 08:35:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 08:35:52 +0000 Subject: Change in libosmocore[master]: gprs_ns.h: add missing prototype gprs_ns_rcvmsg() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19138 ) Change subject: gprs_ns.h: add missing prototype gprs_ns_rcvmsg() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7edc5f4fb6e1fda059e35ea0988d0ef42208aa50 Gerrit-Change-Number: 19138 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 08:35:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 08:44:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 08:44:34 +0000 Subject: Change in libosmocore[master]: osmo_sock_init2: improve support for AF_UNSPEC In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19140 ) Change subject: osmo_sock_init2: improve support for AF_UNSPEC ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19140/1/src/socket.c File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/19140/1/src/socket.c at 327 PS1, Line 327: return -ENODEV; Missing freeaddrinfo. It may be helpful adding a goto and have the freeaddinfo + return probably. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I397c633931fd00d4f083955a3c49a40fb002d766 Gerrit-Change-Number: 19140 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 08:44:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 08:44:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 08:44:37 +0000 Subject: Change in libosmocore[master]: osmo_sock_init2: improve support for AF_UNSPEC In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19140 ) Change subject: osmo_sock_init2: improve support for AF_UNSPEC ...................................................................... Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I397c633931fd00d4f083955a3c49a40fb002d766 Gerrit-Change-Number: 19140 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 08:44:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 08:48:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 08:48:53 +0000 Subject: Change in libosmocore[master]: socket.h: introduce osmo_sockaddr to hold v4 and v6 endpoints In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19141 ) Change subject: socket.h: introduce osmo_sockaddr to hold v4 and v6 endpoints ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19141/1/include/osmocom/core/socket.h File include/osmocom/core/socket.h: https://gerrit.osmocom.org/c/libosmocore/+/19141/1/include/osmocom/core/socket.h at 25 PS1, Line 25: struct osmo_sockaddr { How do you differentiate the address family in here? Do all contain a type field in the same address and it doesn't get overwritten no matter which substruct you use? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If80172373735193401af872b18e1ff00c93880e7 Gerrit-Change-Number: 19141 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 08:48:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 08:51:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 08:51:31 +0000 Subject: Change in libosmocore[master]: sockaddr_str: add osmo_sockaddr_str_from_str2() which doesn't set the... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19142 ) Change subject: sockaddr_str: add osmo_sockaddr_str_from_str2() which doesn't set the port ...................................................................... Patch Set 1: I think this is actually 2 patches, one changing the behavior of existing APIs by using memset, and the other adding the new API. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifd4e282586b8bd40b912a9f1c25f9e8208420106 Gerrit-Change-Number: 19142 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 08:51:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 08:59:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 08:59:05 +0000 Subject: Change in libosmocore[master]: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19143 ) Change subject: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd ...................................................................... Patch Set 2: Code-Review-1 (5 comments) https://gerrit.osmocom.org/c/libosmocore/+/19143/2/include/osmocom/core/socket.h File include/osmocom/core/socket.h: https://gerrit.osmocom.org/c/libosmocore/+/19143/2/include/osmocom/core/socket.h at 69 PS2, Line 69: int osmo_sock_init3(uint16_t type, uint8_t proto, Looks like it'd be better keeping current order. Move osmo_sock_init3 above and leave the _ofd here. https://gerrit.osmocom.org/c/libosmocore/+/19143/2/src/socket.c File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/19143/2/src/socket.c at 448 PS2, Line 448: #define OSMO_SOCKADDR_TO_STR(sockaddr) \ I don't get how this macro is supposed to work. It's storing it into a local variable defined by the macro? this looks really strange. https://gerrit.osmocom.org/c/libosmocore/+/19143/2/src/socket.c at 451 PS2, Line 451: strcpy(sastr.ip, "Invalid IP") osmo_strlcpy https://gerrit.osmocom.org/c/libosmocore/+/19143/2/src/socket.c at 453 PS2, Line 453: int osmo_sock_init3(uint16_t type, uint8_t proto, Missing documentation https://gerrit.osmocom.org/c/libosmocore/+/19143/2/src/socket.c at 931 PS2, Line 931: return osmo_fd_init_ofd(ofd, osmo_sock_init3(type, proto, local, remote, flags)); passing -1 to osmo_fd_init_ofd if osmo_sock_init3 fails? No thanks. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 08:59:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 09:04:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 09:04:29 +0000 Subject: Change in libosmocore[master]: socket.c add osmo_sockaddr_valid() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19144 ) Change subject: socket.c add osmo_sockaddr_valid() ...................................................................... Patch Set 2: Code-Review-1 (3 comments) https://gerrit.osmocom.org/c/libosmocore/+/19144/2/src/socket.c File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/19144/2/src/socket.c at 1526 PS2, Line 1526: int osmo_sockaddr_valid(struct osmo_sockaddr *addr) the return type/values look strange. Looks like a boolean checker but then it returns 0 on true... https://gerrit.osmocom.org/c/libosmocore/+/19144/2/src/socket.c at 1532 PS2, Line 1532: if (addr->u.sas.ss_family == AF_INET) { So indeed you are using one of the fields in a substruct of the union to find out the type. Did you really take care to look this makes sense and that it cannot contain other content based on the union being populated by different ways? https://gerrit.osmocom.org/c/libosmocore/+/19144/2/src/socket.c at 1543 PS2, Line 1543: return -ENOTSUP; So in IPv6 it never returns 0, so no ipv6 adr is ever valid. In any case, this function makes no sense to me. An IP addr being 0.0.0.0 or port 0 is completely fine when binding. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib6fb050e1bfe3f3a8d8bbe5e762351ce6b7cc48c Gerrit-Change-Number: 19144 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 09:04:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 09:05:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 09:05:53 +0000 Subject: Change in libosmocore[master]: socket.c: fix osmo_sock_get_ip_and_port for IPv6 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19147 ) Change subject: socket.c: fix osmo_sock_get_ip_and_port for IPv6 ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19147/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/19147/1//COMMIT_MSG at 9 PS1, Line 9: The struct sockaddr is too small for IPv6. IPv6 has a 16 byte address, while Hmm I thought struct sockaddr was a struct big enough to hold any address? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4e69d814367168c05f0da161ec9b705db36ad096 Gerrit-Change-Number: 19147 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 09:05:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 09:07:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 09:07:34 +0000 Subject: Change in libosmocore[master]: bts_features: add feature BTS_FEAT_IPV6_NSVC In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19145 ) Change subject: bts_features: add feature BTS_FEAT_IPV6_NSVC ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19145/2/include/osmocom/gsm/bts_features.h File include/osmocom/gsm/bts_features.h: https://gerrit.osmocom.org/c/libosmocore/+/19145/2/include/osmocom/gsm/bts_features.h at 28 PS2, Line 28: BTS_FEAT_IPV6_NSVC, What's the point in using this? Why not simply using a correct IP address type when configuring (config file) each BTS? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 Gerrit-Change-Number: 19145 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 09:07:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 09:08:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 09:08:21 +0000 Subject: Change in libosmocore[master]: gsm 12.21: add osmocom specific NM_ATT_OSMO_NS_LINK_CFG In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19146 ) Change subject: gsm 12.21: add osmocom specific NM_ATT_OSMO_NS_LINK_CFG ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic261bc43a07fa741b97a9c6ec5a9ed6f5ecae588 Gerrit-Change-Number: 19146 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 09:08:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 09:09:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 09:09:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_SystemInformation: add SI2quater In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 ) Change subject: GSM_SystemInformation: add SI2quater ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I879c37eb51ece55d79346c6bf1a4951c3f11c77e Gerrit-Change-Number: 19149 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 09:09:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 09:09:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 09:09:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148 ) Change subject: GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f00dd0b4863582fc5edf08149103150b8b5e97b Gerrit-Change-Number: 19148 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 09:09:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 09:10:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 09:10:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: split f_init_bts() from f_init() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19150 ) Change subject: bsc: split f_init_bts() from f_init() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I24afb07735c3827f52760214fcb7a239190c3402 Gerrit-Change-Number: 19150 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 09:10:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 09:10:43 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 09:10:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: change f_bts_0_cfg() to take a VTY port arg In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19151 ) Change subject: bsc: change f_bts_0_cfg() to take a VTY port arg ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib059d9690f92f5f76025bca2b84496716a2a4cf0 Gerrit-Change-Number: 19151 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 09:10:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 09:13:47 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 09:13:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add first test to verify System Information on RSL startup In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 ) Change subject: bsc: add first test to verify System Information on RSL startup ...................................................................... Patch Set 6: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062/6/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062/6/bsc/BSC_Tests.ttcn at 439 PS6, Line 439: }; Did you think about moving this to a separate helper file? It's quite a lot of lines and BSC_Tests.ttcn is already big. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 06 Jul 2020 09:13:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 09:14:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 09:14:44 +0000 Subject: Change in osmo-bsc[master]: si2quater: fix budget calculation for multiple EARFCNs In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19153 ) Change subject: si2quater: fix budget calculation for multiple EARFCNs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5df269f713456a6ccbb874d6b7faac4a6f123c67 Gerrit-Change-Number: 19153 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 09:14:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 09:21:26 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 09:21:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148 ) Change subject: GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f00dd0b4863582fc5edf08149103150b8b5e97b Gerrit-Change-Number: 19148 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 09:21:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 09:22:46 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 09:22:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_SystemInformation: add SI2quater In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 ) Change subject: GSM_SystemInformation: add SI2quater ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149/3/library/GSM_SystemInformation.ttcn File library/GSM_SystemInformation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149/3/library/GSM_SystemInformation.ttcn at 147 PS3, Line 147: rest_octets Let's please use consistent spacing: a tab, or even two in this case. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I879c37eb51ece55d79346c6bf1a4951c3f11c77e Gerrit-Change-Number: 19149 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 09:22:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 09:23:45 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 6 Jul 2020 09:23:45 +0000 Subject: Change in osmo-mgw[master]: trunk: parse E1 trunk number In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18752 ) Change subject: trunk: parse E1 trunk number ...................................................................... Patch Set 14: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifdaab953544151e73b58cc3e95d21afdb40765f4 Gerrit-Change-Number: 18752 Gerrit-PatchSet: 14 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 09:23:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 09:23:51 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 6 Jul 2020 09:23:51 +0000 Subject: Change in osmo-mgw[master]: trunk: parse E1 trunk number In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18752 ) Change subject: trunk: parse E1 trunk number ...................................................................... trunk: parse E1 trunk number The E1 trunk number is currently not parsed, whenever a trunk prefix is detected that indicates an E1 trunk, then the entire request is rejected. Parse the trunk number and select the trunk accordingly Related: OS#2547 Change-Id: Ifdaab953544151e73b58cc3e95d21afdb40765f4 --- M include/osmocom/mgcp/mgcp_trunk.h M src/libosmo-mgcp/mgcp_trunk.c M tests/mgcp/mgcp_test.c 3 files changed, 70 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve dexter: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/mgcp/mgcp_trunk.h b/include/osmocom/mgcp/mgcp_trunk.h index c6a0997..82728fe 100644 --- a/include/osmocom/mgcp/mgcp_trunk.h +++ b/include/osmocom/mgcp/mgcp_trunk.h @@ -50,6 +50,7 @@ int mgcp_trunk_alloc_endpts(struct mgcp_trunk *tcfg); struct mgcp_trunk *mgcp_trunk_by_num(const struct mgcp_config *cfg, int index); struct mgcp_trunk *mgcp_trunk_by_name(const struct mgcp_config *cfg, const char *epname); +int e1_trunk_nr_from_epname(const char *epname); /* The virtual trunk is always created on trunk id 0 for historical reasons, * use this define constant as ID when allocating a virtual trunk. Other diff --git a/src/libosmo-mgcp/mgcp_trunk.c b/src/libosmo-mgcp/mgcp_trunk.c index bd7bb2a..cc6637b 100644 --- a/src/libosmo-mgcp/mgcp_trunk.c +++ b/src/libosmo-mgcp/mgcp_trunk.c @@ -118,6 +118,27 @@ return NULL; } +/* Made public for unit-testing, do not use from outside this file */ +int e1_trunk_nr_from_epname(const char *epname) +{ + unsigned long int trunk_nr; + size_t prefix_len; + char *str_trunk_nr_end; + + prefix_len = sizeof(MGCP_ENDPOINT_PREFIX_E1_TRUNK) - 1; + if (strncmp(epname, MGCP_ENDPOINT_PREFIX_E1_TRUNK, prefix_len) != 0) + return -EINVAL; + + errno = 0; + trunk_nr = strtoul(epname + prefix_len, &str_trunk_nr_end, 10); + if (errno == ERANGE || trunk_nr > 64 || trunk_nr == 0 + || epname + prefix_len == str_trunk_nr_end + || str_trunk_nr_end[0] != '/') + return -EINVAL; + else + return trunk_nr; +} + /*! Find a trunk by the trunk prefix in the endpoint name. * \param[in] epname endpoint name with trunk prefix to look up. * \param[in] cfg that contains the trunks where the endpoint is located. @@ -126,6 +147,7 @@ { size_t prefix_len; char epname_lc[MGCP_ENDPOINT_MAXLEN]; + unsigned long int trunk_nr; osmo_str_tolower_buf(epname_lc, sizeof(epname_lc), epname); epname = epname_lc; @@ -135,13 +157,12 @@ return mgcp_trunk_by_num(cfg, MGCP_VIRT_TRUNK_ID); } - /* E1 trunks are not implemented yet, so we deny any request for an - * e1 trunk for now. */ prefix_len = sizeof(MGCP_ENDPOINT_PREFIX_E1_TRUNK) - 1; if (strncmp(epname, MGCP_ENDPOINT_PREFIX_E1_TRUNK, prefix_len) == 0) { - LOGP(DLMGCP, LOGL_ERROR, - "endpoint name \"%s\" suggests an E1 trunk, but E1 trunks are not implemented in this version of osmo-mgw!\n", epname); - return NULL; + trunk_nr = e1_trunk_nr_from_epname(epname); + if (trunk_nr < 0) + return NULL; + return mgcp_trunk_by_num(cfg, trunk_nr); } /* Earlier versions of osmo-mgw were accepting endpoint names diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 56a17b1..b0647f4 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -2130,6 +2130,48 @@ talloc_free(conn); } +void test_e1_trunk_nr_from_epname() +{ + int trunk_nr; + + /* Note: e1_trunk_nr_from_epname does not check the text + * after the E1 trunk number, after the delimiter + * character "/" arbitrary text may follow. */ + trunk_nr = e1_trunk_nr_from_epname("ds/e1-1/s-1/su16-0"); + OSMO_ASSERT(trunk_nr == 1); + trunk_nr = e1_trunk_nr_from_epname("ds/e1-2/s-2/su16-0"); + OSMO_ASSERT(trunk_nr == 2); + trunk_nr = e1_trunk_nr_from_epname("ds/e1-3/s-23/su32-0"); + OSMO_ASSERT(trunk_nr == 3); + trunk_nr = e1_trunk_nr_from_epname("ds/e1-3/xxxxxxx"); + OSMO_ASSERT(trunk_nr == 3); + trunk_nr = e1_trunk_nr_from_epname("ds/e1-24/s-1/su16-0"); + OSMO_ASSERT(trunk_nr == 24); + trunk_nr = e1_trunk_nr_from_epname("ds/e1-64/s-1/su16-0"); + OSMO_ASSERT(trunk_nr == 64); + + /* The following endpoint strings should fail, either the + * trunk number exceeds the valid range or the trunk prefix + * is wrong. Also when the delimiter character "/" at the + * end of the trunk is wrong the parsing should fail. */ + trunk_nr = e1_trunk_nr_from_epname("ds/e1-0/s-1/su16-0"); + OSMO_ASSERT(trunk_nr == -EINVAL); + trunk_nr = e1_trunk_nr_from_epname("ds/e1-65/s-1/su16-0"); + OSMO_ASSERT(trunk_nr == -EINVAL); + trunk_nr = e1_trunk_nr_from_epname("ds/e1--1/s-1/su16-0"); + OSMO_ASSERT(trunk_nr == -EINVAL); + trunk_nr = e1_trunk_nr_from_epname("xxxxxx4zyz"); + OSMO_ASSERT(trunk_nr == -EINVAL); + trunk_nr = e1_trunk_nr_from_epname("ds/e1+2/s-1/su16-0"); + OSMO_ASSERT(trunk_nr == -EINVAL); + trunk_nr = e1_trunk_nr_from_epname("ds/e2-24/s-1/su16-0"); + OSMO_ASSERT(trunk_nr == -EINVAL); + trunk_nr = e1_trunk_nr_from_epname("ds/e1-24s-1/su16-0"); + OSMO_ASSERT(trunk_nr == -EINVAL); + + return; +} + int main(int argc, char **argv) { void *ctx = talloc_named_const(NULL, 0, "mgcp_test"); @@ -2155,6 +2197,7 @@ test_check_local_cx_options(ctx); test_mgcp_codec_pt_translate(); test_conn_id_matching(); + test_e1_trunk_nr_from_epname(); OSMO_ASSERT(talloc_total_size(msgb_ctx) == 0); OSMO_ASSERT(talloc_total_blocks(msgb_ctx) == 1); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifdaab953544151e73b58cc3e95d21afdb40765f4 Gerrit-Change-Number: 18752 Gerrit-PatchSet: 14 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 09:24:12 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 09:24:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: split f_init_bts() from f_init() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19150 ) Change subject: bsc: split f_init_bts() from f_init() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I24afb07735c3827f52760214fcb7a239190c3402 Gerrit-Change-Number: 19150 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 09:24:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 09:24:47 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 09:24:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: change f_bts_0_cfg() to take a VTY port arg In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19151 ) Change subject: bsc: change f_bts_0_cfg() to take a VTY port arg ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib059d9690f92f5f76025bca2b84496716a2a4cf0 Gerrit-Change-Number: 19151 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 09:24:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 09:33:23 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 09:33:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add first test to verify System Information on RSL startup In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 ) Change subject: bsc: add first test to verify System Information on RSL startup ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 06 Jul 2020 09:33:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 09:40:15 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 09:40:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add SI2quater tests for multiple EARFCNs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 ) Change subject: bsc: add SI2quater tests for multiple EARFCNs ...................................................................... Patch Set 3: Code-Review-1 Please use use template inheritance (see 'modifies' keyword [1]), so there would be no need to define the same template with the same fields (with some exceptions) again and again. See also [2]. In your case, incremental inheritance should be possible, i.e. the template with 2 E-ARFCNs may be inherited from the template with 1 E-ARFCN, the one with 3 E-ARFCNs may be inherited from the old with 2 E-ARFCNs and so on. [1] ETSI ES 201 873-1, section 15.5 "Modified templates" [2] https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I45382f88686ca60e68569e93569fc4cfb63a0e0d Gerrit-Change-Number: 19152 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 06 Jul 2020 09:40:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 10:38:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 10:38:45 +0000 Subject: Change in libosmo-netif[master]: stream: Fix some SCTP code not disabled if --disable-libsctp is used References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/19154 ) Change subject: stream: Fix some SCTP code not disabled if --disable-libsctp is used ...................................................................... stream: Fix some SCTP code not disabled if --disable-libsctp is used Some previous commit added some code to workaround some kernel ABI unstabilities but forgot to add the code inside a conditional preprocessor block. Fixes: 157ad6d7075ad56038c984ebf8634f1bc7c6c59c Change-Id: Ibee01222d8d11cf2520cdbd4d0d5bed6b72d2107 --- M src/stream.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/54/19154/1 diff --git a/src/stream.c b/src/stream.c index 9e5d805..cfe8cfe 100644 --- a/src/stream.c +++ b/src/stream.c @@ -65,6 +65,7 @@ * \brief Osmocom stream socket helpers */ +#ifdef HAVE_LIBSCTP /* * Platforms that don't have MSG_NOSIGNAL (which disables SIGPIPE) * usually have SO_NOSIGPIPE (set via setsockopt). @@ -164,6 +165,7 @@ return setsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS, event, sctp_sockopt_event_subscribe_size); } } +#endif // HAVE_LIBSCTP static int sctp_sock_activate_events(int fd) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/19154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibee01222d8d11cf2520cdbd4d0d5bed6b72d2107 Gerrit-Change-Number: 19154 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 11:09:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 11:09:28 +0000 Subject: Change in libosmo-netif[master]: stream: Fix some SCTP code not disabled if --disable-libsctp is used In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/19154 ) Change subject: stream: Fix some SCTP code not disabled if --disable-libsctp is used ...................................................................... Patch Set 1: Code-Review+2 Merging quick-path to avoid build failures -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/19154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibee01222d8d11cf2520cdbd4d0d5bed6b72d2107 Gerrit-Change-Number: 19154 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 11:09:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 11:09:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 11:09:31 +0000 Subject: Change in libosmo-netif[master]: stream: Fix some SCTP code not disabled if --disable-libsctp is used In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/19154 ) Change subject: stream: Fix some SCTP code not disabled if --disable-libsctp is used ...................................................................... stream: Fix some SCTP code not disabled if --disable-libsctp is used Some previous commit added some code to workaround some kernel ABI unstabilities but forgot to add the code inside a conditional preprocessor block. Fixes: 157ad6d7075ad56038c984ebf8634f1bc7c6c59c Change-Id: Ibee01222d8d11cf2520cdbd4d0d5bed6b72d2107 --- M src/stream.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/stream.c b/src/stream.c index 9e5d805..cfe8cfe 100644 --- a/src/stream.c +++ b/src/stream.c @@ -65,6 +65,7 @@ * \brief Osmocom stream socket helpers */ +#ifdef HAVE_LIBSCTP /* * Platforms that don't have MSG_NOSIGNAL (which disables SIGPIPE) * usually have SO_NOSIGPIPE (set via setsockopt). @@ -164,6 +165,7 @@ return setsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS, event, sctp_sockopt_event_subscribe_size); } } +#endif // HAVE_LIBSCTP static int sctp_sock_activate_events(int fd) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/19154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibee01222d8d11cf2520cdbd4d0d5bed6b72d2107 Gerrit-Change-Number: 19154 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 11:36:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 11:36:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_flow_multiple_llc_blocks In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19073 ) Change subject: pcu: Introduce test TC_ul_flow_multiple_llc_blocks ...................................................................... Patch Set 1: This patchset has been laying here for one week already, shall I go and merge it? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I62f42981d31bc5c2e4c61e92bea329bd74cb2d19 Gerrit-Change-Number: 19073 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 11:36:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:05:41 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 12:05:41 +0000 Subject: Change in libosmocore[master]: Revert "gsmtap_makemsg_ex: NULL for unknown chan_type" In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19067 ) Change subject: Revert "gsmtap_makemsg_ex: NULL for unknown chan_type" ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19067/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/19067/2//COMMIT_MSG at 11 PS2, Line 11: being able to determine channel type. a bit hard to understand why. maybe reword to something like: These callers rely on a NULL return value for unknown channel type: - gsmtap_send() - osmo-bts/src/osmo-bts-virtual/scheduler_virtbts.c _tx_to_virt_um() With the reverted patch, they would send invalid GSMTAP data. but do they? Do any callers regularly pass GSMTAP_CHANNEL_UNKNOWN? If you saw fallout that would be nice to know. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ebaa89cc3422df1d7fd2365a6176cb2902d1c67 Gerrit-Change-Number: 19067 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Mon, 06 Jul 2020 12:05:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:10:05 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 12:10:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_flow_multiple_llc_blocks In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19073 ) Change subject: pcu: Introduce test TC_ul_flow_multiple_llc_blocks ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19073/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19073/1/pcu/PCU_Tests.ttcn at 1371 PS1, Line 1371: We'll also receive some UL ACK/NACK we need to reply with CTRL ACK. (comment *s) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I62f42981d31bc5c2e4c61e92bea329bd74cb2d19 Gerrit-Change-Number: 19073 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 12:10:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:16:13 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 12:16:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 ) Change subject: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibafa4246b442e7c26666eb0d37570bfbbf1dbda7 Gerrit-Change-Number: 19076 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 12:16:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:17:32 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 12:17:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ull_all_sizes In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19077 ) Change subject: pcu: Introduce test TC_ull_all_sizes ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I293c8dea2d44c5232a96c44b605e0d8c6dc1fa0e Gerrit-Change-Number: 19077 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 12:17:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:18:25 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 12:18:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce TC_ul_data_toolong_fills_padding In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19097 ) Change subject: pcu: Introduce TC_ul_data_toolong_fills_padding ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic37294efac005ed6c0ce48dea566fd20284b5868 Gerrit-Change-Number: 19097 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Mon, 06 Jul 2020 12:18:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:32:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 12:32:00 +0000 Subject: Change in osmo-bts[master]: bts-trx: Don't set OPSTATE enabled during trx_init References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19155 ) Change subject: bts-trx: Don't set OPSTATE enabled during trx_init ...................................................................... bts-trx: Don't set OPSTATE enabled during trx_init At that time we schedule a POWERON command towards osmo-trx, so let the callback of RSP POWERON set the OPSTATE in l1if_poweronoff_cb rather than setting it without waiting for confirmation from osmo-trx. Change-Id: Ib36a073cae5e1522821a04d8806648562f4e0f5b --- M src/osmo-bts-trx/l1_if.c 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/55/19155/1 diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 4cdb108..f47fc05 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -406,9 +406,6 @@ if (trx == trx->bts->c0) lchan_init_lapdm(&trx->ts[0].lchan[CCCH_LCHAN]); - /* Set to Operational State: Enabled */ - oml_mo_state_chg(&trx->mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK); - /* Send OPSTART ack */ return oml_mo_opstart_ack(&trx->mo); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib36a073cae5e1522821a04d8806648562f4e0f5b Gerrit-Change-Number: 19155 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:32:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 12:32:00 +0000 Subject: Change in osmo-bts[master]: common: Avoid changing OPSTATE to Enabled upon RSL up References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19156 ) Change subject: common: Avoid changing OPSTATE to Enabled upon RSL up ...................................................................... common: Avoid changing OPSTATE to Enabled upon RSL up the RSL link has nothing to do regarding the state of the Radio Carrier, as in it being up is not enough to have a working (enabled) Radio Carrier. Change-Id: Iefb5c4e1097233b5c31e4d621c544d51516af678 --- M src/common/trx.c 1 file changed, 2 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/56/19156/1 diff --git a/src/common/trx.c b/src/common/trx.c index 074cb95..90d3148 100644 --- a/src/common/trx.c +++ b/src/common/trx.c @@ -153,13 +153,10 @@ int trx_link_estab(struct gsm_bts_trx *trx) { struct e1inp_sign_link *link = trx->rsl_link; - uint8_t radio_state = link ? NM_OPSTATE_ENABLED : NM_OPSTATE_DISABLED; int rc; - LOGP(DSUM, LOGL_INFO, "RSL link (TRX %02x) state changed to %s, sending Status'.\n", - trx->nr, link ? "up" : "down"); - - oml_mo_state_chg(&trx->mo, radio_state, NM_AVSTATE_OK); + LOGPTRX(trx, DSUM, LOGL_INFO, "RSL link %s\n", + link ? "up" : "down"); if (link) rc = rsl_tx_rf_res(trx); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iefb5c4e1097233b5c31e4d621c544d51516af678 Gerrit-Change-Number: 19156 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:34:06 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 12:34:06 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/19157 ) Change subject: ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default ...................................................................... ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default Change-Id: I51e95a83aac0af1223d9608c234b87162835c9bc --- M ttcn3-bts-test/oml/osmo-bts.cfg M ttcn3-bts-test/osmo-bts.cfg M ttcn3-bts-test/virtphy/osmo-bts.cfg 3 files changed, 3 insertions(+), 69 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/57/19157/1 diff --git a/ttcn3-bts-test/oml/osmo-bts.cfg b/ttcn3-bts-test/oml/osmo-bts.cfg index ff21431..1f3f689 100644 --- a/ttcn3-bts-test/oml/osmo-bts.cfg +++ b/ttcn3-bts-test/oml/osmo-bts.cfg @@ -12,38 +12,16 @@ logging print category 1 logging timestamp 1 logging print extended-timestamp 1 + logging level set-all notice logging level rsl info logging level oml info - logging level rll notice - logging level rr notice logging level meas info logging level pag info logging level l1c info - logging level l1p notice logging level dsp info logging level pcu debug - logging level ho notice logging level trx info - logging level loop notice - logging level abis notice - logging level rtp notice - logging level sum notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice logging level lmib debug - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice ! line vty no login diff --git a/ttcn3-bts-test/osmo-bts.cfg b/ttcn3-bts-test/osmo-bts.cfg index 45e491c..5357801 100644 --- a/ttcn3-bts-test/osmo-bts.cfg +++ b/ttcn3-bts-test/osmo-bts.cfg @@ -12,38 +12,16 @@ logging print category 1 logging timestamp 1 logging print extended-timestamp 1 + logging level set-all notice logging level rsl info logging level oml info - logging level rll notice - logging level rr notice logging level meas info logging level pag info logging level l1c info - logging level l1p notice logging level dsp info logging level pcu debug - logging level ho notice logging level trx info - logging level loop notice - logging level abis notice - logging level rtp notice - logging level sum notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice logging level lmib debug - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice ! line vty no login diff --git a/ttcn3-bts-test/virtphy/osmo-bts.cfg b/ttcn3-bts-test/virtphy/osmo-bts.cfg index 478990d..eb28220 100644 --- a/ttcn3-bts-test/virtphy/osmo-bts.cfg +++ b/ttcn3-bts-test/virtphy/osmo-bts.cfg @@ -12,38 +12,16 @@ logging print category 1 logging timestamp 1 logging print extended-timestamp 1 + logging level set-all notice logging level rsl info logging level oml info - logging level rll notice - logging level rr notice logging level meas info logging level pag info logging level l1c info - logging level l1p notice logging level dsp info logging level pcu debug - logging level ho notice logging level trx info - logging level loop notice - logging level abis notice - logging level rtp notice - logging level sum notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice logging level lmib debug - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice ! line vty no login -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I51e95a83aac0af1223d9608c234b87162835c9bc Gerrit-Change-Number: 19157 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:34:06 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 12:34:06 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: use logging level 'notice' by default References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/19158 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: use logging level 'notice' by default ...................................................................... ttcn3-bts-test/osmo-bsc.cfg: use logging level 'notice' by default Change-Id: Ib0bfbe0d98ef0d3e6d627e737edbbf013a5f19c0 --- M ttcn3-bts-test/osmo-bsc.cfg 1 file changed, 1 insertion(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/58/19158/1 diff --git a/ttcn3-bts-test/osmo-bsc.cfg b/ttcn3-bts-test/osmo-bsc.cfg index 3064595..1dcf226 100644 --- a/ttcn3-bts-test/osmo-bsc.cfg +++ b/ttcn3-bts-test/osmo-bsc.cfg @@ -14,38 +14,14 @@ logging timestamp 1 logging print extended-timestamp 1 logging print file 1 - logging level all everything + logging level set-all notice logging level rll info - logging level mm notice - logging level rr notice logging level rsl debug - logging level nm notice - logging level pag notice - logging level meas notice logging level msc debug - logging level ho notice - logging level hodec notice - logging level ref notice - logging level ctrl notice logging level filter debug logging level pcu debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice logging level lctrl info - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice logging level lsccp info - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice ! stats interval 5 ! -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib0bfbe0d98ef0d3e6d627e737edbbf013a5f19c0 Gerrit-Change-Number: 19158 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:34:06 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 12:34:06 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/19159 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 ...................................................................... ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 The new physical channel configuration will be used in the upcoming frequency hopping test cases. TRX#0 is kept unchanged. == Physical channel configuration == +-------+------------------+------------------+------------------+------------------+ | # / # | TRX#0 | TRX#1 | TRX#2 | TRX#3 | +-------+------------------+------------------+------------------+------------------+ | TS0 | CCCH+SDCCH4 | TCH/F | TCH/F | TCH/F | +-------+------------------+------------------+------------------+------------------+ | TS1 | TCH/F | SDCCH8+CBCH | SDCCH8+CBCH | SDCCH8+CBCH | +-------+------------------+------------------+------------------+------------------+ | TS2 | TCH/F | TCH/H | TCH/F | TCH/H | +-------+------------------+------------------+------------------+------------------+ | TS3 | TCH/F_PDCH | TCH/F_PDCH | TCH/F_PDCH | TCH/F_PDCH | +-------+------------------+------------------+------------------+------------------+ | TS4 | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | +-------+------------------+------------------+------------------+------------------+ | TS5 | TCH/H | TCH/H | TCH/H | TCH/H | +-------+------------------+------------------+------------------+------------------+ | TS6 | SDCCH8 | PDCH | PDCH | SDCCH8 | +-------+------------------+------------------+------------------+------------------+ | TS7 | PDCH | PDCH | PDCH | PDCH | +-------+------------------+------------------+------------------+------------------+ Change-Id: Ib27704dcba3979d69e44065c472b1452eaa11a7a Related: SYS#4868, OS#4546 --- M ttcn3-bts-test/osmo-bsc.cfg 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/59/19159/1 diff --git a/ttcn3-bts-test/osmo-bsc.cfg b/ttcn3-bts-test/osmo-bsc.cfg index 1dcf226..88983c4 100644 --- a/ttcn3-bts-test/osmo-bsc.cfg +++ b/ttcn3-bts-test/osmo-bsc.cfg @@ -148,13 +148,13 @@ max_power_red 20 rsl e1 tei 1 timeslot 0 - phys_chan_config SDCCH8 + phys_chan_config TCH/F hopping enabled 0 timeslot 1 - phys_chan_config TCH/F + phys_chan_config SDCCH8+CBCH hopping enabled 0 timeslot 2 - phys_chan_config TCH/F + phys_chan_config TCH/H hopping enabled 0 timeslot 3 phys_chan_config TCH/F_PDCH @@ -166,7 +166,7 @@ phys_chan_config TCH/H hopping enabled 0 timeslot 6 - phys_chan_config SDCCH8 + phys_chan_config PDCH hopping enabled 0 timeslot 7 phys_chan_config PDCH @@ -178,10 +178,10 @@ max_power_red 20 rsl e1 tei 2 timeslot 0 - phys_chan_config SDCCH8 + phys_chan_config TCH/F hopping enabled 0 timeslot 1 - phys_chan_config TCH/F + phys_chan_config SDCCH8+CBCH hopping enabled 0 timeslot 2 phys_chan_config TCH/F @@ -196,7 +196,7 @@ phys_chan_config TCH/H hopping enabled 0 timeslot 6 - phys_chan_config SDCCH8 + phys_chan_config PDCH hopping enabled 0 timeslot 7 phys_chan_config PDCH @@ -208,13 +208,13 @@ max_power_red 20 rsl e1 tei 3 timeslot 0 - phys_chan_config SDCCH8 + phys_chan_config TCH/F hopping enabled 0 timeslot 1 - phys_chan_config TCH/F + phys_chan_config SDCCH8+CBCH hopping enabled 0 timeslot 2 - phys_chan_config TCH/F + phys_chan_config TCH/H hopping enabled 0 timeslot 3 phys_chan_config TCH/F_PDCH -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib27704dcba3979d69e44065c472b1452eaa11a7a Gerrit-Change-Number: 19159 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:34:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 12:34:07 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: add osmo-bsc-fh.cfg with hopping parameters References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/19160 ) Change subject: ttcn3-bts-test: add osmo-bsc-fh.cfg with hopping parameters ...................................................................... ttcn3-bts-test: add osmo-bsc-fh.cfg with hopping parameters The Physical channel configuration is the same as in the non-hopping configuration file. Hopping parameters are listed below the table. == Physical channel configuration (FDMA) == +-------+------------------+------------------+------------------+------------------+ | # / # | TRX#0 | TRX#1 | TRX#2 | TRX#3 | +-------+------------------+------------------+------------------+------------------+ | ARFCN | 871 | 873 | 875 | 877 | +-------+------------------+------------------+------------------+------------------+ == Physical channel configuration (TDMA) == +-------+------------------+------------------+------------------+------------------+ | # / # | TRX#0 | TRX#1 | TRX#2 | TRX#3 | +-------+------------------+------------------+------------------+------------------+ | TS0 | CCCH+SDCCH4 | TCH/F (a) | TCH/F (a) | TCH/F (a) | +-------+------------------+------------------+------------------+------------------+ | TS1 | TCH/F | SDCCH8+CBCH | SDCCH8+CBCH (b) | SDCCH8+CBCH (b) | +-------+------------------+------------------+------------------+------------------+ | TS2 | TCH/F (c) | TCH/H (c) | TCH/F (d) | TCH/H (d) | +-------+------------------+------------------+------------------+------------------+ | TS3 | TCH/F_PDCH (e) | TCH/F_PDCH (e) | TCH/F_PDCH (e) | TCH/F_PDCH (e) | +-------+------------------+------------------+------------------+------------------+ | TS4 | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | +-------+------------------+------------------+------------------+------------------+ | TS5 | TCH/H (f) | TCH/H (f) | TCH/H (f) | TCH/H (f) | +-------+------------------+------------------+------------------+------------------+ | TS6 | SDCCH8 (g) | PDCH (h) | PDCH (h) | SDCCH8 (g) | +-------+------------------+------------------+------------------+------------------+ | TS7 | PDCH (i) | PDCH (j) | PDCH (i) | PDCH (j) | +-------+------------------+------------------+------------------+------------------+ == Hopping configuration == a) HSN=0, MAIO=0,1,2 b) HSN=1, MAIO=3,5 c) HSN=2, MAIO=0,1 d) HSN=2, MAIO=2,3 e) HSN=3, MAIO=3,2,1,0 f) HSN=5, MAIO=0,1,2,3 g) HSN=6, MAIO=1,0 h) HSN=6, MAIO=1,0 i) HSN=0, MAIO=1,3 j) HSN=0, MAIO=0,2 Change-Id: I7822c3581fccba3277a63577e740e7486307635d Related: SYS#4868, OS#4546 --- A ttcn3-bts-test/osmo-bsc-fh.cfg 1 file changed, 404 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/60/19160/1 diff --git a/ttcn3-bts-test/osmo-bsc-fh.cfg b/ttcn3-bts-test/osmo-bsc-fh.cfg new file mode 100644 index 0000000..e11cec4 --- /dev/null +++ b/ttcn3-bts-test/osmo-bsc-fh.cfg @@ -0,0 +1,404 @@ +! +! OsmoBSC (1.1.2.236-5f22) configuration saved from vty +!! +password foo +! +log gsmtap 172.18.9.10 + logging level set-all debug + logging filter all 1 +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging print file 1 + logging level set-all notice + logging level rll info + logging level rsl debug + logging level msc debug + logging level filter debug + logging level pcu debug + logging level lctrl info + logging level lsccp info +! +stats interval 5 +! +line vty + no login + bind 0.0.0.0 +! +e1_input + e1_line 0 driver ipa + e1_line 0 port 0 + no e1_line 0 keepalive + ipa bind 0.0.0.0 +cs7 instance 0 + point-code 0.23.3 + asp asp-clnt-msc-0 2905 0 m3ua + as as-clnt-msc-0 m3ua + asp asp-clnt-msc-0 + routing-key 2 0.23.3 +network + network country code 1 + mobile network code 1 + encryption a5 0 + neci 1 + paging any use tch 0 + handover 0 + handover1 window rxlev averaging 10 + handover1 window rxqual averaging 1 + handover1 window rxlev neighbor averaging 10 + handover1 power budget interval 6 + handover1 power budget hysteresis 3 + handover1 maximum distance 9999 + timer t3212 30 + bts 0 + type sysmobts + band DCS1800 + cell_identity 0 + location_area_code 1 + dtx uplink force + dtx downlink + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-descrption attach 1 + channel-descrption bs-pa-mfrms 5 + channel-descrption bs-ag-blks-res 1 + early-classmark-sending forbidden + early-classmark-sending-3g allowed + ip.access unit_id 1234 0 + ip.access rsl-ip 172.18.9.10 + oml ip.access stream_id 255 line 0 + neighbor-list mode manual-si5 + neighbor-list add arfcn 100 + neighbor-list add arfcn 200 + si5 neighbor-list add arfcn 10 + si5 neighbor-list add arfcn 20 + codec-support fr + gprs mode gprs + gprs routing area 0 + gprs network-control-order nc0 + gprs cell bvci 1234 + gprs cell timer blocking-timer 3 + gprs cell timer blocking-retries 3 + gprs cell timer unblocking-retries 3 + gprs cell timer reset-timer 3 + gprs cell timer reset-retries 3 + gprs cell timer suspend-timer 10 + gprs cell timer suspend-retries 3 + gprs cell timer resume-timer 10 + gprs cell timer resume-retries 3 + gprs cell timer capability-update-timer 10 + gprs cell timer capability-update-retries 3 + gprs nsei 1234 + gprs ns timer tns-block 3 + gprs ns timer tns-block-retries 3 + gprs ns timer tns-reset 3 + gprs ns timer tns-reset-retries 3 + gprs ns timer tns-test 30 + gprs ns timer tns-alive 3 + gprs ns timer tns-alive-retries 10 + gprs nsvc 0 nsvci 1234 + gprs nsvc 0 local udp port 23000 + gprs nsvc 0 remote udp port 23000 + gprs nsvc 0 remote ip 0.0.0.0 + no force-combined-si + trx 0 + rf_locked 0 + arfcn 871 + nominal power 50 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + ! Shall not be hopping + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + ! Intentionally non-hopping + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + ! (c) HSN=2, MAIO=0,1 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 873 + timeslot 3 + phys_chan_config TCH/F_PDCH + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 3 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + ! Intentionally non-hopping + phys_chan_config TCH/F_TCH/H_PDCH + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/H + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + phys_chan_config SDCCH8 + ! (g) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 877 + timeslot 7 + phys_chan_config PDCH + ! (i) HSN=0, MAIO=1,3 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 875 + trx 1 + rf_locked 0 + arfcn 873 + nominal power 50 + max_power_red 20 + rsl e1 tei 1 + timeslot 0 + phys_chan_config TCH/F + ! (a) HSN=0, MAIO=0,1,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 1 + phys_chan_config SDCCH8+CBCH + ! Intentionally non-hopping + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/H + ! (c) HSN=2, MAIO=0,1 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 873 + timeslot 3 + phys_chan_config TCH/F_PDCH + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 2 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + ! Intentionally non-hopping + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/H + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + phys_chan_config PDCH + ! (h) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 1 + hopping arfcn add 873 + hopping arfcn add 875 + timeslot 7 + phys_chan_config PDCH + ! (j) HSN=0, MAIO=0,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 873 + hopping arfcn add 877 + trx 2 + rf_locked 0 + arfcn 875 + nominal power 50 + max_power_red 20 + rsl e1 tei 2 + timeslot 0 + phys_chan_config TCH/F + ! (a) HSN=0, MAIO=0,1,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 1 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 1 + phys_chan_config SDCCH8+CBCH + ! (b) HSN=1, MAIO=3,5 + hopping enabled 1 + hopping sequence-number 1 + hopping maio 3 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 2 + phys_chan_config TCH/F + ! (d) HSN=2, MAIO=2,3 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 2 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 3 + phys_chan_config TCH/F_PDCH + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + ! Intentionally non-hopping + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/H + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 2 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + phys_chan_config PDCH + ! (h) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 0 + hopping arfcn add 873 + hopping arfcn add 875 + timeslot 7 + phys_chan_config PDCH + ! (i) HSN=0, MAIO=1,3 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 3 + hopping arfcn add 871 + hopping arfcn add 875 + trx 3 + rf_locked 0 + arfcn 877 + nominal power 50 + max_power_red 20 + rsl e1 tei 3 + timeslot 0 + phys_chan_config TCH/F + ! (a) HSN=0, MAIO=0,1,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 2 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 1 + phys_chan_config SDCCH8+CBCH + ! (b) HSN=1, MAIO=3,5 + hopping enabled 1 + hopping sequence-number 1 + hopping maio 5 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 2 + phys_chan_config TCH/H + ! (d) HSN=2, MAIO=2,3 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 3 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 3 + phys_chan_config TCH/F_PDCH + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + ! Intentionally non-hopping + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/H + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 3 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + phys_chan_config SDCCH8 + ! (g) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 877 + timeslot 7 + phys_chan_config PDCH + ! (j) HSN=0, MAIO=0,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 2 + hopping arfcn add 873 + hopping arfcn add 877 +msc 0 + core-location-area-code 666 + core-cell-identity 333 + no bsc-welcome-text + no bsc-msc-lost-text + no bsc-grace-text + codec-list fr1 fr2 fr3 + type normal + allow-emergency allow + amr-config 12_2k forbidden + amr-config 10_2k forbidden + amr-config 7_95k forbidden + amr-config 7_40k forbidden + amr-config 6_70k forbidden + amr-config 5_90k allowed + amr-config 5_15k forbidden + amr-config 4_75k forbidden +bsc + mid-call-timeout 0 + no missing-msc-text -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7822c3581fccba3277a63577e740e7486307635d Gerrit-Change-Number: 19160 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:34:17 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 12:34:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_flow_multiple_llc_blocks In-Reply-To: References: Message-ID: Hello neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19073 to look at the new patch set (#2). Change subject: pcu: Introduce test TC_ul_flow_multiple_llc_blocks ...................................................................... pcu: Introduce test TC_ul_flow_multiple_llc_blocks Related: OS#4559 Change-Id: I62f42981d31bc5c2e4c61e92bea329bd74cb2d19 --- M library/RLCMAC_Templates.ttcn M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 3 files changed, 128 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/73/19073/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I62f42981d31bc5c2e4c61e92bea329bd74cb2d19 Gerrit-Change-Number: 19073 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:35:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 12:35:15 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19157 ) Change subject: ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default ...................................................................... Patch Set 1: Why? Rationale? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I51e95a83aac0af1223d9608c234b87162835c9bc Gerrit-Change-Number: 19157 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 12:35:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:39:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 12:39:49 +0000 Subject: Change in libosmocore[master]: Revert "gsmtap_makemsg_ex: NULL for unknown chan_type" In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19067 ) Change subject: Revert "gsmtap_makemsg_ex: NULL for unknown chan_type" ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19067/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/19067/2//COMMIT_MSG at 11 PS2, Line 11: being able to determine channel type. > a bit hard to understand why. [?] That code should check for GSMTAP_CHANNEL_UNKNOWN instead of assuming NULL is returned in that case. I submit a patch. some callers in osmo-pcu call gsmtap_send() with GSMTAP_CHANNEL_UNKNOWN, and it's a valid case, basically whenever you try to parse some message which contains inside the type, but it somehow fails. So in that case I want to receive in gsmtap some packet, and the wireshark dissectors shows an empty line but I can see the hexdump of the packet failing to be parsed for later analysis of the issue. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ebaa89cc3422df1d7fd2365a6176cb2902d1c67 Gerrit-Change-Number: 19067 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Mon, 06 Jul 2020 12:39:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:45:01 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 12:45:01 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19157 ) Change subject: ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default ...................................................................... Patch Set 1: > Patch Set 1: > > Why? Rationale? Obviously, to make the configuration files easier to read. There is no need to set every category to 'NOTICE' since we can just use 'NOTICE' by default. All osmo-* programs already switched to hard-coded 'NOTICE' by default some time ago. This is rather a cosmetic change. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I51e95a83aac0af1223d9608c234b87162835c9bc Gerrit-Change-Number: 19157 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 12:45:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:46:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 12:46:14 +0000 Subject: Change in osmo-bts[master]: bts-virt: Don't rely on gsmtap_makemsg() returning NULL for GSMTAP_CH... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19161 ) Change subject: bts-virt: Don't rely on gsmtap_makemsg() returning NULL for GSMTAP_CHANNEL_UNKNOWN ...................................................................... bts-virt: Don't rely on gsmtap_makemsg() returning NULL for GSMTAP_CHANNEL_UNKNOWN commit d211c490cad38f2009943121d57bdb7df8eee9b0 avoided sending GSMTAP packets on the virtual Um interface with type GSMTAP_CHANNEL_UNKNOWN by relying on gsmtap_makemsg returning NULL. But that's not the corect approach since it's totally fine to be sending GSMTAP_CHANNEL_UNKNOWN on some GSMTAP cases (for instance when the program fails to infer the type when decoding a message), since then this way one can study pcap files and find the offending encoded messages which failed to be decoded. This patch goes togehter with revert patch introduced in libosmocore as explained in the commit referred above. Change-Id: I233afd930d3e43f7b120d40192c7c192102e38d9 --- M src/osmo-bts-virtual/scheduler_virtbts.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/61/19161/1 diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c index 1c2b057..466e864 100644 --- a/src/osmo-bts-virtual/scheduler_virtbts.c +++ b/src/osmo-bts-virtual/scheduler_virtbts.c @@ -78,9 +78,12 @@ else gsmtap_chantype = chantype_rsl2gsmtap2(rsl_chantype, chdesc->link_id, is_voice_frame); /* the logical channel type */ - if (gsmtap_chantype == GSMTAP_CHANNEL_UNKNOWN) + if (gsmtap_chantype == GSMTAP_CHANNEL_UNKNOWN) { LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Tx GSMTAP for RSL channel type 0x%02x: cannot send, this" " channel type is unknown in GSMTAP\n", rsl_chantype); + msgb_free(msg); + return; + } #if MODULO_HYPERFRAME /* Restart fn after every superframe (26 * 51 frames) to simulate hyperframe overflow each 6 seconds. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I233afd930d3e43f7b120d40192c7c192102e38d9 Gerrit-Change-Number: 19161 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:46:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 12:46:23 +0000 Subject: Change in libosmocore[master]: Revert "gsmtap_makemsg_ex: NULL for unknown chan_type" In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19067 ) Change subject: Revert "gsmtap_makemsg_ex: NULL for unknown chan_type" ...................................................................... Patch Set 2: https://gerrit.osmocom.org/c/osmo-bts/+/19161 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ebaa89cc3422df1d7fd2365a6176cb2902d1c67 Gerrit-Change-Number: 19067 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Mon, 06 Jul 2020 12:46:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:47:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 12:47:57 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19157 ) Change subject: ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default ...................................................................... Patch Set 1: Code-Review+1 Ah find, I didn't "notice" (j/k) you were not actually changing the log level, simply cleaning up. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I51e95a83aac0af1223d9608c234b87162835c9bc Gerrit-Change-Number: 19157 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 12:47:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:48:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 12:48:01 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: use logging level 'notice' by default In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19158 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: use logging level 'notice' by default ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib0bfbe0d98ef0d3e6d627e737edbbf013a5f19c0 Gerrit-Change-Number: 19158 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 12:48:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:49:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 12:49:14 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19159 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 ...................................................................... Patch Set 1: Code-Review+1 Please make sure the config can be used by BTS with more restrictions like nanobts if possible (to be able to later run tests against it). -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib27704dcba3979d69e44065c472b1452eaa11a7a Gerrit-Change-Number: 19159 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 12:49:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:49:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 12:49:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_flow_multiple_llc_blocks In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19073 ) Change subject: pcu: Introduce test TC_ul_flow_multiple_llc_blocks ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I62f42981d31bc5c2e4c61e92bea329bd74cb2d19 Gerrit-Change-Number: 19073 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 12:49:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:50:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 12:50:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_flow_multiple_llc_blocks In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19073 ) Change subject: pcu: Introduce test TC_ul_flow_multiple_llc_blocks ...................................................................... pcu: Introduce test TC_ul_flow_multiple_llc_blocks Related: OS#4559 Change-Id: I62f42981d31bc5c2e4c61e92bea329bd74cb2d19 --- M library/RLCMAC_Templates.ttcn M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 3 files changed, 128 insertions(+), 9 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index 939a814..848052e 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -683,17 +683,27 @@ } } - /* Template for a LlcBlock (part of a LLC frame inside RlcMac?lDataBlock */ - template LlcBlock t_RLCMAC_LLCBLOCK(octetstring data, boolean more := false, boolean e := true) := { - /* let encoder figure out the header */ - hdr := omit, + template LlcBlockHdr t_RLCMAC_LLCBLOCK_HDR(uint16_t length_ind, boolean more, boolean e) := { + length_ind := length_ind, + more := more, /* 1 = new LLC PDU starts */ + e := e /* 0 = another extension octet after LLC PDU, 1 = no more extension octets */ + } + + template EgprsLlcBlockHdr t_RLCMAC_LLCBLOCK_EGPRS_HDR(uint16_t length_ind, boolean e) := { + length_ind := length_ind, + e := e /* 0 = another extension octet after LLC PDU, 1 = no more extension octets */ + } + + /* Template for a LlcBlock (part of a LLC frame inside RlcMacDlDataBlock */ + template LlcBlock t_RLCMAC_LLCBLOCK(octetstring data, template (omit) LlcBlockHdr llc_hdr := omit) := { + hdr := llc_hdr, /* omit = let encoder figure out the header */ payload := data } /* Template for a LlcBlock (part of a LLC frame inside RlcMacEgprs?lDataBlock */ - template EgprsLlcBlock t_RLCMAC_LLCBLOCK_EGPRS(octetstring data, boolean e := true) := { + template EgprsLlcBlock t_RLCMAC_LLCBLOCK_EGPRS(octetstring data, template (omit) EgprsLlcBlockHdr llc_hdr := omit) := { /* let encoder figure out the header */ - hdr := omit, + hdr := llc_hdr, /* omit = let encoder figure out the header */ payload := data } diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 392440c..3eb3f9f 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -263,6 +263,12 @@ return dl_tbf; } +function f_ultbf_inc_bsn(inout UlTbf ul_tbf) +runs on MS_BTS_IFACE_CT { + ul_tbf.bsn := ul_tbf.bsn + 1; + ul_tbf.bsn := ul_tbf.bsn mod 128; /* FIXME: EGPRS SNS: 2048 */ +} + function f_ms_use_ra(inout GprsMS ms, uint16_t ra, uint8_t ra_is_11bit := 0) runs on MS_BTS_IFACE_CT { ms.ra_is_11bit := ra_is_11bit; @@ -353,10 +359,8 @@ ul_data.data.mac_hdr.tlli_ind := true; ul_data.data.tlli := ms.tlli; } - ms.ul_tbf.bsn := ms.ul_tbf.bsn + 1; - ms.ul_tbf.bsn := ms.ul_tbf.bsn mod 128; /* FIXME: EGPRS SNS: 2048 */ + f_ultbf_inc_bsn(ms.ul_tbf); return f_ms_tx_ul_block(ms, ul_data, fn); - } /* Send random payload for last "num_blocks" blocks in Ul TBF (ending with CV=0). */ diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index bdcf7c1..ef689e2 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -1333,6 +1333,110 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Verify Decoding and segmentation of UL LLC PDUs into RLC data blocks, OS#4559. + * Check "GPRS from A-Z" slide "Example of LI-Field and E-Bit" page 186. + * Check "3GPP TS 44.060" Annex B. */ +testcase TC_ul_flow_multiple_llc_blocks() runs on RAW_PCU_Test_CT { + var RlcmacDlBlock dl_block; + var octetstring dataA := f_rnd_octstring(20); + var octetstring dataB := f_rnd_octstring(13); + var octetstring dataC := f_rnd_octstring(3); + var octetstring dataD := f_rnd_octstring(12); + var uint32_t sched_fn; + var GprsMS ms; + var template (value) RlcmacUlBlock ul_data; + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename()); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign('FFFFFFFF'O, ms.tlli); + + /* Establish an Uplink TBF */ + f_ms_establish_ul_tbf(ms); + + /* Summary of what's transmitted: + * 1- UL RlcDataBlock(dataA) [BSN=0, CV=3] + * 2- UL RlcDataBlock(dataA finished, dataB starts) [BSN=1, CV=2] + * 3- UL RlcDataBlock(dataB finished, dataC starts and finishes, dataD starts) [BSN=2, CV=1] + * 4- UL RlcDataBlock(dataD finishes) [BSN=3, CV=0] + * And on SGSN we receive 4 packets, one for each LlcBlock dataA..D. + * We'll also receive some UL ACK/NACK we need to reply with CTRL ACK. + */ + + /* UL RlcDataBlock(dataA) [BSN=0, CV=3] */ + ul_data := t_RLCMAC_UL_DATA_TLLI(tfi := ms.ul_tbf.tfi, + cv := 3, + bsn := ms.ul_tbf.bsn, + blocks := { t_RLCMAC_LLCBLOCK(substr(dataA, 0, 16)) }, + tlli := ms.tlli); + /* Indicate no llc header, meaning first LLC block doesn't finish in current + * RLCMAC block being sent. */ + ul_data.data.mac_hdr.e := true; + f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_ul_block(ms, ul_data); + + /* UL RlcDataBlock(dataA finished, dataB starts) [BSN=1, CV=2] */ + ul_data := t_RLCMAC_UL_DATA_TLLI(tfi := ms.ul_tbf.tfi, + cv := 2, + bsn := ms.ul_tbf.bsn, + blocks := { t_RLCMAC_LLCBLOCK(substr(dataA, 16, 4), + t_RLCMAC_LLCBLOCK_HDR(length_ind := 4, more := true, e := true)), + t_RLCMAC_LLCBLOCK(substr(dataB, 0, 11)) + }, + tlli := ms.tlli); + f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_ul_block(ms, ul_data); + + /* UL block dataA should be received in SGSN */ + BSSGP[0].receive(tr_BSSGP_UL_UD(ms.tlli, mp_gb_cfg.cell_id, dataA)); + + /* UL RlcDataBlock(dataB finished, dataC starts and finishes, dataD starts) [BSN=2, CV=1] */ + ul_data := t_RLCMAC_UL_DATA_TLLI(tfi := ms.ul_tbf.tfi, + cv := 1, + bsn := ms.ul_tbf.bsn, + blocks := { t_RLCMAC_LLCBLOCK(substr(dataB, 11, 2), + t_RLCMAC_LLCBLOCK_HDR(length_ind := 2, more := true, e := false)), + t_RLCMAC_LLCBLOCK(substr(dataC, 0, 3), + t_RLCMAC_LLCBLOCK_HDR(length_ind := 3, more := true, e := true)), + t_RLCMAC_LLCBLOCK(substr(dataD, 0, 9)) + }, + tlli := ms.tlli); + f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_ul_block(ms, ul_data); + + /* UL block dataB and dataC should be received in SGSN */ + BSSGP[0].receive(tr_BSSGP_UL_UD(ms.tlli, mp_gb_cfg.cell_id, dataB)); + BSSGP[0].receive(tr_BSSGP_UL_UD(ms.tlli, mp_gb_cfg.cell_id, dataC)); + + /* UL RlcDataBlock(dataD finishes) [BSN=3, CV=0] */ + ul_data := t_RLCMAC_UL_DATA_TLLI(tfi := ms.ul_tbf.tfi, + cv := 0, + bsn := ms.ul_tbf.bsn, + blocks := { t_RLCMAC_LLCBLOCK(substr(dataD, 9, 3), + t_RLCMAC_LLCBLOCK_HDR(length_ind := 3, more := false, e := true)) + }, + tlli := ms.tlli); + f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_ul_block(ms, ul_data); + + /* UL block dataB and dataD should be received in SGSN */ + BSSGP[0].receive(tr_BSSGP_UL_UD(ms.tlli, mp_gb_cfg.cell_id, dataD)); + + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn); + /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + + f_shutdown(__BFILE__, __LINE__, final := true); +} + private function f_pkt_paging_match_imsi(in PacketPagingReq req, hexstring imsi) runs on RAW_PCU_Test_CT { var MobileIdentityLV_Paging mi_lv := req.repeated_pageinfo.cs.mobile_identity; @@ -1766,6 +1870,7 @@ execute (TC_ul_intermediate_retrans() ); execute( TC_imm_ass_dl_block_retrans() ); execute( TC_dl_flow_more_blocks() ); + execute (TC_ul_flow_multiple_llc_blocks() ); execute( TC_paging_cs_from_bts() ); execute( TC_paging_cs_from_sgsn_sign_ptmsi() ); execute( TC_paging_cs_from_sgsn_sign() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I62f42981d31bc5c2e4c61e92bea329bd74cb2d19 Gerrit-Change-Number: 19073 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:50:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 12:50:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 ) Change subject: pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() ...................................................................... pcu: Support sending with CS other than CS1 in f_ms_tx_ul_block() Change-Id: Ibafa4246b442e7c26666eb0d37570bfbbf1dbda7 --- M library/RLCMAC_Templates.ttcn M pcu/GPRS_Components.ttcn 2 files changed, 45 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index 848052e..560074f 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -93,6 +93,30 @@ return CS_1; } + /* Minimum CodingScheme required to fit RLCMAC block */ + function f_rlcmac_block_len_required_cs_mcs(uint32_t len, boolean is_mcs) return CodingScheme { + if (is_mcs) { + if (len <= 27) { return MCS_1; } + if (len <= 33) { return MCS_2; } + if (len <= 42) { return MCS_3; } + if (len <= 49) { return MCS_4; } + if (len <= 60) { return MCS_5; } + if (len <= 61) { return MCS_5; } + if (len <= 79) { return MCS_6; } + if (len <= 119) { return MCS_7; } + if (len <= 143) { return MCS_8; } + if (len <= 155) { return MCS_9; } + return MCS_1; /* error! */ + } else { + /* 3GPP TS 44.060 Table 10.2.1: RLC data block size, discounting padding in octet */ + if (len <= 23) { return CS_1; } + if (len <= 33) { return CS_2; } + if (len <= 39) { return CS_3; } + if (len <= 53) { return CS_4; } + return CS_1; /* error! */ + } + } + function f_rlcmac_block_ChCodingCommand2cs_mcs(ChCodingCommand chcc) return CodingScheme { select (chcc) { case (CH_CODING_CS1) { return CS_1; } diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 3eb3f9f..6018b7b 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -333,14 +333,32 @@ f_pcuif_tx_data_ind(data, ms.lqual_cb, fn); } -function f_ms_tx_ul_block(inout GprsMS ms, template (value) RlcmacUlBlock ul_data, uint32_t fn := 0) +function f_ms_tx_ul_block(inout GprsMS ms, template (value) RlcmacUlBlock ul_data, uint32_t fn := 0, template (omit) CodingScheme force_cs_mcs := omit) runs on MS_BTS_IFACE_CT return integer { var octetstring data; var integer padding_len; + var CodingScheme cs_mcs; + var uint32_t cs_mcs_len; + /* Encode the payload of DATA.ind */ data := enc_RlcmacUlBlock(valueof(ul_data)); - padding_len := 23 - lengthof(data); - data := f_pad_oct(data, 23, '00'O); /* CS-1 */ + + if (ispresent(force_cs_mcs)) { + cs_mcs := valueof(force_cs_mcs); + } else if (ischosen(ul_data.ctrl)) { + cs_mcs := CS_1; /* CTRL is always CS1 */ + } else { + /* Add padding to encode payload to minimum required CS/MCS: */ + cs_mcs := f_rlcmac_block_len_required_cs_mcs(lengthof(data), ischosen(ul_data.data_egprs)); + } + + cs_mcs_len := f_rlcmac_cs_mcs2block_len(cs_mcs); + padding_len := cs_mcs_len - lengthof(data); + if (padding_len < 0) { + setverdict(fail, "Unable to encode UL block of size ", lengthof(data), " with ", cs_mcs); + f_shutdown(__BFILE__, __LINE__); + } + data := f_pad_oct(data, cs_mcs_len, '00'O); /* Enqueue DATA.ind (both TDMA frame and block numbers to be patched) */ f_ms_tx_data_ind(ms, data, fn); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibafa4246b442e7c26666eb0d37570bfbbf1dbda7 Gerrit-Change-Number: 19076 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:50:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 12:50:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ull_all_sizes In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19077 ) Change subject: pcu: Introduce test TC_ull_all_sizes ...................................................................... pcu: Introduce test TC_ull_all_sizes Change-Id: I293c8dea2d44c5232a96c44b605e0d8c6dc1fa0e --- M pcu/PCU_Tests.ttcn 1 file changed, 91 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index ef689e2..76a2d9e 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -876,6 +876,96 @@ BSSGP[0].receive(tr_BSSGP_UL_UD(ms.tlli, mp_gb_cfg.cell_id, total_payload)); } +/* Verify PCU handles correctly CS1..4 with all possible LLC payload sizes fitting alone in one RLC block */ +testcase TC_ul_all_sizes() runs on RAW_PCU_Test_CT { + var RlcmacDlBlock dl_block; + var uint32_t dl_fn, sched_fn; + var octetstring payload; + var template (value) RlcmacUlBlock ul_data; + var GprsMS ms; + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename()); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign('FFFFFFFF'O, ms.tlli); + + /* Establish an Uplink TBF */ + f_ms_establish_ul_tbf(ms); + + /* Send one UL block (with TLLI since we are in One-Phase Access + contention resoultion) and make sure it is ACKED fine. */ + payload := f_rnd_octstring(16); /* 16 bytes fills the llc block (because TLLI takes 4 bytes) */ + /* Set CV = 15 to signal there's still more than BS_CV_MAX blocks to be sent */ + ul_data := t_RLCMAC_UL_DATA_TLLI(tfi := ms.ul_tbf.tfi, + cv := 15, + bsn := ms.ul_tbf.bsn, + blocks := { t_RLCMAC_LLCBLOCK(payload, + t_RLCMAC_LLCBLOCK_HDR(length_ind := lengthof(payload), more := false, e := true)) + }, + tlli := ms.tlli); + f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_ul_block(ms, ul_data); + + /* ACK and check it was received fine */ + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn); + /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + /* receive one message on BSSGP with all aggregated data in payload: */ + BSSGP[0].receive(tr_BSSGP_UL_UD(ms.tlli, mp_gb_cfg.cell_id, payload)); + + /* Test sending LLC PDUS of incrementing size */ + var integer max_size := 49; + for (var integer i := 1; i <= max_size; i := i + 1) { + var integer cv; + /* Enqueue DATA.ind (both TDMA frame and block numbers to be patched) */ + log("Sending DATA.ind with LLC payload size ", i); + if (i < max_size - g_bs_cv_max) { + cv := 15; + } else { + cv := max_size - i; + } + + payload := f_rnd_octstring(i); + /* Set CV = 15 to signal there's still more than BS_CV_MAX blocks to be sent */ + ul_data := t_RLCMAC_UL_DATA(tfi := ms.ul_tbf.tfi, + cv := cv, + bsn := ms.ul_tbf.bsn, + blocks := { t_RLCMAC_LLCBLOCK(payload, + t_RLCMAC_LLCBLOCK_HDR(length_ind := lengthof(payload), more := false, e := true)) + }); + f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_ul_block(ms, ul_data); + + /* receive one message on BSSGP with all aggregated data in payload: */ + BSSGP[0].receive(tr_BSSGP_UL_UD(ms.tlli, mp_gb_cfg.cell_id, payload)); + + /* we will receive UL ACK/NACK from time to time, handle it. */ + f_rx_rlcmac_dl_block(dl_block, dl_fn); + if (match(dl_block, tr_RLCMAC_DUMMY_CTRL())) { + continue; + } + if (not match(dl_block, tr_RLCMAC_UL_ACK_NACK_GPRS(ul_tfi := ?)) and + not match(dl_block, tr_RLCMAC_UL_ACK_NACK_EGPRS(ul_tfi := ?))) { + setverdict(fail, "Failed to match Packet Uplink ACK / NACK:", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + + log("Rx Packet Uplink ACK / NACK"); + sched_fn := f_rrbp_ack_fn(dl_fn, dl_block.ctrl.mac_hdr.rrbp); + /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } + setverdict(pass); +} + /* Test scenario where MS wants to send some data on PDCH against SGSN and it is * answered, so TBFs for uplink and later for downlink are created. */ @@ -1862,6 +1952,7 @@ execute( TC_t3169() ); execute( TC_t3193() ); execute( TC_countdown_procedure() ); + execute( TC_ul_all_sizes() ); execute( TC_mo_ping_pong() ); execute( TC_mo_ping_pong_with_ul_racap() ); execute( TC_force_two_phase_access() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I293c8dea2d44c5232a96c44b605e0d8c6dc1fa0e Gerrit-Change-Number: 19077 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:50:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 12:50:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce TC_ul_data_toolong_fills_padding In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19097 ) Change subject: pcu: Introduce TC_ul_data_toolong_fills_padding ...................................................................... pcu: Introduce TC_ul_data_toolong_fills_padding Change-Id: Ic37294efac005ed6c0ce48dea566fd20284b5868 --- M pcu/PCU_Tests.ttcn 1 file changed, 66 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 76a2d9e..641b978 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -966,6 +966,71 @@ setverdict(pass); } +function f_TC_ul_data_toolong_fills_padding_cs(inout GprsMS ms, CodingScheme cs, integer cv) runs on RAW_PCU_Test_CT { + var octetstring payload; + var template (value) RlcmacUlBlock ul_data; + var integer block_len, max_valid_data_len; + timer T; + + block_len := f_rlcmac_cs_mcs2block_len(cs); + /* We need to send with TLLI since we are in One-Phase Access Contenion + * resoultion), so that's -4 bytes of data, -3 for headers, -1 for LI + * indicator, -1 for spare bits octet at the end */ + max_valid_data_len := block_len - 4 - 3 - 1 - 1; + payload := f_rnd_octstring(max_valid_data_len + 1); /* +1 to write LLC data on last padding octet */ + ul_data := t_RLCMAC_UL_DATA_TLLI(tfi := ms.ul_tbf.tfi, + cv := cv, + bsn := ms.ul_tbf.bsn, + blocks := { t_RLCMAC_LLCBLOCK(payload, + t_RLCMAC_LLCBLOCK_HDR(length_ind := lengthof(payload), more := false, e := true)) + }, + tlli := ms.tlli); + f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_data_ind(ms, enc_RlcmacUlBlock(valueof(ul_data))); + + T.start(0.5); + alt { + [] BSSGP[0].receive(tr_BSSGP_UL_UD(ms.tlli, mp_gb_cfg.cell_id, ?)) { + setverdict(fail, "LLC PDU in Malformed RLC block was forwarded"); + f_shutdown(__BFILE__, __LINE__); + } + [] T.timeout { + setverdict(pass); + } + } +} +/* Verify PCU finds out incorrectly formated RLC block and discards it. This + blocks intentionally contain last byte of data placed in last byte of RLC + containing padding/spare bits, which is incorrect. Spare bits exist and are + described for CS2..4 in 3GPP TS 44.060 Table 10.2.1: "RLC data block size, + discounting padding in octet" */ +testcase TC_ul_data_toolong_fills_padding() runs on RAW_PCU_Test_CT { + var GprsMS ms; + var integer block_len, max_valid_data_len; + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename()); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign('FFFFFFFF'O, ms.tlli); + + /* Establish an Uplink TBF */ + f_ms_establish_ul_tbf(ms); + + f_TC_ul_data_toolong_fills_padding_cs(ms, CS_2, 2); + f_TC_ul_data_toolong_fills_padding_cs(ms, CS_3, 1); + f_TC_ul_data_toolong_fills_padding_cs(ms, CS_4, 0); + + setverdict(pass); +} + /* Test scenario where MS wants to send some data on PDCH against SGSN and it is * answered, so TBFs for uplink and later for downlink are created. */ @@ -1953,6 +2018,7 @@ execute( TC_t3193() ); execute( TC_countdown_procedure() ); execute( TC_ul_all_sizes() ); + execute( TC_ul_data_toolong_fills_padding() ); execute( TC_mo_ping_pong() ); execute( TC_mo_ping_pong_with_ul_racap() ); execute( TC_force_two_phase_access() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic37294efac005ed6c0ce48dea566fd20284b5868 Gerrit-Change-Number: 19097 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:50:59 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 12:50:59 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19157 ) Change subject: ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default ...................................................................... Patch Set 1: > Patch Set 1: Code-Review+1 > > Ah find, I didn't "notice" (j/k) you were not actually changing the log level, simply cleaning up. you should switch to "debug" when reviewing my changes next time :P I'll update the commit message to reflect that it's a cosmetic change. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I51e95a83aac0af1223d9608c234b87162835c9bc Gerrit-Change-Number: 19157 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 12:50:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 12:55:04 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 12:55:04 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19159 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 ...................................................................... Patch Set 1: > Patch Set 1: Code-Review+1 > > Please make sure the config can be used by BTS with more restrictions like nanobts if possible (to be able to later run tests against it). Hmm, aren't we using a different osmo-bsc.cfg for other BTS models in osmo-gsm-tester? I don't think nanoBTS supports TCH/F_TCH/H_PDCH either, so this configuration looks quite osmo-bts-{trx,virtual,*} specific. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib27704dcba3979d69e44065c472b1452eaa11a7a Gerrit-Change-Number: 19159 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 12:55:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 13:08:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 13:08:49 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19159 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 ...................................................................... Patch Set 1: > Patch Set 1: > > > Patch Set 1: Code-Review+1 > > > > Please make sure the config can be used by BTS with more restrictions like nanobts if possible (to be able to later run tests against it). > > Hmm, aren't we using a different osmo-bsc.cfg for other BTS models in osmo-gsm-tester? > > I don't think nanoBTS supports TCH/F_TCH/H_PDCH either, so this configuration looks quite osmo-bts-{trx,virtual,*} specific. It uses a different osmo-bsc.cfg indeed, I was worring more about possible tests to come relying on this specific setup. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib27704dcba3979d69e44065c472b1452eaa11a7a Gerrit-Change-Number: 19159 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 13:08:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 13:22:19 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 13:22:19 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19159 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/docker-playground/+/19159/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/docker-playground/+/19159/1//COMMIT_MSG at 8 PS1, Line 8: This commit log lacks a rationale why the channel config needs changing. https://gerrit.osmocom.org/c/docker-playground/+/19159/1//COMMIT_MSG at 32 PS1, Line 32: +-------+------------------+------------------+------------------+------------------+ seems like this graph could rather go in some in-code comment, instead of being "lost" in git log history? ideally adding first in a separate patch and showing the changes as part of this patch ... just an idea. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib27704dcba3979d69e44065c472b1452eaa11a7a Gerrit-Change-Number: 19159 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 13:22:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 13:26:26 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 13:26:26 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19157 ) Change subject: ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default ...................................................................... Patch Set 1: Code-Review+2 wasn't aware that "All osmo-* programs already switched to hard-coded NOTICE" I'm still finding some INFO and DEBUG in gbproxy and bs11_config but otherwise that seems to be accurate -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I51e95a83aac0af1223d9608c234b87162835c9bc Gerrit-Change-Number: 19157 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 13:26:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 13:27:18 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 13:27:18 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: use logging level 'notice' by default In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19158 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: use logging level 'notice' by default ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib0bfbe0d98ef0d3e6d627e737edbbf013a5f19c0 Gerrit-Change-Number: 19158 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 13:27:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 13:31:26 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 13:31:26 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: use define constant to define max number of E1 subslots In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19118 ) Change subject: mgcp_endp: use define constant to define max number of E1 subslots ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/19118/2/src/libosmo-mgcp/mgcp_endp.c File src/libosmo-mgcp/mgcp_endp.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19118/2/src/libosmo-mgcp/mgcp_endp.c at 527 PS2, Line 527: const int8_t interlock_tab[MGCP_ENDP_E1_SUBSLOTS][16] = s/16/MGCP_ENDP_E1_SUBSLOTS + 1 ? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If7cb74e486946aff09e22abf8a8885bf0693f34e Gerrit-Change-Number: 19118 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 13:31:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 13:36:26 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 13:36:26 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: remove double check In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19119 ) Change subject: mgcp_trunk: remove double check ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/19119/2/src/libosmo-mgcp/mgcp_trunk.c File src/libosmo-mgcp/mgcp_trunk.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19119/2/src/libosmo-mgcp/mgcp_trunk.c at 164 PS2, Line 164: return mgcp_trunk_by_num(cfg, MGCP_TRUNK_E1, trunk_nr); It looks to me like now mgcp_trunk_by_name() no longer works for epname that contain the virtual trunk prefix. Above condition returns the trunk only for trunk_nr > 0, i.e. not including the virtual trunk, and below conditions match only for epnames that lack a trunk prefix. right? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I91fb8cf6e3b077ba8f18fdbcd071275c6fd7cacd Gerrit-Change-Number: 19119 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 13:36:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 13:43:16 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 13:43:16 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19159 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/19159/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/docker-playground/+/19159/1//COMMIT_MSG at 32 PS1, Line 32: +-------+------------------+------------------+------------------+------------------+ > seems like this graph could rather go in some in-code comment, instead of being "lost" in git log hi [?] This table (actually, a slightly modified version) will be in osmo-ttcn-hacks.git. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib27704dcba3979d69e44065c472b1452eaa11a7a Gerrit-Change-Number: 19159 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 13:43:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 13:45:11 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 13:45:11 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: do not access endpoint array elements directly In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19120 ) Change subject: mgcp_test: do not access endpoint array elements directly ...................................................................... Patch Set 2: Code-Review+1 (4 comments) https://gerrit.osmocom.org/c/osmo-mgw/+/19120/2/tests/mgcp/mgcp_test.c File tests/mgcp/mgcp_test.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19120/2/tests/mgcp/mgcp_test.c at 610 PS2, Line 610: strcpy(last_endpoint, trunk->endpoints[i]->name); to copy entire strings always use OSMO_STRLCPY_ARRAY(...) or osmo_strlcpy() https://gerrit.osmocom.org/c/osmo-mgw/+/19120/2/tests/mgcp/mgcp_test.c at 826 PS2, Line 826: endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); OSMO_ASSERT(endp); https://gerrit.osmocom.org/c/osmo-mgw/+/19120/2/tests/mgcp/mgcp_test.c at 882 PS2, Line 882: endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); OSMO_ASSERT(endp); or actually, seems like this endp is not used at all? The next loop iteration is a separate test, so it uses a different endp anyway, right? https://gerrit.osmocom.org/c/osmo-mgw/+/19120/2/tests/mgcp/mgcp_test.c at 1414 PS2, Line 1414: endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); OSMO_ASSERT(endp); (...some more below) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic950c427f23be4a792af94972554637c2b0fbdf2 Gerrit-Change-Number: 19120 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 13:45:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 14:22:50 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 14:22:50 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: refactor endpoint number configuration In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19121 ) Change subject: mgcp_vty: refactor endpoint number configuration ...................................................................... Patch Set 2: Code-Review-1 (9 comments) https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/include/osmocom/mgcp/mgcp_trunk.h File include/osmocom/mgcp/mgcp_trunk.h: https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/include/osmocom/mgcp/mgcp_trunk.h at 51 PS2, Line 51: } virtual; better to use a different name, because 'virtual' is a C++ keyword... virt or virtual_trunk or ... If only to avoid confusing code highlighting, like here in gerrit. https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_trunk.c File src/libosmo-mgcp/mgcp_trunk.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_trunk.c at 51 PS2, Line 51: trunk->trunk_nr = nr; (unrelated whitespace change) https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_trunk.c at 87 PS2, Line 87: offset_endpoints = 1; (naming: first_endp_id or first_endp_nr? "offset" to me indicates that we are skipping some items in an array or data buffer, so for a couple minutes i was reading this code wrong. This variable only affects the endpoint id / number starting with at the start of the array, without an actual data offset. maybe it's just me though.) https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_trunk.c at 99 PS2, Line 99: * however miss-initalation of the struct or memory corruption 'initialization' https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_trunk.c at 103 PS2, Line 103: Note that the vty allows vty_number_endpoints to be 0, in which case we probably should not invoke talloc? Seems odd to allow zero endpoints, so see comment in mgcp_vty.c... https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_trunk.c at 105 PS2, Line 105: trunk->endpoints = _talloc_zero_array(trunk->cfg, (separate issue: seems sketchy to use an API function that starts with an underscore and that isn't documented. Why not just talloc_zero_array(ctx, struct mgcp_endpoint*, number_endpoints) -- the only difference seems the name shown in the talloc report, right?) https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_vty.c File src/libosmo-mgcp/mgcp_vty.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_vty.c at 713 PS2, Line 713: "number endpoints <0-65534>", ...this is where vty_number_endpoints == 0 is allowed by the vty. I think the problem could be fixed trivially by a separate patch changing this to '<1-65534>'. (Only if we're reasonably sure that no current config out there sanely uses 0 in the cfg file) https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_vty.c at 936 PS2, Line 936: vty_out(vty, " timeslot first %u%s", Preferably add new vty commands in a separate patch, because the commit log says "refactor" https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_vty.c at 1179 PS2, Line 1179: "Timeslot options\n" "Number of E1 timeslots to use\n" "E1 timeslot count\n") explain whether the used E1 timeslots end up being [first .. first+num] or [first .. num] ? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Gerrit-Change-Number: 19121 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 14:22:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 15:01:29 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 15:01:29 +0000 Subject: Change in osmo-bts[master]: bts-trx: Introduce rate counter for scheduler timerfd missed FNs In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19107 ) Change subject: bts-trx: Introduce rate counter for scheduler timerfd missed FNs ...................................................................... Patch Set 2: Code-Review+1 no neels-style comments here -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0051b9ab18ebc9f92db11374d856de94f155efa4 Gerrit-Change-Number: 19107 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 15:01:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 15:03:43 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 15:03:43 +0000 Subject: Change in osmo-bts[master]: bts-trx: Introduce rate counter for scheduler timerfd missed FNs In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19107 ) Change subject: bts-trx: Introduce rate counter for scheduler timerfd missed FNs ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0051b9ab18ebc9f92db11374d856de94f155efa4 Gerrit-Change-Number: 19107 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 15:03:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 15:03:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 15:03:50 +0000 Subject: Change in osmo-bts[master]: bts-trx: Introduce rate counter for scheduler timerfd missed FNs In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19107 ) Change subject: bts-trx: Introduce rate counter for scheduler timerfd missed FNs ...................................................................... bts-trx: Introduce rate counter for scheduler timerfd missed FNs This should provide a quick way to check if the system is frequently overloaded over time and hence downlink FNs are scheduled later than expected. Change-Id: I0051b9ab18ebc9f92db11374d856de94f155efa4 --- M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 3 files changed, 25 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h index 3fda726..7f60ca3 100644 --- a/src/osmo-bts-trx/l1_if.h +++ b/src/osmo-bts-trx/l1_if.h @@ -1,6 +1,8 @@ #ifndef L1_IF_H_TRX #define L1_IF_H_TRX +#include + #include #include #include "trx_if.h" @@ -24,6 +26,11 @@ * send burst data for the missing frame numbers. */ +/* bts-trx specific rate counters */ +enum { + BTSTRX_CTR_SCHED_DL_MISS_FN, +}; + /*! clock state of a given TRX */ struct osmo_trx_clock_state { /*! number of FN periods without TRX clock indication */ @@ -47,6 +54,7 @@ /* gsm_bts->model_priv, specific to osmo-bts-trx */ struct bts_trx_priv { struct osmo_trx_clock_state clk_s; + struct rate_ctr_group *ctrs; /* bts-trx specific rate counters */ }; struct trx_config { diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index 0d2a1f7..d8cbbaa 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -43,6 +43,8 @@ #include #include #include +#include +#include #include #include @@ -59,6 +61,18 @@ #include "l1_if.h" #include "trx_if.h" +static const struct rate_ctr_desc btstrx_ctr_desc[] = { + [BTSTRX_CTR_SCHED_DL_MISS_FN] = {"trx_clk:sched_dl_miss_fn", + "Downlink frames scheduled later than expected due to missed timerfd event (due to high system load)"}, +}; +static const struct rate_ctr_group_desc btstrx_ctrg_desc = { + "bts-trx", + "osmo-bts-trx specific counters", + OSMO_STATS_CLASS_GLOBAL, + ARRAY_SIZE(btstrx_ctr_desc), + btstrx_ctr_desc +}; + /* dummy, since no direct dsp support */ uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx) { @@ -99,6 +113,7 @@ { struct bts_trx_priv *bts_trx = talloc_zero(bts, struct bts_trx_priv); bts_trx->clk_s.fn_timer_ofd.fd = -1; + bts_trx->ctrs = rate_ctr_group_alloc(bts_trx, &btstrx_ctrg_desc, 0); bts->model_priv = bts_trx; bts->variant = BTS_OSMO_TRX; diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 472bae8..fcd1eee 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -158,7 +158,8 @@ if (expire_count > 1) { LOGP(DL1C, LOGL_NOTICE, "FN timer expire_count=%"PRIu64": We missed %"PRIu64" timers\n", - expire_count, expire_count-1); + expire_count, expire_count - 1); + rate_ctr_add(&bts_trx->ctrs->ctr[BTSTRX_CTR_SCHED_DL_MISS_FN], expire_count - 1); } /* check if transceiver is still alive */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0051b9ab18ebc9f92db11374d856de94f155efa4 Gerrit-Change-Number: 19107 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 15:03:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 15:03:58 +0000 Subject: Change in osmo-bts[master]: bts_shutdown: Speed up shutdown if no TRX is operational In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19108 ) Change subject: bts_shutdown: Speed up shutdown if no TRX is operational ...................................................................... bts_shutdown: Speed up shutdown if no TRX is operational This change avoids waiting for full ramp down if TRXs are already non operational. Change-Id: Ie1c7c3a969e7968075b89edcd1ab2227b178a869 --- M src/common/bts_shutdown_fsm.c 1 file changed, 36 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, but someone else must approve laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/common/bts_shutdown_fsm.c b/src/common/bts_shutdown_fsm.c index d8a8d11..d55b1cd 100644 --- a/src/common/bts_shutdown_fsm.c +++ b/src/common/bts_shutdown_fsm.c @@ -22,6 +22,7 @@ #include #include +#include #include #include @@ -38,11 +39,33 @@ #define bts_shutdown_fsm_state_chg(fi, NEXT_STATE) \ osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, bts_shutdown_fsm_timeouts, ((struct gsm_bts *)fi->priv)->T_defs, -1) +static unsigned int count_trx_operational(struct gsm_bts *bts) { + unsigned int count = 0; + struct gsm_bts_trx *trx; + llist_for_each_entry(trx, &bts->trx_list, list) { + if (trx->mo.nm_state.operational == NM_OPSTATE_ENABLED) + count++; + } + return count; +} + static void st_none(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct gsm_bts *bts = (struct gsm_bts *)fi->priv; + unsigned int count; switch(event) { case BTS_SHUTDOWN_EV_START: - bts_shutdown_fsm_state_chg(fi, BTS_SHUTDOWN_ST_WAIT_RAMP_DOWN_COMPL); + count = count_trx_operational(bts); + if (count) { + bts_shutdown_fsm_state_chg(fi, BTS_SHUTDOWN_ST_WAIT_RAMP_DOWN_COMPL); + } else { + /* we can skip ramp down since no TRX is running anyway. + * Let's jump into WAIT_TRX_CLOSED to make sure we + * tell lower layer to close all TRX in case there's some + * open() WIP */ + LOGPFSML(fi, LOGL_INFO, "No TRX is operational, skipping power ramp down\n"); + bts_shutdown_fsm_state_chg(fi, BTS_SHUTDOWN_ST_WAIT_TRX_CLOSED); + } break; } } @@ -56,8 +79,11 @@ struct gsm_bts *bts = (struct gsm_bts *)fi->priv; struct gsm_bts_trx *trx; - llist_for_each_entry(trx, &bts->trx_list, list) + llist_for_each_entry(trx, &bts->trx_list, list) { + if (trx->mo.nm_state.operational != NM_OPSTATE_ENABLED) + continue; power_ramp_start(trx, to_mdB(-10), 1, ramp_down_compl_cb); + } } static void st_wait_ramp_down_compl(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -72,7 +98,8 @@ src_trx = (struct gsm_bts_trx *)data; llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->power_params.p_total_cur_mdBm > 0) + if (trx->mo.nm_state.operational == NM_OPSTATE_ENABLED && + trx->power_params.p_total_cur_mdBm > 0) remaining++; } @@ -100,17 +127,13 @@ static void st_wait_trx_closed(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_bts *bts = (struct gsm_bts *)fi->priv; - struct gsm_bts_trx *src_trx, *trx; - unsigned int remaining = 0; + struct gsm_bts_trx *src_trx; + unsigned int remaining; switch(event) { case BTS_SHUTDOWN_EV_TRX_CLOSED: src_trx = (struct gsm_bts_trx *)data; - - llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->mo.nm_state.operational != NM_OPSTATE_DISABLED) - remaining++; - } + remaining = count_trx_operational(bts); LOGPFSML(fi, LOGL_INFO, "%s TRX closed, %u TRX remaining\n", gsm_trx_name(src_trx), remaining); @@ -130,7 +153,9 @@ [BTS_SHUTDOWN_ST_NONE] = { .in_event_mask = X(BTS_SHUTDOWN_EV_START), - .out_state_mask = X(BTS_SHUTDOWN_ST_WAIT_RAMP_DOWN_COMPL), + .out_state_mask = + X(BTS_SHUTDOWN_ST_WAIT_RAMP_DOWN_COMPL) | + X(BTS_SHUTDOWN_ST_WAIT_TRX_CLOSED), .name = "NONE", .action = st_none, }, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie1c7c3a969e7968075b89edcd1ab2227b178a869 Gerrit-Change-Number: 19108 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 15:34:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 15:34:59 +0000 Subject: Change in osmo-bts[master]: bts-trx: Remove unused function l1if_provision_transceiver() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19162 ) Change subject: bts-trx: Remove unused function l1if_provision_transceiver() ...................................................................... bts-trx: Remove unused function l1if_provision_transceiver() Change-Id: I509fdbc7883f227cef4b7e46cb68fa2418c63f97 --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h 2 files changed, 0 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/62/19162/1 diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index f47fc05..a3bdf01 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -363,30 +363,6 @@ return 0; } -int l1if_provision_transceiver(struct gsm_bts *bts) -{ - struct gsm_bts_trx *trx; - uint8_t tn; - - llist_for_each_entry(trx, &bts->trx_list, list) { - struct phy_instance *pinst = trx_phy_instance(trx); - struct trx_l1h *l1h = pinst->u.osmotrx.hdl; - l1h->config.trxd_hdr_ver_req = 0; - l1h->config.trxd_hdr_ver_use = 0; - l1h->config.setformat_sent = 0; - l1h->config.arfcn_sent = 0; - l1h->config.tsc_sent = 0; - l1h->config.bsic_sent = 0; - l1h->config.rxgain_sent = 0; - l1h->config.maxdly_sent = 0; - l1h->config.maxdlynb_sent = 0; - for (tn = 0; tn < TRX_NR_TS; tn++) - l1h->config.slottype_sent[tn] = 0; - l1if_provision_transceiver_trx(l1h); - } - return 0; -} - /* * activation/configuration/deactivation of transceiver's TRX */ diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h index 7f60ca3..d2fdf06 100644 --- a/src/osmo-bts-trx/l1_if.h +++ b/src/osmo-bts-trx/l1_if.h @@ -120,7 +120,6 @@ struct trx_l1h *trx_l1h_alloc(void *tall_ctx, struct phy_instance *pinst); int l1if_provision_transceiver_trx(struct trx_l1h *l1h); -int l1if_provision_transceiver(struct gsm_bts *bts); int l1if_mph_time_ind(struct gsm_bts *bts, uint32_t fn); void l1if_trx_set_nominal_power(struct gsm_bts_trx *trx, int nominal_power); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I509fdbc7883f227cef4b7e46cb68fa2418c63f97 Gerrit-Change-Number: 19162 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 16:49:52 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 16:49:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148 ) Change subject: GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets ...................................................................... GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets Change-Id: I3f00dd0b4863582fc5edf08149103150b8b5e97b --- M bts/BTS_Tests.ttcn M library/GSM_SystemInformation.ttcn M sysinfo/gen_links.sh 3 files changed, 8 insertions(+), 11 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 374228a..1ff0c61 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -322,7 +322,7 @@ }, cell_sel_par := ts_CellSelPar_default, rach_control := ts_RachCtrl_default, - rest_octets := enc_SI3RestOctets(valueof(ts_SI3RestOctets_def)) + rest_octets := valueof(ts_SI3RestOctets_def) } } } @@ -347,7 +347,7 @@ rach_control := ts_RachCtrl_default, cbch_chan_desc := omit, cbch_mobile_alloc := omit, - rest_octets := enc_SI4RestOctets(valueof(ts_SI4RestOctets_def)) + rest_octets := valueof(ts_SI4RestOctets_def) } } } @@ -5226,13 +5226,9 @@ var SystemInformation si := f_get_si(L1CTL, si_type); if (si_type == SYSTEM_INFORMATION_TYPE_3) { - var RestOctets ro := si.payload.si3.rest_octets; - var SI3RestOctets rest := dec_SI3RestOctets(ro); - return rest.gprs_ind.presence == '1'B; + return si.payload.si3.rest_octets.gprs_ind.presence == '1'B; } else if (si_type == SYSTEM_INFORMATION_TYPE_4) { - var RestOctets ro := si.payload.si4.rest_octets; - var SI4RestOctets rest := dec_SI4RestOctets(ro); - return rest.gprs_ind.presence == '1'B; + return si.payload.si4.rest_octets.gprs_ind.presence == '1'B; } Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unhandled SI type"); diff --git a/library/GSM_SystemInformation.ttcn b/library/GSM_SystemInformation.ttcn index 758ad1c..0639eef 100644 --- a/library/GSM_SystemInformation.ttcn +++ b/library/GSM_SystemInformation.ttcn @@ -15,6 +15,7 @@ import from General_Types all; import from GSM_Types all; import from GSM_RR_Types all; + import from GSM_RestOctets all; import from Osmocom_Types all; type union ArfcnOrMaio { @@ -150,7 +151,7 @@ CellOptions cell_options, CellSelectionParameters cell_sel_par, RachControlParameters rach_control, - RestOctets rest_octets length(0..4) + SI3RestOctets rest_octets } with { variant "" }; template SystemInformationType3 t_SI3 := { @@ -171,7 +172,7 @@ RachControlParameters rach_control, ChannelDescriptionTV cbch_chan_desc optional, MobileAllocationT cbch_mobile_alloc optional, - RestOctets rest_octets length(0..10) /* see 10.5.2.35 */ + SI4RestOctets rest_octets /* see 10.5.2.35 */ } with { variant "TAG(cbch_chan_desc, iei = '64'O; cbch_mobile_alloc, iei = '72'O)" }; /* 44.018 9.1.37 */ diff --git a/sysinfo/gen_links.sh b/sysinfo/gen_links.sh index 3526a29..0648e7b 100755 --- a/sysinfo/gen_links.sh +++ b/sysinfo/gen_links.sh @@ -25,7 +25,7 @@ gen_links $DIR $FILES DIR=../library -FILES="GSMTAP_PortType.ttcn GSMTAP_Types.ttcn GSM_SystemInformation.ttcn GSM_RR_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_Types.ttcn IPL4_GSMTAP_CtrlFunct.ttcn IPL4_GSMTAP_CtrlFunctDef.cc Osmocom_Types.ttcn Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn" +FILES="GSMTAP_PortType.ttcn GSMTAP_Types.ttcn GSM_SystemInformation.ttcn GSM_RestOctets.ttcn GSM_RR_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_Types.ttcn IPL4_GSMTAP_CtrlFunct.ttcn IPL4_GSMTAP_CtrlFunctDef.cc Osmocom_Types.ttcn Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn" gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f00dd0b4863582fc5edf08149103150b8b5e97b Gerrit-Change-Number: 19148 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 16:55:11 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 16:55:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_SystemInformation: add SI2quater In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 ) Change subject: GSM_SystemInformation: add SI2quater ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149/3/library/GSM_SystemInformation.ttcn File library/GSM_SystemInformation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149/3/library/GSM_SystemInformation.ttcn at 147 PS3, Line 147: rest_octets > Let's please use consistent spacing: a tab, or even two in this case. oh gawd i hate tabs like that but ok whatever rant: a) you have to fiddle around with the right amount of tabs to achieve line up b) when reading, you get mixed up which var has which type when your eye skips a line in the blank gap c) my editor doesn't do this automatically so i have to manually adjust every time -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I879c37eb51ece55d79346c6bf1a4951c3f11c77e Gerrit-Change-Number: 19149 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 16:55:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 17:06:02 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 17:06:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_SystemInformation: add SI2quater In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 ) Change subject: GSM_SystemInformation: add SI2quater ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149/3/library/GSM_SystemInformation.ttcn File library/GSM_SystemInformation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149/3/library/GSM_SystemInformation.ttcn at 147 PS3, Line 147: rest_octets > oh gawd i hate tabs like that but ok whatever [?] I am also not happy about the mixed tab/space alignment that we use in C for functions with multi-line arguments, but if I see that all functions in a file are aligned, I will also do this. Neither my editor does this automatically, so I do this myself too. Everybody could just say "I prefer this way" or "I hate this thing", but in the end our code would turn into a mix of different styles and preferences. And nobody would be happy in the end. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I879c37eb51ece55d79346c6bf1a4951c3f11c77e Gerrit-Change-Number: 19149 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 17:06:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 17:06:35 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 17:06:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add first test to verify System Information on RSL startup In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 ) Change subject: bsc: add first test to verify System Information on RSL startup ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062/6/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062/6/bsc/BSC_Tests.ttcn at 439 PS6, Line 439: }; > Did you think about moving this to a separate helper file? It's quite a lot of lines and BSC_Tests. [?] no, didn't consider it. it's big but does it matter? I'd be fine if someone else wants to move to a separate file later ... ? I can't be bothered tbh. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 06 Jul 2020 17:06:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 17:07:59 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 17:07:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add SI2quater tests for multiple EARFCNs In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 ) Change subject: bsc: add SI2quater tests for multiple EARFCNs ...................................................................... Patch Set 3: > Patch Set 3: Code-Review-1 > > Please use use template inheritance (see 'modifies' keyword [1]), so there would be no need to define the same template with the same fields (with some exceptions) again and again. See also [2]. In your case, incremental inheritance should be possible, i.e. the template with 2 E-ARFCNs may be inherited from the template with 1 E-ARFCN, the one with 3 E-ARFCNs may be inherited from the old with 2 E-ARFCNs and so on. > > [1] ETSI ES 201 873-1, section 15.5 "Modified templates" > [2] https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 ah yes I was planning on that but forgot when all the tests were nice and green :P -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I45382f88686ca60e68569e93569fc4cfb63a0e0d Gerrit-Change-Number: 19152 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Comment-Date: Mon, 06 Jul 2020 17:07:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 17:10:40 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 6 Jul 2020 17:10:40 +0000 Subject: Change in osmo-mgw[master]: endp: add typeset for e1-endpoints In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18755 ) Change subject: endp: add typeset for e1-endpoints ...................................................................... endp: add typeset for e1-endpoints Add an endpoint typeset for E1 support, also lets add dummy callbacks for the cleanup and rtp dispatch functionality. Related: OS#2547 Change-Id: I68b719a906e8f7251f0ca8c74ceec73bc40376f7 --- M include/osmocom/mgcp/mgcp_endp.h M include/osmocom/mgcp/mgcp_internal.h M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_network.c 4 files changed, 41 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h index 8fb8d2c..0f9110c 100644 --- a/include/osmocom/mgcp/mgcp_endp.h +++ b/include/osmocom/mgcp/mgcp_endp.h @@ -60,6 +60,7 @@ /*! MGCP endpoint typeset */ struct mgcp_endpoint_typeset { struct mgcp_endpoint_type rtp; + struct mgcp_endpoint_type e1; }; /*! static MGCP endpoint typeset (pre-initalized, read-only) */ diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h index f143988..e415bbc 100644 --- a/include/osmocom/mgcp/mgcp_internal.h +++ b/include/osmocom/mgcp/mgcp_internal.h @@ -262,6 +262,9 @@ int mgcp_dispatch_rtp_bridge_cb(int proto, struct sockaddr_in *addr, char *buf, unsigned int buf_size, struct mgcp_conn *conn); void mgcp_cleanup_rtp_bridge_cb(struct mgcp_endpoint *endp, struct mgcp_conn *conn); +int mgcp_dispatch_e1_bridge_cb(int proto, struct sockaddr_in *addr, char *buf, + unsigned int buf_size, struct mgcp_conn *conn); +void mgcp_cleanup_e1_bridge_cb(struct mgcp_endpoint *endp, struct mgcp_conn *conn); int mgcp_bind_net_rtp_port(struct mgcp_endpoint *endp, int rtp_port, struct mgcp_conn_rtp *conn); void mgcp_free_rtp_port(struct mgcp_rtp_end *end); diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index db8898b..94d4083 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -28,9 +28,17 @@ /* Endpoint typeset definition */ const struct mgcp_endpoint_typeset ep_typeset = { /* Specify endpoint properties for RTP endpoint */ - .rtp.max_conns = 2, - .rtp.dispatch_rtp_cb = mgcp_dispatch_rtp_bridge_cb, - .rtp.cleanup_cb = mgcp_cleanup_rtp_bridge_cb + .rtp = { + .max_conns = 2, + .dispatch_rtp_cb = mgcp_dispatch_rtp_bridge_cb, + .cleanup_cb = mgcp_cleanup_rtp_bridge_cb, + }, + /* Specify endpoint properties for E1 endpoint */ + .e1 = { + .max_conns = 1, + .dispatch_rtp_cb = mgcp_dispatch_e1_bridge_cb, + .cleanup_cb = mgcp_cleanup_e1_bridge_cb, + }, }; /* Generate virtual endpoint name from given parameters */ diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 3d01918..a0714c1 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1328,6 +1328,23 @@ } +/*! dispatch incoming RTP packet to E1 subslot, handle RTCP packets locally. + * \param[in] proto protocol (MGCP_CONN_TYPE_RTP or MGCP_CONN_TYPE_RTCP). + * \param[in] addr socket address where the RTP packet has been received from. + * \param[in] buf buffer that hold the RTP payload. + * \param[in] buf_size size data length of buf. + * \param[in] conn originating connection. + * \returns 0 on success, -1 on ERROR. */ +int mgcp_dispatch_e1_bridge_cb(int proto, struct sockaddr_in *addr, char *buf, + unsigned int buf_size, struct mgcp_conn *conn) +{ + /* FIXME: integrate E1 support from libsomoabis, also implement + * handling for RTCP packets, which can not converted to E1. */ + LOGPCONN(conn, DRTP, LOGL_FATAL, + "cannot dispatch! E1 support is not implemented yet!\n"); + return -1; +} + /*! cleanup an endpoint when a connection on an RTP bridge endpoint is removed. * \param[in] endp Endpoint on which the connection resides. * \param[in] conn Connection that is about to be removed (ignored). */ @@ -1346,6 +1363,15 @@ } } +/*! cleanup an endpoint when a connection on an E1 endpoint is removed. + * \param[in] endp Endpoint on which the connection resides. + * \param[in] conn Connection that is about to be removed (ignored). */ +void mgcp_cleanup_e1_bridge_cb(struct mgcp_endpoint *endp, struct mgcp_conn *conn) +{ + LOGPCONN(conn, DRTP, LOGL_FATAL, + "cannot dispatch! E1 support is not implemented yet!\n"); +} + /* Handle incoming RTP data from NET */ static int rtp_data_net(struct osmo_fd *fd, unsigned int what) { -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I68b719a906e8f7251f0ca8c74ceec73bc40376f7 Gerrit-Change-Number: 18755 Gerrit-PatchSet: 10 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 17:24:37 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 6 Jul 2020 17:24:37 +0000 Subject: Change in osmo-mgw[master]: endp: require domain name also for E1 endpoints In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19074 to look at the new patch set (#6). Change subject: endp: require domain name also for E1 endpoints ...................................................................... endp: require domain name also for E1 endpoints RFC3435 requires an MGW domain name appeneded to every endpoints. When defining endpoint names in Appendix E, the domain name is is not mentioned for digital trunks, however, this does not mean that digital trunks do not have a domain appended. Osmo-mgw currently violates the spec because it explicitly checks if the domain name is _NOT_ present for E1 endpoints. Change-Id: Ibb800b689e090b97b58d0206959b660890acd967 Related: OS#2547 --- M src/libosmo-mgcp/mgcp_endp.c 1 file changed, 14 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/74/19074/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibb800b689e090b97b58d0206959b660890acd967 Gerrit-Change-Number: 19074 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 17:24:37 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 6 Jul 2020 17:24:37 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: add function to generate e1-endpoint names In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19075 to look at the new patch set (#6). Change subject: mgcp_client: add function to generate e1-endpoint names ...................................................................... mgcp_client: add function to generate e1-endpoint names mgcp_client.h offers functions to generate endpoint names for wildcarded request. This is used in osmo-bsc, lets now also add a function that can generate e1-endpoint names. Change-Id: Iec35b5bae8a7b07ddb3559f7114a24dcd10e8f14 Related: OS#2547 --- M include/osmocom/mgcp_client/mgcp_client.h M src/libosmo-mgcp-client/mgcp_client.c 2 files changed, 62 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/75/19075/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iec35b5bae8a7b07ddb3559f7114a24dcd10e8f14 Gerrit-Change-Number: 19075 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 17:24:37 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 6 Jul 2020 17:24:37 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: be more specific about E1 trunks In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19103 to look at the new patch set (#5). Change subject: mgcp_vty: be more specific about E1 trunks ...................................................................... mgcp_vty: be more specific about E1 trunks Currently only E1 trunks can be crated using the node "trunk". However, should we ever introduce another trunk type we will not be able to distinguish the new trunk type. Lets rename "trunk" to "trunk-e1" along with its underlying constants and function names so that we can easily add another "trunk-t1" for example without making old configs incompatible with the old concept. Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e Related: OS#2659 --- M include/osmocom/mgcp/vty.h M src/libosmo-mgcp/mgcp_vty.c M src/osmo-mgw/mgw_main.c 3 files changed, 34 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/03/19103/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e Gerrit-Change-Number: 19103 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 17:24:40 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 6 Jul 2020 17:24:40 +0000 Subject: Change in osmo-mgw[master]: mgcp_conn: move struct mgcp_conn mgcp_conn.h References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19163 ) Change subject: mgcp_conn: move struct mgcp_conn mgcp_conn.h ...................................................................... mgcp_conn: move struct mgcp_conn mgcp_conn.h The struct mgcp_conn is currently defined in mgcp_internal.h, however it makes more sense to put the struct in mgcp_conn.h Change-Id: Ibe9a356300ddb9567432fe48e37c956b7125c79c Related: OS#2659 --- M include/osmocom/mgcp/mgcp_conn.h M include/osmocom/mgcp/mgcp_internal.h 2 files changed, 41 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/63/19163/1 diff --git a/include/osmocom/mgcp/mgcp_conn.h b/include/osmocom/mgcp/mgcp_conn.h index f4e89f2..ff5a779 100644 --- a/include/osmocom/mgcp/mgcp_conn.h +++ b/include/osmocom/mgcp/mgcp_conn.h @@ -33,6 +33,47 @@ (conn)->id, \ ## args) +/*! Connection type, specifies which member of the union "u" in mgcp_conn + * contains a useful connection description (currently only RTP) */ +enum mgcp_conn_type { + MGCP_CONN_TYPE_RTP, +}; + +/*! MGCP connection (untyped) */ +struct mgcp_conn { + /*! list head */ + struct llist_head entry; + + /*! Backpointer to the endpoint where the conn belongs to */ + struct mgcp_endpoint *endp; + + /*! type of the connection (union) */ + enum mgcp_conn_type type; + + /*! mode of the connection */ + enum mgcp_connection_mode mode; + + /*! copy of the mode to restore the original setting (VTY) */ + enum mgcp_connection_mode mode_orig; + + /*! connection id to identify the connection */ + char id[MGCP_CONN_ID_MAXLEN]; + + /*! 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; + } u; + + /*! pointer to optional private data */ + void *priv; +}; + /* RTP connection related counters */ enum { IN_STREAM_ERR_TSTMP_CTR, diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h index e415bbc..a9d5ea4 100644 --- a/include/osmocom/mgcp/mgcp_internal.h +++ b/include/osmocom/mgcp/mgcp_internal.h @@ -153,7 +153,6 @@ }; #include -struct mgcp_conn; /* MGCP connection (RTP) */ struct mgcp_conn_rtp { @@ -196,47 +195,6 @@ struct rate_ctr_group *rate_ctr_group; }; -/*! Connection type, specifies which member of the union "u" in mgcp_conn - * contains a useful connection description (currently only RTP) */ -enum mgcp_conn_type { - MGCP_CONN_TYPE_RTP, -}; - -/*! MGCP connection (untyped) */ -struct mgcp_conn { - /*! list head */ - struct llist_head entry; - - /*! Backpointer to the endpoint where the conn belongs to */ - struct mgcp_endpoint *endp; - - /*! type of the connection (union) */ - enum mgcp_conn_type type; - - /*! mode of the connection */ - enum mgcp_connection_mode mode; - - /*! copy of the mode to restore the original setting (VTY) */ - enum mgcp_connection_mode mode_orig; - - /*! connection id to identify the connection */ - char id[MGCP_CONN_ID_MAXLEN]; - - /*! 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; - } u; - - /*! pointer to optional private data */ - void *priv; -}; - #include struct mgcp_endpoint_type; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19163 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibe9a356300ddb9567432fe48e37c956b7125c79c Gerrit-Change-Number: 19163 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 17:24:41 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 6 Jul 2020 17:24:41 +0000 Subject: Change in osmo-mgw[master]: mgcp_internal: remove forward declaration struct mgcp_endpoint_type References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19164 ) Change subject: mgcp_internal: remove forward declaration struct mgcp_endpoint_type ...................................................................... mgcp_internal: remove forward declaration struct mgcp_endpoint_type In is no longer needed to define struct mgcp_endpoint_type in mgcp_internal.h Change-Id: Iecea75e5620e8a2f1fd2066949c116bf72320aca Related: OS#2659 --- M include/osmocom/mgcp/mgcp_internal.h 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/64/19164/1 diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h index a9d5ea4..ec3ce31 100644 --- a/include/osmocom/mgcp/mgcp_internal.h +++ b/include/osmocom/mgcp/mgcp_internal.h @@ -197,12 +197,6 @@ #include -struct mgcp_endpoint_type; - - - - - /** * Internal structure while parsing a request */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iecea75e5620e8a2f1fd2066949c116bf72320aca Gerrit-Change-Number: 19164 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 17:24:41 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 6 Jul 2020 17:24:41 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: remove trunk2 from unit-test References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19165 ) Change subject: mgcp_test: remove trunk2 from unit-test ...................................................................... mgcp_test: remove trunk2 from unit-test Some of the unit-tests initalize a second trunk (trunk2) but the test never do anything with this trunk. Lets remove it. Change-Id: I228aa45160152091baac9d9c2e6486b774278b6a Related: OS#2659 --- M tests/mgcp/mgcp_test.c 1 file changed, 0 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/65/19165/1 diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index c0e70d3..f934c43 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -761,7 +761,6 @@ struct mgcp_config *cfg; struct mgcp_endpoint *endp; struct mgcp_trunk *trunk; - struct mgcp_trunk *trunk2; int i; struct mgcp_conn_rtp *conn = NULL; char last_conn_id[256]; @@ -776,9 +775,6 @@ memset(last_conn_id, 0, sizeof(last_conn_id)); - trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1); - mgcp_trunk_alloc_endpts(trunk2); - for (i = 0; i < ARRAY_SIZE(tests); i++) { const struct mgcp_test *t = &tests[i]; struct msgb *inp; @@ -895,7 +891,6 @@ } } - mgcp_endpoints_release(trunk2); mgcp_endpoints_release(trunk); talloc_free(cfg); } @@ -904,7 +899,6 @@ { struct mgcp_config *cfg; struct mgcp_trunk *trunk; - struct mgcp_trunk *trunk2; int i; char last_conn_id[256]; int rc; @@ -917,9 +911,6 @@ memset(last_conn_id, 0, sizeof(last_conn_id)); - trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1); - mgcp_trunk_alloc_endpts(trunk2); - for (i = 0; i < ARRAY_SIZE(retransmit); i++) { const struct mgcp_test *t = &retransmit[i]; struct msgb *inp; @@ -958,7 +949,6 @@ msgb_free(msg); } - mgcp_endpoints_release(trunk2); mgcp_endpoints_release(trunk); talloc_free(cfg); } @@ -974,7 +964,6 @@ { struct mgcp_config *cfg; struct mgcp_trunk *trunk; - struct mgcp_trunk *trunk2; struct msgb *inp, *msg; char conn_id[256]; @@ -985,9 +974,6 @@ trunk->virtual.vty_number_endpoints = 64; mgcp_trunk_alloc_endpts(trunk); - trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1); - mgcp_trunk_alloc_endpts(trunk2); - inp = create_msg(CRCX, NULL); msg = mgcp_handle_message(cfg, inp); OSMO_ASSERT(msg); @@ -1015,7 +1001,6 @@ inp = create_msg(DLCX, conn_id); msgb_free(mgcp_handle_message(cfg, inp)); msgb_free(inp); - mgcp_endpoints_release(trunk2); mgcp_endpoints_release(trunk); talloc_free(cfg); } @@ -1383,7 +1368,6 @@ { struct mgcp_config *cfg; struct mgcp_trunk *trunk; - struct mgcp_trunk *trunk2; struct mgcp_endpoint *endp; struct msgb *inp, *resp; struct in_addr addr; @@ -1398,9 +1382,6 @@ mgcp_trunk_alloc_endpts(trunk); cfg->policy_cb = mgcp_test_policy_cb; - trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1); - mgcp_trunk_alloc_endpts(trunk2); - /* Allocate endpoint 1 at mgw with two codecs */ last_endpoint[0] = '\0'; inp = create_msg(CRCX_MULT_1, NULL); @@ -1523,7 +1504,6 @@ OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 0); - mgcp_endpoints_release(trunk2); mgcp_endpoints_release(trunk); talloc_free(cfg); } @@ -1582,7 +1562,6 @@ static void test_no_name(void) { struct mgcp_trunk *trunk; - struct mgcp_trunk *trunk2; struct mgcp_config *cfg; struct msgb *inp, *msg; @@ -1596,9 +1575,6 @@ cfg->policy_cb = mgcp_test_policy_cb; - trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1); - mgcp_trunk_alloc_endpts(trunk2); - inp = create_msg(CRCX, NULL); msg = mgcp_handle_message(cfg, inp); @@ -1610,7 +1586,6 @@ msgb_free(inp); msgb_free(msg); - mgcp_endpoints_release(trunk2); mgcp_endpoints_release(trunk); talloc_free(cfg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I228aa45160152091baac9d9c2e6486b774278b6a Gerrit-Change-Number: 19165 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 17:24:41 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 6 Jul 2020 17:24:41 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: add function to claim an endpoint References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19166 ) Change subject: mgcp_endp: add function to claim an endpoint ...................................................................... mgcp_endp: add function to claim an endpoint At the moment where the first CRCX writes the CALLID to the endp struct the endpoint is marked as "serving a call", which could also be described as a "claimed" state. Lets have a function to do that. This way we also create an entry point where the endpoint could call some type specific initalization functions. Change-Id: I402ac43dffd2c85789e4f0308a540e227063cc28 Related: OS#2659 --- M include/osmocom/mgcp/mgcp_endp.h M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_protocol.c 3 files changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/66/19166/1 diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h index 879947b..22a1b81 100644 --- a/include/osmocom/mgcp/mgcp_endp.h +++ b/include/osmocom/mgcp/mgcp_endp.h @@ -109,6 +109,7 @@ struct mgcp_endpoint *mgcp_endp_alloc(struct mgcp_trunk *trunk, unsigned int index); void mgcp_endp_release(struct mgcp_endpoint *endp); +void mgcp_endp_claim(struct mgcp_endpoint *endp, const char *callid); struct mgcp_endpoint *mgcp_endp_by_name_trunk(int *cause, const char *epname, const struct mgcp_trunk *trunk); struct mgcp_endpoint *mgcp_endp_by_name(int *cause, const char *epname, diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index eac5832..d745aff 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -151,6 +151,19 @@ endp->wildcarded_req = false; } +/*! claim endpoint, sets callid and initializes endpoint. + * \param[in] endp endpoint to release */ +void mgcp_endp_claim(struct mgcp_endpoint *endp, const char *callid) +{ + /* TODO: Make this function more intelligent, it should run the + * call id checks we currently have in protocol.c directly here. */ + + /* Set the callid, creation of another connection will only be possible + * when the callid matches up. (Connections are distinguished by their + * connection ids) */ + endp->callid = talloc_strdup(endp, callid); +} + /* Check if the endpoint name contains the prefix (e.g. "rtpbridge/" or * "ds/e1-") and write the epname without the prefix back to the memory * pointed at by epname. (per trunk the prefix is the same for all endpoints, diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index f2fc20c..5d9509a 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -855,7 +855,7 @@ /* Set the callid, creation of another connection will only be possible * when the callid matches up. (Connections are distinguished by their * connection ids) */ - endp->callid = talloc_strdup(trunk->endpoints, callid); + mgcp_endp_claim(endp, callid); snprintf(conn_name, sizeof(conn_name), "%s", callid); _conn = mgcp_conn_alloc(trunk->endpoints, endp, MGCP_CONN_TYPE_RTP, conn_name); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I402ac43dffd2c85789e4f0308a540e227063cc28 Gerrit-Change-Number: 19166 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:01:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:01:01 +0000 Subject: Change in osmo-mgw[master]: mgcp_conn: move struct mgcp_conn mgcp_conn.h In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19163 ) Change subject: mgcp_conn: move struct mgcp_conn mgcp_conn.h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19163 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibe9a356300ddb9567432fe48e37c956b7125c79c Gerrit-Change-Number: 19163 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 06 Jul 2020 19:01:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:01:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:01:15 +0000 Subject: Change in osmo-mgw[master]: mgcp_internal: remove forward declaration struct mgcp_endpoint_type In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19164 ) Change subject: mgcp_internal: remove forward declaration struct mgcp_endpoint_type ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iecea75e5620e8a2f1fd2066949c116bf72320aca Gerrit-Change-Number: 19164 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 06 Jul 2020 19:01:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:01:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:01:23 +0000 Subject: Change in osmo-mgw[master]: mgcp_conn: move struct mgcp_conn mgcp_conn.h In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19163 ) Change subject: mgcp_conn: move struct mgcp_conn mgcp_conn.h ...................................................................... mgcp_conn: move struct mgcp_conn mgcp_conn.h The struct mgcp_conn is currently defined in mgcp_internal.h, however it makes more sense to put the struct in mgcp_conn.h Change-Id: Ibe9a356300ddb9567432fe48e37c956b7125c79c Related: OS#2659 --- M include/osmocom/mgcp/mgcp_conn.h M include/osmocom/mgcp/mgcp_internal.h 2 files changed, 41 insertions(+), 42 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_conn.h b/include/osmocom/mgcp/mgcp_conn.h index f4e89f2..ff5a779 100644 --- a/include/osmocom/mgcp/mgcp_conn.h +++ b/include/osmocom/mgcp/mgcp_conn.h @@ -33,6 +33,47 @@ (conn)->id, \ ## args) +/*! Connection type, specifies which member of the union "u" in mgcp_conn + * contains a useful connection description (currently only RTP) */ +enum mgcp_conn_type { + MGCP_CONN_TYPE_RTP, +}; + +/*! MGCP connection (untyped) */ +struct mgcp_conn { + /*! list head */ + struct llist_head entry; + + /*! Backpointer to the endpoint where the conn belongs to */ + struct mgcp_endpoint *endp; + + /*! type of the connection (union) */ + enum mgcp_conn_type type; + + /*! mode of the connection */ + enum mgcp_connection_mode mode; + + /*! copy of the mode to restore the original setting (VTY) */ + enum mgcp_connection_mode mode_orig; + + /*! connection id to identify the connection */ + char id[MGCP_CONN_ID_MAXLEN]; + + /*! 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; + } u; + + /*! pointer to optional private data */ + void *priv; +}; + /* RTP connection related counters */ enum { IN_STREAM_ERR_TSTMP_CTR, diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h index e415bbc..a9d5ea4 100644 --- a/include/osmocom/mgcp/mgcp_internal.h +++ b/include/osmocom/mgcp/mgcp_internal.h @@ -153,7 +153,6 @@ }; #include -struct mgcp_conn; /* MGCP connection (RTP) */ struct mgcp_conn_rtp { @@ -196,47 +195,6 @@ struct rate_ctr_group *rate_ctr_group; }; -/*! Connection type, specifies which member of the union "u" in mgcp_conn - * contains a useful connection description (currently only RTP) */ -enum mgcp_conn_type { - MGCP_CONN_TYPE_RTP, -}; - -/*! MGCP connection (untyped) */ -struct mgcp_conn { - /*! list head */ - struct llist_head entry; - - /*! Backpointer to the endpoint where the conn belongs to */ - struct mgcp_endpoint *endp; - - /*! type of the connection (union) */ - enum mgcp_conn_type type; - - /*! mode of the connection */ - enum mgcp_connection_mode mode; - - /*! copy of the mode to restore the original setting (VTY) */ - enum mgcp_connection_mode mode_orig; - - /*! connection id to identify the connection */ - char id[MGCP_CONN_ID_MAXLEN]; - - /*! 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; - } u; - - /*! pointer to optional private data */ - void *priv; -}; - #include struct mgcp_endpoint_type; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19163 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibe9a356300ddb9567432fe48e37c956b7125c79c Gerrit-Change-Number: 19163 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:01:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:01:23 +0000 Subject: Change in osmo-mgw[master]: mgcp_internal: remove forward declaration struct mgcp_endpoint_type In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19164 ) Change subject: mgcp_internal: remove forward declaration struct mgcp_endpoint_type ...................................................................... mgcp_internal: remove forward declaration struct mgcp_endpoint_type In is no longer needed to define struct mgcp_endpoint_type in mgcp_internal.h Change-Id: Iecea75e5620e8a2f1fd2066949c116bf72320aca Related: OS#2659 --- M include/osmocom/mgcp/mgcp_internal.h 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h index a9d5ea4..ec3ce31 100644 --- a/include/osmocom/mgcp/mgcp_internal.h +++ b/include/osmocom/mgcp/mgcp_internal.h @@ -197,12 +197,6 @@ #include -struct mgcp_endpoint_type; - - - - - /** * Internal structure while parsing a request */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iecea75e5620e8a2f1fd2066949c116bf72320aca Gerrit-Change-Number: 19164 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:01:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:01:24 +0000 Subject: Change in osmo-mgw[master]: endp: add E1 endpoint interlocking In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18898 ) Change subject: endp: add E1 endpoint interlocking ...................................................................... endp: add E1 endpoint interlocking E1 endpoint names also represent different rates, this may mean that some rate / subslot combinations are not possible because they overlap within nthe timeslot. When the equipment (BSC) is properly configured, this will be no problem, however invalid configuration may cause the selection of overlapping endpoints and this needs to be prevented, and logged. Also rate counters need to be in place. Change-Id: I18e90b10648a7e504371179ad144645fc82e1c27 Related: OS#2547 --- M include/osmocom/mgcp/mgcp_endp.h M include/osmocom/mgcp/mgcp_ratectr.h M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_ratectr.c M src/libosmo-mgcp/mgcp_vty.c 6 files changed, 301 insertions(+), 27 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h index 0f9110c..a58053a 100644 --- a/include/osmocom/mgcp/mgcp_endp.h +++ b/include/osmocom/mgcp/mgcp_endp.h @@ -110,3 +110,4 @@ const struct mgcp_trunk *trunk); struct mgcp_endpoint *mgcp_endp_by_name(int *cause, const char *epname, struct mgcp_config *cfg); +bool mgcp_endp_avail(struct mgcp_endpoint *endp); diff --git a/include/osmocom/mgcp/mgcp_ratectr.h b/include/osmocom/mgcp/mgcp_ratectr.h index a579f5b..d0bc628 100644 --- a/include/osmocom/mgcp/mgcp_ratectr.h +++ b/include/osmocom/mgcp/mgcp_ratectr.h @@ -28,6 +28,7 @@ MGCP_CRCX_FAIL_INVALID_CONN_OPTIONS, MGCP_CRCX_FAIL_CODEC_NEGOTIATION, MGCP_CRCX_FAIL_BIND_PORT, + MGCP_CRCX_FAIL_AVAIL, }; /* Global MCGP MDCX related rate counters */ @@ -45,7 +46,8 @@ MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC, MGCP_MDCX_FAIL_START_RTP, MGCP_MDCX_FAIL_REJECTED_BY_POLICY, - MGCP_MDCX_DEFERRED_BY_POLICY + MGCP_MDCX_DEFERRED_BY_POLICY, + MGCP_MDCX_FAIL_AVAIL, }; /* Global MCGP DLCX related rate counters */ @@ -58,6 +60,7 @@ MGCP_DLCX_FAIL_UNHANDLED_PARAM, MGCP_DLCX_FAIL_REJECTED_BY_POLICY, MGCP_DLCX_DEFERRED_BY_POLICY, + MGCP_DLCX_FAIL_AVAIL, }; /* NOTE: When adding counters, also the dump_ratectr_* routines in vty.c must be updated. */ diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index 94d4083..5e7bebb 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -25,6 +25,33 @@ #include #include +#define E1_TIMESLOTS 32 +#define E1_RATE_MAX 64 +#define E1_OFFS_MAX 8 + +/* A 64k timeslot on an E1 line can be subdevied into the following + * subslot combinations: + * + * subslot: offset: + * [ ][ ][ 16k ][8k_subslot] 0 + * [ ][ 32k ][_subslot__][8k_subslot] 1 + * [ ][ subslot ][ 16k ][8k_subslot] 2 + * [ 64k ][__________][_subslot__][8k_subslot] 3 + * [ timeslot ][ ][ 16k ][8k_subslot] 4 + * [ ][ 32K ][_subslot__][8k_subslot] 5 + * [ ][ subslot ][ 16k ][8k_subslot] 6 + * [ ][ ][ subslot ][8k_subslot] 7 + * + * Since overlapping assignment of subslots is not possible there is a limited + * set of subslot assignments possible. The e1_rates array lists the possible + * assignments as depicted above. Also each subslot assignment comes along with + * a bit offset in the E1 bitstream. The e1_offsets arrays lists the bit + * offsets. */ +static const uint8_t e1_rates[] = + { 64, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 8, 8, 8 }; +static const uint8_t e1_offsets[] = + { 0, 0, 4, 0, 2, 4, 6, 0, 1, 2, 3, 4, 5, 6, 7 }; + /* Endpoint typeset definition */ const struct mgcp_endpoint_typeset ep_typeset = { /* Specify endpoint properties for RTP endpoint */ @@ -53,35 +80,13 @@ static char *gen_e1_epname(void *ctx, uint8_t trunk_nr, uint8_t ts_nr, uint8_t ss_nr) { - /* A 64k timeslot on an E1 line can be subdevied into the following - * subslot combinations: - * - * subslot: offset: - * [ ][ ][ 16k ][8k_subslot] 0 - * [ ][ 32k ][_subslot__][8k_subslot] 1 - * [ ][ subslot ][ 16k ][8k_subslot] 2 - * [ 64k ][__________][_subslot__][8k_subslot] 3 - * [ timeslot ][ ][ 16k ][8k_subslot] 4 - * [ ][ 32K ][_subslot__][8k_subslot] 5 - * [ ][ subslot ][ 16k ][8k_subslot] 6 - * [ ][ ][ subslot ][8k_subslot] 7 - * - * Since overlapping assignment of subsolts is not possible there is - * a limited set of subsolt assignments possible. The rates array - * lists the possible assignments as depicted above. Also each subslot - * assignment comes along with a bit offset in the E1 bitstream. The - * offsets arrays lists the bit offsets. */ - static const uint8_t rates[] = - { 64, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 8, 8, 8 }; - static const uint8_t offsets[] = - { 0, 0, 4, 0, 2, 4, 6, 0, 1, 2, 3, 4, 5, 6, 7 }; unsigned int rate; unsigned int offset; - OSMO_ASSERT(ss_nr < sizeof(rates)); + OSMO_ASSERT(ss_nr < sizeof(e1_rates)); - rate = rates[ss_nr]; - offset = offsets[ss_nr]; + rate = e1_rates[ss_nr]; + offset = e1_offsets[ss_nr]; return talloc_asprintf(ctx, "%s%u/s-%u/su%u-%u", MGCP_ENDPOINT_PREFIX_E1_TRUNK, trunk_nr, ts_nr, rate, offset); @@ -213,7 +218,9 @@ for (i = 0; i < trunk->number_endpoints; i++) { endp = trunk->endpoints[i]; - if (endp->callid == NULL) + /* A free endpoint must not serve a call already and it must + * be available. */ + if (endp->callid == NULL && mgcp_endp_avail(endp)) return endp; } @@ -362,3 +369,247 @@ *cause = 0; return endp; } + +/* Get the E1 timeslot number from a given E1 endpoint name + * (e.g. ds/e1-0/s-30/su16-4), returns 0xff on error. */ +static uint8_t e1_ts_nr_from_epname(const char *epname) +{ + char buf[MGCP_ENDPOINT_MAXLEN + 1]; + char *save_ptr = NULL; + char *buf_ptr = buf; + char *token; + unsigned long int res = 0; + + strncpy(buf, epname, MGCP_ENDPOINT_MAXLEN); + + while (1) { + token = strtok_r(buf_ptr, "/", &save_ptr); + buf_ptr = NULL; + if (!token) + break; + if (strncmp(token, "s-", 2) == 0) { + errno = 0; + res = strtoul(token + 2, NULL, 10); + if (errno == ERANGE || res > E1_TIMESLOTS) + return 0xff; + return (uint8_t) res; + } + } + + return 0xff; +} + +/* Get the E1 timeslot number from a given E1 endpoint name + * (e.g. ds/e1-0/s-30/su16-4), returns 0xff on error. */ +static uint8_t e1_rate_from_epname(const char *epname) +{ + char buf[MGCP_ENDPOINT_MAXLEN + 1]; + char *save_ptr = NULL; + char *buf_ptr = buf; + char *token; + unsigned long int res = 0; + unsigned int i; + + strncpy(buf, epname, MGCP_ENDPOINT_MAXLEN); + + while (1) { + token = strtok_r(buf_ptr, "/", &save_ptr); + buf_ptr = NULL; + if (!token) + break; + if (strncmp(token, "su", 2) == 0) { + errno = 0; + res = strtoul(token + 2, NULL, 10); + if (errno == ERANGE || res > E1_RATE_MAX) + return 0xff; + /* Make sure the rate is a valid rate */ + for (i = 0; i < sizeof(e1_rates); i++) { + if (res == e1_rates[i]) + return (uint8_t) res; + } + return 0xff; + } + } + + return 0xff; +} + +/* Get the E1 bitstream offset from a given E1 endpoint name + * (e.g. ds/e1-0/s-30/su16-4), returns 0xff on error. */ +static uint8_t e1_offs_from_epname(const char *epname) +{ + char buf[MGCP_ENDPOINT_MAXLEN + 1]; + char *save_ptr = NULL; + char *buf_ptr = buf; + char *token; + unsigned long int res = 0; + + strncpy(buf, epname, MGCP_ENDPOINT_MAXLEN); + + while (1) { + token = strtok_r(buf_ptr, "/", &save_ptr); + buf_ptr = NULL; + if (!token) + break; + if (strncmp(token, "su", 2) == 0) { + token = strstr(token, "-"); + if (!token) + return 0xff; + token += 1; + errno = 0; + res = strtoul(token, NULL, 10); + if (errno == ERANGE || res > E1_OFFS_MAX) + return 0xff; + return (uint8_t) res; + } + } + + return 0xff; +} + +/* Get the E1 subslot number (internal) from a given E1 endpoint name + * (e.g. ds/e1-0/s-30/su16-4), returns 0xff on error. */ +static uint8_t e1_ss_nr_from_epname(const char *epname) +{ + uint8_t rate; + uint8_t offs; + unsigned int i; + + rate = e1_rate_from_epname(epname); + offs = e1_offs_from_epname(epname); + + osmo_static_assert(sizeof(e1_rates) == sizeof(e1_offsets), e1_rates_e1_offsets_size); + + for (i = 0; i < sizeof(e1_rates); i++) { + if ((e1_rates[i] == rate) && (e1_offsets[i] == offs)) + return i; + } + + return 0xff; +} + +/* Check if the selected E1 endpoint is avalable, which means that none of + * the overlapping endpoints are currently serving a call. (if the system + * is properly configured such a situation should never ocurr!) */ +static bool endp_avail_e1(struct mgcp_endpoint *endp) +{ + /* The following map shows the overlapping of the subslots and their + * respective rates. The numbers on the right running from top to bottom + * are the bit offsets in the whole 64k timeslot. The numbers inside the + * boxes symbolize the internal subslot number (array index) and the + * rate in the form: i:r where i is the subslot number and r the + * respective rate. + * + * +--------+--------+--------+--------+ 0 + * | | | | 7:8k | + * | | + 3:16k +--------+ 1 + * | | | | 8:8k | + * | | 1:32k +--------+--------+ 2 + * | | | | 9:8k | + * | | + 4:16k +--------+ 3 + * | | | | 10:8k | + * | 0:64k +--------+--------+--------+ 4 + * | | | | 11:8k | + * | | + 5:16k +--------+ 5 + * | | | | 12:8k | + * | | 2:32k +--------+--------+ 6 + * | | | | 13:8k | + * | | + 6:16k +--------+ 7 + * | | | | 14:8k | + * +--------+--------+--------+--------+ 8 + * + * The following array contains tables with the subslot numbers that must be + * unused for each subslot. During this test we do not have to check the + * endpoint we need to verify, only the overlaps need to be checked. This is + * also the reason why the related subslot number is missing from each each + * line. */ + const int8_t interlock_tab[15][16] = + { { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, -1 }, + { 0, 3, 4, 7, 8, 9, 10, -1, -1, -1, -1, -1, -1, -1, -1 }, + { 0, 5, 6, 11, 12, 13, 14, -1, -1, -1, -1, -1, -1, -1, -1 }, + { 0, 1, 7, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { 0, 1, 9, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { 0, 2, 11, 12, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { 0, 2, 13, 14, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { 0, 1, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { 0, 1, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { 0, 1, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { 0, 1, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { 0, 2, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { 0, 2, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { 0, 2, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { 0, 2, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 } }; + + const int8_t *interlock; + unsigned int i; + uint8_t ts_nr = 0; + uint8_t ss_nr = 0; + char *epname_check; + struct mgcp_endpoint *endp_check; + bool available = true; + + /* This function must only be used with E1 type endpoints! */ + OSMO_ASSERT(endp->trunk->trunk_type == MGCP_TRUNK_E1); + + ts_nr = e1_ts_nr_from_epname(endp->name); + ss_nr = e1_ss_nr_from_epname(endp->name); + if (ts_nr == 0xff || ss_nr == 0xff) { + LOGPENDP(endp, DLMGCP, LOGL_ERROR, + "cannot check endpoint availability, endpoint name not parseable!\n"); + return false; + } + + interlock = interlock_tab[ss_nr]; + + for (i = 0; i < sizeof(interlock_tab[0]); i++) { + /* Detect row end */ + if (interlock[i] == -1) + break; + + /* Pick overlapping endpoint to check */ + epname_check = + gen_e1_epname(endp, endp->trunk->trunk_nr, ts_nr, + interlock[i]); + endp_check = find_specific_endpoint(epname_check, endp->trunk); + if (!endp_check) { + LOGPENDP(endp, DLMGCP, LOGL_ERROR, + "cannot check endpoint availability, overlapping endpoint:%s not found!\n", + epname_check); + talloc_free(epname_check); + continue; + } + talloc_free(epname_check); + + /* Check if overlapping endpoint currently serves another call + * (This is an exceptional situation, that should not occur + * in a properly configured environment!) */ + if (endp_check->callid) { + LOGPENDP(endp, DLMGCP, LOGL_ERROR, + "endpoint unavailable - overlapping endpoint:%s already serves a call!\n", + endp_check->name); + available = false; + } + } + + return available; +} + +/*! check if an endpoint is available for any kind of operation. + * \param[in] endp endpoint to check. + * \returns true if endpoint is avalable, false it is blocked for any reason. */ +bool mgcp_endp_avail(struct mgcp_endpoint *endp) +{ + switch (endp->trunk->trunk_type) { + case MGCP_TRUNK_VIRTUAL: + /* There are no obstacles that may render a virtual trunk + * endpoint unusable, so virtual trunk endpoints are always + * available */ + return true; + case MGCP_TRUNK_E1: + return endp_avail_e1(endp); + default: + OSMO_ASSERT(false); + } + + return false; +} diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 1e393e2..f2fc20c 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -747,6 +747,10 @@ int rc; LOGPENDP(endp, DLMGCP, LOGL_NOTICE, "CRCX: creating new connection ...\n"); + if (!mgcp_endp_avail(endp)) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_AVAIL]); + return create_err_response(NULL, 501, "CRCX", p->trans); + } /* parse CallID C: and LocalParameters L: */ for_each_line(line, p->save) { @@ -1004,6 +1008,11 @@ LOGPENDP(endp, DLMGCP, LOGL_NOTICE, "MDCX: modifying existing connection ...\n"); + if (!mgcp_endp_avail(endp)) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_AVAIL]); + return create_err_response(NULL, 501, "MDCX", p->trans); + } + /* Prohibit wildcarded requests */ if (endp->wildcarded_req) { LOGPENDP(endp, DLMGCP, LOGL_ERROR, @@ -1224,6 +1233,11 @@ LOGPENDP(endp, DLMGCP, LOGL_NOTICE, "DLCX: deleting connection ...\n"); + if (!mgcp_endp_avail(endp)) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_AVAIL]); + return create_err_response(NULL, 501, "DLCX", p->trans); + } + /* Prohibit wildcarded requests */ if (endp->wildcarded_req) { LOGPENDP(endp, DLMGCP, LOGL_ERROR, diff --git a/src/libosmo-mgcp/mgcp_ratectr.c b/src/libosmo-mgcp/mgcp_ratectr.c index 302786f..1a89c83 100644 --- a/src/libosmo-mgcp/mgcp_ratectr.c +++ b/src/libosmo-mgcp/mgcp_ratectr.c @@ -63,6 +63,7 @@ [MGCP_CRCX_FAIL_INVALID_CONN_OPTIONS] = { "crcx:conn_opt", "connection options invalid." }, [MGCP_CRCX_FAIL_CODEC_NEGOTIATION] = { "crcx:codec_nego", "codec negotiation failure." }, [MGCP_CRCX_FAIL_BIND_PORT] = { "crcx:bind_port", "port bind failure." }, + [MGCP_CRCX_FAIL_AVAIL] = { "crcx:unavailable", "endpoint unavailable." }, }; const static struct rate_ctr_group_desc mgcp_crcx_ctr_group_desc = { @@ -90,6 +91,7 @@ [MGCP_MDCX_FAIL_START_RTP] = { "mdcx:start_rtp_failure", "failure to start RTP processing." }, [MGCP_MDCX_FAIL_REJECTED_BY_POLICY] = { "mdcx:conn_rejected", "connection rejected by policy." }, [MGCP_MDCX_DEFERRED_BY_POLICY] = { "mdcx:conn_deferred", "connection deferred by policy." }, + [MGCP_MDCX_FAIL_AVAIL] = { "mdcx:unavailable", "endpoint unavailable." }, }; const static struct rate_ctr_group_desc mgcp_mdcx_ctr_group_desc = { @@ -111,6 +113,7 @@ [MGCP_DLCX_FAIL_UNHANDLED_PARAM] = { "dlcx:unhandled_param", "unhandled parameter in DLCX command." }, [MGCP_DLCX_FAIL_REJECTED_BY_POLICY] = { "dlcx:rejected", "connection deletion rejected by policy." }, [MGCP_DLCX_DEFERRED_BY_POLICY] = { "dlcx:deferred", "connection deletion deferred by policy." }, + [MGCP_DLCX_FAIL_AVAIL] = { "dlcx:unavailable", "endpoint unavailable." }, }; const static struct rate_ctr_group_desc mgcp_dlcx_ctr_group_desc = { diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 938eef5..cbff700 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -199,6 +199,8 @@ vty_out(vty, "%s trunk %d endpoint %s:%s", trunk_type == MGCP_TRUNK_VIRTUAL ? "Virtual" : "E1", trunk_nr, endp->name, VTY_NEWLINE); + vty_out(vty, " Availability: %s%s", + mgcp_endp_avail(endp) ? "available" : "not in service", VTY_NEWLINE); if (llist_empty(&endp->conns)) { vty_out(vty, " No active connections%s", VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I18e90b10648a7e504371179ad144645fc82e1c27 Gerrit-Change-Number: 18898 Gerrit-PatchSet: 11 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:03:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:03:37 +0000 Subject: Change in osmo-mgw[master]: endp: require domain name also for E1 endpoints In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19074 ) Change subject: endp: require domain name also for E1 endpoints ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibb800b689e090b97b58d0206959b660890acd967 Gerrit-Change-Number: 19074 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 19:03:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:06:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:06:09 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: add function to generate e1-endpoint names In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19075 ) Change subject: mgcp_client: add function to generate e1-endpoint names ...................................................................... Patch Set 6: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-mgw/+/19075/6/src/libosmo-mgcp-client/mgcp_client.c File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19075/6/src/libosmo-mgcp-client/mgcp_client.c at 934 PS6, Line 934: osmo-mgw only allows a maximum of 64 trunks. The trunk id 0 is : * reserved due to historical reasons. */ : if (trunk_id == 0 || trunk_id > 64) { : LOGP(DLMGCP, LOGL_ERROR, "Cannot compose MGCP e1-endpoint name, trunk number (%u) is not entirely sure if we should constrain the client to what [current] osmo-mgw allows. I would permit it here and have osmo-mgw refuse/reject it, if it is unsupported. https://gerrit.osmocom.org/c/osmo-mgw/+/19075/6/src/libosmo-mgcp-client/mgcp_client.c at 941 PS6, Line 941: An E1 line has a maximum of 32 timeslots, while the first (ts=0) is : * reserverd for signalling, so we can not use it here. */ TS0 is not really used for signalling (Q.931, Abis, SCCP, ...) but for framing/alignment. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iec35b5bae8a7b07ddb3559f7114a24dcd10e8f14 Gerrit-Change-Number: 19075 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 19:06:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:09:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:09:18 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: be more specific about E1 trunks In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19103 ) Change subject: mgcp_vty: be more specific about E1 trunks ...................................................................... Patch Set 5: Code-Review+1 one could argue "trunk e1" (with then later extended to "trunk (e1|t1|stm1)" might be more in line with what we do in other places, but I don't have a strong preference here. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e Gerrit-Change-Number: 19103 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 19:09:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:09:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:09:28 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: use define constant to define max number of E1 subslots In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19118 ) Change subject: mgcp_endp: use define constant to define max number of E1 subslots ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If7cb74e486946aff09e22abf8a8885bf0693f34e Gerrit-Change-Number: 19118 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 19:09:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:10:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:10:11 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: do not access endpoint array elements directly In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19120 ) Change subject: mgcp_test: do not access endpoint array elements directly ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic950c427f23be4a792af94972554637c2b0fbdf2 Gerrit-Change-Number: 19120 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 19:10:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:12:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 6 Jul 2020 19:12:58 +0000 Subject: Change in osmo-bts[master]: bts-trx: introduce TRX provisioning FSM References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19167 ) Change subject: bts-trx: introduce TRX provisioning FSM ...................................................................... bts-trx: introduce TRX provisioning FSM With prior code state managing the TRXC side of osmo-bts-trx, there are plenty o cases (race conditions) where things can go wrong/unexpected, because there's really no infrastructure to wait and synchronize between different TRXs (eg wait until all are configured to POWERON), or to simply keep well known per-trx state regarding lower layers. In order to fix in the future all of those issues and to sanitize current code, a new per-trx FSM is introduced, which takes care of submitting TRXC commands and waiting for response when needed to manage the state of the TRX. Related: OS#4364 Change-Id: I2a00c23df15840e33fbb232c9e1dd6db128f63f6 --- M src/osmo-bts-trx/Makefile.am M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/trx_if.c A src/osmo-bts-trx/trx_provision_fsm.c A src/osmo-bts-trx/trx_provision_fsm.h 6 files changed, 536 insertions(+), 224 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/67/19167/1 diff --git a/src/osmo-bts-trx/Makefile.am b/src/osmo-bts-trx/Makefile.am index ae69000..3bd729f 100644 --- a/src/osmo-bts-trx/Makefile.am +++ b/src/osmo-bts-trx/Makefile.am @@ -47,6 +47,7 @@ sched_lchan_pdtch.c \ sched_lchan_tchf.c \ sched_lchan_tchh.c \ + trx_provision_fsm.c \ trx_vty.c \ loops.c \ $(NULL) diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index a3bdf01..d65900f 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -45,6 +46,7 @@ #include "l1_if.h" #include "trx_if.h" +#include "trx_provision_fsm.h" #define RF_DISABLED_mdB to_mdB(-10) @@ -62,7 +64,7 @@ [GSM_PCHAN_UNKNOWN] = 0, }; -static enum gsm_phys_chan_config transceiver_chan_type_2_pchan(uint8_t type) +enum gsm_phys_chan_config transceiver_chan_type_2_pchan(uint8_t type) { int i; for (i = 0; i < _GSM_PCHAN_MAX; i++) { @@ -77,6 +79,8 @@ struct trx_l1h *l1h; l1h = talloc_zero(tall_ctx, struct trx_l1h); l1h->phy_inst = pinst; + l1h->provision_fi = osmo_fsm_inst_alloc(&trx_prov_fsm, l1h, l1h, LOGL_INFO, NULL); + OSMO_ASSERT(osmo_fsm_inst_update_id_f_sanitize(l1h->provision_fi, '-', phy_instance_name(pinst)) == 0); trx_if_init(l1h); return l1h; } @@ -140,7 +144,7 @@ return trx_sched_set_lchan(&l1h->l1s, gsm_lchan2chan_nr(lchan), LID_SACCH, false); } -static int l1if_trx_start_power_ramp(struct gsm_bts_trx *trx, ramp_compl_cb_t ramp_compl_cb) +int l1if_trx_start_power_ramp(struct gsm_bts_trx *trx, ramp_compl_cb_t ramp_compl_cb) { struct phy_instance *pinst = trx_phy_instance(trx); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; @@ -174,78 +178,6 @@ l1if_trx_start_power_ramp(trx, NULL); } -static void l1if_getnompower_cb(struct trx_l1h *l1h, int nominal_power, int rc) -{ - struct phy_instance *pinst = l1h->phy_inst; - struct gsm_bts_trx *trx = pinst->trx; - - LOGPPHI(pinst, DL1C, LOGL_DEBUG, "l1if_getnompower_cb(nominal_power=%d, rc=%d)\n", nominal_power, rc); - - l1if_trx_set_nominal_power(trx, nominal_power); -} - -static void l1if_setslot_cb(struct trx_l1h *l1h, uint8_t tn, uint8_t type, int rc) -{ - struct phy_instance *pinst = l1h->phy_inst; - struct gsm_bts_trx *trx = pinst->trx; - struct gsm_bts_trx_ts *ts; - enum gsm_phys_chan_config pchan; - - if (tn >= TRX_NR_TS) { - LOGPPHI(pinst, DL1C, LOGL_ERROR, "transceiver SETSLOT invalid param TN (%" PRIu8 ")\n", - tn); - return; - } - - pchan = transceiver_chan_type_2_pchan(type); - if (pchan == GSM_PCHAN_UNKNOWN) { - LOGPPHI(pinst, DL1C, LOGL_ERROR, "transceiver SETSLOT invalid param TS_TYPE (%" PRIu8 ")\n", - type); - return; - } - - ts = &trx->ts[tn]; - LOGPPHI(pinst, DL1C, LOGL_DEBUG, "%s l1if_setslot_cb(as_pchan=%s)," - " calling cb_ts_connected(rc=%d)\n", - gsm_ts_name(ts), gsm_pchan_name(pchan), rc); - cb_ts_connected(ts, rc); -} - -static void l1if_poweronoff_cb(struct trx_l1h *l1h, bool poweronoff, int rc) -{ - struct phy_instance *pinst = l1h->phy_inst; - struct phy_link *plink = pinst->phy_link; - - plink->u.osmotrx.powered = poweronoff; - plink->u.osmotrx.poweronoff_sent = false; - - if (poweronoff) { - if (rc == 0 && plink->state != PHY_LINK_CONNECTED) { - trx_sched_clock_started(pinst->trx->bts); - phy_link_state_set(plink, PHY_LINK_CONNECTED); - - /* Begin to ramp up the power on all TRX associated with this phy */ - llist_for_each_entry(pinst, &plink->instances, list) { - if (pinst->trx->mo.nm_state.administrative == NM_STATE_UNLOCKED) - l1if_trx_start_power_ramp(pinst->trx, NULL); - } - } else if (rc != 0 && plink->state != PHY_LINK_SHUTDOWN) { - trx_sched_clock_stopped(pinst->trx->bts); - phy_link_state_set(plink, PHY_LINK_SHUTDOWN); - } - } else { - if (plink->state != PHY_LINK_SHUTDOWN) { - trx_sched_clock_stopped(pinst->trx->bts); - phy_link_state_set(plink, PHY_LINK_SHUTDOWN); - - /* Notify TRX close on all TRX associated with this phy */ - llist_for_each_entry(pinst, &plink->instances, list) { - bts_model_trx_close_cb(pinst->trx, rc); - } - } - } -} - static void l1if_setpower_att_cb(struct trx_l1h *l1h, int power_att_db, int rc) { struct phy_instance *pinst = l1h->phy_inst; @@ -257,113 +189,6 @@ } /* - * transceiver provisioning - */ -int l1if_provision_transceiver_trx(struct trx_l1h *l1h) -{ - uint8_t tn; - struct phy_instance *pinst = l1h->phy_inst; - struct phy_link *plink = pinst->phy_link; - - /* During setup, pinst may still not be associated to a TRX nr */ - if (!pinst->trx) { - LOGPPHI(pinst, DL1C, LOGL_INFO, - "Delaying provision, TRX not yet assigned to phy instance\n"); - return -EIO; - } - - if (phy_link_state_get(plink) == PHY_LINK_SHUTDOWN) { - LOGPPHI(pinst, DL1C, LOGL_INFO, - "Delaying provision, TRX not yet available\n"); - return -EIO; - } - - if (l1h->config.enabled - && l1h->config.tsc_valid - && l1h->config.bsic_valid - && l1h->config.arfcn_valid) { - /* before power on */ - if (!l1h->config.arfcn_sent) { - trx_if_cmd_rxtune(l1h, l1h->config.arfcn); - trx_if_cmd_txtune(l1h, l1h->config.arfcn); - /* After TXTUNE is sent to TRX, get the tx nominal power - * (which may vary precisly on band/arfcn. Avoid sending - * it if we are forced by VTY to use a specific nominal - * power (because TRX may not support the command or - * provide broken values) */ - if (!l1h->config.nominal_power_set_by_vty) - trx_if_cmd_getnompower(l1h, l1if_getnompower_cb); - l1h->config.arfcn_sent = 1; - } - if (!l1h->config.tsc_sent) { - trx_if_cmd_settsc(l1h, l1h->config.tsc); - l1h->config.tsc_sent = 1; - } - if (!l1h->config.bsic_sent) { - trx_if_cmd_setbsic(l1h, l1h->config.bsic); - l1h->config.bsic_sent = 1; - } - - /* Ask transceiver to use the newest TRXD header version if not using it yet */ - if (!l1h->config.setformat_sent) { - if (l1h->config.trxd_hdr_ver_use != plink->u.osmotrx.trxd_hdr_ver_max) { - trx_if_cmd_setformat(l1h, plink->u.osmotrx.trxd_hdr_ver_max); - l1h->config.trxd_hdr_ver_req = plink->u.osmotrx.trxd_hdr_ver_max; - } else { - LOGPPHI(pinst, DL1C, LOGL_INFO, - "No need to negotiate TRXD version, " - "already using maximum configured one: %" PRIu8 "\n", - l1h->config.trxd_hdr_ver_use); - } - l1h->config.setformat_sent = 1; - } - - if (pinst->num == 0 && !plink->u.osmotrx.powered && !plink->u.osmotrx.poweronoff_sent) { - trx_if_cmd_poweron(l1h, l1if_poweronoff_cb); - plink->u.osmotrx.poweronoff_sent = true; - } - - /* after power on */ - if (l1h->config.rxgain_valid && !l1h->config.rxgain_sent) { - trx_if_cmd_setrxgain(l1h, l1h->config.rxgain); - l1h->config.rxgain_sent = 1; - } - if (l1h->config.maxdly_valid && !l1h->config.maxdly_sent) { - trx_if_cmd_setmaxdly(l1h, l1h->config.maxdly); - l1h->config.maxdly_sent = 1; - } - if (l1h->config.maxdlynb_valid && !l1h->config.maxdlynb_sent) { - trx_if_cmd_setmaxdlynb(l1h, l1h->config.maxdlynb); - l1h->config.maxdlynb_sent = 1; - } - - for (tn = 0; tn < TRX_NR_TS; tn++) { - if (l1h->config.slottype_valid[tn] - && !l1h->config.slottype_sent[tn]) { - trx_if_cmd_setslot(l1h, tn, - l1h->config.slottype[tn], l1if_setslot_cb); - l1h->config.slottype_sent[tn] = 1; - } - } - return 0; - } - - if (!l1h->config.enabled) { - if (pinst->num == 0 && plink->u.osmotrx.powered && !plink->u.osmotrx.poweronoff_sent) { - trx_if_cmd_poweroff(l1h, l1if_poweronoff_cb); - plink->u.osmotrx.poweronoff_sent = true; - } - l1h->config.rxgain_sent = 0; - l1h->config.maxdly_sent = 0; - l1h->config.maxdlynb_sent = 0; - for (tn = 0; tn < TRX_NR_TS; tn++) - l1h->config.slottype_sent[tn] = 0; - } - - return 0; -} - -/* * activation/configuration/deactivation of transceiver's TRX */ @@ -373,11 +198,7 @@ struct phy_instance *pinst = trx_phy_instance(trx); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; - /* power on transceiver, if not already */ - if (!l1h->config.enabled) { - l1h->config.enabled = true; - l1if_provision_transceiver_trx(l1h); - } + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CFG_ENABLE, (void*)(intptr_t)true); if (trx == trx->bts->c0) lchan_init_lapdm(&trx->ts[0].lchan[CCCH_LCHAN]); @@ -411,13 +232,7 @@ struct phy_instance *pinst = trx_phy_instance(trx); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; - /* power off transceiver, if not already */ - if (l1h->config.enabled) { - l1h->config.enabled = false; - l1if_provision_transceiver_trx(l1h); - } else if (!pinst->phy_link->u.osmotrx.poweronoff_sent) { - bts_model_trx_close_cb(trx, 0); - } /* else: poweroff in progress, cb will be called upon TRXC RSP */ + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_POWEROFF, NULL); /* Set to Operational State: Disabled */ check_transceiver_availability_trx(l1h, 0); @@ -446,12 +261,7 @@ struct phy_instance *pinst = trx_phy_instance(trx); struct phy_link *plink = pinst->phy_link; struct trx_l1h *l1h = pinst->u.osmotrx.hdl; - if (l1h->config.bsic != bsic || !l1h->config.bsic_valid) { - l1h->config.bsic = bsic; - l1h->config.bsic_valid = 1; - l1h->config.bsic_sent = 0; - l1if_provision_transceiver_trx(l1h); - } + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CFG_BSIC, (void*)(intptr_t)bsic); check_transceiver_availability_trx(l1h, phy_link_state_get(plink) != PHY_LINK_SHUTDOWN); } @@ -466,12 +276,7 @@ struct phy_link *plink = pinst->phy_link; uint16_t arfcn = trx->arfcn; - if (l1h->config.arfcn != arfcn || !l1h->config.arfcn_valid) { - l1h->config.arfcn = arfcn; - l1h->config.arfcn_valid = 1; - l1h->config.arfcn_sent = 0; - l1if_provision_transceiver_trx(l1h); - } + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CFG_ARFCN, (void*)(intptr_t)arfcn); /* Begin to ramp up the power if power reduction is set by OML and TRX is already running. Otherwise skip, power ramping will be started @@ -497,12 +302,7 @@ /* all TSC of all timeslots must be equal, because transceiver only * supports one TSC per TRX */ - if (l1h->config.tsc != tsc || !l1h->config.tsc_valid) { - l1h->config.tsc = tsc; - l1h->config.tsc_valid = 1; - l1h->config.tsc_sent = 0; - l1if_provision_transceiver_trx(l1h); - } + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CFG_TSC, (void*)(intptr_t)tsc); /* ignore disabled slots */ if (!(l1h->config.slotmask & (1 << tn))) @@ -525,13 +325,9 @@ slottype = transceiver_chan_types[pchan]; - if (l1h->config.slottype[tn] != slottype - || !l1h->config.slottype_valid[tn]) { - l1h->config.slottype[tn] = slottype; - l1h->config.slottype_valid[tn] = 1; - l1h->config.slottype_sent[tn] = 0; - l1if_provision_transceiver_trx(l1h); - } + + struct trx_prov_ev_cfg_ts_data data = { .tn = tn, .slottype = slottype }; + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CFG_TS, &data); return 0; } diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h index d2fdf06..07751f2 100644 --- a/src/osmo-bts-trx/l1_if.h +++ b/src/osmo-bts-trx/l1_if.h @@ -114,6 +114,7 @@ /* transceiver config */ struct trx_config config; + struct osmo_fsm_inst *provision_fi; struct l1sched_trx l1s; }; @@ -122,6 +123,8 @@ int l1if_provision_transceiver_trx(struct trx_l1h *l1h); int l1if_mph_time_ind(struct gsm_bts *bts, uint32_t fn); void l1if_trx_set_nominal_power(struct gsm_bts_trx *trx, int nominal_power); +int l1if_trx_start_power_ramp(struct gsm_bts_trx *trx, ramp_compl_cb_t ramp_compl_cb); +enum gsm_phys_chan_config transceiver_chan_type_2_pchan(uint8_t type); static inline struct l1sched_trx *trx_l1sched_hdl(struct gsm_bts_trx *trx) { diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index 7508606..e650d79 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -47,6 +48,7 @@ #include "l1_if.h" #include "trx_if.h" +#include "trx_provision_fsm.h" /* * socket helper functions @@ -1231,12 +1233,6 @@ if (rc < 0) goto err; - /* enable all slots */ - l1h->config.slotmask = 0xff; - - if (pinst->num == 0) - trx_if_cmd_poweroff(l1h, NULL); - return 0; err: @@ -1301,8 +1297,10 @@ /* open the individual instances with their ctrl+data sockets */ llist_for_each_entry(pinst, &plink->instances, list) { + struct trx_l1h *l1h = pinst->u.osmotrx.hdl; if (trx_phy_inst_open(pinst) < 0) goto cleanup; + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_OPEN, NULL); } return 0; diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c new file mode 100644 index 0000000..c3b266d --- /dev/null +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -0,0 +1,459 @@ +/* BTS shutdown FSM */ + +/* (C) 2020 by sysmocom - s.m.f.c. GmbH + * Author: Pau Espin Pedrol + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "l1_if.h" +#include "trx_provision_fsm.h" + +#define X(s) (1 << (s)) + +#define trx_prov_fsm_state_chg(fi, NEXT_STATE) \ + osmo_fsm_inst_state_chg(fi, NEXT_STATE, 0, 0) + +static void l1if_poweronoff_cb(struct trx_l1h *l1h, bool poweronoff, int rc) +{ + struct phy_instance *pinst = l1h->phy_inst; + struct phy_link *plink = pinst->phy_link; + + plink->u.osmotrx.powered = poweronoff; + plink->u.osmotrx.poweronoff_sent = false; + + if (poweronoff) + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_POWERON_CNF, (void*)(intptr_t)rc); + else + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_POWEROFF_CNF, (void*)(intptr_t)rc); +} + +static void l1if_getnompower_cb(struct trx_l1h *l1h, int nominal_power, int rc) +{ + struct phy_instance *pinst = l1h->phy_inst; + struct gsm_bts_trx *trx = pinst->trx; + + LOGPPHI(pinst, DL1C, LOGL_DEBUG, "l1if_getnompower_cb(nominal_power=%d, rc=%d)\n", nominal_power, rc); + + l1if_trx_set_nominal_power(trx, nominal_power); +} + +/* + * transceiver provisioning + */ +int l1if_provision_transceiver_trx(struct trx_l1h *l1h) +{ + struct phy_instance *pinst = l1h->phy_inst; + struct phy_link *plink = pinst->phy_link; + + /* During setup, pinst may still not be associated to a TRX nr */ + if (!pinst->trx) { + LOGPPHI(pinst, DL1C, LOGL_INFO, + "Delaying provision, TRX not yet assigned to phy instance\n"); + return -EIO; + } + + if (phy_link_state_get(plink) == PHY_LINK_SHUTDOWN) { + LOGPPHI(pinst, DL1C, LOGL_INFO, + "Delaying provision, TRX not yet available\n"); + return -EIO; + } + + if (l1h->config.enabled + && l1h->config.tsc_valid + && l1h->config.bsic_valid + && l1h->config.arfcn_valid) { + /* before power on */ + if (!l1h->config.arfcn_sent) { + trx_if_cmd_rxtune(l1h, l1h->config.arfcn); + trx_if_cmd_txtune(l1h, l1h->config.arfcn); + /* After TXTUNE is sent to TRX, get the tx nominal power + * (which may vary precisly on band/arfcn. Avoid sending + * it if we are forced by VTY to use a specific nominal + * power (because TRX may not support the command or + * provide broken values) */ + if (!l1h->config.nominal_power_set_by_vty) + trx_if_cmd_getnompower(l1h, l1if_getnompower_cb); + l1h->config.arfcn_sent = 1; + } + if (!l1h->config.tsc_sent) { + trx_if_cmd_settsc(l1h, l1h->config.tsc); + l1h->config.tsc_sent = 1; + } + if (!l1h->config.bsic_sent) { + trx_if_cmd_setbsic(l1h, l1h->config.bsic); + l1h->config.bsic_sent = 1; + } + + /* Ask transceiver to use the newest TRXD header version if not using it yet */ + if (!l1h->config.setformat_sent) { + if (l1h->config.trxd_hdr_ver_use != plink->u.osmotrx.trxd_hdr_ver_max) { + trx_if_cmd_setformat(l1h, plink->u.osmotrx.trxd_hdr_ver_max); + l1h->config.trxd_hdr_ver_req = plink->u.osmotrx.trxd_hdr_ver_max; + } else { + LOGPPHI(pinst, DL1C, LOGL_INFO, + "No need to negotiate TRXD version, " + "already using maximum configured one: %" PRIu8 "\n", + l1h->config.trxd_hdr_ver_use); + } + l1h->config.setformat_sent = 1; + } + + if (pinst->num == 0 && !plink->u.osmotrx.powered && !plink->u.osmotrx.poweronoff_sent) { + trx_if_cmd_poweron(l1h, l1if_poweronoff_cb); + plink->u.osmotrx.poweronoff_sent = true; + } + + return 0; + } + LOGPPHI(pinst, DL1C, LOGL_INFO, "Delaying provision, TRX attributes not yet received from BSC:%s%s%s%s\n", + l1h->config.enabled ? "" :" enable", + l1h->config.tsc_valid ? "" : " tsc", + l1h->config.bsic_valid ? "" : " bsic", + l1h->config.arfcn_valid ? "" : " arfcn"); + return 1; +} + +static void l1if_setslot_cb(struct trx_l1h *l1h, uint8_t tn, uint8_t type, int rc) +{ + struct phy_instance *pinst = l1h->phy_inst; + struct gsm_bts_trx *trx = pinst->trx; + struct gsm_bts_trx_ts *ts; + enum gsm_phys_chan_config pchan; + + if (tn >= TRX_NR_TS) { + LOGPPHI(pinst, DL1C, LOGL_ERROR, "transceiver SETSLOT invalid param TN (%" PRIu8 ")\n", + tn); + return; + } + + pchan = transceiver_chan_type_2_pchan(type); + if (pchan == GSM_PCHAN_UNKNOWN) { + LOGPPHI(pinst, DL1C, LOGL_ERROR, "transceiver SETSLOT invalid param TS_TYPE (%" PRIu8 ")\n", + type); + return; + } + + ts = &trx->ts[tn]; + LOGPPHI(pinst, DL1C, LOGL_DEBUG, "%s l1if_setslot_cb(as_pchan=%s)," + " calling cb_ts_connected(rc=%d)\n", + gsm_ts_name(ts), gsm_pchan_name(pchan), rc); + cb_ts_connected(ts, rc); +} + +/* Returns true if any TS changed, false otherwise */ +static bool update_ts_data(struct trx_l1h *l1h, struct trx_prov_ev_cfg_ts_data* ts_data) { + + if (l1h->config.slottype[ts_data->tn] != ts_data->slottype || + !l1h->config.slottype_valid[ts_data->tn]) { + l1h->config.slottype[ts_data->tn] = ts_data->slottype; + l1h->config.slottype_valid[ts_data->tn] = 1; + l1h->config.slottype_sent[ts_data->tn] = 0; + return true; + } + return false; +} + + +////////////////////////// +// FSM STATE ACTIONS +////////////////////////// + +static void st_closed(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; + + switch(event) { + case TRX_PROV_EV_OPEN: + /* enable all slots */ + l1h->config.slotmask = 0xff; + if (l1h->phy_inst->num == 0) + trx_if_cmd_poweroff(l1h, NULL); /* TODO: jump to poweroff upon cb received */ + trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_POWEROFF); + break; + } +} + +static void st_open_poweroff(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; + uint8_t bsic; + uint16_t arfcn; + uint16_t tsc; + + switch(event) { + case TRX_PROV_EV_CFG_ENABLE: + l1h->config.enabled =(bool)data; + break; + case TRX_PROV_EV_CFG_BSIC: + bsic = (uint8_t)(intptr_t)data; + if (l1h->config.bsic != bsic || !l1h->config.bsic_valid) { + l1h->config.bsic = bsic; + l1h->config.bsic_valid = 1; + l1h->config.bsic_sent = 0; + } + break; + case TRX_PROV_EV_CFG_ARFCN: + arfcn = (uint16_t)(intptr_t)data; + if (l1h->config.arfcn != arfcn || !l1h->config.arfcn_valid) { + l1h->config.arfcn = arfcn; + l1h->config.arfcn_valid = 1; + l1h->config.arfcn_sent = 0; + } + break; + case TRX_PROV_EV_CFG_TSC: + tsc = (uint16_t)(intptr_t)data; + if (l1h->config.tsc != tsc || !l1h->config.tsc_valid) { + l1h->config.tsc = tsc; + l1h->config.tsc_valid = 1; + l1h->config.tsc_sent = 0; + } + break; + case TRX_PROV_EV_CFG_TS: + update_ts_data(l1h, (struct trx_prov_ev_cfg_ts_data*)data); + break; + } + + /* 0 = if we gathered all date and could go forward :*/ + if (l1if_provision_transceiver_trx(l1h) == 0) { + if (l1h->phy_inst->num == 0) + trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWERON_CNF); + else + trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_POWERON); + } +} + +static void st_open_wait_power_cnf(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; + struct phy_instance *pinst = l1h->phy_inst; + struct phy_link *plink = pinst->phy_link; + int rc; + + switch(event) { + case TRX_PROV_EV_POWERON_CNF: + rc = (uint16_t)(intptr_t)data; + if (rc == 0 && plink->state != PHY_LINK_CONNECTED) { + trx_sched_clock_started(pinst->trx->bts); + phy_link_state_set(plink, PHY_LINK_CONNECTED); + + /* Begin to ramp up the power on all TRX associated with this phy */ + llist_for_each_entry(pinst, &plink->instances, list) { + if (pinst->trx->mo.nm_state.administrative == NM_STATE_UNLOCKED) + l1if_trx_start_power_ramp(pinst->trx, NULL); + } + + trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_POWERON); + } else if (rc != 0 && plink->state != PHY_LINK_SHUTDOWN) { + trx_sched_clock_stopped(pinst->trx->bts); + phy_link_state_set(plink, PHY_LINK_SHUTDOWN); + } + break; + case TRX_PROV_EV_CFG_TS: + update_ts_data(l1h, (struct trx_prov_ev_cfg_ts_data*)data); + break; + } +} + +static void st_open_poweron_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; + uint8_t tn; + + /* after power on */ + if (l1h->config.rxgain_valid && !l1h->config.rxgain_sent) { + trx_if_cmd_setrxgain(l1h, l1h->config.rxgain); + l1h->config.rxgain_sent = 1; + } + if (l1h->config.maxdly_valid && !l1h->config.maxdly_sent) { + trx_if_cmd_setmaxdly(l1h, l1h->config.maxdly); + l1h->config.maxdly_sent = 1; + } + if (l1h->config.maxdlynb_valid && !l1h->config.maxdlynb_sent) { + trx_if_cmd_setmaxdlynb(l1h, l1h->config.maxdlynb); + l1h->config.maxdlynb_sent = 1; + } + + for (tn = 0; tn < TRX_NR_TS; tn++) { + if (l1h->config.slottype_valid[tn] + && !l1h->config.slottype_sent[tn]) { + trx_if_cmd_setslot(l1h, tn, + l1h->config.slottype[tn], l1if_setslot_cb); + l1h->config.slottype_sent[tn] = 1; + } + } +} + +static void st_open_poweron(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; + struct phy_instance *pinst = l1h->phy_inst; + struct phy_link *plink = pinst->phy_link; + struct trx_prov_ev_cfg_ts_data* ts_data; + uint8_t tn; + + switch(event) { + case TRX_PROV_EV_CLOSE: + /* power off transceiver, if not already */ + if (l1h->config.enabled) { + if (pinst->num == 0 && plink->u.osmotrx.powered && !plink->u.osmotrx.poweronoff_sent) { + trx_if_cmd_poweroff(l1h, l1if_poweronoff_cb); + plink->u.osmotrx.poweronoff_sent = true; + } + l1h->config.rxgain_sent = 0; + l1h->config.maxdly_sent = 0; + l1h->config.maxdlynb_sent = 0; + for (tn = 0; tn < TRX_NR_TS; tn++) + l1h->config.slottype_sent[tn] = 0; + } else if (!pinst->phy_link->u.osmotrx.poweronoff_sent) { + bts_model_trx_close_cb(pinst->trx, 0); + } /* else: poweroff in progress, cb will be called upon TRXC RSP */ + + if (pinst->num == 0) + trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF); + else + trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_POWEROFF); + break; + case TRX_PROV_EV_CFG_TS: + ts_data = (struct trx_prov_ev_cfg_ts_data*)data; + if (update_ts_data(l1h, ts_data)) { + trx_if_cmd_setslot(l1h, ts_data->tn, + l1h->config.slottype[ ts_data->tn], l1if_setslot_cb); + l1h->config.slottype_sent[ ts_data->tn] = 1; + } + + break; + } +} + +static void st_open_wait_poweroff_cnf(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; + struct phy_instance *pinst = l1h->phy_inst; + struct phy_link *plink = pinst->phy_link; + int rc; + + switch(event) { + case TRX_PROV_EV_POWEROFF_CNF: + rc = (uint16_t)(intptr_t)data; + if (plink->state != PHY_LINK_SHUTDOWN) { + trx_sched_clock_stopped(pinst->trx->bts); + phy_link_state_set(plink, PHY_LINK_SHUTDOWN); + + /* Notify TRX close on all TRX associated with this phy */ + llist_for_each_entry(pinst, &plink->instances, list) { + bts_model_trx_close_cb(pinst->trx, rc); + } + } + break; + } +} + +static struct osmo_fsm_state trx_prov_fsm_states[] = { + [TRX_PROV_ST_CLOSED] = { + .in_event_mask = + X(TRX_PROV_EV_OPEN), + .out_state_mask = + X(TRX_PROV_ST_OPEN_POWEROFF), + .name = "CLOSED", + .action = st_closed, + }, + [TRX_PROV_ST_OPEN_POWEROFF] = { + .in_event_mask = + X(TRX_PROV_EV_CFG_ENABLE) | + X(TRX_PROV_EV_CFG_BSIC) | + X(TRX_PROV_EV_CFG_ARFCN) | + X(TRX_PROV_EV_CFG_TSC) | + X(TRX_PROV_EV_CFG_TS), + .out_state_mask = + X(TRX_PROV_ST_OPEN_WAIT_POWERON_CNF) | + X(TRX_PROV_ST_OPEN_POWERON), + .name = "OPEN_POWEROFF", + .action = st_open_poweroff, + }, + [TRX_PROV_ST_OPEN_WAIT_POWERON_CNF] = { + .in_event_mask = + X(TRX_PROV_EV_POWERON_CNF) | + X(TRX_PROV_EV_CFG_TS), + .out_state_mask = + X(TRX_PROV_ST_OPEN_POWERON), + .name = "OPEN_WAIT_POWERON_CNF", + .action = st_open_wait_power_cnf, + }, + [TRX_PROV_ST_OPEN_POWERON] = { + .in_event_mask = + X(TRX_PROV_EV_POWEROFF) | + X(TRX_PROV_EV_CFG_TS), + .out_state_mask = + X(TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF) | + X(TRX_PROV_ST_OPEN_POWEROFF), + .name = "OPEN_POWERON", + .onenter = st_open_poweron_on_enter, + .action = st_open_poweron, + }, + [TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF] = { + .in_event_mask = + X(TRX_PROV_EV_POWEROFF_CNF), + .out_state_mask = + X(TRX_PROV_ST_OPEN_POWEROFF), + .name = "OPEN_WAIT_POWEROFF_CNF", + .action = st_open_wait_poweroff_cnf, + }, +}; + +const struct value_string trx_prov_fsm_event_names[] = { + OSMO_VALUE_STRING(TRX_PROV_EV_OPEN), + OSMO_VALUE_STRING(TRX_PROV_EV_CFG_ENABLE), + OSMO_VALUE_STRING(TRX_PROV_EV_CFG_BSIC), + OSMO_VALUE_STRING(TRX_PROV_EV_CFG_ARFCN), + OSMO_VALUE_STRING(TRX_PROV_EV_CFG_TSC), + OSMO_VALUE_STRING(TRX_PROV_EV_CFG_TS), + OSMO_VALUE_STRING(TRX_PROV_EV_CFG_RXGAIN), + OSMO_VALUE_STRING(TRX_PROV_EV_CFG_SETMAXDLY), + OSMO_VALUE_STRING(TRX_PROV_EV_POWERON_CNF), + OSMO_VALUE_STRING(TRX_PROV_EV_POWEROFF), + OSMO_VALUE_STRING(TRX_PROV_EV_POWEROFF_CNF), + OSMO_VALUE_STRING(TRX_PROV_EV_CLOSE), + { 0, NULL } +}; + +struct osmo_fsm trx_prov_fsm = { + .name = "TRX_PROV", + .states = trx_prov_fsm_states, + .num_states = ARRAY_SIZE(trx_prov_fsm_states), + .event_names = trx_prov_fsm_event_names, + .log_subsys = DL1C, +}; + +static __attribute__((constructor)) void trx_prov_fsm_init(void) +{ + OSMO_ASSERT(osmo_fsm_register(&trx_prov_fsm) == 0); +} diff --git a/src/osmo-bts-trx/trx_provision_fsm.h b/src/osmo-bts-trx/trx_provision_fsm.h new file mode 100644 index 0000000..7fede35 --- /dev/null +++ b/src/osmo-bts-trx/trx_provision_fsm.h @@ -0,0 +1,55 @@ +/* Provision TRX over TRXC protocol FSM */ + +/* (C) 2020 by sysmocom - s.m.f.c. GmbH + * Author: Pau Espin Pedrol + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#pragma once + +#include + +enum trx_provision_fsm_states { + TRX_PROV_ST_CLOSED, + TRX_PROV_ST_OPEN_POWEROFF, + TRX_PROV_ST_OPEN_WAIT_POWERON_CNF, + TRX_PROV_ST_OPEN_POWERON, + TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF, +}; + +struct trx_prov_ev_cfg_ts_data { + uint8_t tn; + uint8_t slottype; +}; + +enum trx_provision_fsm_events { + TRX_PROV_EV_OPEN, + TRX_PROV_EV_CFG_ENABLE, + TRX_PROV_EV_CFG_BSIC, + TRX_PROV_EV_CFG_ARFCN, + TRX_PROV_EV_CFG_TSC, + TRX_PROV_EV_CFG_TS, + TRX_PROV_EV_CFG_RXGAIN, + TRX_PROV_EV_CFG_SETMAXDLY, + TRX_PROV_EV_POWERON_CNF, + TRX_PROV_EV_POWEROFF, + TRX_PROV_EV_POWEROFF_CNF, + TRX_PROV_EV_CLOSE, +}; + +extern struct osmo_fsm trx_prov_fsm; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2a00c23df15840e33fbb232c9e1dd6db128f63f6 Gerrit-Change-Number: 19167 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:16:12 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:16:12 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: refactor endpoint number configuration In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19121 ) Change subject: mgcp_vty: refactor endpoint number configuration ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/19121/3/src/libosmo-mgcp/mgcp_trunk.c File src/libosmo-mgcp/mgcp_trunk.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19121/3/src/libosmo-mgcp/mgcp_trunk.c at 45 PS3, Line 45: trunk->virtual.vty_number_endpoints = 32; : trunk->e1.vty_timeslot_first = 1; : trunk->e1.vty_timeslot_num = 2; I would not make this vty configurable. Having to synchronize your configuration files between BSC and MGW all the time becomes a nightmare from a maintenance/operations point of view. I would hope that drivers like DAHDI and osmo-e1d doesn't permit opening the same timeslot multiple times at once? If they refuse to be opened multiple times, then osmo-mgw could simply try to open any timeslot, and return an error if it's already opened (Such as those used for Abis signaling). If DAHDI actually permits opening the same TS multiple times, I suggest we introduce some kind of automatic locking mechanism. For example, osmo-bsc could write a file in /var/lib/osmocom/... which lines/files/.. it has opened and osmo-mgw then reads that file. But this is also "ugly" in a sense that it produces a lot of file I/O and we end up with the problem that libosmo-abis line numbers 0-255 are dynamically mapped (per vty config) to any driver + driver-specific line number, and those configs might not match on osmo-bsc + osmo-mgw. For now, I would simply trust that osmo-bsc is not sending invalid (signaling) timeslotss in endpoint names to osmo-mgw. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Gerrit-Change-Number: 19121 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 06 Jul 2020 19:16:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:16:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:16:22 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: remove trunk2 from unit-test In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19165 ) Change subject: mgcp_test: remove trunk2 from unit-test ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I228aa45160152091baac9d9c2e6486b774278b6a Gerrit-Change-Number: 19165 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 06 Jul 2020 19:16:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:16:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:16:55 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: add function to claim an endpoint In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19166 ) Change subject: mgcp_endp: add function to claim an endpoint ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I402ac43dffd2c85789e4f0308a540e227063cc28 Gerrit-Change-Number: 19166 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 06 Jul 2020 19:16:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:20:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:20:41 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: refactor endpoint number configuration In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19121 ) Change subject: mgcp_vty: refactor endpoint number configuration ...................................................................... Patch Set 3: I just checked the DAHDI source. It seems the dahdi kernel code guards against opening the same timeslot multiple times. We can implement the same in osmo-e1d and then have covered the two most important drivers. mISDN is probably not used much anymore [with libosmo-abis], so I don't think it's worth checking what would happen there. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Gerrit-Change-Number: 19121 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 06 Jul 2020 19:20:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:33:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:33:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_SystemInformation: add SI2quater In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 ) Change subject: GSM_SystemInformation: add SI2quater ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149/3/library/GSM_SystemInformation.ttcn File library/GSM_SystemInformation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149/3/library/GSM_SystemInformation.ttcn at 147 PS3, Line 147: rest_octets > I am also not happy about the mixed tab/space alignment that we use in C for functions with multi-line arguments, but if I see that all functions in a file are aligned, I will also do this. Neither my editor does this automatically, so I do this myself too. ACK. I don't even have to think about it, I will automatically format code how the surrounding code is. Guess it's in my subconscious by now. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I879c37eb51ece55d79346c6bf1a4951c3f11c77e Gerrit-Change-Number: 19149 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 06 Jul 2020 19:33:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:35:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:35:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add first test to verify System Information on RSL startup In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 ) Change subject: bsc: add first test to verify System Information on RSL startup ...................................................................... Patch Set 6: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062/6/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062/6/bsc/BSC_Tests.ttcn at 1026 PS6, Line 1026: f I think this might be too short, imagining a highly loaded jenkins slave with lots of concurrent tasks... In the end, such short timeouts likely contirbute to unreliable/flaky test results. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 19:35:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:35:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:35:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add SI2quater tests for multiple EARFCNs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 ) Change subject: bsc: add SI2quater tests for multiple EARFCNs ...................................................................... Patch Set 3: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I45382f88686ca60e68569e93569fc4cfb63a0e0d Gerrit-Change-Number: 19152 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Mon, 06 Jul 2020 19:35:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:36:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:36:02 +0000 Subject: Change in osmo-bts[master]: bts-trx: Remove unused function l1if_provision_transceiver() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19162 ) Change subject: bts-trx: Remove unused function l1if_provision_transceiver() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I509fdbc7883f227cef4b7e46cb68fa2418c63f97 Gerrit-Change-Number: 19162 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 06 Jul 2020 19:36:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:36:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:36:57 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19159 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 ...................................................................... Patch Set 1: Code-Review+1 agreeing with pespint that a reason/rationale is good to have. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib27704dcba3979d69e44065c472b1452eaa11a7a Gerrit-Change-Number: 19159 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 19:36:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:37:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:37:18 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: use logging level 'notice' by default In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19158 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: use logging level 'notice' by default ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib0bfbe0d98ef0d3e6d627e737edbbf013a5f19c0 Gerrit-Change-Number: 19158 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 19:37:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:37:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:37:31 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19157 ) Change subject: ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I51e95a83aac0af1223d9608c234b87162835c9bc Gerrit-Change-Number: 19157 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 19:37:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:38:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:38:03 +0000 Subject: Change in osmo-bts[master]: bts-virt: Don't rely on gsmtap_makemsg() returning NULL for GSMTAP_CH... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19161 ) Change subject: bts-virt: Don't rely on gsmtap_makemsg() returning NULL for GSMTAP_CHANNEL_UNKNOWN ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I233afd930d3e43f7b120d40192c7c192102e38d9 Gerrit-Change-Number: 19161 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 06 Jul 2020 19:38:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:38:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:38:47 +0000 Subject: Change in osmo-bts[master]: common: Avoid changing OPSTATE to Enabled upon RSL up In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19156 ) Change subject: common: Avoid changing OPSTATE to Enabled upon RSL up ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iefb5c4e1097233b5c31e4d621c544d51516af678 Gerrit-Change-Number: 19156 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 06 Jul 2020 19:38:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:39:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:39:20 +0000 Subject: Change in osmo-bts[master]: bts-trx: Don't set OPSTATE enabled during trx_init In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19155 ) Change subject: bts-trx: Don't set OPSTATE enabled during trx_init ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib36a073cae5e1522821a04d8806648562f4e0f5b Gerrit-Change-Number: 19155 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 06 Jul 2020 19:39:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:39:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:39:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: split f_init_bts() from f_init() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19150 ) Change subject: bsc: split f_init_bts() from f_init() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I24afb07735c3827f52760214fcb7a239190c3402 Gerrit-Change-Number: 19150 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 19:39:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:40:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:40:25 +0000 Subject: Change in osmo-bsc[master]: si2quater: fix budget calculation for multiple EARFCNs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19153 ) Change subject: si2quater: fix budget calculation for multiple EARFCNs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5df269f713456a6ccbb874d6b7faac4a6f123c67 Gerrit-Change-Number: 19153 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 19:40:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:40:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:40:32 +0000 Subject: Change in osmo-bsc[master]: si2quater: fix budget calculation for multiple EARFCNs In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19153 ) Change subject: si2quater: fix budget calculation for multiple EARFCNs ...................................................................... si2quater: fix budget calculation for multiple EARFCNs In rest_octets.c append_earfcn(), the unconditional bits added are 40, not 25. Removing only 25 bits from the budget resulted in malformed SI2quater starting with 4 configured EARFCNs, by adding more EARFCNs than fit in 20 bits. These malformed SI2quater were also expected in gsm0408_test.c. Update the expected SI2quater to what is being generated now. This patch passes the ttcn3 testing added in I45382f88686ca60e68569e93569fc4cfb63a0e0d, which provides some confidence that the coding expected in gsm0408_test.c is now correct. Related: OS#4652 Change-Id: I5df269f713456a6ccbb874d6b7faac4a6f123c67 --- M src/osmo-bsc/rest_octets.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 91 insertions(+), 67 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/osmo-bsc/rest_octets.c b/src/osmo-bsc/rest_octets.c index 2238b08..0d806f3 100644 --- a/src/osmo-bsc/rest_octets.c +++ b/src/osmo-bsc/rest_octets.c @@ -162,7 +162,7 @@ { bool appended; unsigned int old = bv->cur_bit; /* save current position to make rollback possible */ - int rem = budget - 25; + int rem = ((int)budget) - 40; if (rem <= 0) return; @@ -190,6 +190,8 @@ /* Priority and E-UTRAN Parameters Description */ bitvec_set_bit(bv, 1); + /* budget: 10 bits used above */ + /* Serving Cell Priority Parameters Descr. is Present, * see also: 3GPP TS 44.018, Table 10.5.2.33b.1 */ bitvec_set_bit(bv, 1); @@ -209,6 +211,8 @@ /* T_Reselection */ bitvec_set_uint(bv, 0, 2); + /* budget: 26 bits used above */ + /* No 3G Priority Parameters Description */ bitvec_set_bit(bv, 0); /* E-UTRAN Parameters Description */ @@ -232,12 +236,16 @@ /* Repeated E-UTRAN Neighbour Cells */ bitvec_set_bit(bv, 1); + /* budget: 34 bits used above */ + appended = append_eutran_neib_cell(bv, bts, rem); if (!appended) { /* appending is impossible within current budget: rollback */ bv->cur_bit = old; return; } + /* budget: further 6 bits used below, totalling 40 bits */ + /* stop bit - end of Repeated E-UTRAN Neighbour Cells sequence: */ bitvec_set_bit(bv, 0); diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index bad8aef..7e054f4 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -80,13 +80,14 @@ added EARFCN 1945 - generating SI2quater for 4 EARFCNs and 0 UARFCNs... generated valid SI2quater [00/00]: [23] 59 06 07 40 00 04 87 00 00 b3 07 7d 98 3c 62 0f 23 50 79 90 50 0b 2b added EARFCN 1965 - generating SI2quater for 5 EARFCNs and 0 UARFCNs... -generated valid SI2quater [00/00]: [23] 59 06 07 40 00 04 87 00 00 b3 07 7d 98 3c 62 0f 23 50 79 94 1e b4 14 +generated valid SI2quater [00/01]: [23] 59 06 07 40 20 04 87 00 00 b3 07 7d 98 3c 62 0f 23 50 79 90 50 0b 2b +generated valid SI2quater [01/01]: [23] 59 06 07 42 20 04 87 00 00 b3 07 ad 05 01 2b 2b 2b 2b 2b 2b 2b 2b 2b added EARFCN 1967 - generating SI2quater for 6 EARFCNs and 0 UARFCNs... -generated valid SI2quater [00/01]: [23] 59 06 07 40 20 04 87 00 00 b3 07 7d 98 3c 62 0f 23 50 79 94 1e b4 14 -generated valid SI2quater [01/01]: [23] 59 06 07 42 20 04 87 00 00 b3 07 af c0 a0 2b 2b 2b 2b 2b 2b 2b 2b 2b +generated valid SI2quater [00/01]: [23] 59 06 07 40 20 04 87 00 00 b3 07 7d 98 3c 62 0f 23 50 79 90 50 0b 2b +generated valid SI2quater [01/01]: [23] 59 06 07 42 20 04 87 00 00 b3 07 ad 41 eb f0 28 0b 2b 2b 2b 2b 2b 2b added EARFCN 1982 - generating SI2quater for 7 EARFCNs and 0 UARFCNs... -generated valid SI2quater [00/01]: [23] 59 06 07 40 20 04 87 00 00 b3 07 7d 98 3c 62 0f 23 50 79 94 1e b4 14 -generated valid SI2quater [01/01]: [23] 59 06 07 42 20 04 87 00 00 b3 07 af c8 3d f5 85 01 2b 2b 2b 2b 2b 2b +generated valid SI2quater [00/01]: [23] 59 06 07 40 20 04 87 00 00 b3 07 7d 98 3c 62 0f 23 50 79 90 50 0b 2b +generated valid SI2quater [01/01]: [23] 59 06 07 42 20 04 87 00 00 b3 07 ad 41 eb f2 0f 7d 61 40 2b 2b 2b 2b BTS deallocated OK in test_si2q_e() BTS allocation OK in test_si2q_u() Testing SYSINFO_TYPE_2quater UARFCN generation: @@ -135,77 +136,92 @@ BTS allocation OK in test_si2q_long() Testing SYSINFO_TYPE_2quater combined EARFCN & UARFCN generation: generating SI2quater for 17 EARFCNs and 1 UARFCNs... -generated valid SI2quater [00/04]: [23] 59 06 07 40 80 25 0f 70 0c 1a 10 9c 00 02 cc 1e 09 07 82 39 76 56 0b -generated valid SI2quater [01/04]: [23] 59 06 07 42 80 04 87 00 00 b3 07 84 d8 3c 1e c1 e1 76 10 7f ae 5d 95 -generated valid SI2quater [02/04]: [23] 59 06 07 44 80 04 87 00 00 b3 08 40 c8 42 0d c2 10 aa 10 a7 ae 5d 95 -generated valid SI2quater [03/04]: [23] 59 06 07 46 80 04 87 00 00 b3 08 54 c8 42 ad c2 15 aa 10 93 ae 5d 95 -generated valid SI2quater [04/04]: [23] 59 06 07 48 80 04 87 00 00 b3 08 4a c8 42 5d c2 13 29 cb b2 b0 2b 2b +generated valid SI2quater [00/05]: [23] 59 06 07 40 a0 25 0f 70 0c 1a 10 9c 00 02 cc 1e 09 07 82 39 76 56 0b +generated valid SI2quater [01/05]: [23] 59 06 07 42 a0 04 87 00 00 b3 07 84 d8 3c 1e c1 e1 75 cb b2 b0 2b 2b +generated valid SI2quater [02/05]: [23] 59 06 07 44 a0 04 87 00 00 b3 08 3f d8 42 06 42 10 6d cb b2 b0 2b 2b +generated valid SI2quater [03/05]: [23] 59 06 07 46 a0 04 87 00 00 b3 08 42 a8 42 9e c2 15 31 cb b2 b0 2b 2b +generated valid SI2quater [04/05]: [23] 59 06 07 48 a0 04 87 00 00 b3 08 55 b8 42 b5 42 12 75 cb b2 b0 2b 2b +generated valid SI2quater [05/05]: [23] 59 06 07 4a a0 04 87 00 00 b3 08 4a c8 42 5d c2 13 29 cb b2 b0 2b 2b generating SI2quater for 17 EARFCNs and 2 UARFCNs... -generated valid SI2quater [00/04]: [23] 59 06 07 40 80 25 0f 70 14 4d e7 00 46 00 01 66 0f 04 83 c1 1c bb 2b -generated valid SI2quater [01/04]: [23] 59 06 07 42 80 04 87 00 00 b3 07 84 d8 3c 1e c1 e1 76 10 7f ae 5d 95 -generated valid SI2quater [02/04]: [23] 59 06 07 44 80 04 87 00 00 b3 08 40 c8 42 0d c2 10 aa 10 a7 ae 5d 95 -generated valid SI2quater [03/04]: [23] 59 06 07 46 80 04 87 00 00 b3 08 54 c8 42 ad c2 15 aa 10 93 ae 5d 95 -generated valid SI2quater [04/04]: [23] 59 06 07 48 80 04 87 00 00 b3 08 4a c8 42 5d c2 13 29 cb b2 b0 2b 2b +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 14 4d e7 00 46 00 01 66 0f 04 72 ec ac 0b 2b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e1 36 0f 07 ae 5d 95 83 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 85 d8 41 fe c2 10 31 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 41 b8 42 15 42 14 f5 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 54 c8 42 ad c2 15 a9 cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 49 d8 42 56 42 12 ed cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4c a7 2e ca c1 2b 2b 2b 2b 2b 2b 2b generating SI2quater for 17 EARFCNs and 3 UARFCNs... -generated valid SI2quater [00/04]: [23] 59 06 07 40 80 25 0f 70 1c 4d e7 03 04 87 00 00 b3 07 82 41 e0 8e 5d -generated valid SI2quater [01/04]: [23] 59 06 07 42 80 04 87 00 00 b3 07 84 d8 3c 1e c1 e1 76 10 7f ae 5d 95 -generated valid SI2quater [02/04]: [23] 59 06 07 44 80 04 87 00 00 b3 08 40 c8 42 0d c2 10 aa 10 a7 ae 5d 95 -generated valid SI2quater [03/04]: [23] 59 06 07 46 80 04 87 00 00 b3 08 54 c8 42 ad c2 15 aa 10 93 ae 5d 95 -generated valid SI2quater [04/04]: [23] 59 06 07 48 80 04 87 00 00 b3 08 4a c8 42 5d c2 13 29 cb b2 b0 2b 2b +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 1c 4d e7 03 04 87 00 00 b3 07 82 39 76 56 0b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e1 36 0f 07 ae 5d 95 83 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 85 d8 41 fe c2 10 31 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 41 b8 42 15 42 14 f5 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 54 c8 42 ad c2 15 a9 cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 49 d8 42 56 42 12 ed cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4c a7 2e ca c1 2b 2b 2b 2b 2b 2b 2b generating SI2quater for 17 EARFCNs and 4 UARFCNs... -generated valid SI2quater [00/04]: [23] 59 06 07 40 80 25 0f 70 24 59 fa 26 73 84 87 00 00 b3 07 82 39 76 56 -generated valid SI2quater [01/04]: [23] 59 06 07 42 80 04 87 00 00 b3 07 82 41 e1 36 0f 07 b0 78 5d 72 ec ac -generated valid SI2quater [02/04]: [23] 59 06 07 44 80 04 87 00 00 b3 08 3f d8 42 06 42 10 6e 10 85 4e 5d 95 -generated valid SI2quater [03/04]: [23] 59 06 07 46 80 04 87 00 00 b3 08 53 d8 42 a6 42 15 6e 10 ad 4e 5d 95 -generated valid SI2quater [04/04]: [23] 59 06 07 48 80 04 87 00 00 b3 08 49 d8 42 56 42 12 ee 10 99 4e 5d 95 +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 24 59 fa 26 73 84 87 00 00 b2 e5 d9 58 2b 2b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e0 90 78 4d 72 ec ac 0b 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8 3c 2e c2 0f f5 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8 42 0d c2 10 a9 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8 42 a6 42 15 6d cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b1 cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8 42 65 39 76 56 0b 2b 2b 2b 2b generating SI2quater for 17 EARFCNs and 5 UARFCNs... -generated valid SI2quater [00/04]: [23] 59 06 07 40 80 25 0f 70 2c 59 fa 30 73 f6 04 87 00 00 b3 07 82 39 76 -generated valid SI2quater [01/04]: [23] 59 06 07 42 80 04 87 00 00 b3 07 82 41 e1 36 0f 07 b0 78 5d 72 ec ac -generated valid SI2quater [02/04]: [23] 59 06 07 44 80 04 87 00 00 b3 08 3f d8 42 06 42 10 6e 10 85 4e 5d 95 -generated valid SI2quater [03/04]: [23] 59 06 07 46 80 04 87 00 00 b3 08 53 d8 42 a6 42 15 6e 10 ad 4e 5d 95 -generated valid SI2quater [04/04]: [23] 59 06 07 48 80 04 87 00 00 b3 08 49 d8 42 56 42 12 ee 10 99 4e 5d 95 +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 2c 59 fa 30 73 f6 04 87 00 00 b2 e5 d9 58 2b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e0 90 78 4d 72 ec ac 0b 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8 3c 2e c2 0f f5 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8 42 0d c2 10 a9 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8 42 a6 42 15 6d cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b1 cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8 42 65 39 76 56 0b 2b 2b 2b 2b generating SI2quater for 17 EARFCNs and 6 UARFCNs... -generated valid SI2quater [00/05]: [23] 59 06 07 40 a0 25 0f 70 34 f1 ae 15 f3 f4 83 04 87 00 00 b2 e5 d9 58 -generated valid SI2quater [01/05]: [23] 59 06 07 42 a0 04 87 00 00 b3 07 82 41 e0 90 78 4d 83 c1 eb 97 65 60 -generated valid SI2quater [02/05]: [23] 59 06 07 44 a0 04 87 00 00 b3 07 85 d8 41 fe c2 10 32 10 83 6e 5d 95 -generated valid SI2quater [03/05]: [23] 59 06 07 46 a0 04 87 00 00 b3 08 42 a8 42 9e c2 15 32 10 ab 6e 5d 95 -generated valid SI2quater [04/05]: [23] 59 06 07 48 a0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b2 10 97 6e 5d 95 -generated valid SI2quater [05/05]: [23] 59 06 07 4a a0 04 87 00 00 b3 08 4c a7 2e ca c1 2b 2b 2b 2b 2b 2b 2b +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 34 f1 ae 15 f3 f4 83 03 2b 2b 2b 2b 2b 2b 2b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e0 90 78 4d 72 ec ac 0b 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8 3c 2e c2 0f f5 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8 42 0d c2 10 a9 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8 42 a6 42 15 6d cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b1 cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8 42 65 39 76 56 0b 2b 2b 2b 2b generating SI2quater for 17 EARFCNs and 7 UARFCNs... -generated valid SI2quater [00/05]: [23] 59 06 07 40 a0 25 0f 70 3c f1 ae 15 f3 f4 83 01 84 87 00 00 b2 e5 d9 -generated valid SI2quater [01/05]: [23] 59 06 07 42 a0 04 87 00 00 b3 07 82 41 e0 90 78 4d 83 c1 eb 97 65 60 -generated valid SI2quater [02/05]: [23] 59 06 07 44 a0 04 87 00 00 b3 07 85 d8 41 fe c2 10 32 10 83 6e 5d 95 -generated valid SI2quater [03/05]: [23] 59 06 07 46 a0 04 87 00 00 b3 08 42 a8 42 9e c2 15 32 10 ab 6e 5d 95 -generated valid SI2quater [04/05]: [23] 59 06 07 48 a0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b2 10 97 6e 5d 95 -generated valid SI2quater [05/05]: [23] 59 06 07 4a a0 04 87 00 00 b3 08 4c a7 2e ca c1 2b 2b 2b 2b 2b 2b 2b +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 3c f1 ae 15 f3 f4 83 01 83 2b 2b 2b 2b 2b 2b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e0 90 78 4d 72 ec ac 0b 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8 3c 2e c2 0f f5 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8 42 0d c2 10 a9 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8 42 a6 42 15 6d cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b1 cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8 42 65 39 76 56 0b 2b 2b 2b 2b generating SI2quater for 17 EARFCNs and 8 UARFCNs... -generated valid SI2quater [00/05]: [23] 59 06 07 40 a0 25 0f 70 45 19 a0 0d 7d 7e a6 19 e7 0b 2b 2b 2b 2b 2b -generated valid SI2quater [01/05]: [23] 59 06 07 42 a0 04 87 00 00 b3 07 82 41 e0 90 78 4d 83 c1 eb 97 65 60 -generated valid SI2quater [02/05]: [23] 59 06 07 44 a0 04 87 00 00 b3 07 85 d8 41 fe c2 10 32 10 83 6e 5d 95 -generated valid SI2quater [03/05]: [23] 59 06 07 46 a0 04 87 00 00 b3 08 42 a8 42 9e c2 15 32 10 ab 6e 5d 95 -generated valid SI2quater [04/05]: [23] 59 06 07 48 a0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b2 10 97 6e 5d 95 -generated valid SI2quater [05/05]: [23] 59 06 07 4a a0 04 87 00 00 b3 08 4c a7 2e ca c1 2b 2b 2b 2b 2b 2b 2b +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 45 19 a0 0d 7d 7e a6 19 e7 0b 2b 2b 2b 2b 2b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e0 90 78 4d 72 ec ac 0b 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8 3c 2e c2 0f f5 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8 42 0d c2 10 a9 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8 42 a6 42 15 6d cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b1 cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8 42 65 39 76 56 0b 2b 2b 2b 2b generating SI2quater for 17 EARFCNs and 9 UARFCNs... -generated valid SI2quater [00/05]: [23] 59 06 07 40 a0 25 0f 70 4d 19 a0 26 fd 66 a6 03 e7 fa 0b 2b 2b 2b 2b -generated valid SI2quater [01/05]: [23] 59 06 07 42 a0 04 87 00 00 b3 07 82 41 e0 90 78 4d 83 c1 eb 97 65 60 -generated valid SI2quater [02/05]: [23] 59 06 07 44 a0 04 87 00 00 b3 07 85 d8 41 fe c2 10 32 10 83 6e 5d 95 -generated valid SI2quater [03/05]: [23] 59 06 07 46 a0 04 87 00 00 b3 08 42 a8 42 9e c2 15 32 10 ab 6e 5d 95 -generated valid SI2quater [04/05]: [23] 59 06 07 48 a0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b2 10 97 6e 5d 95 -generated valid SI2quater [05/05]: [23] 59 06 07 4a a0 04 87 00 00 b3 08 4c a7 2e ca c1 2b 2b 2b 2b 2b 2b 2b +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 4d 19 a0 26 fd 66 a6 03 e7 fa 0b 2b 2b 2b 2b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e0 90 78 4d 72 ec ac 0b 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8 3c 2e c2 0f f5 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8 42 0d c2 10 a9 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8 42 a6 42 15 6d cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b1 cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8 42 65 39 76 56 0b 2b 2b 2b 2b generating SI2quater for 17 EARFCNs and 10 UARFCNs... -generated valid SI2quater [00/05]: [23] 59 06 07 40 a0 25 0f 70 55 47 89 1e fd 7c b0 00 e7 9b b0 2b 2b 2b 2b -generated valid SI2quater [01/05]: [23] 59 06 07 42 a0 04 87 00 00 b3 07 82 41 e0 90 78 4d 83 c1 eb 97 65 60 -generated valid SI2quater [02/05]: [23] 59 06 07 44 a0 04 87 00 00 b3 07 85 d8 41 fe c2 10 32 10 83 6e 5d 95 -generated valid SI2quater [03/05]: [23] 59 06 07 46 a0 04 87 00 00 b3 08 42 a8 42 9e c2 15 32 10 ab 6e 5d 95 -generated valid SI2quater [04/05]: [23] 59 06 07 48 a0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b2 10 97 6e 5d 95 -generated valid SI2quater [05/05]: [23] 59 06 07 4a a0 04 87 00 00 b3 08 4c a7 2e ca c1 2b 2b 2b 2b 2b 2b 2b +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 55 47 89 1e fd 7c b0 00 e7 9b b0 2b 2b 2b 2b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e0 90 78 4d 72 ec ac 0b 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8 3c 2e c2 0f f5 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8 42 0d c2 10 a9 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8 42 a6 42 15 6d cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b1 cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8 42 65 39 76 56 0b 2b 2b 2b 2b generating SI2quater for 17 EARFCNs and 11 UARFCNs... -generated valid SI2quater [00/05]: [23] 59 06 07 40 a0 25 0f 70 5d 47 89 1e fd 7c b0 01 67 9b b3 f8 2b 2b 2b -generated valid SI2quater [01/05]: [23] 59 06 07 42 a0 04 87 00 00 b3 07 82 41 e0 90 78 4d 83 c1 eb 97 65 60 -generated valid SI2quater [02/05]: [23] 59 06 07 44 a0 04 87 00 00 b3 07 85 d8 41 fe c2 10 32 10 83 6e 5d 95 -generated valid SI2quater [03/05]: [23] 59 06 07 46 a0 04 87 00 00 b3 08 42 a8 42 9e c2 15 32 10 ab 6e 5d 95 -generated valid SI2quater [04/05]: [23] 59 06 07 48 a0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b2 10 97 6e 5d 95 -generated valid SI2quater [05/05]: [23] 59 06 07 4a a0 04 87 00 00 b3 08 4c a7 2e ca c1 2b 2b 2b 2b 2b 2b 2b +generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 5d 47 89 1e fd 7c b0 01 67 9b b3 f8 2b 2b 2b +generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41 e0 90 78 4d 72 ec ac 0b 2b 2b +generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8 3c 2e c2 0f f5 cb b2 b0 2b 2b +generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8 42 0d c2 10 a9 cb b2 b0 2b 2b +generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8 42 a6 42 15 6d cb b2 b0 2b 2b +generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8 42 4e c2 12 b1 cb b2 b0 2b 2b +generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8 42 65 39 76 56 0b 2b 2b 2b 2b BTS deallocated OK in test_si2q_long() BTS allocation OK in test_si_ba_ind() Testing if BA-IND is set as expected in SI2xxx and SI5xxx -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5df269f713456a6ccbb874d6b7faac4a6f123c67 Gerrit-Change-Number: 19153 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:41:57 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 19:41:57 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19157 ) Change subject: ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I51e95a83aac0af1223d9608c234b87162835c9bc Gerrit-Change-Number: 19157 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 19:41:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:42:00 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 19:42:00 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: use logging level 'notice' by default In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19158 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: use logging level 'notice' by default ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib0bfbe0d98ef0d3e6d627e737edbbf013a5f19c0 Gerrit-Change-Number: 19158 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 19:42:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:42:05 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 19:42:05 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19157 ) Change subject: ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default ...................................................................... ttcn3-bts-test/osmo-bts.cfg: use logging level 'notice' by default Change-Id: I51e95a83aac0af1223d9608c234b87162835c9bc --- M ttcn3-bts-test/oml/osmo-bts.cfg M ttcn3-bts-test/osmo-bts.cfg M ttcn3-bts-test/virtphy/osmo-bts.cfg 3 files changed, 3 insertions(+), 69 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved laforge: Looks good to me, approved fixeria: Verified diff --git a/ttcn3-bts-test/oml/osmo-bts.cfg b/ttcn3-bts-test/oml/osmo-bts.cfg index ff21431..1f3f689 100644 --- a/ttcn3-bts-test/oml/osmo-bts.cfg +++ b/ttcn3-bts-test/oml/osmo-bts.cfg @@ -12,38 +12,16 @@ logging print category 1 logging timestamp 1 logging print extended-timestamp 1 + logging level set-all notice logging level rsl info logging level oml info - logging level rll notice - logging level rr notice logging level meas info logging level pag info logging level l1c info - logging level l1p notice logging level dsp info logging level pcu debug - logging level ho notice logging level trx info - logging level loop notice - logging level abis notice - logging level rtp notice - logging level sum notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice logging level lmib debug - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice ! line vty no login diff --git a/ttcn3-bts-test/osmo-bts.cfg b/ttcn3-bts-test/osmo-bts.cfg index 45e491c..5357801 100644 --- a/ttcn3-bts-test/osmo-bts.cfg +++ b/ttcn3-bts-test/osmo-bts.cfg @@ -12,38 +12,16 @@ logging print category 1 logging timestamp 1 logging print extended-timestamp 1 + logging level set-all notice logging level rsl info logging level oml info - logging level rll notice - logging level rr notice logging level meas info logging level pag info logging level l1c info - logging level l1p notice logging level dsp info logging level pcu debug - logging level ho notice logging level trx info - logging level loop notice - logging level abis notice - logging level rtp notice - logging level sum notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice logging level lmib debug - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice ! line vty no login diff --git a/ttcn3-bts-test/virtphy/osmo-bts.cfg b/ttcn3-bts-test/virtphy/osmo-bts.cfg index 478990d..eb28220 100644 --- a/ttcn3-bts-test/virtphy/osmo-bts.cfg +++ b/ttcn3-bts-test/virtphy/osmo-bts.cfg @@ -12,38 +12,16 @@ logging print category 1 logging timestamp 1 logging print extended-timestamp 1 + logging level set-all notice logging level rsl info logging level oml info - logging level rll notice - logging level rr notice logging level meas info logging level pag info logging level l1c info - logging level l1p notice logging level dsp info logging level pcu debug - logging level ho notice logging level trx info - logging level loop notice - logging level abis notice - logging level rtp notice - logging level sum notice - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice logging level lmib debug - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice ! line vty no login -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I51e95a83aac0af1223d9608c234b87162835c9bc Gerrit-Change-Number: 19157 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:42:06 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 6 Jul 2020 19:42:06 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: use logging level 'notice' by default In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19158 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: use logging level 'notice' by default ...................................................................... ttcn3-bts-test/osmo-bsc.cfg: use logging level 'notice' by default Change-Id: Ib0bfbe0d98ef0d3e6d627e737edbbf013a5f19c0 --- M ttcn3-bts-test/osmo-bsc.cfg 1 file changed, 1 insertion(+), 25 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved laforge: Looks good to me, approved fixeria: Verified diff --git a/ttcn3-bts-test/osmo-bsc.cfg b/ttcn3-bts-test/osmo-bsc.cfg index 3064595..1dcf226 100644 --- a/ttcn3-bts-test/osmo-bsc.cfg +++ b/ttcn3-bts-test/osmo-bsc.cfg @@ -14,38 +14,14 @@ logging timestamp 1 logging print extended-timestamp 1 logging print file 1 - logging level all everything + logging level set-all notice logging level rll info - logging level mm notice - logging level rr notice logging level rsl debug - logging level nm notice - logging level pag notice - logging level meas notice logging level msc debug - logging level ho notice - logging level hodec notice - logging level ref notice - logging level ctrl notice logging level filter debug logging level pcu debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice logging level lctrl info - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice logging level lsccp info - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice ! stats interval 5 ! -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib0bfbe0d98ef0d3e6d627e737edbbf013a5f19c0 Gerrit-Change-Number: 19158 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 19:53:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 6 Jul 2020 19:53:10 +0000 Subject: Change in libosmocore[master]: socket.h: introduce osmo_sockaddr to hold v4 and v6 endpoints In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19141 ) Change subject: socket.h: introduce osmo_sockaddr to hold v4 and v6 endpoints ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19141/1/include/osmocom/core/socket.h File include/osmocom/core/socket.h: https://gerrit.osmocom.org/c/libosmocore/+/19141/1/include/osmocom/core/socket.h at 25 PS1, Line 25: struct osmo_sockaddr { > How do you differentiate the address family in here? Do all contain a type field in the same address [?] yes, I think it's universally the case that you always have a "sin_addr" / "sin6_addr" / ... field as first member in the 'struct sockaddr_foo'. Ugly, but has been used in BSD sockets API for decades :/ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If80172373735193401af872b18e1ff00c93880e7 Gerrit-Change-Number: 19141 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 19:53:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 21:20:07 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 21:20:07 +0000 Subject: Change in osmo-mgw[master]: refactor: use msgb to receive, pass and send RTP packets In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/18913 to look at the new patch set (#3). Change subject: refactor: use msgb to receive, pass and send RTP packets ...................................................................... refactor: use msgb to receive, pass and send RTP packets Instead of numerous arguments (buf, len and context data), use a msgb, like most other osmo programs do, with a msb->cb pointing at a context data struct. This opens the future for adding/stripping IuUP header data from the msgb easily. (Checked to pass current ttcn3-mgw-tests.) Change-Id: I3af40b63bc49f8636d4e7ea2f8f83bb67f6619ee --- M include/osmocom/mgcp/mgcp_codec.h M include/osmocom/mgcp/mgcp_endp.h M include/osmocom/mgcp/mgcp_internal.h M src/libosmo-mgcp/mgcp_codec.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_osmux.c M tests/mgcp/mgcp_test.c 7 files changed, 238 insertions(+), 216 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/13/18913/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3af40b63bc49f8636d4e7ea2f8f83bb67f6619ee Gerrit-Change-Number: 18913 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 6 22:34:39 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 6 Jul 2020 22:34:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add first test to verify System Information on RSL startup In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 ) Change subject: bsc: add first test to verify System Information on RSL startup ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062/6/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062/6/bsc/BSC_Tests.ttcn at 1026 PS6, Line 1026: f > I think this might be too short, imagining a highly loaded jenkins slave with lots of concurrent tas [?] i'll make it 5 then -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 06 Jul 2020 22:34:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Jul 7 00:36:54 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jul 2020 00:36:54 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f03c3bc58249_6202ab04e6885fc101975f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 82s] /usr/src/packages/BUILD/src/ulfius.c: In function 'ulfius_run_mhd_daemon': [ 82s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 82s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 82s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 82s] | | [ 82s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 82s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 82s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 82s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 82s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 82s] 2425 | MHD_start_daemon (unsigned int flags, [ 82s] | ^~~~~~~~~~~~~~~~ [ 82s] cc1: all warnings being treated as errors [ 82s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 82s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 82s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 82s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 82s] make[1]: *** [Makefile:166: all] Error 2 [ 82s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 82s] dh_auto_build: error: cd build && make -j6 "INSTALL=install --strip-program=true" returned exit code 2 [ 82s] make: *** [debian/rules:9: build] Error 25 [ 82s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 82s] ### VM INTERACTION START ### [ 85s] [ 75.671744] sysrq: SysRq : Power Off [ 85s] [ 75.674945] reboot: Power down [ 85s] ### VM INTERACTION END ### [ 85s] [ 85s] sheep85 failed "build ulfius_2.5.2-4.1.dsc" at Tue Jul 7 00:36:38 UTC 2020. [ 85s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jul 7 00:37:12 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jul 2020 00:37:12 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f03c3bd53495_6202ab04e6885fc1019877@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 213s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 213s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 213s] 268 | access_handler, server, [ 213s] | ^~~~~~~~~~~~~~ [ 213s] | | [ 213s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 213s] In file included from ../lib/sbi/server.c:23: [ 213s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 213s] 2425 | MHD_start_daemon (unsigned int flags, [ 213s] | ^~~~~~~~~~~~~~~~ [ 213s] cc1: some warnings being treated as errors [ 213s] [2091/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o' -c ../src/mme/s1ap-sm.c [ 213s] [2092/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -c ../src/mme/s1ap-build.c [ 213s] [2093/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 214s] [2094/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -c ../src/mme/emm-build.c [ 214s] [2095/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o' -MF 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o' -c ../src/mme/esm-sm.c [ 214s] [2096/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -c ../src/mme/emm-handler.c [ 216s] [2097/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 216s] ninja: build stopped: subcommand failed. [ 216s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j8 -v returned exit code 1 [ 216s] make: *** [debian/rules:11: binary] Error 25 [ 216s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 216s] ### VM INTERACTION START ### [ 219s] [ 206.957537] sysrq: SysRq : Power Off [ 219s] [ 206.963416] reboot: Power down [ 219s] ### VM INTERACTION END ### [ 219s] [ 219s] lamb01 failed "build open5gs_1.3.0.20200706.dsc" at Tue Jul 7 00:37:08 UTC 2020. [ 219s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jul 7 00:38:20 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jul 2020 00:38:20 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f03c415e2c88_6202ab04e6885fc10199d3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 118s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 118s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 118s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 118s] | | [ 118s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 118s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 118s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 118s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 118s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 118s] 2425 | MHD_start_daemon (unsigned int flags, [ 118s] | ^~~~~~~~~~~~~~~~ [ 118s] cc1: all warnings being treated as errors [ 118s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 118s] make[3]: *** Waiting for unfinished jobs.... [ 119s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 119s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 119s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 119s] make[1]: *** [Makefile:166: all] Error 2 [ 119s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 119s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 119s] make: *** [debian/rules:9: build] Error 25 [ 119s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 119s] ### VM INTERACTION START ### [ 122s] [ 109.376941] sysrq: SysRq : Power Off [ 122s] [ 109.382392] reboot: Power down [ 122s] ### VM INTERACTION END ### [ 122s] [ 122s] lamb54 failed "build ulfius_2.5.2-4.1.dsc" at Tue Jul 7 00:38:08 UTC 2020. [ 122s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jul 7 01:32:37 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jul 2020 01:32:37 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5f03d0bdccbc3_6202ab04e6885fc10270cc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/open5gs failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 90s] Build dir: /usr/src/packages/BUILD/obj-x86_64-linux-gnu [ 90s] Build type: native build [ 90s] [ 90s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 90s] [ 90s] A full log can be found at /usr/src/packages/BUILD/obj-x86_64-linux-gnu/meson-logs/meson-log.txt [ 90s] cd obj-x86_64-linux-gnu && tail -v -n \+0 meson-logs/meson-log.txt [ 90s] ==> meson-logs/meson-log.txt <== [ 90s] Build started at 2020-07-07T01:32:30.322435 [ 90s] Main binary: /usr/bin/python3 [ 90s] Python system: Linux [ 90s] The Meson build system [ 90s] Version: 0.45.1 [ 90s] Source dir: /usr/src/packages/BUILD [ 90s] Build dir: /usr/src/packages/BUILD/obj-x86_64-linux-gnu [ 90s] Build type: native build [ 90s] [ 90s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 90s] dh_auto_configure: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 90s] debian/rules:11: recipe for target 'binary' failed [ 90s] make: *** [binary] Error 2 [ 90s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 90s] ### VM INTERACTION START ### [ 94s] [ 87.294956] sysrq: SysRq : Power Off [ 94s] [ 87.303672] reboot: Power down [ 94s] ### VM INTERACTION END ### [ 94s] [ 94s] sheep84 failed "build open5gs_1.3.0.20200707.dsc" at Tue Jul 7 01:32:34 UTC 2020. [ 94s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jul 7 01:32:54 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jul 2020 01:32:54 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f03d0dce048f_6202ab04e6885fc102722e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/xUbuntu_18.04/i586 Package network:osmocom:nightly/open5gs failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 114s] Build dir: /usr/src/packages/BUILD/obj-i686-linux-gnu [ 114s] Build type: native build [ 114s] [ 114s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 114s] [ 114s] A full log can be found at /usr/src/packages/BUILD/obj-i686-linux-gnu/meson-logs/meson-log.txt [ 114s] cd obj-i686-linux-gnu && tail -v -n \+0 meson-logs/meson-log.txt [ 114s] ==> meson-logs/meson-log.txt <== [ 114s] Build started at 2020-07-07T01:32:50.154524 [ 114s] Main binary: /usr/bin/python3 [ 114s] Python system: Linux [ 114s] The Meson build system [ 114s] Version: 0.45.1 [ 114s] Source dir: /usr/src/packages/BUILD [ 114s] Build dir: /usr/src/packages/BUILD/obj-i686-linux-gnu [ 114s] Build type: native build [ 114s] [ 114s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 114s] dh_auto_configure: cd obj-i686-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/i386-linux-gnu --libexecdir=lib/i386-linux-gnu returned exit code 1 [ 115s] debian/rules:11: recipe for target 'binary' failed [ 115s] make: *** [binary] Error 2 [ 115s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 115s] ### VM INTERACTION START ### [ 118s] [ 108.547847] sysrq: SysRq : Power Off [ 118s] [ 108.552661] reboot: Power down [ 118s] ### VM INTERACTION END ### [ 118s] [ 118s] lamb58 failed "build open5gs_1.3.0.20200707.dsc" at Tue Jul 7 01:32:53 UTC 2020. [ 118s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jul 7 01:35:29 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jul 2020 01:35:29 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f03d171adcee_6202ab04e6885fc1028012@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 194s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 194s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 194s] 268 | access_handler, server, [ 194s] | ^~~~~~~~~~~~~~ [ 194s] | | [ 194s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 194s] In file included from ../lib/sbi/server.c:23: [ 194s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 194s] 2425 | MHD_start_daemon (unsigned int flags, [ 194s] | ^~~~~~~~~~~~~~~~ [ 194s] cc1: some warnings being treated as errors [ 194s] [2091/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o' -c ../lib/sbi/path.c [ 194s] [2092/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -c ../src/mme/s1ap-build.c [ 194s] [2093/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 195s] [2094/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o' -MF 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o' -c ../src/mme/esm-sm.c [ 195s] [2095/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -c ../src/mme/emm-build.c [ 195s] [2096/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -c ../src/mme/emm-handler.c [ 196s] [2097/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 196s] ninja: build stopped: subcommand failed. [ 196s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j8 -v returned exit code 1 [ 196s] make: *** [debian/rules:11: binary] Error 25 [ 196s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 196s] ### VM INTERACTION START ### [ 199s] [ 187.484492] sysrq: SysRq : Power Off [ 199s] [ 187.488777] reboot: Power down [ 199s] ### VM INTERACTION END ### [ 199s] [ 199s] lamb15 failed "build open5gs_1.3.0.20200707.dsc" at Tue Jul 7 01:35:15 UTC 2020. [ 199s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jul 7 01:35:46 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jul 2020 01:35:46 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f03d190790bd_6202ab04e6885fc10281cb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Testing/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 192s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 192s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 192s] 268 | access_handler, server, [ 192s] | ^~~~~~~~~~~~~~ [ 192s] | | [ 192s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 192s] In file included from ../lib/sbi/server.c:23: [ 192s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 192s] 2425 | MHD_start_daemon (unsigned int flags, [ 192s] | ^~~~~~~~~~~~~~~~ [ 192s] cc1: some warnings being treated as errors [ 192s] [2090/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o' -c ../src/mme/s1ap-sm.c [ 192s] [2091/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o' -c ../lib/sbi/path.c [ 192s] [2092/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -c ../src/mme/s1ap-build.c [ 192s] [2093/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 192s] [2094/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -c ../src/mme/emm-build.c [ 192s] [2095/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -c ../src/mme/emm-handler.c [ 194s] [2096/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 194s] ninja: build stopped: subcommand failed. [ 194s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j8 -v returned exit code 1 [ 194s] make: *** [debian/rules:11: binary] Error 25 [ 194s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 194s] ### VM INTERACTION START ### [ 197s] [ 185.842907] sysrq: SysRq : Power Off [ 197s] [ 185.849778] reboot: Power down [ 197s] ### VM INTERACTION END ### [ 197s] [ 197s] lamb51 failed "build open5gs_1.3.0.20200707.dsc" at Tue Jul 7 01:35:32 UTC 2020. [ 197s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jul 7 02:57:12 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jul 2020 02:57:12 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f03e49d70d8d_6202ab04e6885fc10335ba@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Testing/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 61s] /usr/src/packages/BUILD/src/ulfius.c: In function 'ulfius_run_mhd_daemon': [ 61s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 61s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 61s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 61s] | | [ 61s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 61s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 61s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 61s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 61s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 61s] 2425 | MHD_start_daemon (unsigned int flags, [ 61s] | ^~~~~~~~~~~~~~~~ [ 62s] cc1: all warnings being treated as errors [ 62s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 62s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 62s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 62s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 62s] make[1]: *** [Makefile:166: all] Error 2 [ 62s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 62s] dh_auto_build: error: cd build && make -j3 "INSTALL=install --strip-program=true" returned exit code 2 [ 62s] make: *** [debian/rules:9: build] Error 25 [ 62s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 62s] ### VM INTERACTION START ### [ 65s] [ 56.610935] sysrq: SysRq : Power Off [ 65s] [ 56.612506] reboot: Power down [ 65s] ### VM INTERACTION END ### [ 65s] [ 65s] build76 failed "build ulfius_2.5.2-4.1.dsc" at Tue Jul 7 02:57:07 UTC 2020. [ 65s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jul 7 02:58:22 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jul 2020 02:58:22 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f03e4e360eaa_6202ab04e6885fc10338f3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Testing/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 192s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 192s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 192s] 268 | access_handler, server, [ 192s] | ^~~~~~~~~~~~~~ [ 192s] | | [ 192s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 192s] In file included from ../lib/sbi/server.c:23: [ 192s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 192s] 2425 | MHD_start_daemon (unsigned int flags, [ 192s] | ^~~~~~~~~~~~~~~~ [ 192s] cc1: some warnings being treated as errors [ 192s] [2090/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o' -c ../lib/sbi/path.c [ 193s] [2091/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -c ../src/mme/s1ap-build.c [ 193s] [2092/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o' -c ../src/mme/s1ap-sm.c [ 193s] [2093/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 193s] [2094/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -c ../src/mme/emm-build.c [ 193s] [2095/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -c ../src/mme/emm-handler.c [ 194s] [2096/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 194s] ninja: build stopped: subcommand failed. [ 194s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j8 -v returned exit code 1 [ 194s] make: *** [debian/rules:11: binary] Error 25 [ 194s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 194s] ### VM INTERACTION START ### [ 197s] [ 185.962312] sysrq: SysRq : Power Off [ 197s] [ 185.967929] reboot: Power down [ 198s] ### VM INTERACTION END ### [ 198s] [ 198s] lamb18 failed "build open5gs_1.3.0.20200707.dsc" at Tue Jul 7 02:58:17 UTC 2020. [ 198s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jul 7 03:00:21 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jul 2020 03:00:21 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f03e55d9d6c7_6202ab04e6885fc10342d2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Testing/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 168s] /usr/src/packages/BUILD/src/ulfius.c: In function 'ulfius_run_mhd_daemon': [ 168s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 168s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 168s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 168s] | | [ 168s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 168s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 168s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 168s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 168s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 168s] 2425 | MHD_start_daemon (unsigned int flags, [ 168s] | ^~~~~~~~~~~~~~~~ [ 168s] cc1: all warnings being treated as errors [ 168s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 168s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 168s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 168s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 168s] make[1]: *** [Makefile:166: all] Error 2 [ 168s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 168s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 168s] make: *** [debian/rules:9: build] Error 25 [ 168s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 168s] ### VM INTERACTION START ### [ 172s] [ 155.029599] sysrq: SysRq : Power Off [ 172s] [ 155.049899] reboot: Power down [ 172s] ### VM INTERACTION END ### [ 172s] [ 172s] cloud114 failed "build ulfius_2.5.2-4.1.dsc" at Tue Jul 7 03:00:10 UTC 2020. [ 172s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jul 7 03:02:20 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jul 2020 03:02:20 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f03e5d415c54_6202ab04e6885fc1034625@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 203s] /usr/src/packages/BUILD/src/ulfius.c: In function 'ulfius_run_mhd_daemon': [ 203s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 203s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 203s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 203s] | | [ 203s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 203s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 203s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 203s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 203s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 203s] 2425 | MHD_start_daemon (unsigned int flags, [ 203s] | ^~~~~~~~~~~~~~~~ [ 203s] cc1: all warnings being treated as errors [ 203s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 203s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 203s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 203s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 203s] make[1]: *** [Makefile:166: all] Error 2 [ 203s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 203s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 203s] make: *** [debian/rules:9: build] Error 25 [ 203s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 203s] ### VM INTERACTION START ### [ 206s] [ 182.165082] sysrq: SysRq : Power Off [ 206s] [ 182.173774] reboot: Power down [ 206s] ### VM INTERACTION END ### [ 206s] [ 206s] cloud115 failed "build ulfius_2.5.2-4.1.dsc" at Tue Jul 7 03:02:18 UTC 2020. [ 206s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jul 7 03:07:13 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jul 2020 03:07:13 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f03e6e74da3c_6202ab04e6885fc1035533@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 101s] /usr/src/packages/BUILD/src/ulfius.c: In function 'ulfius_run_mhd_daemon': [ 101s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 101s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 101s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 101s] | | [ 101s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 101s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 101s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 101s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 101s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 101s] 2425 | MHD_start_daemon (unsigned int flags, [ 101s] | ^~~~~~~~~~~~~~~~ [ 101s] cc1: all warnings being treated as errors [ 101s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 101s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 101s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 101s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 101s] make[1]: *** [Makefile:166: all] Error 2 [ 101s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 101s] dh_auto_build: error: cd build && make -j3 "INSTALL=install --strip-program=true" returned exit code 2 [ 101s] make: *** [debian/rules:9: build] Error 25 [ 101s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 101s] ### VM INTERACTION START ### [ 104s] [ 92.106468] sysrq: SysRq : Power Off [ 104s] [ 92.109191] reboot: Power down [ 104s] ### VM INTERACTION END ### [ 104s] [ 104s] build70 failed "build ulfius_2.5.2-4.1.dsc" at Tue Jul 7 03:07:05 UTC 2020. [ 104s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jul 7 03:09:46 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jul 2020 03:09:46 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f03e79788549_6202ab04e6885fc103569f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 747s] [2088/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/contrib_multipart_parser.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/contrib_multipart_parser.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/contrib_multipart_parser.c.o' -c ../lib/sbi/contrib/multipart_parser.c [ 748s] [2089/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -c ../lib/sbi/server.c [ 748s] FAILED: lib/sbi/9848b6c@@ogssbi at sha/server.c.o [ 748s] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -c ../lib/sbi/server.c [ 748s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 748s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 748s] 268 | access_handler, server, [ 748s] | ^~~~~~~~~~~~~~ [ 748s] | | [ 748s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 748s] In file included from ../lib/sbi/server.c:23: [ 748s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 748s] 2425 | MHD_start_daemon (unsigned int flags, [ 748s] | ^~~~~~~~~~~~~~~~ [ 748s] cc1: some warnings being treated as errors [ 748s] [2090/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -c ../lib/sbi/nnrf-build.c [ 748s] [2091/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 750s] [2092/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 750s] ninja: build stopped: subcommand failed. [ 750s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j4 -v returned exit code 1 [ 750s] make: *** [debian/rules:11: binary] Error 25 [ 750s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 750s] ### VM INTERACTION START ### [ 753s] [ 702.198179] sysrq: SysRq : Power Off [ 753s] [ 702.207840] reboot: Power down [ 753s] ### VM INTERACTION END ### [ 753s] [ 753s] cloud105 failed "build open5gs_1.3.0.20200707.dsc" at Tue Jul 7 03:09:40 UTC 2020. [ 753s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Jul 7 07:05:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 7 Jul 2020 07:05:09 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp: fix unsigned compared against 0 in mgcp_trunk_by_name() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19168 ) Change subject: libosmo-mgcp: fix unsigned compared against 0 in mgcp_trunk_by_name() ...................................................................... libosmo-mgcp: fix unsigned compared against 0 in mgcp_trunk_by_name() e1_trunk_nr_from_epname() returns a signed integer: int e1_trunk_nr_from_epname(const char *epname); mgcp_trunk_by_num() accepts a signed integer: struct mgcp_trunk *mgcp_trunk_by_num(const struct mgcp_config *cfg, int index); Change-Id: Id333a6ddcefd37d82d19f9378ab87d1c02ffd7e3 Closes: CID#211333 --- M src/libosmo-mgcp/mgcp_trunk.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/68/19168/1 diff --git a/src/libosmo-mgcp/mgcp_trunk.c b/src/libosmo-mgcp/mgcp_trunk.c index cc6637b..4f60cc9 100644 --- a/src/libosmo-mgcp/mgcp_trunk.c +++ b/src/libosmo-mgcp/mgcp_trunk.c @@ -147,7 +147,7 @@ { size_t prefix_len; char epname_lc[MGCP_ENDPOINT_MAXLEN]; - unsigned long int trunk_nr; + int trunk_nr; osmo_str_tolower_buf(epname_lc, sizeof(epname_lc), epname); epname = epname_lc; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id333a6ddcefd37d82d19f9378ab87d1c02ffd7e3 Gerrit-Change-Number: 19168 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 07:10:23 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 7 Jul 2020 07:10:23 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp: fix unused extra argument to printf() in add_fmtp() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19169 ) Change subject: libosmo-mgcp: fix unused extra argument to printf() in add_fmtp() ...................................................................... libosmo-mgcp: fix unused extra argument to printf() in add_fmtp() Change-Id: Ie48da20aea7bc1eedc3f8b5b4a708458f0860a25 Closes: CID#208171 --- M src/libosmo-mgcp/mgcp_sdp.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/69/19169/1 diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index f80ebb8..a7478ad 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -496,7 +496,7 @@ return -EINVAL; } - rc = msgb_printf(sdp, "\r\n", fmtp_params[i].payload_type); + rc = msgb_printf(sdp, "\r\n"); if (rc < 0) return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie48da20aea7bc1eedc3f8b5b4a708458f0860a25 Gerrit-Change-Number: 19169 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 07:12:35 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 7 Jul 2020 07:12:35 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp: always check result of msgb_printf() in add_fmtp() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19170 ) Change subject: libosmo-mgcp: always check result of msgb_printf() in add_fmtp() ...................................................................... libosmo-mgcp: always check result of msgb_printf() in add_fmtp() Change-Id: I218ac21612116366eabd0c75ce3648bad4e27abf --- M src/libosmo-mgcp/mgcp_sdp.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/70/19170/1 diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index a7478ad..5fa6bdb 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -478,6 +478,8 @@ for (i = 0; i < fmtp_params_len; i++) { rc = msgb_printf(sdp, "a=fmtp:%u", fmtp_params[i].payload_type); + if (rc < 0) + return -EINVAL; /* Add amr octet align parameter */ if (fmtp_params[i].param.amr_octet_aligned_present) { -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I218ac21612116366eabd0c75ce3648bad4e27abf Gerrit-Change-Number: 19170 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 07:29:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jul 2020 07:29:03 +0000 Subject: Change in libosmocore[master]: osmo_sock_init2: improve support for AF_UNSPEC In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19140 ) Change subject: osmo_sock_init2: improve support for AF_UNSPEC ...................................................................... Patch Set 1: I'm a bit puzzled by the build failure. For sure all our build slave should have IPv6 configured. The specific one that failed (host2-debian8) clearly has IPv6 enabled and ::1 on loopback: root at deb8build-ansible:~# ip a 1: lo: mtu 65536 qdisc noqueue state UNKNOWN group default qlen 1 link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00 inet 127.0.0.1/8 scope host lo valid_lft forever preferred_lft forever inet6 ::1/128 scope host valid_lft forever preferred_lft forever -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I397c633931fd00d4f083955a3c49a40fb002d766 Gerrit-Change-Number: 19140 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 07 Jul 2020 07:29:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 07:29:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jul 2020 07:29:47 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp: fix unsigned compared against 0 in mgcp_trunk_by_name() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19168 ) Change subject: libosmo-mgcp: fix unsigned compared against 0 in mgcp_trunk_by_name() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id333a6ddcefd37d82d19f9378ab87d1c02ffd7e3 Gerrit-Change-Number: 19168 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jul 2020 07:29:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 07:30:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jul 2020 07:30:03 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp: fix unused extra argument to printf() in add_fmtp() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19169 ) Change subject: libosmo-mgcp: fix unused extra argument to printf() in add_fmtp() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie48da20aea7bc1eedc3f8b5b4a708458f0860a25 Gerrit-Change-Number: 19169 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jul 2020 07:30:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 07:30:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 7 Jul 2020 07:30:23 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp: always check result of msgb_printf() in add_fmtp() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19170 ) Change subject: libosmo-mgcp: always check result of msgb_printf() in add_fmtp() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I218ac21612116366eabd0c75ce3648bad4e27abf Gerrit-Change-Number: 19170 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jul 2020 07:30:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 09:26:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jul 2020 09:26:04 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: be more specific about E1 trunks In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19103 ) Change subject: mgcp_vty: be more specific about E1 trunks ...................................................................... Patch Set 5: Code-Review+1 "trunk e1": agree with laforge, I also thought about that, though not really a big preference neither -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e Gerrit-Change-Number: 19103 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jul 2020 09:26:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 09:31:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jul 2020 09:31:59 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp: fix unsigned compared against 0 in mgcp_trunk_by_name() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19168 ) Change subject: libosmo-mgcp: fix unsigned compared against 0 in mgcp_trunk_by_name() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id333a6ddcefd37d82d19f9378ab87d1c02ffd7e3 Gerrit-Change-Number: 19168 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jul 2020 09:31:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 09:37:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jul 2020 09:37:56 +0000 Subject: Change in osmo-bts[master]: bts-trx: introduce TRX provisioning FSM In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19167 to look at the new patch set (#2). Change subject: bts-trx: introduce TRX provisioning FSM ...................................................................... bts-trx: introduce TRX provisioning FSM With prior code state managing the TRXC side of osmo-bts-trx, there are plenty o cases (race conditions) where things can go wrong/unexpected, because there's really no infrastructure to wait and synchronize between different TRXs (eg wait until all are configured to POWERON), or to simply keep well known per-trx state regarding lower layers. In order to fix in the future all of those issues and to sanitize current code, a new per-trx FSM is introduced, which takes care of submitting TRXC commands and waiting for response when needed to manage the state of the TRX. Related: OS#4364 Change-Id: I2a00c23df15840e33fbb232c9e1dd6db128f63f6 --- M src/osmo-bts-trx/Makefile.am M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/trx_if.c A src/osmo-bts-trx/trx_provision_fsm.c A src/osmo-bts-trx/trx_provision_fsm.h 6 files changed, 537 insertions(+), 224 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/67/19167/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2a00c23df15840e33fbb232c9e1dd6db128f63f6 Gerrit-Change-Number: 19167 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 09:42:07 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Jul 2020 09:42:07 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp: fix unsigned compared against 0 in mgcp_trunk_by_name() In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19168 ) Change subject: libosmo-mgcp: fix unsigned compared against 0 in mgcp_trunk_by_name() ...................................................................... Patch Set 1: Code-Review+2 Thanks. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id333a6ddcefd37d82d19f9378ab87d1c02ffd7e3 Gerrit-Change-Number: 19168 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jul 2020 09:42:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 09:42:30 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Jul 2020 09:42:30 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp: fix unsigned compared against 0 in mgcp_trunk_by_name() In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19168 ) Change subject: libosmo-mgcp: fix unsigned compared against 0 in mgcp_trunk_by_name() ...................................................................... libosmo-mgcp: fix unsigned compared against 0 in mgcp_trunk_by_name() e1_trunk_nr_from_epname() returns a signed integer: int e1_trunk_nr_from_epname(const char *epname); mgcp_trunk_by_num() accepts a signed integer: struct mgcp_trunk *mgcp_trunk_by_num(const struct mgcp_config *cfg, int index); Change-Id: Id333a6ddcefd37d82d19f9378ab87d1c02ffd7e3 Closes: CID#211333 --- M src/libosmo-mgcp/mgcp_trunk.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved dexter: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_trunk.c b/src/libosmo-mgcp/mgcp_trunk.c index cc6637b..4f60cc9 100644 --- a/src/libosmo-mgcp/mgcp_trunk.c +++ b/src/libosmo-mgcp/mgcp_trunk.c @@ -147,7 +147,7 @@ { size_t prefix_len; char epname_lc[MGCP_ENDPOINT_MAXLEN]; - unsigned long int trunk_nr; + int trunk_nr; osmo_str_tolower_buf(epname_lc, sizeof(epname_lc), epname); epname = epname_lc; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id333a6ddcefd37d82d19f9378ab87d1c02ffd7e3 Gerrit-Change-Number: 19168 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Jul 7 09:54:29 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jul 2020 09:54:29 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f04467189df7_4b782ae16d96c61085192@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 59s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 59s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 59s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 59s] | | [ 59s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 59s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 59s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 59s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 59s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 59s] 2425 | MHD_start_daemon (unsigned int flags, [ 59s] | ^~~~~~~~~~~~~~~~ [ 59s] cc1: all warnings being treated as errors [ 59s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 59s] make[3]: *** Waiting for unfinished jobs.... [ 59s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 59s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 59s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 59s] make[1]: *** [Makefile:166: all] Error 2 [ 59s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 59s] dh_auto_build: error: cd build && make -j3 "INSTALL=install --strip-program=true" returned exit code 2 [ 59s] make: *** [debian/rules:9: build] Error 25 [ 59s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 59s] ### VM INTERACTION START ### [ 62s] [ 54.083829] sysrq: SysRq : Power Off [ 62s] [ 54.087159] reboot: Power down [ 62s] ### VM INTERACTION END ### [ 62s] [ 62s] build83 failed "build ulfius_2.5.2-4.1.dsc" at Tue Jul 7 09:54:12 UTC 2020. [ 62s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jul 7 09:55:20 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jul 2020 09:55:20 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f044691b212c_4b782ae16d96c61085356@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 117s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 117s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 117s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 117s] | | [ 117s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 117s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 117s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 117s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 117s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 117s] 2425 | MHD_start_daemon (unsigned int flags, [ 117s] | ^~~~~~~~~~~~~~~~ [ 117s] cc1: all warnings being treated as errors [ 117s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 117s] make[3]: *** Waiting for unfinished jobs.... [ 118s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 118s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 118s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 118s] make[1]: *** [Makefile:166: all] Error 2 [ 118s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 118s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 118s] make: *** [debian/rules:9: build] Error 25 [ 118s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 118s] ### VM INTERACTION START ### [ 121s] [ 108.585203] sysrq: SysRq : Power Off [ 121s] [ 108.592224] reboot: Power down [ 121s] ### VM INTERACTION END ### [ 121s] [ 121s] lamb12 failed "build ulfius_2.5.2-4.1.dsc" at Tue Jul 7 09:55:19 UTC 2020. [ 121s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jul 7 09:56:12 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Jul 2020 09:56:12 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0446cd5cc9d_4b782ae16d96c6108569e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 284s] [2088/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/contrib_multipart_parser.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/contrib_multipart_parser.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/contrib_multipart_parser.c.o' -c ../lib/sbi/contrib/multipart_parser.c [ 285s] [2089/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -c ../lib/sbi/server.c [ 285s] FAILED: lib/sbi/9848b6c@@ogssbi at sha/server.c.o [ 285s] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -c ../lib/sbi/server.c [ 285s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 285s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 285s] 268 | access_handler, server, [ 285s] | ^~~~~~~~~~~~~~ [ 285s] | | [ 285s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 285s] In file included from ../lib/sbi/server.c:23: [ 285s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 285s] 2425 | MHD_start_daemon (unsigned int flags, [ 285s] | ^~~~~~~~~~~~~~~~ [ 285s] cc1: some warnings being treated as errors [ 285s] [2090/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 285s] [2091/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -c ../lib/sbi/nnrf-build.c [ 287s] [2092/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 287s] ninja: build stopped: subcommand failed. [ 287s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j4 -v returned exit code 1 [ 287s] make: *** [debian/rules:11: binary] Error 25 [ 287s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 287s] ### VM INTERACTION START ### [ 290s] [ 271.040569] sysrq: SysRq : Power Off [ 290s] [ 271.055767] reboot: Power down [ 291s] ### VM INTERACTION END ### [ 291s] [ 291s] cloud107 failed "build open5gs_1.3.0.20200707.dsc" at Tue Jul 7 09:55:55 UTC 2020. [ 291s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Jul 7 10:24:54 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jul 2020 10:24:54 +0000 Subject: Change in docker-playground[master]: ttcn3-bts: Fix most OML test failing after osmo-bts shutdown optimiza... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/19171 ) Change subject: ttcn3-bts: Fix most OML test failing after osmo-bts shutdown optimization ...................................................................... ttcn3-bts: Fix most OML test failing after osmo-bts shutdown optimization Since osmo-bts.git 0a6bdb024f5429a35c56178496158c9b1c3ee032, the process is quickly terminated during shutdown if no TRX is running. Since in the OML tests the TTCN3 components implements the OML IPA server side, most of the time when osmo-bts starts it finds no one listening on the address and exits immediately. This makes respawn.sh script run osmo-bts lots of times per seconds (since osmo-bts terminates quicker now). As a result, it quickly consumes the 500 launch threshold and exits without starting osmo-bts being launched anymore. As a result, only first tests pass, and all the later ones fail because osmo-bts never connects. Let's add a sleep 1 between respawns in respawn.sh only when running OML tests (not needed in the others since there's an osmo-bsc always running). This also clears a lot of output in the logs of osmo-bts processes restarting over and over again. Change-Id: I10d3e1ef8325dd78f9ae2b95fbfd1c6d893bf8a4 --- M osmo-bts-master/respawn.sh M ttcn3-bts-test/jenkins.sh 2 files changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/71/19171/1 diff --git a/osmo-bts-master/respawn.sh b/osmo-bts-master/respawn.sh index 2413916..31a8c06 100755 --- a/osmo-bts-master/respawn.sh +++ b/osmo-bts-master/respawn.sh @@ -2,6 +2,8 @@ trap "kill 0" EXIT +SLEEP_BEFORE_RESPAWN=${SLEEP_BEFORE_RESPAWN:-0} + i=0 max_i=500 while [ $i -lt $max_i ]; do @@ -10,6 +12,10 @@ LAST_PID=$! wait $LAST_PID echo "$i: stopped pid $LAST_PID with status $?" + if [ $SLEEP_BEFORE_RESPAWN -gt 0 ]; then + echo "sleeping $SLEEP_BEFORE_RESPAWN seconds..." + sleep $SLEEP_BEFORE_RESPAWN + fi i=$(expr $i + 1) done echo "exiting after $max_i runs" diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index d85c82f..c32682c 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -24,6 +24,7 @@ start_bts() { local variant variant="$1" + sleep_time_respawn="$2" echo Starting container with BTS if [ -z "$variant" ]; then echo ERROR: You have to specify a BTS variant @@ -34,6 +35,7 @@ --ulimit core=-1 \ -v $VOL_BASE_DIR/bts:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ + -e "SLEEP_BEFORE_RESPAWN=$sleep_time_respawn" \ --name ${BUILD_TAG}-bts -d \ $DOCKER_ARGS \ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ @@ -127,7 +129,7 @@ # 1) classic test suite with BSC for OML and trxcon+fake_trx start_bsc -start_bts trx +start_bts trx 0 start_fake_trx start_trxcon start_testsuite @@ -139,7 +141,7 @@ docker container kill ${BUILD_TAG}-fake_trx docker container kill ${BUILD_TAG}-bts cp virtphy/osmo-bts.cfg $VOL_BASE_DIR/bts/ -start_bts virtual +start_bts virtual 0 start_virtphy # ... and execute the testsuite again with different cfg cp virtphy/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester/ @@ -151,7 +153,7 @@ docker container kill ${BUILD_TAG}-virtphy docker container kill ${BUILD_TAG}-bts cp oml/osmo-bts.cfg $VOL_BASE_DIR/bts/ -start_bts trx +start_bts trx 1 start_fake_trx start_trxcon # ... and execute the testsuite again with different cfg -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I10d3e1ef8325dd78f9ae2b95fbfd1c6d893bf8a4 Gerrit-Change-Number: 19171 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 10:25:35 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Jul 2020 10:25:35 +0000 Subject: Change in osmo-mgw[master]: endp: require domain name also for E1 endpoints In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19074 ) Change subject: endp: require domain name also for E1 endpoints ...................................................................... endp: require domain name also for E1 endpoints RFC3435 requires an MGW domain name appeneded to every endpoints. When defining endpoint names in Appendix E, the domain name is is not mentioned for digital trunks, however, this does not mean that digital trunks do not have a domain appended. Osmo-mgw currently violates the spec because it explicitly checks if the domain name is _NOT_ present for E1 endpoints. Change-Id: Ibb800b689e090b97b58d0206959b660890acd967 Related: OS#2547 --- M src/libosmo-mgcp/mgcp_endp.c 1 file changed, 14 insertions(+), 13 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index 5e7bebb..82f7732 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -77,8 +77,8 @@ } /* Generate E1 endpoint name from given numeric parameters */ -static char *gen_e1_epname(void *ctx, uint8_t trunk_nr, uint8_t ts_nr, - uint8_t ss_nr) +static char *gen_e1_epname(void *ctx, const char *domain, uint8_t trunk_nr, + uint8_t ts_nr, uint8_t ss_nr) { unsigned int rate; unsigned int offset; @@ -88,8 +88,9 @@ rate = e1_rates[ss_nr]; offset = e1_offsets[ss_nr]; - return talloc_asprintf(ctx, "%s%u/s-%u/su%u-%u", - MGCP_ENDPOINT_PREFIX_E1_TRUNK, trunk_nr, ts_nr, rate, offset); + return talloc_asprintf(ctx, "%s%u/s-%u/su%u-%u@%s", + MGCP_ENDPOINT_PREFIX_E1_TRUNK, trunk_nr, ts_nr, + rate, offset, domain); } /*! allocate an endpoint and set default values. @@ -116,7 +117,9 @@ break; case MGCP_TRUNK_E1: endp->type = &ep_typeset.rtp; - endp->name = gen_e1_epname(endp, trunk->trunk_nr, index / 15, index % 15); + endp->name = gen_e1_epname(endp, trunk->cfg->domain, + trunk->trunk_nr, + index / 15, index % 15); break; default: osmo_panic("Cannot allocate unimplemented trunk type %d! %s:%d\n", @@ -353,11 +356,9 @@ if (!trunk) return NULL; - /* Virtual endpoints require a domain name (see RFC3435, section E.3) */ - if (trunk->trunk_type == MGCP_TRUNK_VIRTUAL) { - if (check_domain_name(epname, cfg)) - return NULL; - } + /* All endpoint names require a domain as suffix */ + if (check_domain_name(epname, cfg)) + return NULL; /* Identify the endpoint on the trunk */ endp = mgcp_endp_by_name_trunk(cause, epname, trunk); @@ -567,9 +568,9 @@ break; /* Pick overlapping endpoint to check */ - epname_check = - gen_e1_epname(endp, endp->trunk->trunk_nr, ts_nr, - interlock[i]); + epname_check = gen_e1_epname(endp, endp->trunk->cfg->domain, + endp->trunk->trunk_nr, ts_nr, + interlock[i]); endp_check = find_specific_endpoint(epname_check, endp->trunk); if (!endp_check) { LOGPENDP(endp, DLMGCP, LOGL_ERROR, -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibb800b689e090b97b58d0206959b660890acd967 Gerrit-Change-Number: 19074 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 10:42:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jul 2020 10:42:53 +0000 Subject: Change in docker-playground[master]: ttcn3-bts: Fix most OML test failing after osmo-bts shutdown optimiza... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19171 ) Change subject: ttcn3-bts: Fix most OML test failing after osmo-bts shutdown optimization ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I10d3e1ef8325dd78f9ae2b95fbfd1c6d893bf8a4 Gerrit-Change-Number: 19171 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jul 2020 10:42:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 11:27:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jul 2020 11:27:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cosmetic: pcu: Fix whitespacing typos References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19172 ) Change subject: cosmetic: pcu: Fix whitespacing typos ...................................................................... cosmetic: pcu: Fix whitespacing typos Change-Id: I38f752f709e593d1cfd3489a6ac590360f22a10f --- M pcu/PCU_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/19172/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 641b978..10a9275 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -2024,10 +2024,10 @@ execute( TC_force_two_phase_access() ); execute( TC_mt_ping_pong() ); execute( TC_mt_ping_pong_with_dl_racap() ); - execute (TC_ul_intermediate_retrans() ); + execute( TC_ul_intermediate_retrans() ); execute( TC_imm_ass_dl_block_retrans() ); execute( TC_dl_flow_more_blocks() ); - execute (TC_ul_flow_multiple_llc_blocks() ); + execute( TC_ul_flow_multiple_llc_blocks() ); execute( TC_paging_cs_from_bts() ); execute( TC_paging_cs_from_sgsn_sign_ptmsi() ); execute( TC_paging_cs_from_sgsn_sign() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I38f752f709e593d1cfd3489a6ac590360f22a10f Gerrit-Change-Number: 19172 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 12:08:30 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 7 Jul 2020 12:08:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_SystemInformation: add SI2quater In-Reply-To: References: Message-ID: Hello fixeria, pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 to look at the new patch set (#4). Change subject: GSM_SystemInformation: add SI2quater ...................................................................... GSM_SystemInformation: add SI2quater Change-Id: I879c37eb51ece55d79346c6bf1a4951c3f11c77e --- M library/GSM_SystemInformation.ttcn 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/19149/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I879c37eb51ece55d79346c6bf1a4951c3f11c77e Gerrit-Change-Number: 19149 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 13:32:39 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Jul 2020 13:32:39 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp: fix unused extra argument to printf() in add_fmtp() In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19169 ) Change subject: libosmo-mgcp: fix unused extra argument to printf() in add_fmtp() ...................................................................... Patch Set 1: Can you explain a bit more why this unused. Is the filed never populated? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie48da20aea7bc1eedc3f8b5b4a708458f0860a25 Gerrit-Change-Number: 19169 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Tue, 07 Jul 2020 13:32:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 13:41:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jul 2020 13:41:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_SystemInformation: add SI2quater In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 ) Change subject: GSM_SystemInformation: add SI2quater ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I879c37eb51ece55d79346c6bf1a4951c3f11c77e Gerrit-Change-Number: 19149 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 07 Jul 2020 13:41:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 14:04:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jul 2020 14:04:04 +0000 Subject: Change in osmo-ggsn[master]: gtp: queue_test: Fix printf gcc warn under ARM References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/19173 ) Change subject: gtp: queue_test: Fix printf gcc warn under ARM ...................................................................... gtp: queue_test: Fix printf gcc warn under ARM queue_test.c:39:3: warning: format '%ld' expects argument of type 'long int', but argument 9 has type 'unsigned int' [-Wformat=] Change-Id: Ie9530cdd191386ca3f6c336684f81c4582c4d962 --- M tests/gtp/queue_test.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/73/19173/1 diff --git a/tests/gtp/queue_test.c b/tests/gtp/queue_test.c index bcc6d15..11b653d 100644 --- a/tests/gtp/queue_test.c +++ b/tests/gtp/queue_test.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include @@ -27,7 +28,7 @@ OSMO_ASSERT(memcmp(&qmsg_zero, &queue->qmsga[n], sizeof(qmsg_zero)) == 0); continue; } - printf("%d\t%d\t%d\t%d\t%d\t%d\t%u\t%ld\n", + printf("%d\t%d\t%d\t%d\t%d\t%d\t%u\t%" PRIuPTR "\n", n, queue->qmsga[n].seq, queue->qmsga[n].next, @@ -35,7 +36,7 @@ (int)queue->qmsga[n].timeout, queue->qmsga[n].retrans, queue->qmsga[n].type, - ((uintptr_t)queue->qmsga[n].cbp & 0xFFFFFFFF) + (uintptr_t)queue->qmsga[n].cbp ); } printf("======================================================\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/19173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie9530cdd191386ca3f6c336684f81c4582c4d962 Gerrit-Change-Number: 19173 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 14:09:24 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Jul 2020 14:09:24 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: be more specific about E1 trunks In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19103 to look at the new patch set (#6). Change subject: mgcp_vty: be more specific about E1 trunks ...................................................................... mgcp_vty: be more specific about E1 trunks Currently only E1 trunks can be crated using the node "trunk". However, should we ever introduce another trunk type we will not be able to distinguish the new trunk type. Lets rename "trunk" to "trunk-e1" along with its underlying constants and function names so that we can easily add another "trunk-t1" for example without making old configs incompatible with the old concept. Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e Related: OS#2659 --- M include/osmocom/mgcp/vty.h M src/libosmo-mgcp/mgcp_vty.c M src/osmo-mgw/mgw_main.c 3 files changed, 34 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/03/19103/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e Gerrit-Change-Number: 19103 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 14:09:24 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Jul 2020 14:09:24 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: add function to generate e1-endpoint names In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19075 to look at the new patch set (#7). Change subject: mgcp_client: add function to generate e1-endpoint names ...................................................................... mgcp_client: add function to generate e1-endpoint names mgcp_client.h offers functions to generate endpoint names for wildcarded request. This is used in osmo-bsc, lets now also add a function that can generate e1-endpoint names. Change-Id: Iec35b5bae8a7b07ddb3559f7114a24dcd10e8f14 Related: OS#2547 --- M include/osmocom/mgcp_client/mgcp_client.h M src/libosmo-mgcp-client/mgcp_client.c 2 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/75/19075/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iec35b5bae8a7b07ddb3559f7114a24dcd10e8f14 Gerrit-Change-Number: 19075 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 14:09:24 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Jul 2020 14:09:24 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: use define constant to define max number of E1 subslots In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19118 to look at the new patch set (#4). Change subject: mgcp_endp: use define constant to define max number of E1 subslots ...................................................................... mgcp_endp: use define constant to define max number of E1 subslots There are 15 possible subslots (not all at the same time) in one E1 timeslot. Lets use a define constant for that. Change-Id: If7cb74e486946aff09e22abf8a8885bf0693f34e Related: OS#2547 --- M include/osmocom/mgcp/mgcp_endp.h M src/libosmo-mgcp/mgcp_endp.c 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/18/19118/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If7cb74e486946aff09e22abf8a8885bf0693f34e Gerrit-Change-Number: 19118 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 14:09:24 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Jul 2020 14:09:24 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: remove double check In-Reply-To: References: Message-ID: Hello pespin, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19119 to look at the new patch set (#4). Change subject: mgcp_trunk: remove double check ...................................................................... mgcp_trunk: remove double check At the moment, the trunk prefix is checked twice. Lets re-arange the code a bit so that the check only happens once. Change-Id: I91fb8cf6e3b077ba8f18fdbcd071275c6fd7cacd Related: OS#2547 --- M src/libosmo-mgcp/mgcp_trunk.c 1 file changed, 2 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/19/19119/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I91fb8cf6e3b077ba8f18fdbcd071275c6fd7cacd Gerrit-Change-Number: 19119 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 14:09:24 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Jul 2020 14:09:24 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: do not access endpoint array elements directly In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19120 to look at the new patch set (#4). Change subject: mgcp_test: do not access endpoint array elements directly ...................................................................... mgcp_test: do not access endpoint array elements directly The test assumes that the endpoint "rtpbridge/X at mgw" is at array position X in many places. This does not necessarly have to match. Accessing the array elements directly was the prefered way when the MGW did use integer numbers and not strings to identify endpoints. Since the endpoint name strings are used to access the endpoints the unit-test should also reflect this. Lets replace the integer variable last_endpoint with a string variable and do related verifications based on strings. Change-Id: Ic950c427f23be4a792af94972554637c2b0fbdf2 Related: OS#2659 --- M tests/mgcp/mgcp_test.c 1 file changed, 40 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/20/19120/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic950c427f23be4a792af94972554637c2b0fbdf2 Gerrit-Change-Number: 19120 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 14:09:24 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Jul 2020 14:09:24 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: fix endpoint number configuration In-Reply-To: References: Message-ID: Hello pespin, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 to look at the new patch set (#4). Change subject: mgcp_vty: fix endpoint number configuration ...................................................................... mgcp_vty: fix endpoint number configuration At the moment the number of possible E1 endpoints (depends on the number of E1 timeslots that should be used) is hardcoded and the configuration of the number of virtual endpoints has an off-by-one problem. For the E1 timeslots one might choose not to occupy all E1 timeslots of once. A one TRX E1 BTS usually requires 3 E1 timeslots. One as D-Channel timeslot and two to cover the voice channels. The voice channels timeslots need to be set up in osmo-mgw, while the D-Channel timeslot must not be touched. The VTY config needs to be able to reflect that. Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Related: OS#2547 --- M include/osmocom/mgcp/mgcp_trunk.h M src/libosmo-mgcp/mgcp_trunk.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 4 files changed, 91 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/21/19121/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Gerrit-Change-Number: 19121 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 14:09:28 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Jul 2020 14:09:28 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: use talloc_zero_array instead of _talloc_zero_array References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19174 ) Change subject: mgcp_trunk: use talloc_zero_array instead of _talloc_zero_array ...................................................................... mgcp_trunk: use talloc_zero_array instead of _talloc_zero_array _talloc_zero_array is not supposed to be called by the API user. Lets use talloc_zero_array instead. Related: OS#2659 Change-Id: I27549585016a7998e9233c52f6d86429fc75f509 --- M src/libosmo-mgcp/mgcp_trunk.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/74/19174/1 diff --git a/src/libosmo-mgcp/mgcp_trunk.c b/src/libosmo-mgcp/mgcp_trunk.c index a0322eb..7bcf059 100644 --- a/src/libosmo-mgcp/mgcp_trunk.c +++ b/src/libosmo-mgcp/mgcp_trunk.c @@ -104,8 +104,8 @@ OSMO_ASSERT(number_endpoints < 65534); /* allocate pointer array for the endpoints */ - trunk->endpoints = _talloc_zero_array(trunk->cfg, - sizeof(struct mgcp_endpoint *), number_endpoints, "endpoints"); + trunk->endpoints = talloc_zero_array(trunk->cfg, struct mgcp_endpoint*, + number_endpoints); if (!trunk->endpoints) return -1; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I27549585016a7998e9233c52f6d86429fc75f509 Gerrit-Change-Number: 19174 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 14:10:47 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Jul 2020 14:10:47 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: fix endpoint number configuration In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19121 ) Change subject: mgcp_vty: fix endpoint number configuration ...................................................................... Patch Set 4: (10 comments) (ensuring all messages are sent) https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/include/osmocom/mgcp/mgcp_trunk.h File include/osmocom/mgcp/mgcp_trunk.h: https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/include/osmocom/mgcp/mgcp_trunk.h at 51 PS2, Line 51: } virtual; > better to use a different name, because 'virtual' is a C++ keyword... virt or virtual_trunk or ... [?] Done https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_trunk.c File src/libosmo-mgcp/mgcp_trunk.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_trunk.c at 51 PS2, Line 51: trunk->trunk_nr = nr; > (unrelated whitespace change) This is intentional. I want to have the trunk specific and the generic settings grouped. https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_trunk.c at 87 PS2, Line 87: offset_endpoints = 1; > (naming: first_endp_id or first_endp_nr? "offset" to me indicates that we are skipping some items in [?] Done https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_trunk.c at 99 PS2, Line 99: * however miss-initalation of the struct or memory corruption > 'initialization' Done https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_trunk.c at 103 PS2, Line 103: > Note that the vty allows vty_number_endpoints to be 0, in which case we probably should not invoke t [?] We should make sure that the VTY forces to create at least one endpoints. I have fixed it there now. https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_trunk.c at 105 PS2, Line 105: trunk->endpoints = _talloc_zero_array(trunk->cfg, > (separate issue: seems sketchy to use an API function that starts with an underscore and that isn't [?] I have fixed that in a different patch. https://gerrit.osmocom.org/c/osmo-mgw/+/19121/3/src/libosmo-mgcp/mgcp_trunk.c File src/libosmo-mgcp/mgcp_trunk.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19121/3/src/libosmo-mgcp/mgcp_trunk.c at 45 PS3, Line 45: trunk->virtual.vty_number_endpoints = 32; : trunk->e1.vty_timeslot_first = 1; : trunk->e1.vty_timeslot_num = 2; > I would not make this vty configurable. [?] Just thought that a bit of flexibility would not hurt. So we make it static: first timeslot is 1 and last one is 32. Maybe it would be a compromise to put a default config that opens all timeslots. Then we would not need to syncronize the configs, but should it be necessary we have the option to do so. https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_vty.c File src/libosmo-mgcp/mgcp_vty.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_vty.c at 713 PS2, Line 713: "number endpoints <0-65534>", > ...this is where vty_number_endpoints == 0 is allowed by the vty. [?] Done https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_vty.c at 936 PS2, Line 936: vty_out(vty, " timeslot first %u%s", > Preferably add new vty commands in a separate patch, because the commit log says "refactor" You are probably right, this patch is more about adding features. The refactoring is just a minimal side effect. https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_vty.c at 1179 PS2, Line 1179: "Timeslot options\n" "Number of E1 timeslots to use\n" "E1 timeslot count\n") > explain whether the used E1 timeslots end up being [first .. first+num] or [first .. [?] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Gerrit-Change-Number: 19121 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 07 Jul 2020 14:10:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 14:24:47 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jul 2020 14:24:47 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: be more specific about E1 trunks In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19103 ) Change subject: mgcp_vty: be more specific about E1 trunks ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e Gerrit-Change-Number: 19103 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jul 2020 14:24:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 14:26:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jul 2020 14:26:28 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: use define constant to define max number of E1 subslots In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19118 ) Change subject: mgcp_endp: use define constant to define max number of E1 subslots ...................................................................... Patch Set 4: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/19118/4/src/libosmo-mgcp/mgcp_endp.c File src/libosmo-mgcp/mgcp_endp.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19118/4/src/libosmo-mgcp/mgcp_endp.c at 528 PS4, Line 528: { { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, -1 }, Looking at it now, the alignment you use here is pretty weird. Simply move the first { up. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If7cb74e486946aff09e22abf8a8885bf0693f34e Gerrit-Change-Number: 19118 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jul 2020 14:26:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 15:24:43 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jul 2020 15:24:43 +0000 Subject: Change in osmo-pcu[master]: tbf_dl: uint8_t is enough to store a TA value References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19175 ) Change subject: tbf_dl: uint8_t is enough to store a TA value ...................................................................... tbf_dl: uint8_t is enough to store a TA value According to 3GPP TS 44.018 sec 10.5.2.40, Timing Advance value is 8 bit and range is 0-63 (0-219 on GSM400). So there's no need for 16 bits to store it. uint8_t is used in all other places in the code. Change-Id: I38aa063ae30ca5680fef6252d2cef22cea98c123 --- M src/tbf_dl.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/75/19175/1 diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 02aaa3a..e6be3c3 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -138,7 +138,7 @@ { bool ss; int8_t use_trx; - uint16_t ta = GSM48_TA_INVALID; + uint8_t ta = GSM48_TA_INVALID; struct gprs_rlcmac_ul_tbf *ul_tbf = NULL, *old_ul_tbf; struct gprs_rlcmac_dl_tbf *dl_tbf = NULL; GprsMs *ms; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I38aa063ae30ca5680fef6252d2cef22cea98c123 Gerrit-Change-Number: 19175 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 15:24:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jul 2020 15:24:45 +0000 Subject: Change in osmo-pcu[master]: encoding: Encode TA as unsigned and check validty against GSM48_TA_IN... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19176 ) Change subject: encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID ...................................................................... encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID According to 3GPP TS 44.018 sec 10.5.2.40, Timing Advance value is 8 bit and range is 0-63 (0-219 on GSM400). unsigned value (uint8_t) is used everywhere else, so avoid using a signed one here, and simply check for GSM48_TA_INVALID here.ch we use everywhere else to initialize when the value is not known. Ideally we should check for value based on band. Change-Id: I82b13561d0fe5ebafb5c3a8b9a501045c29809bc --- M src/encoding.cpp 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/76/19176/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index 89cc5f2..92944f0 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -142,9 +142,9 @@ } /* { 0 | 1 < TIMING_ADVANCE_VALUE : bit (6) > } */ -static inline void write_ta(bitvec *dest, unsigned& wp, int8_t ta) +static inline void write_ta(bitvec *dest, unsigned& wp, uint8_t ta) { - if (ta < 0) /* No TIMING_ADVANCE_VALUE: */ + if (ta >= GSM48_TA_INVALID) /* No TIMING_ADVANCE_VALUE: */ bitvec_write_field(dest, &wp, 0, 1); else { /* TIMING_ADVANCE_VALUE: */ bitvec_write_field(dest, &wp, 1, 1); @@ -174,7 +174,7 @@ < TIMING_ADVANCE_TIMESLOT_NUMBER : bit (3) > } */ static inline void write_ta_ie(bitvec *dest, unsigned& wp, - int8_t ta, int8_t tai, uint8_t ts) + uint8_t ta, int8_t tai, uint8_t ts) { write_ta(dest, wp, ta); if (write_tai(dest, wp, tai)) /* TIMING_ADVANCE_TIMESLOT_NUMBER: */ @@ -580,7 +580,7 @@ bitvec_write_field(dest, &wp,0x0,1); // Message escape bitvec_write_field(dest, &wp, mcs_chan_code(tbf->current_cs()), 2); // CHANNEL_CODING_COMMAND bitvec_write_field(dest, &wp,0x1,1); // TLLI_BLOCK_CHANNEL_CODING - write_ta_ie(dest, wp,tbf->ta(), ta_idx, ta_ts); + write_ta_ie(dest, wp, tbf->ta(), ta_idx, ta_ts); } else { /* EPGRS */ bitvec_write_field(dest, &wp,0x1,1); // Message escape bitvec_write_field(dest, &wp,0x0,2); // EGPRS message contents @@ -594,7 +594,7 @@ bitvec_write_field(dest, &wp,0x0,1); // No ARAC RETRANSMISSION REQUEST bitvec_write_field(dest, &wp,0x1,1); // TLLI_BLOCK_CHANNEL_CODING bitvec_write_field(dest, &wp,0x0,1); // No BEP_PERIOD2 - write_ta_ie(dest, wp,tbf->ta(), ta_idx, ta_ts); + write_ta_ie(dest, wp, tbf->ta(), ta_idx, ta_ts); bitvec_write_field(dest, &wp,0x0,1); // No Packet Extended Timing Advance } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I82b13561d0fe5ebafb5c3a8b9a501045c29809bc Gerrit-Change-Number: 19176 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 16:41:17 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 7 Jul 2020 16:41:17 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp: fix unused extra argument to printf() in add_fmtp() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19169 ) Change subject: libosmo-mgcp: fix unused extra argument to printf() in add_fmtp() ...................................................................... Patch Set 1: (1 comment) > Patch Set 1: > > Can you explain a bit more why this unused. Is the filed never populated? Well, the format string "\r\n" contains no format specifiers... It's like calling printf("Hello world\n", foo, bar). https://gerrit.osmocom.org/c/osmo-mgw/+/19169/1/src/libosmo-mgcp/mgcp_sdp.c File src/libosmo-mgcp/mgcp_sdp.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19169/1/src/libosmo-mgcp/mgcp_sdp.c at 480 PS1, Line 480: fmtp_params[i].payload_type Looks like it was copy-pasted from here. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie48da20aea7bc1eedc3f8b5b4a708458f0860a25 Gerrit-Change-Number: 19169 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Tue, 07 Jul 2020 16:41:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 16:54:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 7 Jul 2020 16:54:40 +0000 Subject: Change in osmo-pcu[master]: tbf_dl: uint8_t is enough to store a TA value In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19175 ) Change subject: tbf_dl: uint8_t is enough to store a TA value ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I38aa063ae30ca5680fef6252d2cef22cea98c123 Gerrit-Change-Number: 19175 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 07 Jul 2020 16:54:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 17:00:44 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 7 Jul 2020 17:00:44 +0000 Subject: Change in osmo-pcu[master]: encoding: Encode TA as unsigned and check validty against GSM48_TA_IN... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19176 ) Change subject: encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/19176/1/src/encoding.cpp File src/encoding.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/19176/1/src/encoding.cpp at 147 PS1, Line 147: GSM48_TA_INVALID Maybe rather '> 63'? Anything grater than 63 (0b111111) would not fit into a 6 bit field. https://gerrit.osmocom.org/c/osmo-pcu/+/19176/1/src/encoding.cpp at 583 PS1, Line 583: Unrelated change. https://gerrit.osmocom.org/c/osmo-pcu/+/19176/1/src/encoding.cpp at 597 PS1, Line 597: Unrelated change. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I82b13561d0fe5ebafb5c3a8b9a501045c29809bc Gerrit-Change-Number: 19176 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 07 Jul 2020 17:00:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 18:12:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jul 2020 18:12:01 +0000 Subject: Change in osmo-pcu[master]: encoding: Encode TA as unsigned and check validty against GSM48_TA_IN... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19176 ) Change subject: encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/19176/1/src/encoding.cpp File src/encoding.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/19176/1/src/encoding.cpp at 583 PS1, Line 583: > Unrelated change. I did it in the same patch because it's the two callers of that function being fixed and we are updating the function params too, so anyway provides a quick way to see who's calling it in the same patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I82b13561d0fe5ebafb5c3a8b9a501045c29809bc Gerrit-Change-Number: 19176 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 07 Jul 2020 18:12:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 18:13:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jul 2020 18:13:10 +0000 Subject: Change in osmo-pcu[master]: encoding: Encode TA as unsigned and check validty against GSM48_TA_IN... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19176 ) Change subject: encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/19176/1/src/encoding.cpp File src/encoding.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/19176/1/src/encoding.cpp at 147 PS1, Line 147: GSM48_TA_INVALID > Maybe rather '> 63'? Anything grater than 63 (0b111111) would not fit into a 6 bit field. I think we should rather make sure a value between 65 and GSM48_TA_INVALID is not stored during set_ta(). In here we check fot GSM48_TA_INVALID because it's actually a possible value in code logic (because it means it's unset/unknown). -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I82b13561d0fe5ebafb5c3a8b9a501045c29809bc Gerrit-Change-Number: 19176 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 07 Jul 2020 18:13:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 19:02:59 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 7 Jul 2020 19:02:59 +0000 Subject: Change in osmo-pcu[master]: encoding: Encode TA as unsigned and check validty against GSM48_TA_IN... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19176 ) Change subject: encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/19176/1/src/encoding.cpp File src/encoding.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/19176/1/src/encoding.cpp at 583 PS1, Line 583: > I did it in the same patch because it's the two callers of that function being fixed and we are upda [?] I would still prefer if you send this as a separate change, so this one looks cleaner. I would accept this if such cosmetic changes were made within the same 'if'/'for'/'switch' statement where you do the actual logic changes. In the end, if someone would (for some *theoretical* reason) need to revert this change, we would lose this whitespace fix too. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I82b13561d0fe5ebafb5c3a8b9a501045c29809bc Gerrit-Change-Number: 19176 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 07 Jul 2020 19:02:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 19:29:54 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Jul 2020 19:29:54 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp: fix unused extra argument to printf() in add_fmtp() In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19169 ) Change subject: libosmo-mgcp: fix unused extra argument to printf() in add_fmtp() ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/19169/1/src/libosmo-mgcp/mgcp_sdp.c File src/libosmo-mgcp/mgcp_sdp.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19169/1/src/libosmo-mgcp/mgcp_sdp.c at 480 PS1, Line 480: fmtp_params[i].payload_type > Looks like it was copy-pasted from here. Oh, I see, it is not even in the format string. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie48da20aea7bc1eedc3f8b5b4a708458f0860a25 Gerrit-Change-Number: 19169 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jul 2020 19:29:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 19:30:38 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Jul 2020 19:30:38 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: fix endpoint number configuration In-Reply-To: References: Message-ID: Hello pespin, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 to look at the new patch set (#5). Change subject: mgcp_vty: fix endpoint number configuration ...................................................................... mgcp_vty: fix endpoint number configuration At the moment the number of possible E1 endpoints (depends on the number of E1 timeslots that should be used) is hardcoded and the configuration of the number of virtual endpoints has an off-by-one problem. For the E1 timeslots one might choose not to occupy all E1 timeslots of once. A one TRX E1 BTS usually requires 3 E1 timeslots. One as D-Channel timeslot and two to cover the voice channels. The voice channels timeslots need to be set up in osmo-mgw, while the D-Channel timeslot must not be touched. The VTY config needs to be able to reflect that. Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Related: OS#2547 --- M include/osmocom/mgcp/mgcp_trunk.h M src/libosmo-mgcp/mgcp_trunk.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 4 files changed, 88 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/21/19121/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Gerrit-Change-Number: 19121 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 19:30:40 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Jul 2020 19:30:40 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp.c: cosmetic: fix sourcecode formatting References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19178 ) Change subject: mgcp_endp.c: cosmetic: fix sourcecode formatting ...................................................................... mgcp_endp.c: cosmetic: fix sourcecode formatting Change-Id: Ib83442d9a033b96c304bfd5e81206405d98d2ed5 --- M src/libosmo-mgcp/mgcp_endp.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/78/19178/1 diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index 3ac3c5d..5d9ec27 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -524,8 +524,8 @@ * endpoint we need to verify, only the overlaps need to be checked. This is * also the reason why the related subslot number is missing from each each * line. */ - const int8_t interlock_tab[MGCP_ENDP_E1_SUBSLOTS][15] = - { { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, -1 }, + const int8_t interlock_tab[MGCP_ENDP_E1_SUBSLOTS][15] = { + { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, -1 }, { 0, 3, 4, 7, 8, 9, 10, -1, -1, -1, -1, -1, -1, -1, -1 }, { 0, 5, 6, 11, 12, 13, 14, -1, -1, -1, -1, -1, -1, -1, -1 }, { 0, 1, 7, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib83442d9a033b96c304bfd5e81206405d98d2ed5 Gerrit-Change-Number: 19178 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 19:32:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 7 Jul 2020 19:32:10 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp.c: cosmetic: fix sourcecode formatting In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19178 ) Change subject: mgcp_endp.c: cosmetic: fix sourcecode formatting ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib83442d9a033b96c304bfd5e81206405d98d2ed5 Gerrit-Change-Number: 19178 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Jul 2020 19:32:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 7 20:11:17 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Jul 2020 20:11:17 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: pick trunk by number and type In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19102 ) Change subject: mgcp_trunk: pick trunk by number and type ...................................................................... mgcp_trunk: pick trunk by number and type The function mgcp_trunk_by_num() is used to directly pick a specific trunk that is known by its id number (sometimes called "index"). Traditionally the virtual trunk will reside under id number 0 and all consecutively created E1 trunks will be created under number 1 to 64. This works fine, but puts a limitation on us should we ever introduce an aditional trunk type (e.g. T1). Since the numbers must be unique regardless of the trunk type one could not have an E1 trunk number 1 and e.g. a T1 trunk number 1 at the same time. So we should pick the trunk not only by its number, but also by its type to allow different trunk types to carry the same number. The trunks will still be distinguishable by its type along with the respective endpoint prefix. Change-Id: I7af1e9ce601babd4a51e88201a98319e03945f83 Related: OS#2659 --- M include/osmocom/mgcp/mgcp_trunk.h M src/libosmo-mgcp/mgcp_osmux.c M src/libosmo-mgcp/mgcp_trunk.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 5 files changed, 49 insertions(+), 47 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_trunk.h b/include/osmocom/mgcp/mgcp_trunk.h index 82728fe..aa6dd29 100644 --- a/include/osmocom/mgcp/mgcp_trunk.h +++ b/include/osmocom/mgcp/mgcp_trunk.h @@ -48,7 +48,7 @@ struct mgcp_trunk *mgcp_trunk_alloc(struct mgcp_config *cfg, enum mgcp_trunk_type ttype, int nr); int mgcp_trunk_alloc_endpts(struct mgcp_trunk *tcfg); -struct mgcp_trunk *mgcp_trunk_by_num(const struct mgcp_config *cfg, int index); +struct mgcp_trunk *mgcp_trunk_by_num(const struct mgcp_config *cfg, enum mgcp_trunk_type ttype, int nr); struct mgcp_trunk *mgcp_trunk_by_name(const struct mgcp_config *cfg, const char *epname); int e1_trunk_nr_from_epname(const char *epname); diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 9715e70..ceae087 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -198,7 +198,7 @@ osmux_conn_lookup(struct mgcp_config *cfg, uint8_t cid, struct in_addr *from_addr) { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); struct mgcp_endpoint *endp; struct mgcp_conn *conn = NULL; struct mgcp_conn_rtp * conn_rtp; diff --git a/src/libosmo-mgcp/mgcp_trunk.c b/src/libosmo-mgcp/mgcp_trunk.c index 4f60cc9..e41ed0e 100644 --- a/src/libosmo-mgcp/mgcp_trunk.c +++ b/src/libosmo-mgcp/mgcp_trunk.c @@ -105,15 +105,17 @@ /*! get trunk configuration by trunk number (index). * \param[in] cfg mgcp configuration. - * \param[in] index trunk number. + * \param[in] ttype trunk type. + * \param[in] nr trunk number. * \returns pointer to trunk configuration, NULL on error. */ -struct mgcp_trunk *mgcp_trunk_by_num(const struct mgcp_config *cfg, int index) +struct mgcp_trunk *mgcp_trunk_by_num(const struct mgcp_config *cfg, enum mgcp_trunk_type ttype, int nr) { struct mgcp_trunk *trunk; - llist_for_each_entry(trunk, &cfg->trunks, entry) - if (trunk->trunk_nr == index) - return trunk; + llist_for_each_entry(trunk, &cfg->trunks, entry) { + if (trunk->trunk_nr == nr && trunk->trunk_type == ttype) + return trunk; + } return NULL; } @@ -154,7 +156,7 @@ prefix_len = sizeof(MGCP_ENDPOINT_PREFIX_VIRTUAL_TRUNK) - 1; if (strncmp(epname, MGCP_ENDPOINT_PREFIX_VIRTUAL_TRUNK, prefix_len) == 0) { - return mgcp_trunk_by_num(cfg, MGCP_VIRT_TRUNK_ID); + return mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); } prefix_len = sizeof(MGCP_ENDPOINT_PREFIX_E1_TRUNK) - 1; @@ -162,7 +164,7 @@ trunk_nr = e1_trunk_nr_from_epname(epname); if (trunk_nr < 0) return NULL; - return mgcp_trunk_by_num(cfg, trunk_nr); + return mgcp_trunk_by_num(cfg, MGCP_TRUNK_E1, trunk_nr); } /* Earlier versions of osmo-mgw were accepting endpoint names @@ -176,7 +178,7 @@ if ((epname[0] >= '0' && epname[0] <= '9') || (epname[0] >= 'a' && epname[0] <= 'f')) { LOGP(DLMGCP, LOGL_ERROR, "missing trunk prefix in endpoint name \"%s\", assuming trunk \"%s\"!\n", epname, MGCP_ENDPOINT_PREFIX_VIRTUAL_TRUNK); - return mgcp_trunk_by_num(cfg, MGCP_VIRT_TRUNK_ID); + return mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); } LOGP(DLMGCP, LOGL_ERROR, "unable to find trunk for endpoint name \"%s\"!\n", epname); diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index cbff700..2f862f1 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -57,7 +57,7 @@ static int config_write_mgcp(struct vty *vty) { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); vty_out(vty, "mgcp%s", VTY_NEWLINE); @@ -377,7 +377,7 @@ struct mgcp_trunk *trunk; int trunkidx = atoi(argv[0]); - trunk = mgcp_trunk_by_num(g_cfg, trunkidx); + trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_E1, trunkidx); if (!trunk) { vty_out(vty, "trunk %d not found%s", trunkidx, VTY_NEWLINE); return CMD_WARNING; @@ -567,7 +567,7 @@ "Add extra fmtp for the SDP file\n" "Audio\n" "Fmtp-extra\n" "Extra Information\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); char *txt = argv_concat(argv, argc, 0); if (!txt) @@ -582,7 +582,7 @@ cfg_mgcp_allow_transcoding_cmd, "allow-transcoding", "Allow transcoding\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->no_audio_transcoding = 0; return CMD_SUCCESS; @@ -592,7 +592,7 @@ cfg_mgcp_no_allow_transcoding_cmd, "no allow-transcoding", NO_STR "Allow transcoding\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->no_audio_transcoding = 1; return CMD_SUCCESS; @@ -630,7 +630,7 @@ "sdp audio-payload send-ptime", SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->audio_send_ptime = 1; return CMD_SUCCESS; @@ -641,7 +641,7 @@ "no sdp audio-payload send-ptime", NO_STR SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->audio_send_ptime = 0; return CMD_SUCCESS; @@ -652,7 +652,7 @@ "sdp audio-payload send-name", SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->audio_send_name = 1; return CMD_SUCCESS; @@ -663,7 +663,7 @@ "no sdp audio-payload send-name", NO_STR SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->audio_send_name = 0; return CMD_SUCCESS; @@ -674,7 +674,7 @@ "loop (0|1)", "Loop audio for all endpoints on main trunk\n" "Don't Loop\n" "Loop\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); if (g_cfg->osmux) { vty_out(vty, "Cannot use `loop' with `osmux'.%s", VTY_NEWLINE); @@ -690,7 +690,7 @@ "Force endpoint reallocation when the endpoint is still seized\n" "Don't force reallocation\n" "force reallocation\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->force_realloc = atoi(argv[0]); return CMD_SUCCESS; @@ -702,7 +702,7 @@ "Accept all RTP packets, even when the originating IP/Port does not match\n" "enable filter\n" "disable filter\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->rtp_accept_all = atoi(argv[0]); return CMD_SUCCESS; @@ -713,7 +713,7 @@ "number endpoints <0-65534>", "Number options\n" "Endpoints available\n" "Number endpoints\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); /* + 1 as we start counting at one */ trunk->vty_number_endpoints = atoi(argv[0]) + 1; @@ -722,7 +722,7 @@ DEFUN(cfg_mgcp_omit_rtcp, cfg_mgcp_omit_rtcp_cmd, "rtcp-omit", RTCP_OMIT_STR) { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, 0); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); trunk->omit_rtcp = 1; return CMD_SUCCESS; } @@ -730,7 +730,7 @@ DEFUN(cfg_mgcp_no_omit_rtcp, cfg_mgcp_no_omit_rtcp_cmd, "no rtcp-omit", NO_STR RTCP_OMIT_STR) { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->omit_rtcp = 0; return CMD_SUCCESS; @@ -740,7 +740,7 @@ cfg_mgcp_patch_rtp_ssrc_cmd, "rtp-patch ssrc", RTP_PATCH_STR "Force a fixed SSRC\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->force_constant_ssrc = 1; return CMD_SUCCESS; @@ -750,7 +750,7 @@ cfg_mgcp_no_patch_rtp_ssrc_cmd, "no rtp-patch ssrc", NO_STR RTP_PATCH_STR "Force a fixed SSRC\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->force_constant_ssrc = 0; return CMD_SUCCESS; @@ -760,7 +760,7 @@ cfg_mgcp_patch_rtp_ts_cmd, "rtp-patch timestamp", RTP_PATCH_STR "Adjust RTP timestamp\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->force_aligned_timing = 1; return CMD_SUCCESS; @@ -770,7 +770,7 @@ cfg_mgcp_no_patch_rtp_ts_cmd, "no rtp-patch timestamp", NO_STR RTP_PATCH_STR "Adjust RTP timestamp\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->force_aligned_timing = 0; return CMD_SUCCESS; @@ -780,7 +780,7 @@ cfg_mgcp_patch_rtp_rfc5993hr_cmd, "rtp-patch rfc5993hr", RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR) { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->rfc5993_hr_convert = true; return CMD_SUCCESS; @@ -790,7 +790,7 @@ cfg_mgcp_no_patch_rtp_rfc5993hr_cmd, "no rtp-patch rfc5993hr", NO_STR RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR) { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->rfc5993_hr_convert = false; return CMD_SUCCESS; @@ -799,7 +799,7 @@ DEFUN(cfg_mgcp_no_patch_rtp, cfg_mgcp_no_patch_rtp_cmd, "no rtp-patch", NO_STR RTP_PATCH_STR) { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); trunk->force_constant_ssrc = 0; trunk->force_aligned_timing = 0; @@ -812,7 +812,7 @@ "rtp keep-alive <1-120>", RTP_STR RTP_KEEPALIVE_STR "Keep alive interval in secs\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); mgcp_trunk_set_keepalive(trunk, atoi(argv[0])); return CMD_SUCCESS; @@ -823,7 +823,7 @@ "rtp keep-alive once", RTP_STR RTP_KEEPALIVE_STR "Send dummy packet only once after CRCX/MDCX\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); mgcp_trunk_set_keepalive(trunk, MGCP_KEEPALIVE_ONCE); return CMD_SUCCESS; @@ -833,7 +833,7 @@ cfg_mgcp_no_rtp_keepalive_cmd, "no rtp keep-alive", NO_STR RTP_STR RTP_KEEPALIVE_STR) { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); mgcp_trunk_set_keepalive(trunk, MGCP_KEEPALIVE_NEVER); return CMD_SUCCESS; @@ -865,7 +865,7 @@ * parameters, so we restrict the access to trunks with id numbers * greater than 0. */ - trunk = mgcp_trunk_by_num(g_cfg, index); + trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_E1, index); if (!trunk) { trunk = mgcp_trunk_alloc(g_cfg, MGCP_TRUNK_E1, index); if (!trunk) { @@ -1171,7 +1171,7 @@ struct mgcp_endpoint *endp; struct mgcp_conn *conn; - trunk = mgcp_trunk_by_num(g_cfg, atoi(argv[0])); + trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_E1, atoi(argv[0])); if (!trunk) { vty_out(vty, "%%Trunk %d not found in the config.%s", atoi(argv[0]), VTY_NEWLINE); @@ -1230,7 +1230,7 @@ struct mgcp_conn_rtp *conn; const char *conn_id = NULL; - trunk = mgcp_trunk_by_num(g_cfg, atoi(argv[0])); + trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_E1, atoi(argv[0])); if (!trunk) { vty_out(vty, "%%Trunk %d not found in the config.%s", atoi(argv[0]), VTY_NEWLINE); @@ -1283,7 +1283,7 @@ struct mgcp_trunk *trunk; struct mgcp_endpoint *endp; - trunk = mgcp_trunk_by_num(g_cfg, atoi(argv[0])); + trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_E1, atoi(argv[0])); if (!trunk) { vty_out(vty, "%%Trunk %d not found in the config.%s", atoi(argv[0]), VTY_NEWLINE); @@ -1316,7 +1316,7 @@ struct mgcp_endpoint *endp; int endp_no, rc; - trunk = mgcp_trunk_by_num(g_cfg, atoi(argv[0])); + trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_E1, atoi(argv[0])); if (!trunk) { vty_out(vty, "%%Trunk %d not found in the config.%s", atoi(argv[0]), VTY_NEWLINE); @@ -1365,7 +1365,7 @@ "osmux (on|off|only)", OSMUX_STR "Enable OSMUX\n" "Disable OSMUX\n" "Only use OSMUX\n") { - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_VIRT_TRUNK_ID); + struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); if (strcmp(argv[0], "off") == 0) { diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index b0647f4..0e87c15 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -768,7 +768,7 @@ int rc; cfg = mgcp_config_alloc(); - trunk = mgcp_trunk_by_num(cfg, MGCP_VIRT_TRUNK_ID); + trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); trunk->vty_number_endpoints = 64; mgcp_trunk_alloc_endpts(trunk); @@ -910,7 +910,7 @@ int rc; cfg = mgcp_config_alloc(); - trunk = mgcp_trunk_by_num(cfg, MGCP_VIRT_TRUNK_ID); + trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); trunk->vty_number_endpoints = 64; mgcp_trunk_alloc_endpts(trunk); @@ -979,7 +979,7 @@ char conn_id[256]; cfg = mgcp_config_alloc(); - trunk = mgcp_trunk_by_num(cfg, MGCP_VIRT_TRUNK_ID); + trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); cfg->rqnt_cb = rqnt_cb; trunk->vty_number_endpoints = 64; @@ -1393,7 +1393,7 @@ printf("Testing multiple payload types\n"); cfg = mgcp_config_alloc(); - trunk = mgcp_trunk_by_num(cfg, MGCP_VIRT_TRUNK_ID); + trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); trunk->vty_number_endpoints = 64; mgcp_trunk_alloc_endpts(trunk); cfg->policy_cb = mgcp_test_policy_cb; @@ -1539,7 +1539,7 @@ printf("Testing no sequence flow on initial packet\n"); cfg = mgcp_config_alloc(); - trunk = mgcp_trunk_by_num(cfg, MGCP_VIRT_TRUNK_ID); + trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); trunk->vty_number_endpoints = 64; mgcp_trunk_alloc_endpts(trunk); @@ -1588,7 +1588,7 @@ printf("Testing no rtpmap name\n"); cfg = mgcp_config_alloc(); - trunk = mgcp_trunk_by_num(cfg, MGCP_VIRT_TRUNK_ID); + trunk = mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); trunk->vty_number_endpoints = 64; trunk->audio_send_name = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I7af1e9ce601babd4a51e88201a98319e03945f83 Gerrit-Change-Number: 19102 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 00:00:27 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 00:00:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RestOctets: add SI2quater EUTRAN templates In-Reply-To: References: Message-ID: neels has uploaded a new patch set (#3) to the change originally created by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 ) Change subject: library/GSM_RestOctets: add SI2quater EUTRAN templates ...................................................................... library/GSM_RestOctets: add SI2quater EUTRAN templates Will be used in upcoming System Information tests. Change-Id: I4162cc39ad351f5e96f5941116a424adc44efaa2 --- M library/GSM_RestOctets.ttcn 1 file changed, 138 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/19114/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4162cc39ad351f5e96f5941116a424adc44efaa2 Gerrit-Change-Number: 19114 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 00:00:27 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 00:00:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add SI2quater tests for multiple EARFCNs In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 to look at the new patch set (#4). Change subject: bsc: add SI2quater tests for multiple EARFCNs ...................................................................... bsc: add SI2quater tests for multiple EARFCNs Shows bug OS#4652 in osmo-bsc, fixed by I5df269f713456a6ccbb874d6b7faac4a6f123c67 Change-Id: I45382f88686ca60e68569e93569fc4cfb63a0e0d --- M bsc/BSC_Tests.ttcn 1 file changed, 153 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/19152/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I45382f88686ca60e68569e93569fc4cfb63a0e0d Gerrit-Change-Number: 19152 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 00:00:31 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 00:00:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_RestOctets: SI2quater fixup: rename "Cell List" to "Repeated Cells" References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19179 ) Change subject: GSM_RestOctets: SI2quater fixup: rename "Cell List" to "Repeated Cells" ...................................................................... GSM_RestOctets: SI2quater fixup: rename "Cell List" to "Repeated Cells" So far the naming is so that the EUTRAN_NeighborCell sounds like it reflects a single E-ARFCN, while in fact it contains a list of E-ARFCNs. In 3GPP TS 48.018 it is more accurately named "Neighbor Cells", in plural. There is another "list layer" that allows repeating these lists of E-ARFCNs, which the spec names Repeated Neighbor Cells, i.e. have a list of (=repeat) the lists of E-ARFCNs. Repeated Neighbor Cells = { // first cells list Neighbor Cells = { cell descriptions = { { e_arfcn = 1, meas_bw = 3 }, { e_arfcn = 2, meas_bw = 3 }, { e_arfcn = 3, meas_bw = 3 }, }, prio, thresh, ... }, // second cells list Neighbor Cells = { cell descriptions = { { e_arfcn = 4, meas_bw = 3 }, { e_arfcn = 5, meas_bw = 3 }, { e_arfcn = 6, meas_bw = 3 }, }, prio, thresh, ... }, ... } Adjust the naming of the SI2quaterRestOctets members to more closely resemble this structure, adopting the naming in 3GPP TS 48.018: EUTRAN_NeighborCell -> EUTRAN_NeighborCells because it is really a collection of multiple E-ARFCNs EUTRAN_NeighborCells -> EUTRAN_RepeatedNeighborCells because it is a list of E-ARFCN lists, and 3GPP TS 48.018 names it "Repeated Neighbor Cells". Also rename the EUTRAN_NotAllowedCells accordingly. Change-Id: Ib11d72c04cdb8997ec97321257fb58b2c113e790 --- M library/GSM_RestOctets.ttcn 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/19179/1 diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn index 3bc9349..39f15bb 100644 --- a/library/GSM_RestOctets.ttcn +++ b/library/GSM_RestOctets.ttcn @@ -350,11 +350,11 @@ EUTRAN_GPRSMeasParamsDescOpt gprs_meas_params_desc, /* { 1 < Repeated E-UTRAN Neighbour Cells > } ** 0 */ - EUTRAN_NeighbourCells neigh_cell_list optional, - BIT1 neigh_cell_list_term ('0'B), + EUTRAN_RepeatedNeighbourCells repeated_neigh_cells optional, + BIT1 repeated_neigh_cells_term ('0'B), /* { 1 < Repeated E-UTRAN Not Allowed Cells > } ** 0 */ - EUTRAN_NotAllowedCells not_allowed_cell_list optional, - BIT1 not_allowed_cell_list_term ('0'B), + EUTRAN_RepeatedNotAllowedCells repeated_not_allowed_cells optional, + BIT1 repeated_not_allowed_cells_term ('0'B), /* { 1 < Repeated E-UTRAN PCID to TA mapping > } ** 0 */ EUTRAN_PCID2TAMaps pcid2ta_map_list optional, BIT1 pcid2ta_map_list_term ('0'B) @@ -376,9 +376,9 @@ variant (desc) "PRESENCE(presence = '1'B)" }; -/* Repeated E-UTRAN Neighbour Cell List */ -private type record of EUTRAN_NeighbourCell EUTRAN_NeighbourCells; -private type record EUTRAN_NeighbourCell { +/* Repeated E-UTRAN Neighbour Cells */ +private type record of EUTRAN_NeighbourCells EUTRAN_RepeatedNeighbourCells; +private type record EUTRAN_NeighbourCells { BIT1 item_ind ('1'B), /* { 1 < Repeated E-UTRAN Neighbour Cells > } ** 0 */ EUTRAN_CellDescs cell_desc_list optional, @@ -409,9 +409,9 @@ variant (meas_bw) "PRESENCE(meas_bw_presence = '1'B)" }; -/* Repeated E-UTRAN Not Allowed Cell List */ -private type record of EUTRAN_NotAllowedCell EUTRAN_NotAllowedCells; -private type record EUTRAN_NotAllowedCell { +/* Repeated E-UTRAN Not Allowed Cells */ +private type record of EUTRAN_NotAllowedCells EUTRAN_RepeatedNotAllowedCells; +private type record EUTRAN_NotAllowedCells { BIT1 item_ind ('1'B), /* FIXME: Not Allowed Cells : < PCID Group IE > (not implemented) */ BIT1 pcid_group_presence ('0'B), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19179 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib11d72c04cdb8997ec97321257fb58b2c113e790 Gerrit-Change-Number: 19179 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 00:00:48 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 00:00:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add first test to verify System Information on RSL startup In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 ) Change subject: bsc: add first test to verify System Information on RSL startup ...................................................................... Patch Set 7: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 7 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 00:00:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 00:11:57 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 00:11:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add first test to verify System Information on RSL startup In-Reply-To: References: Message-ID: Hello fixeria, pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 to look at the new patch set (#8). Change subject: bsc: add first test to verify System Information on RSL startup ...................................................................... bsc: add first test to verify System Information on RSL startup Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 --- M bsc/BSC_Tests.ttcn M bsc/gen_links.sh 2 files changed, 411 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/19062/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 8 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 00:12:41 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 00:12:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add SI2quater tests for multiple EARFCNs In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 ) Change subject: bsc: add SI2quater tests for multiple EARFCNs ...................................................................... Patch Set 5: looks much nicer now, thx -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I45382f88686ca60e68569e93569fc4cfb63a0e0d Gerrit-Change-Number: 19152 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 08 Jul 2020 00:12:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 00:18:25 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 00:18:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add SI2quater tests for multiple EARFCNs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 ) Change subject: bsc: add SI2quater tests for multiple EARFCNs ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I45382f88686ca60e68569e93569fc4cfb63a0e0d Gerrit-Change-Number: 19152 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 08 Jul 2020 00:18:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 00:20:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 00:20:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_RestOctets: SI2quater fixup: rename "Cell List" to "Repeated Cells" In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19179 ) Change subject: GSM_RestOctets: SI2quater fixup: rename "Cell List" to "Repeated Cells" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19179 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib11d72c04cdb8997ec97321257fb58b2c113e790 Gerrit-Change-Number: 19179 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 08 Jul 2020 00:20:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 00:20:27 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 00:20:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_SystemInformation: add SI2quater In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 ) Change subject: GSM_SystemInformation: add SI2quater ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I879c37eb51ece55d79346c6bf1a4951c3f11c77e Gerrit-Change-Number: 19149 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 08 Jul 2020 00:20:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 00:43:26 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 00:43:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RestOctets: add SI2quater EUTRAN templates In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 ) Change subject: library/GSM_RestOctets: add SI2quater EUTRAN templates ...................................................................... Patch Set 3: Code-Review-1 (4 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114/3/library/GSM_RestOctets.ttcn File library/GSM_RestOctets.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114/3/library/GSM_RestOctets.ttcn at 523 PS3, Line 523: meas_params_desc := { presence := '0'B, desc := omit }, : gprs := { : rt_diff_desc := { presence := '0'B, desc := omit }, : bsic_desc := { presence := '0'B, desc := omit }, : rep_prio_desc := { presence := '0'B, desc := omit }, : meas_params_desc := { presence := '0'B, desc := omit } : }, : nc_meas_params := { presence := '0'B, params := omit }, : ext_info := { presence := '0'B, info := omit }, : : utran_neigh_desc := { presence := '0'B, desc := omit }, : utran_meas_params_desc := { presence := '0'B, desc := omit }, : utran_gprs_meas_params_desc := { presence := '0'B, desc := omit }, Again, please do not copy-paste. Rather do 'modifies tro_SI2quaterRestOctets_base' and change what needs to be different from the base template. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114/3/library/GSM_RestOctets.ttcn at 583 PS3, Line 583: uint16_t e_arfcn := 111, uint3_t meas_bw := 3 These values are ttcn-bsc-test specific, while this file belongs to 'library'. Rather add template arguments, so this template would be much more flexible: template (present) uint16_t e_arfcn := ?, template (omit) uint3_t meas_bw := * https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114/3/library/GSM_RestOctets.ttcn at 587 PS3, Line 587: meas_bw_presence := '1'B, : meas_bw := meas_bw So here you can do: meas_bw_presence := ?, meas_bw := meas_bw https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114/3/library/GSM_RestOctets.ttcn at 595 PS3, Line 595: uint5_t thresh_hi := 20 Same here: tr_* templates should allow matching against '?' and '*'. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4162cc39ad351f5e96f5941116a424adc44efaa2 Gerrit-Change-Number: 19114 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 08 Jul 2020 00:43:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 00:51:11 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 00:51:11 +0000 Subject: Change in osmo-mgw[master]: refactor: use msgb to receive, pass and send RTP packets In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/18913 to look at the new patch set (#4). Change subject: refactor: use msgb to receive, pass and send RTP packets ...................................................................... refactor: use msgb to receive, pass and send RTP packets Instead of numerous arguments (buf, len and context data), use a msgb, like most other osmo programs do, with a msb->cb pointing at a context data struct. This opens the future for adding/stripping IuUP header data from the msgb easily. (Checked to pass current ttcn3-mgw-tests.) Change-Id: I3af40b63bc49f8636d4e7ea2f8f83bb67f6619ee --- M include/osmocom/mgcp/mgcp_codec.h M include/osmocom/mgcp/mgcp_endp.h M include/osmocom/mgcp/mgcp_internal.h M src/libosmo-mgcp/mgcp_codec.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_osmux.c M tests/mgcp/mgcp_test.c 7 files changed, 244 insertions(+), 220 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/13/18913/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3af40b63bc49f8636d4e7ea2f8f83bb67f6619ee Gerrit-Change-Number: 18913 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 01:19:42 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 01:19:42 +0000 Subject: Change in osmo-bsc[master]: SI2quater: allow storing 48 EARFCNs References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19180 ) Change subject: SI2quater: allow storing 48 EARFCNs ...................................................................... SI2quater: allow storing 48 EARFCNs Up to 16 SI2quater are multiplexed; each fits 3 EARFCNS, so the practical maximum is 48. Change-Id: Iabeed10053ee5899b4def3509aedd25abb2410a9 --- M include/osmocom/bsc/gsm_data.h 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/80/19180/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index ce18d1b..010d871 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -393,7 +393,8 @@ #define A38_XOR_MAX_KEY_LEN 16 #define A38_COMP128_KEY_LEN 16 #define RSL_ENC_ALG_A5(x) (x+1) -#define MAX_EARFCN_LIST 32 +/* Up to 16 SI2quater are multiplexed; each fits 3 EARFCNS, so the maximum is... */ +#define MAX_EARFCN_LIST (3*16) /* is the data link established? who established it? */ #define LCHAN_SAPI_UNUSED 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iabeed10053ee5899b4def3509aedd25abb2410a9 Gerrit-Change-Number: 19180 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 8 01:33:07 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 08 Jul 2020 01:33:07 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f052272d5f33_4b782ae16d96c61024749e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/xUbuntu_18.04/i586 Package network:osmocom:nightly/open5gs failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 111s] Build dir: /usr/src/packages/BUILD/obj-i686-linux-gnu [ 111s] Build type: native build [ 111s] [ 111s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 111s] [ 111s] A full log can be found at /usr/src/packages/BUILD/obj-i686-linux-gnu/meson-logs/meson-log.txt [ 111s] cd obj-i686-linux-gnu && tail -v -n \+0 meson-logs/meson-log.txt [ 111s] ==> meson-logs/meson-log.txt <== [ 111s] Build started at 2020-07-08T01:32:53.510025 [ 111s] Main binary: /usr/bin/python3 [ 111s] Python system: Linux [ 111s] The Meson build system [ 111s] Version: 0.45.1 [ 111s] Source dir: /usr/src/packages/BUILD [ 111s] Build dir: /usr/src/packages/BUILD/obj-i686-linux-gnu [ 111s] Build type: native build [ 111s] [ 111s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 111s] dh_auto_configure: cd obj-i686-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/i386-linux-gnu --libexecdir=lib/i386-linux-gnu returned exit code 1 [ 111s] debian/rules:11: recipe for target 'binary' failed [ 111s] make: *** [binary] Error 2 [ 111s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 111s] ### VM INTERACTION START ### [ 114s] [ 105.838845] sysrq: SysRq : Power Off [ 114s] [ 105.842474] reboot: Power down [ 114s] ### VM INTERACTION END ### [ 114s] [ 114s] lamb05 failed "build open5gs_1.3.0.20200708.dsc" at Wed Jul 8 01:32:56 UTC 2020. [ 114s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 8 01:33:51 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 01:33:51 +0000 Subject: Change in osmo-bsc[master]: SI2quater: allow storing 48 EARFCNs In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19180 to look at the new patch set (#2). Change subject: SI2quater: allow storing 48 EARFCNs ...................................................................... SI2quater: allow storing 48 EARFCNs Up to 16 SI2quater are multiplexed; each fits 3 EARFCNS, so the practical maximum is 48 (of course depending on how many bits are used by other SI2quater elements). Change-Id: Iabeed10053ee5899b4def3509aedd25abb2410a9 --- M include/osmocom/bsc/gsm_data.h 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/80/19180/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iabeed10053ee5899b4def3509aedd25abb2410a9 Gerrit-Change-Number: 19180 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 8 01:33:41 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 08 Jul 2020 01:33:41 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5f05229289b46_4b782ae16d96c6102475bd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/open5gs failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 108s] Build dir: /usr/src/packages/BUILD/obj-x86_64-linux-gnu [ 108s] Build type: native build [ 108s] [ 108s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 108s] [ 108s] A full log can be found at /usr/src/packages/BUILD/obj-x86_64-linux-gnu/meson-logs/meson-log.txt [ 108s] cd obj-x86_64-linux-gnu && tail -v -n \+0 meson-logs/meson-log.txt [ 108s] ==> meson-logs/meson-log.txt <== [ 108s] Build started at 2020-07-08T01:33:35.280127 [ 108s] Main binary: /usr/bin/python3 [ 108s] Python system: Linux [ 108s] The Meson build system [ 108s] Version: 0.45.1 [ 108s] Source dir: /usr/src/packages/BUILD [ 108s] Build dir: /usr/src/packages/BUILD/obj-x86_64-linux-gnu [ 108s] Build type: native build [ 108s] [ 108s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 108s] dh_auto_configure: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 108s] debian/rules:11: recipe for target 'binary' failed [ 108s] make: *** [binary] Error 2 [ 108s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 108s] ### VM INTERACTION START ### [ 111s] [ 102.717960] sysrq: SysRq : Power Off [ 111s] [ 102.723396] reboot: Power down [ 111s] ### VM INTERACTION END ### [ 111s] [ 111s] lamb02 failed "build open5gs_1.3.0.20200708.dsc" at Wed Jul 8 01:33:38 UTC 2020. [ 111s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 8 01:35:41 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 08 Jul 2020 01:35:41 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f05230a59c97_4b782ae16d96c610247647@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Testing/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 192s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 192s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 192s] 268 | access_handler, server, [ 192s] | ^~~~~~~~~~~~~~ [ 192s] | | [ 192s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 192s] In file included from ../lib/sbi/server.c:23: [ 192s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 192s] 2425 | MHD_start_daemon (unsigned int flags, [ 192s] | ^~~~~~~~~~~~~~~~ [ 192s] cc1: some warnings being treated as errors [ 192s] [2090/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o' -c ../lib/sbi/path.c [ 192s] [2091/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o' -c ../src/mme/s1ap-sm.c [ 192s] [2092/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -c ../src/mme/s1ap-build.c [ 192s] [2093/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 192s] [2094/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -c ../src/mme/emm-build.c [ 193s] [2095/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -c ../src/mme/emm-handler.c [ 194s] [2096/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 194s] ninja: build stopped: subcommand failed. [ 194s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j8 -v returned exit code 1 [ 194s] make: *** [debian/rules:11: binary] Error 25 [ 194s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 194s] ### VM INTERACTION START ### [ 197s] [ 185.581685] sysrq: SysRq : Power Off [ 197s] [ 185.587394] reboot: Power down [ 197s] ### VM INTERACTION END ### [ 197s] [ 197s] lamb06 failed "build open5gs_1.3.0.20200708.dsc" at Wed Jul 8 01:35:30 UTC 2020. [ 197s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 8 01:36:31 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 01:36:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add first test to verify System Information on RSL startup In-Reply-To: References: Message-ID: Hello fixeria, pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 to look at the new patch set (#9). Change subject: bsc: add first test to verify System Information on RSL startup ...................................................................... bsc: add first test to verify System Information on RSL startup Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 --- M bsc/BSC_Tests.ttcn M bsc/gen_links.sh 2 files changed, 414 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/19062/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 9 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 01:36:33 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 01:36:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: more SI2quater EUTRAN ARFCN tests References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 ) Change subject: bsc: more SI2quater EUTRAN ARFCN tests ...................................................................... bsc: more SI2quater EUTRAN ARFCN tests Add more EUTRAN ARFCNs, reaching the maximum allowed amount. Add tests with 12, 23, 42 EARFCNs, just for the sake of testing some arbitrary numbers. Add tests with 32 and 33 EARFCNs because before osmo-bsc Iabeed10053ee5899b4def3509aedd25abb2410a9, only 32 EARFCNs could be stored by osmo-bsc. Add a test with 48 EARFCNs to verify the maximum amount of EARFCNs and maximum amount of SI2quater multiplexes works as expected. Add a test with 49 EARFCNs to verify the VTY error response when adding too many EARFCNs, and showing that osmo-bsc still sends 16 SI2quater with 48 EARFCNs. Change-Id: I99bf9b3381812d1db6fd0757f65995bae48da776 --- M bsc/BSC_Tests.ttcn 1 file changed, 1,127 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/19181/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index c903935..51e9044 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -61,6 +61,7 @@ import from GSM_SystemInformation all; import from GSM_RestOctets all; +import from TCCConversion_Functions all; const integer NUM_BTS := 3; const integer NUM_MSC := 3; @@ -1832,6 +1833,1125 @@ f_test_si2quater(6, sic); } +testcase TC_si2quater_12_earfcns() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + const integer count := 3; + sic.si2quater := { + tr_SI2quaterRestOctets_EUTRAN( + index := 0, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 111), + tr_EUTRAN_CellDesc(e_arfcn := 23), + tr_EUTRAN_CellDesc(e_arfcn := 24) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 1, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 25), + tr_EUTRAN_CellDesc(e_arfcn := 26), + tr_EUTRAN_CellDesc(e_arfcn := 27) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 2, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 28), + tr_EUTRAN_CellDesc(e_arfcn := 29), + tr_EUTRAN_CellDesc(e_arfcn := 30) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 3, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 31), + tr_EUTRAN_CellDesc(e_arfcn := 32), + tr_EUTRAN_CellDesc(e_arfcn := 33) + } + ) + } + ) + }; + f_test_si2quater(12, sic); +} + +testcase TC_si2quater_23_earfcns() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + const integer count := 7; + sic.si2quater := { + tr_SI2quaterRestOctets_EUTRAN( + index := 0, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 111), + tr_EUTRAN_CellDesc(e_arfcn := 23), + tr_EUTRAN_CellDesc(e_arfcn := 24) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 1, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 25), + tr_EUTRAN_CellDesc(e_arfcn := 26), + tr_EUTRAN_CellDesc(e_arfcn := 27) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 2, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 28), + tr_EUTRAN_CellDesc(e_arfcn := 29), + tr_EUTRAN_CellDesc(e_arfcn := 30) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 3, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 31), + tr_EUTRAN_CellDesc(e_arfcn := 32), + tr_EUTRAN_CellDesc(e_arfcn := 33) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 4, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 34), + tr_EUTRAN_CellDesc(e_arfcn := 35), + tr_EUTRAN_CellDesc(e_arfcn := 36) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 5, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 37), + tr_EUTRAN_CellDesc(e_arfcn := 38), + tr_EUTRAN_CellDesc(e_arfcn := 39) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 6, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 40), + tr_EUTRAN_CellDesc(e_arfcn := 41), + tr_EUTRAN_CellDesc(e_arfcn := 42) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 7, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 43), + tr_EUTRAN_CellDesc(e_arfcn := 44) + } + ) + } + ) + }; + f_test_si2quater(23, sic); +} + +testcase TC_si2quater_32_earfcns() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + const integer count := 10; + sic.si2quater := { + tr_SI2quaterRestOctets_EUTRAN( + index := 0, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 111), + tr_EUTRAN_CellDesc(e_arfcn := 23), + tr_EUTRAN_CellDesc(e_arfcn := 24) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 1, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 25), + tr_EUTRAN_CellDesc(e_arfcn := 26), + tr_EUTRAN_CellDesc(e_arfcn := 27) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 2, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 28), + tr_EUTRAN_CellDesc(e_arfcn := 29), + tr_EUTRAN_CellDesc(e_arfcn := 30) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 3, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 31), + tr_EUTRAN_CellDesc(e_arfcn := 32), + tr_EUTRAN_CellDesc(e_arfcn := 33) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 4, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 34), + tr_EUTRAN_CellDesc(e_arfcn := 35), + tr_EUTRAN_CellDesc(e_arfcn := 36) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 5, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 37), + tr_EUTRAN_CellDesc(e_arfcn := 38), + tr_EUTRAN_CellDesc(e_arfcn := 39) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 6, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 40), + tr_EUTRAN_CellDesc(e_arfcn := 41), + tr_EUTRAN_CellDesc(e_arfcn := 42) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 7, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 43), + tr_EUTRAN_CellDesc(e_arfcn := 44), + tr_EUTRAN_CellDesc(e_arfcn := 45) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 8, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 46), + tr_EUTRAN_CellDesc(e_arfcn := 47), + tr_EUTRAN_CellDesc(e_arfcn := 48) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 9, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 49), + tr_EUTRAN_CellDesc(e_arfcn := 50), + tr_EUTRAN_CellDesc(e_arfcn := 51) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 10, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 52), + tr_EUTRAN_CellDesc(e_arfcn := 53) + } + ) + } + ) + }; + f_test_si2quater(32, sic); +} + +testcase TC_si2quater_33_earfcns() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + const integer count := 10; + sic.si2quater := { + tr_SI2quaterRestOctets_EUTRAN( + index := 0, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 111), + tr_EUTRAN_CellDesc(e_arfcn := 23), + tr_EUTRAN_CellDesc(e_arfcn := 24) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 1, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 25), + tr_EUTRAN_CellDesc(e_arfcn := 26), + tr_EUTRAN_CellDesc(e_arfcn := 27) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 2, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 28), + tr_EUTRAN_CellDesc(e_arfcn := 29), + tr_EUTRAN_CellDesc(e_arfcn := 30) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 3, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 31), + tr_EUTRAN_CellDesc(e_arfcn := 32), + tr_EUTRAN_CellDesc(e_arfcn := 33) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 4, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 34), + tr_EUTRAN_CellDesc(e_arfcn := 35), + tr_EUTRAN_CellDesc(e_arfcn := 36) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 5, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 37), + tr_EUTRAN_CellDesc(e_arfcn := 38), + tr_EUTRAN_CellDesc(e_arfcn := 39) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 6, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 40), + tr_EUTRAN_CellDesc(e_arfcn := 41), + tr_EUTRAN_CellDesc(e_arfcn := 42) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 7, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 43), + tr_EUTRAN_CellDesc(e_arfcn := 44), + tr_EUTRAN_CellDesc(e_arfcn := 45) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 8, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 46), + tr_EUTRAN_CellDesc(e_arfcn := 47), + tr_EUTRAN_CellDesc(e_arfcn := 48) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 9, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 49), + tr_EUTRAN_CellDesc(e_arfcn := 50), + tr_EUTRAN_CellDesc(e_arfcn := 51) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 10, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 52), + tr_EUTRAN_CellDesc(e_arfcn := 53), + tr_EUTRAN_CellDesc(e_arfcn := 54) + } + ) + } + ) + }; + f_test_si2quater(33, sic); +} + +testcase TC_si2quater_42_earfcns() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + const integer count := 13; + sic.si2quater := { + tr_SI2quaterRestOctets_EUTRAN( + index := 0, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 111), + tr_EUTRAN_CellDesc(e_arfcn := 23), + tr_EUTRAN_CellDesc(e_arfcn := 24) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 1, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 25), + tr_EUTRAN_CellDesc(e_arfcn := 26), + tr_EUTRAN_CellDesc(e_arfcn := 27) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 2, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 28), + tr_EUTRAN_CellDesc(e_arfcn := 29), + tr_EUTRAN_CellDesc(e_arfcn := 30) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 3, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 31), + tr_EUTRAN_CellDesc(e_arfcn := 32), + tr_EUTRAN_CellDesc(e_arfcn := 33) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 4, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 34), + tr_EUTRAN_CellDesc(e_arfcn := 35), + tr_EUTRAN_CellDesc(e_arfcn := 36) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 5, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 37), + tr_EUTRAN_CellDesc(e_arfcn := 38), + tr_EUTRAN_CellDesc(e_arfcn := 39) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 6, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 40), + tr_EUTRAN_CellDesc(e_arfcn := 41), + tr_EUTRAN_CellDesc(e_arfcn := 42) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 7, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 43), + tr_EUTRAN_CellDesc(e_arfcn := 44), + tr_EUTRAN_CellDesc(e_arfcn := 45) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 8, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 46), + tr_EUTRAN_CellDesc(e_arfcn := 47), + tr_EUTRAN_CellDesc(e_arfcn := 48) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 9, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 49), + tr_EUTRAN_CellDesc(e_arfcn := 50), + tr_EUTRAN_CellDesc(e_arfcn := 51) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 10, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 52), + tr_EUTRAN_CellDesc(e_arfcn := 53), + tr_EUTRAN_CellDesc(e_arfcn := 54) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 11, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 55), + tr_EUTRAN_CellDesc(e_arfcn := 56), + tr_EUTRAN_CellDesc(e_arfcn := 57) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 12, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 58), + tr_EUTRAN_CellDesc(e_arfcn := 59), + tr_EUTRAN_CellDesc(e_arfcn := 60) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 13, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 61), + tr_EUTRAN_CellDesc(e_arfcn := 62), + tr_EUTRAN_CellDesc(e_arfcn := 63) + } + ) + } + ) + }; + f_test_si2quater(42, sic); +} + +testcase TC_si2quater_48_earfcns() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + const integer count := 15; + sic.si2quater := { + tr_SI2quaterRestOctets_EUTRAN( + index := 0, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 111), + tr_EUTRAN_CellDesc(e_arfcn := 23), + tr_EUTRAN_CellDesc(e_arfcn := 24) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 1, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 25), + tr_EUTRAN_CellDesc(e_arfcn := 26), + tr_EUTRAN_CellDesc(e_arfcn := 27) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 2, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 28), + tr_EUTRAN_CellDesc(e_arfcn := 29), + tr_EUTRAN_CellDesc(e_arfcn := 30) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 3, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 31), + tr_EUTRAN_CellDesc(e_arfcn := 32), + tr_EUTRAN_CellDesc(e_arfcn := 33) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 4, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 34), + tr_EUTRAN_CellDesc(e_arfcn := 35), + tr_EUTRAN_CellDesc(e_arfcn := 36) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 5, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 37), + tr_EUTRAN_CellDesc(e_arfcn := 38), + tr_EUTRAN_CellDesc(e_arfcn := 39) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 6, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 40), + tr_EUTRAN_CellDesc(e_arfcn := 41), + tr_EUTRAN_CellDesc(e_arfcn := 42) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 7, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 43), + tr_EUTRAN_CellDesc(e_arfcn := 44), + tr_EUTRAN_CellDesc(e_arfcn := 45) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 8, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 46), + tr_EUTRAN_CellDesc(e_arfcn := 47), + tr_EUTRAN_CellDesc(e_arfcn := 48) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 9, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 49), + tr_EUTRAN_CellDesc(e_arfcn := 50), + tr_EUTRAN_CellDesc(e_arfcn := 51) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 10, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 52), + tr_EUTRAN_CellDesc(e_arfcn := 53), + tr_EUTRAN_CellDesc(e_arfcn := 54) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 11, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 55), + tr_EUTRAN_CellDesc(e_arfcn := 56), + tr_EUTRAN_CellDesc(e_arfcn := 57) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 12, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 58), + tr_EUTRAN_CellDesc(e_arfcn := 59), + tr_EUTRAN_CellDesc(e_arfcn := 60) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 13, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 61), + tr_EUTRAN_CellDesc(e_arfcn := 62), + tr_EUTRAN_CellDesc(e_arfcn := 63) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 14, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 64), + tr_EUTRAN_CellDesc(e_arfcn := 65), + tr_EUTRAN_CellDesc(e_arfcn := 66) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 15, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 67), + tr_EUTRAN_CellDesc(e_arfcn := 68), + tr_EUTRAN_CellDesc(e_arfcn := 69) + } + ) + } + ) + }; + f_test_si2quater(48, sic); +} + +testcase TC_si2quater_49_earfcns() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + const integer count := 15; + sic.si2quater := { + tr_SI2quaterRestOctets_EUTRAN( + index := 0, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 111), + tr_EUTRAN_CellDesc(e_arfcn := 23), + tr_EUTRAN_CellDesc(e_arfcn := 24) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 1, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 25), + tr_EUTRAN_CellDesc(e_arfcn := 26), + tr_EUTRAN_CellDesc(e_arfcn := 27) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 2, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 28), + tr_EUTRAN_CellDesc(e_arfcn := 29), + tr_EUTRAN_CellDesc(e_arfcn := 30) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 3, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 31), + tr_EUTRAN_CellDesc(e_arfcn := 32), + tr_EUTRAN_CellDesc(e_arfcn := 33) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 4, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 34), + tr_EUTRAN_CellDesc(e_arfcn := 35), + tr_EUTRAN_CellDesc(e_arfcn := 36) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 5, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 37), + tr_EUTRAN_CellDesc(e_arfcn := 38), + tr_EUTRAN_CellDesc(e_arfcn := 39) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 6, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 40), + tr_EUTRAN_CellDesc(e_arfcn := 41), + tr_EUTRAN_CellDesc(e_arfcn := 42) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 7, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 43), + tr_EUTRAN_CellDesc(e_arfcn := 44), + tr_EUTRAN_CellDesc(e_arfcn := 45) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 8, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 46), + tr_EUTRAN_CellDesc(e_arfcn := 47), + tr_EUTRAN_CellDesc(e_arfcn := 48) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 9, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 49), + tr_EUTRAN_CellDesc(e_arfcn := 50), + tr_EUTRAN_CellDesc(e_arfcn := 51) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 10, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 52), + tr_EUTRAN_CellDesc(e_arfcn := 53), + tr_EUTRAN_CellDesc(e_arfcn := 54) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 11, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 55), + tr_EUTRAN_CellDesc(e_arfcn := 56), + tr_EUTRAN_CellDesc(e_arfcn := 57) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 12, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 58), + tr_EUTRAN_CellDesc(e_arfcn := 59), + tr_EUTRAN_CellDesc(e_arfcn := 60) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 13, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 61), + tr_EUTRAN_CellDesc(e_arfcn := 62), + tr_EUTRAN_CellDesc(e_arfcn := 63) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 14, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 64), + tr_EUTRAN_CellDesc(e_arfcn := 65), + tr_EUTRAN_CellDesc(e_arfcn := 66) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 15, + count := count, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells( + cell_desc_list := { + tr_EUTRAN_CellDesc(e_arfcn := 67), + tr_EUTRAN_CellDesc(e_arfcn := 68), + tr_EUTRAN_CellDesc(e_arfcn := 69) + } + ) + } + ) + }; + f_init(0); + + /* E-ARFCN 111 is already added in the osmo-bsc.cfg, so only add more arfcns if total_earfcns > 1 */ + for (var integer i := 1; i < 48; i := i + 1) { + f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list add earfcn " & int2str(22 + i) & " thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3"}); + } + + /* The 49th EARFCN no longer fits, expect VTY error */ + f_vty_enter_cfg_bts(BSCVTY, 0); + var charstring vty_error; + vty_error := f_vty_transceive_ret(BSCVTY, + "si2quater neighbor-list add earfcn 70 thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3") + f_vty_transceive(BSCVTY, "end"); + + if (f_strstr(vty_error, "Unable to add ARFCN 70") >= 0) { + log("Got expected VTY error: ", vty_error); + setverdict(pass); + } else { + setverdict(fail, "Expected the 49th EUTRAN ARFCN to be rejected by vty config, got: ", vty_error); + } + + f_init_bts_and_check_sysinfo(0, expect_si := sic); + + for (var integer i := 1; i < 48; i := i + 1) { + f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list del earfcn " & int2str(22 + i)}); + } +} + testcase TC_ctrl_msc_connection_status() runs on test_CT { var charstring ctrl_resp; @@ -5800,6 +6920,13 @@ execute( TC_si2quater_4_earfcns() ); execute( TC_si2quater_5_earfcns() ); execute( TC_si2quater_6_earfcns() ); + execute( TC_si2quater_12_earfcns() ); + execute( TC_si2quater_23_earfcns() ); + execute( TC_si2quater_32_earfcns() ); + execute( TC_si2quater_33_earfcns() ); + execute( TC_si2quater_42_earfcns() ); + execute( TC_si2quater_48_earfcns() ); + execute( TC_si2quater_49_earfcns() ); /* RSL DCHAN Channel ACtivation / Deactivation */ execute( TC_chan_act_noreply() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I99bf9b3381812d1db6fd0757f65995bae48da776 Gerrit-Change-Number: 19181 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 8 01:36:49 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 08 Jul 2020 01:36:49 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f052343cec42_4b782ae16d96c6102478f6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 257s] [2088/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/contrib_multipart_parser.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/contrib_multipart_parser.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/contrib_multipart_parser.c.o' -c ../lib/sbi/contrib/multipart_parser.c [ 257s] [2089/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -c ../lib/sbi/server.c [ 257s] FAILED: lib/sbi/9848b6c@@ogssbi at sha/server.c.o [ 257s] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -c ../lib/sbi/server.c [ 257s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 257s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 257s] 268 | access_handler, server, [ 257s] | ^~~~~~~~~~~~~~ [ 257s] | | [ 257s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 257s] In file included from ../lib/sbi/server.c:23: [ 257s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 257s] 2425 | MHD_start_daemon (unsigned int flags, [ 257s] | ^~~~~~~~~~~~~~~~ [ 257s] cc1: some warnings being treated as errors [ 257s] [2090/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -c ../lib/sbi/nnrf-build.c [ 257s] [2091/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 259s] [2092/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 259s] ninja: build stopped: subcommand failed. [ 259s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j4 -v returned exit code 1 [ 259s] make: *** [debian/rules:11: binary] Error 25 [ 259s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 259s] ### VM INTERACTION START ### [ 262s] [ 232.368214] sysrq: SysRq : Power Off [ 262s] [ 232.372770] reboot: Power down [ 262s] ### VM INTERACTION END ### [ 262s] [ 262s] cloud103 failed "build open5gs_1.3.0.20200708.dsc" at Wed Jul 8 01:36:40 UTC 2020. [ 262s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 8 01:44:29 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 01:44:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: verify conn and VLR cell id in most tests In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18998 ) Change subject: msc: verify conn and VLR cell id in most tests ...................................................................... Patch Set 1: Code-Review+2 combining +1s if anything should still change then let's do that in another patch -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie410714a96353f74a52a104c56fa0a08683e0004 Gerrit-Change-Number: 18998 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 01:44:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 01:45:09 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 01:45:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: verify conn and VLR cell id in most tests In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18998 ) Change subject: msc: verify conn and VLR cell id in most tests ...................................................................... msc: verify conn and VLR cell id in most tests osmo-msc failed to record the Complete Layer 3 Information LAC and CI in the MSC-A as well as the VLR record. Since osmo-msc Iee1781985fb25b21ce27526c6a3768bf70d4dc9a and I194271af2acb37b4f8cc2d106ab2fd2b0d443589, osmo-msc properly records these for successful Complete Layer 3 procedures. Incorporate verification of the LAC and CI in all tests calling f_perform_lu() and f_expect_clear(). Implement by scraping the output of vty 'show subscriber imsi 1234 conn' Some tests model a failure to attach, or expire the VLR record: for those, add parameter verify_cell_id to g_pars, and pass it as false, to skip checking the LAC and CI. Disable CI checking for all Iu tests globally in f_verify_vty_lac_ci(), see OS#4634. For the latest build, which does not yet record LAC and CI properly, provide mp_enable_cell_id_test, which skips all cell id verification if set to false. Put to effect by docker-playground I052fea208021509e12826c50474b96474e7a58c2. Related: OS#4627 Depends: Iee1781985fb25b21ce27526c6a3768bf70d4dc9a (osmo-msc) Change-Id: Ie410714a96353f74a52a104c56fa0a08683e0004 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 135 insertions(+), 26 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 007e541..cc69a68 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -59,6 +59,8 @@ import from SGsAP_Emulation all; +import from TCCConversion_Functions { function f_strstr }; + /* this component represents a single subscriber connection */ type component BSC_ConnHdlr extends RAN_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr, CTRL_Adapter_CT, SGsAP_ConnHdlr { var BSC_ConnHdlrPars g_pars; @@ -101,7 +103,8 @@ integer ran_idx, boolean use_umts_aka, boolean ran_is_geran, - boolean use_osmux + boolean use_osmux, + boolean verify_cell_id }; /* get a one-octet bitmaks of supported algorithms based on Classmark information */ @@ -364,6 +367,8 @@ /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */ f_cl3_or_initial_ue(l3_info); + f_verify_vty_lac_ci(verify_vlr := false); + f_mm_common(); if (g_pars.net.expect_ciph or not g_pars.ran_is_geran) { /* implicit CM SERVICE ACCEPT? */ @@ -571,6 +576,96 @@ } } +private function f_lac_ci_vty_str(BSSMAP_IE_CellIdentifier cell_id) return charstring +{ + return "LAC / cell ID: " + & int2str(oct2int(cell_id.cellIdentification.cI_CGI.lac)) & " / " + & int2str(oct2int(cell_id.cellIdentification.cI_CGI.ci)); +} + +/* Get an IMSI's info and verify that the g_pars.cell_id is reflected in the info. + * Verify both the "LAC / cell ID" in the VLR and the "LAC / cell ID" in the "Connection:" part, if any. + * If verify_vlr == false, then only verify the "Connection:" part, and fail if there is no "Connection:"; this is + * useful when a conn has been established, but the subscriber has not been authenticated, so the VLR does not yet + * reflect the new conn's cell ID. + */ +function f_verify_vty_lac_ci(boolean verify_vlr := true) runs on BSC_ConnHdlr { + if (not g_pars.ran_is_geran) { + log("Skipping f_verify_vty_lac_ci(), disabled for Iu"); + setverdict(pass); + return; + } + if (not g_pars.verify_cell_id) { + /* Skip this verification; either the TC expects no cell id to end up being accepted, or this was + * disabled globally to test an older osmo-msc which doesn't store the cell id properly yet. */ + log("Skipping f_verify_vty_lac_ci()"); + setverdict(pass); + return; + } + + var charstring vty_cmd := "show subscriber imsi " & hex2str(g_pars.imsi) & " conn"; + var charstring result := f_vty_transceive_ret(MSCVTY, vty_cmd); + var charstring expect_lac_ci := "LAC / cell ID: " + & int2str(oct2int(g_pars.cell_id.cellIdentification.cI_CGI.lac)) & " / " + & int2str(oct2int(g_pars.cell_id.cellIdentification.cI_CGI.ci)); + + var boolean vlr_matches := false; + var boolean connection_present := false; + var boolean connection_matches := false; + + /* There are two occurences of LAC / cell ID: once for the VLR record, and once for the active connection. The + * active connection part starts with 'Connection:'. If there is no active connection, that part is omitted. + * So, first find out whether there is a 'Connection:' part. Then verify the LAC / cell ID above 'Connection:' + * and below 'Connection:', separately. + */ + var integer connection_start := f_strstr(result, "Connection:"); + connection_present := (connection_start >= 0); + + var integer lac_ci_match := f_strstr(result, expect_lac_ci); + if (connection_present) { + if (lac_ci_match > connection_start) { + /* The first match is below 'Connection:', so the VLR part above it did not match. */ + vlr_matches := false; + connection_matches := true; + } else if (lac_ci_match >= 0) { + /* The first match is above 'Connection:', so the VLR part matches. */ + vlr_matches := true; + + /* Now find a match below 'Connection:' */ + lac_ci_match := f_strstr(result, expect_lac_ci, connection_start); + connection_matches := (lac_ci_match > 0); + } + } else { + /* There is no 'Connection:', so a match, if any, is from the VLR part. */ + vlr_matches := (lac_ci_match >= 0); + } + + if (verify_vlr) { + if (not vlr_matches) { + setverdict(fail, vty_cmd, " shows mismatching LAC / cell ID in the VLR part, expecting: ", + expect_lac_ci, " -- got: ", result); + return; + } else { + log("f_verify_vty_lac_ci(): VLR record matches ", expect_lac_ci); + setverdict(pass); + } + } + + if (connection_present) { + if (not connection_matches) { + setverdict(fail, vty_cmd, " shows mismatching LAC cell ID in the 'Connection' part, expecting: ", + expect_lac_ci, " -- got: ", result); + } else { + log("f_verify_vty_lac_ci(): Active connection matches ", expect_lac_ci); + setverdict(pass); + } + } + + if (not verify_vlr and not connection_present) { + setverdict(fail, "f_verify_vty_lac_ci(verify_vlr := false) called, which requires an active connection, but there is no 'Connection:' part to verify in ", result); + } +} + function f_perform_lu() runs on BSC_ConnHdlr { var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi) @@ -589,6 +684,10 @@ f_ranap_initial_ue(l3_lu); } + /* at this point the conn has been established, but the subscriber has not been authenticated, so the VLR does + * not yet reflect this conn's cell ID. */ + f_verify_vty_lac_ci(verify_vlr := false); + f_mm_imei_early(); f_mm_common(); f_msc_lu_hlr(); @@ -1574,7 +1673,7 @@ } } -function f_expect_clear(float t := 5.0) runs on BSC_ConnHdlr { +function f_expect_clear(float t := 5.0, boolean verify_vlr_cell_id := true) runs on BSC_ConnHdlr { timer T := t; T.start; @@ -1586,6 +1685,11 @@ mtc.stop; } } + + if (verify_vlr_cell_id) { + /* Now the conn is gone, but the VLR reflects the cell ID */ + f_verify_vty_lac_ci(); + } } function f_create_bssmap_exp_handoverRequest(integer targetPointCode) runs on BSC_ConnHdlr { diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index bfac7e9..d59d165 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -167,6 +167,8 @@ rctx := 1 } }; + + boolean mp_enable_cell_id_test := true; } /* altstep for the global guard timer (only used when BSSAP_DIRECT @@ -368,7 +370,8 @@ /* FIXME: move into BSC_ConnectionHandler? */ function f_init_pars(integer imsi_suffix, boolean sgsap := false, boolean gsup := true, integer ran_idx := 0, - boolean ran_is_geran := true, boolean use_osmux := false, OCT4 gsup_sid := '20000101'O) + boolean ran_is_geran := true, boolean use_osmux := false, OCT4 gsup_sid := '20000101'O, + boolean verify_cell_id := true) runs on MTC_CT return BSC_ConnHdlrPars { var BSC_ConnHdlrNetworkPars net_pars := { kc_support := '0A'O, /* A5/1 and A5/3 enabled */ @@ -404,7 +407,8 @@ ran_idx := ran_idx, use_umts_aka := false, ran_is_geran := ran_is_geran, - use_osmux := use_osmux + use_osmux := use_osmux, + verify_cell_id := mp_enable_cell_id_test and verify_cell_id }; if (not ran_is_geran) { pars.use_umts_aka := true; @@ -447,9 +451,10 @@ return vc_conn; } -function f_start_handler(void_fn fn, integer imsi_suffix, integer ran_idx := 0, boolean ran_is_geran := true, boolean use_osmux := false) +function f_start_handler(void_fn fn, integer imsi_suffix, integer ran_idx := 0, boolean ran_is_geran := true, boolean use_osmux := false, + boolean verify_cell_id := true) runs on MTC_CT return BSC_ConnHdlr { - return f_start_handler_with_pars(fn, f_init_pars(imsi_suffix, ran_idx := ran_idx, ran_is_geran := ran_is_geran, use_osmux := use_osmux)); + return f_start_handler_with_pars(fn, f_init_pars(imsi_suffix, ran_idx := ran_idx, ran_is_geran := ran_is_geran, use_osmux := use_osmux, verify_cell_id := verify_cell_id)); } private function f_tc_lu_imsi_noauth_tmsi(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { @@ -502,7 +507,7 @@ var BSC_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_tc_lu_imsi_reject), 3); + vc_conn := f_start_handler(refers(f_tc_lu_imsi_reject), 3, verify_cell_id := false); vc_conn.done; } @@ -533,7 +538,7 @@ var BSC_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_tc_lu_imsi_timeout_gsup), 4); + vc_conn := f_start_handler(refers(f_tc_lu_imsi_timeout_gsup), 4, verify_cell_id := false); vc_conn.done; } @@ -611,7 +616,7 @@ /* f_expect_lu_reject() already waits for T"-1" (X1, 5 seconds), but give some extra time to avoid race conditons... */ - f_expect_clear(7.0); + f_expect_clear(7.0, verify_vlr_cell_id := false); setverdict(pass); } @@ -663,7 +668,7 @@ testcase TC_cmserv_imsi_unknown() runs on MTC_CT { var BSC_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_tc_cmserv_imsi_unknown), 6); + vc_conn := f_start_handler(refers(f_tc_cmserv_imsi_unknown), 6, verify_cell_id := false); vc_conn.done; } @@ -751,7 +756,7 @@ f_init(); f_vty_config(MSCVTY, "network", "authentication required"); - vc_conn := f_start_handler(refers(f_tc_lu_auth_sai_timeout), 8); + vc_conn := f_start_handler(refers(f_tc_lu_auth_sai_timeout), 8, verify_cell_id := false); vc_conn.done; } @@ -785,7 +790,7 @@ f_init(); f_vty_config(MSCVTY, "network", "authentication required"); - vc_conn := f_start_handler(refers(f_tc_lu_auth_sai_err), 9); + vc_conn := f_start_handler(refers(f_tc_lu_auth_sai_err), 9, verify_cell_id := false); vc_conn.done; } @@ -894,7 +899,7 @@ var BSC_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_tc_lu_by_imei), 12); + vc_conn := f_start_handler(refers(f_tc_lu_by_imei), 12, verify_cell_id := false); vc_conn.done; } @@ -974,7 +979,7 @@ var BSC_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_tc_imsi_detach_by_imsi), 14); + vc_conn := f_start_handler(refers(f_tc_imsi_detach_by_imsi), 14, verify_cell_id := false); vc_conn.done; } @@ -1000,7 +1005,7 @@ var BSC_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_tc_imsi_detach_by_tmsi), 15); + vc_conn := f_start_handler(refers(f_tc_imsi_detach_by_tmsi), 15, verify_cell_id := false); vc_conn.done; } @@ -1026,7 +1031,7 @@ var BSC_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_tc_imsi_detach_by_imei), 16); + vc_conn := f_start_handler(refers(f_tc_imsi_detach_by_imei), 16, verify_cell_id := false); vc_conn.done; } @@ -1053,7 +1058,7 @@ var BSC_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_tc_emerg_call_imei_reject), 17); + vc_conn := f_start_handler(refers(f_tc_emerg_call_imei_reject), 17, verify_cell_id := false); vc_conn.done; } @@ -1195,7 +1200,7 @@ f_init(); f_vty_config(MSCVTY, "network", "authentication required"); - vc_conn := f_start_handler(refers(f_tc_lu_auth_2G_fail), 23); + vc_conn := f_start_handler(refers(f_tc_lu_auth_2G_fail), 23, verify_cell_id := false); vc_conn.done; } @@ -1575,7 +1580,7 @@ var BSC_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_tc_gsup_cancel), 33); + vc_conn := f_start_handler(refers(f_tc_gsup_cancel), 33, verify_cell_id := false); vc_conn.done; } @@ -1659,7 +1664,7 @@ f_vty_config(MSCVTY, "network", "authentication required"); f_vty_config(MSCVTY, "network", "encryption a5 3"); - vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi_encr_3_1), 360); + vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi_encr_3_1), 360, verify_cell_id := false); vc_conn.done; } testcase TC_lu_imsi_auth_tmsi_encr_3_1_no_cm() runs on MTC_CT { @@ -1669,7 +1674,7 @@ f_vty_config(MSCVTY, "network", "authentication required"); f_vty_config(MSCVTY, "network", "encryption a5 3"); - pars := f_init_pars(361); + pars := f_init_pars(361, verify_cell_id := false); pars.send_early_cm := false; vc_conn := f_start_handler_with_pars(refers(f_tc_lu_imsi_auth_tmsi_encr_3_1), pars); vc_conn.done; @@ -1684,7 +1689,7 @@ * message that is reported in OS#2947 to trigger the segfault */ f_vty_config(MSCVTY, "log stderr", "logging level msc debug"); - vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi_encr_3_1), 362); + vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi_encr_3_1), 362, verify_cell_id := false); vc_conn.done; } @@ -1726,7 +1731,7 @@ f_vty_config(MSCVTY, "network", "authentication required"); f_vty_config(MSCVTY, "network", "encryption a5 1 3"); - vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi_encr_13_2), 37); + vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi_encr_13_2), 37, verify_cell_id := false); vc_conn.done; } @@ -3986,7 +3991,7 @@ f_init(); f_vty_config(MSCVTY, "network", "encryption a5 1"); - vc_conn := f_start_handler(refers(f_tc_cipher_complete_with_invalid_cipher), 52); + vc_conn := f_start_handler(refers(f_tc_cipher_complete_with_invalid_cipher), 52, verify_cell_id := false); vc_conn.done; } @@ -5999,7 +6004,7 @@ f_init(); - vc_conn := f_start_handler(refers(f_tc_mm_id_resp_no_identity), 7); + vc_conn := f_start_handler(refers(f_tc_mm_id_resp_no_identity), 7, verify_cell_id := false); vc_conn.done; } @@ -6030,7 +6035,7 @@ /* The recent OsmoMSC keeps subscriber in its VLR unless the Paging is completed. * In this case we do not send anything and just wait for a Clear Command. */ - f_expect_clear(); + f_expect_clear(verify_vlr_cell_id := false); } testcase TC_lu_and_expire_while_paging() runs on MTC_CT { var BSC_ConnHdlr vc_conn; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie410714a96353f74a52a104c56fa0a08683e0004 Gerrit-Change-Number: 18998 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 01:45:38 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 01:45:38 +0000 Subject: Change in docker-playground[master]: ttcn3-msc-test latest: do not require VLR cell id match in latest build In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19000 ) Change subject: ttcn3-msc-test latest: do not require VLR cell id match in latest build ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I052fea208021509e12826c50474b96474e7a58c2 Gerrit-Change-Number: 19000 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 01:45:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 01:45:41 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 01:45:41 +0000 Subject: Change in docker-playground[master]: ttcn3-msc-test latest: do not require VLR cell id match in latest build In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19000 ) Change subject: ttcn3-msc-test latest: do not require VLR cell id match in latest build ...................................................................... ttcn3-msc-test latest: do not require VLR cell id match in latest build Depends: Ie410714a96353f74a52a104c56fa0a08683e0004 (osmo-msc) Change-Id: I052fea208021509e12826c50474b96474e7a58c2 --- M ttcn3-msc-test/MSC_Tests.cfg M ttcn3-msc-test/jenkins.sh 2 files changed, 7 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve neels: Verified diff --git a/ttcn3-msc-test/MSC_Tests.cfg b/ttcn3-msc-test/MSC_Tests.cfg index 1e5fd61..55e739c 100644 --- a/ttcn3-msc-test/MSC_Tests.cfg +++ b/ttcn3-msc-test/MSC_Tests.cfg @@ -52,6 +52,7 @@ MSC_Tests.mp_hlr_ip := "172.18.1.103"; MSC_Tests.mp_mgw_ip := "172.18.1.103"; MSC_Tests.mp_enable_osmux_test := true; +MSC_Tests.mp_enable_cell_id_test := true; [MAIN_CONTROLLER] diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index 6ad7b97..fdba9a5 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -13,6 +13,12 @@ mkdir $VOL_BASE_DIR/msc-tester/unix cp MSC_Tests.cfg $VOL_BASE_DIR/msc-tester/ +# Disable verification of VLR and conn Cell ID until osmo-msc.git release > 1.6.1 is available +if [ "$IMAGE_SUFFIX" = "latest" ]; then + sed "s/MSC_Tests.mp_enable_cell_id_test := true/MSC_Tests.mp_enable_cell_id_test := false/" -i \ + "$VOL_BASE_DIR/msc-tester/MSC_Tests.cfg" +fi + mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I052fea208021509e12826c50474b96474e7a58c2 Gerrit-Change-Number: 19000 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 02:28:47 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 02:28:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RestOctets: add SI2quater EUTRAN templates In-Reply-To: References: Message-ID: neels has uploaded a new patch set (#4) to the change originally created by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 ) Change subject: library/GSM_RestOctets: add SI2quater EUTRAN templates ...................................................................... library/GSM_RestOctets: add SI2quater EUTRAN templates Will be used in upcoming System Information tests. Change-Id: I4162cc39ad351f5e96f5941116a424adc44efaa2 --- M library/GSM_RestOctets.ttcn 1 file changed, 133 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/19114/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4162cc39ad351f5e96f5941116a424adc44efaa2 Gerrit-Change-Number: 19114 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 02:28:47 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 02:28:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add first test to verify System Information on RSL startup In-Reply-To: References: Message-ID: Hello fixeria, pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 to look at the new patch set (#10). Change subject: bsc: add first test to verify System Information on RSL startup ...................................................................... bsc: add first test to verify System Information on RSL startup Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 --- M bsc/BSC_Tests.ttcn M bsc/gen_links.sh 2 files changed, 439 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/19062/10 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 10 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 02:28:47 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 02:28:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add SI2quater tests for multiple EARFCNs In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 to look at the new patch set (#7). Change subject: bsc: add SI2quater tests for multiple EARFCNs ...................................................................... bsc: add SI2quater tests for multiple EARFCNs Shows bug OS#4652 in osmo-bsc, fixed by I5df269f713456a6ccbb874d6b7faac4a6f123c67 Change-Id: I45382f88686ca60e68569e93569fc4cfb63a0e0d --- M bsc/BSC_Tests.ttcn 1 file changed, 153 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/19152/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I45382f88686ca60e68569e93569fc4cfb63a0e0d Gerrit-Change-Number: 19152 Gerrit-PatchSet: 7 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 02:28:47 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 02:28:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: more SI2quater EUTRAN ARFCN tests In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 to look at the new patch set (#2). Change subject: bsc: more SI2quater EUTRAN ARFCN tests ...................................................................... bsc: more SI2quater EUTRAN ARFCN tests Add more EUTRAN ARFCNs, reaching the maximum allowed amount. Add tests with 12, 23, 42 EARFCNs, just for the sake of testing some arbitrary numbers. Add tests with 32 and 33 EARFCNs because before osmo-bsc Iabeed10053ee5899b4def3509aedd25abb2410a9, only 32 EARFCNs could be stored by osmo-bsc. Add a test with 48 EARFCNs to verify the maximum amount of EARFCNs and maximum amount of SI2quater multiplexes works as expected. Add a test with 49 EARFCNs to verify the VTY error response when adding too many EARFCNs, and showing that osmo-bsc still sends 16 SI2quater with 48 EARFCNs. Change-Id: I99bf9b3381812d1db6fd0757f65995bae48da776 --- M bsc/BSC_Tests.ttcn 1 file changed, 1,127 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/19181/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I99bf9b3381812d1db6fd0757f65995bae48da776 Gerrit-Change-Number: 19181 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 02:31:44 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 02:31:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RestOctets: add SI2quater EUTRAN templates In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 ) Change subject: library/GSM_RestOctets: add SI2quater EUTRAN templates ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114/3/library/GSM_RestOctets.ttcn File library/GSM_RestOctets.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114/3/library/GSM_RestOctets.ttcn at 523 PS3, Line 523: meas_params_desc := { presence := '0'B, desc := omit }, : gprs := { : rt_diff_desc := { presence := '0'B, desc := omit }, : bsic_desc := { presence := '0'B, desc := omit }, : rep_prio_desc := { presence := '0'B, desc := omit }, : meas_params_desc := { presence := '0'B, desc := omit } : }, : nc_meas_params := { presence := '0'B, params := omit }, : ext_info := { presence := '0'B, info := omit }, : : utran_neigh_desc := { presence := '0'B, desc := omit }, : utran_meas_params_desc := { presence := '0'B, desc := omit }, : utran_gprs_meas_params_desc := { presence := '0'B, desc := omit }, > Again, please do not copy-paste. [?] oh missed these https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114/3/library/GSM_RestOctets.ttcn at 587 PS3, Line 587: meas_bw_presence := '1'B, : meas_bw := meas_bw > So here you can do: [?] nice -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4162cc39ad351f5e96f5941116a424adc44efaa2 Gerrit-Change-Number: 19114 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-Comment-Date: Wed, 08 Jul 2020 02:31:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 8 03:10:29 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 08 Jul 2020 03:10:29 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f053932d541d_4b782ae16d96c610249899@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Testing/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 192s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 192s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 192s] 268 | access_handler, server, [ 192s] | ^~~~~~~~~~~~~~ [ 192s] | | [ 192s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 192s] In file included from ../lib/sbi/server.c:23: [ 192s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 192s] 2425 | MHD_start_daemon (unsigned int flags, [ 192s] | ^~~~~~~~~~~~~~~~ [ 192s] cc1: some warnings being treated as errors [ 192s] [2091/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -c ../lib/sbi/nnrf-build.c [ 192s] [2092/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -c ../src/mme/s1ap-build.c [ 192s] [2093/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 192s] [2094/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -c ../src/mme/emm-build.c [ 192s] [2095/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o' -MF 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o' -c ../src/mme/esm-sm.c [ 192s] [2096/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -c ../src/mme/emm-handler.c [ 193s] [2097/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 193s] ninja: build stopped: subcommand failed. [ 193s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j8 -v returned exit code 1 [ 193s] make: *** [debian/rules:11: binary] Error 25 [ 193s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 194s] ### VM INTERACTION START ### [ 197s] [ 185.445255] sysrq: SysRq : Power Off [ 197s] [ 185.450763] reboot: Power down [ 197s] ### VM INTERACTION END ### [ 197s] [ 197s] lamb65 failed "build open5gs_1.3.0.20200708.dsc" at Wed Jul 8 03:10:15 UTC 2020. [ 197s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 8 03:10:47 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 08 Jul 2020 03:10:47 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f05394f6da81_4b782ae16d96c610249928@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Testing/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 61s] /usr/src/packages/BUILD/src/ulfius.c: In function 'ulfius_run_mhd_daemon': [ 61s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 61s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 61s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 61s] | | [ 61s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 61s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 61s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 61s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 61s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 61s] 2425 | MHD_start_daemon (unsigned int flags, [ 61s] | ^~~~~~~~~~~~~~~~ [ 62s] cc1: all warnings being treated as errors [ 62s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 62s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 62s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 62s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 62s] make[1]: *** [Makefile:166: all] Error 2 [ 62s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 62s] dh_auto_build: error: cd build && make -j3 "INSTALL=install --strip-program=true" returned exit code 2 [ 62s] make: *** [debian/rules:9: build] Error 25 [ 62s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 62s] ### VM INTERACTION START ### [ 65s] [ 57.319478] sysrq: SysRq : Power Off [ 65s] [ 57.320621] reboot: Power down [ 65s] ### VM INTERACTION END ### [ 65s] [ 65s] build77 failed "build ulfius_2.5.2-4.1.dsc" at Wed Jul 8 03:10:35 UTC 2020. [ 65s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 8 03:11:38 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 08 Jul 2020 03:11:38 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f05396ee17a7_4b782ae16d96c6102500a1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Testing/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 81s] /usr/src/packages/BUILD/src/ulfius.c: In function 'ulfius_run_mhd_daemon': [ 81s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 81s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 81s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 81s] | | [ 81s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 81s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 81s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 81s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 81s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 81s] 2425 | MHD_start_daemon (unsigned int flags, [ 81s] | ^~~~~~~~~~~~~~~~ [ 81s] cc1: all warnings being treated as errors [ 81s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 81s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 81s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 81s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 81s] make[1]: *** [Makefile:166: all] Error 2 [ 81s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 81s] dh_auto_build: error: cd build && make -j6 "INSTALL=install --strip-program=true" returned exit code 2 [ 81s] make: *** [debian/rules:9: build] Error 25 [ 81s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 81s] ### VM INTERACTION START ### [ 85s] [ 75.668891] sysrq: SysRq : Power Off [ 85s] [ 75.673024] reboot: Power down [ 85s] ### VM INTERACTION END ### [ 85s] [ 85s] sheep86 failed "build ulfius_2.5.2-4.1.dsc" at Wed Jul 8 03:11:34 UTC 2020. [ 85s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 8 03:16:28 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 08 Jul 2020 03:16:28 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f053a999eeac_4b782ae16d96c610250358@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 60s] /usr/src/packages/BUILD/src/ulfius.c: In function 'ulfius_run_mhd_daemon': [ 60s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 60s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 60s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 60s] | | [ 60s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 60s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 60s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 60s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 60s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 60s] 2425 | MHD_start_daemon (unsigned int flags, [ 60s] | ^~~~~~~~~~~~~~~~ [ 60s] cc1: all warnings being treated as errors [ 60s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 60s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 60s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 60s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 60s] make[1]: *** [Makefile:166: all] Error 2 [ 60s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 60s] dh_auto_build: error: cd build && make -j3 "INSTALL=install --strip-program=true" returned exit code 2 [ 60s] make: *** [debian/rules:9: build] Error 25 [ 60s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 60s] ### VM INTERACTION START ### [ 63s] [ 54.983644] sysrq: SysRq : Power Off [ 63s] [ 54.984755] reboot: Power down [ 63s] ### VM INTERACTION END ### [ 63s] [ 63s] build71 failed "build ulfius_2.5.2-4.1.dsc" at Wed Jul 8 03:16:11 UTC 2020. [ 63s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 8 03:16:45 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 08 Jul 2020 03:16:45 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f053ab36d9f9_4b782ae16d96c610250423@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 192s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 192s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 192s] 268 | access_handler, server, [ 192s] | ^~~~~~~~~~~~~~ [ 192s] | | [ 192s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 192s] In file included from ../lib/sbi/server.c:23: [ 192s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 192s] 2425 | MHD_start_daemon (unsigned int flags, [ 192s] | ^~~~~~~~~~~~~~~~ [ 192s] cc1: some warnings being treated as errors [ 192s] [2089/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o' -c ../src/mme/s1ap-sm.c [ 192s] [2090/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -c ../lib/sbi/nnrf-build.c [ 192s] [2091/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o' -c ../lib/sbi/path.c [ 192s] [2092/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -c ../src/mme/s1ap-build.c [ 192s] [2093/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 192s] [2094/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -c ../src/mme/emm-handler.c [ 194s] [2095/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 194s] ninja: build stopped: subcommand failed. [ 194s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j8 -v returned exit code 1 [ 194s] make: *** [debian/rules:11: binary] Error 25 [ 194s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 194s] ### VM INTERACTION START ### [ 197s] [ 184.881214] sysrq: SysRq : Power Off [ 197s] [ 184.886376] reboot: Power down [ 197s] ### VM INTERACTION END ### [ 197s] [ 197s] lamb51 failed "build open5gs_1.3.0.20200708.dsc" at Wed Jul 8 03:16:27 UTC 2020. [ 197s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 8 03:17:02 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 08 Jul 2020 03:17:02 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f053ab4f3ee4_4b782ae16d96c6102505b5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 116s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 116s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 116s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 116s] | | [ 116s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 116s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 116s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 116s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 116s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 116s] 2425 | MHD_start_daemon (unsigned int flags, [ 116s] | ^~~~~~~~~~~~~~~~ [ 116s] cc1: all warnings being treated as errors [ 116s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 116s] make[3]: *** Waiting for unfinished jobs.... [ 116s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 116s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 116s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 116s] make[1]: *** [Makefile:166: all] Error 2 [ 116s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 116s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 116s] make: *** [debian/rules:9: build] Error 25 [ 116s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 116s] ### VM INTERACTION START ### [ 119s] [ 106.649655] sysrq: SysRq : Power Off [ 119s] [ 106.656311] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] lamb22 failed "build ulfius_2.5.2-4.1.dsc" at Wed Jul 8 03:16:49 UTC 2020. [ 119s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 8 07:54:18 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 07:54:18 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp: always check result of msgb_printf() in add_fmtp() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19170 ) Change subject: libosmo-mgcp: always check result of msgb_printf() in add_fmtp() ...................................................................... libosmo-mgcp: always check result of msgb_printf() in add_fmtp() Change-Id: I218ac21612116366eabd0c75ce3648bad4e27abf --- M src/libosmo-mgcp/mgcp_sdp.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index a7478ad..5fa6bdb 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -478,6 +478,8 @@ for (i = 0; i < fmtp_params_len; i++) { rc = msgb_printf(sdp, "a=fmtp:%u", fmtp_params[i].payload_type); + if (rc < 0) + return -EINVAL; /* Add amr octet align parameter */ if (fmtp_params[i].param.amr_octet_aligned_present) { -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I218ac21612116366eabd0c75ce3648bad4e27abf Gerrit-Change-Number: 19170 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 07:54:17 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 07:54:17 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp: fix unused extra argument to printf() in add_fmtp() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19169 ) Change subject: libosmo-mgcp: fix unused extra argument to printf() in add_fmtp() ...................................................................... libosmo-mgcp: fix unused extra argument to printf() in add_fmtp() Change-Id: Ie48da20aea7bc1eedc3f8b5b4a708458f0860a25 Closes: CID#208171 --- M src/libosmo-mgcp/mgcp_sdp.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve dexter: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index f80ebb8..a7478ad 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -496,7 +496,7 @@ return -EINVAL; } - rc = msgb_printf(sdp, "\r\n", fmtp_params[i].payload_type); + rc = msgb_printf(sdp, "\r\n"); if (rc < 0) return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie48da20aea7bc1eedc3f8b5b4a708458f0860a25 Gerrit-Change-Number: 19169 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 07:59:57 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 07:59:57 +0000 Subject: Change in osmo-bts[master]: l1sap: do not print redundant info in l1sap_chan_act() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19182 ) Change subject: l1sap: do not print redundant info in l1sap_chan_act() ...................................................................... l1sap: do not print redundant info in l1sap_chan_act() LOGPLCHAN() prepends the BTS/TRX/TS numbers itself. Change-Id: I8a1dd7da7098fe8c8a015459608d9134821fb322 --- M src/common/l1sap.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/82/19182/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 17a6c5d..e05ec78 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1729,8 +1729,7 @@ struct gsm48_chan_desc *cd; int rc; - LOGPLCHAN(lchan, DL1C, LOGL_INFO, "activating channel chan_nr=%s trx=%d\n", - rsl_chan_nr_str(chan_nr), trx->nr); + LOGPLCHAN(lchan, DL1C, LOGL_INFO, "activating channel %s\n", rsl_chan_nr_str(chan_nr)); /* osmo-pcu calls this without a valid 'tp' parameter, so we * need to make sure ew don't crash here */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8a1dd7da7098fe8c8a015459608d9134821fb322 Gerrit-Change-Number: 19182 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 08:55:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 08:55:40 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: subst_frame_loss(): print current TDMA fn References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19183 ) Change subject: trxcon/scheduler: subst_frame_loss(): print current TDMA fn ...................................................................... trxcon/scheduler: subst_frame_loss(): print current TDMA fn Change-Id: I3d769ba3cbadc19bac0b25224460af8f06d0d776 --- M src/host/trxcon/sched_trx.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/83/19183/1 diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index b6087ef..79e6f88 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -638,8 +638,8 @@ elapsed = GSM_TDMA_FN_SUB(fn, lchan->tdma.last_proc); if (elapsed > mf->period) { LOGP(DSCHD, LOGL_NOTICE, "Too many (>%u) contiguous TDMA frames elapsed (%u) " - "since the last processed fn=%u\n", mf->period, - elapsed, lchan->tdma.last_proc); + "since the last processed fn=%u (current %u)\n", + mf->period, elapsed, lchan->tdma.last_proc, fn); } else if (elapsed == 0) { LOGP(DSCHD, LOGL_ERROR, "No TDMA frames elapsed since the last processed " "fn=%u, must be a bug?\n", lchan->tdma.last_proc); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3d769ba3cbadc19bac0b25224460af8f06d0d776 Gerrit-Change-Number: 19183 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 08:55:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 08:55:40 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix subst_frame_loss(): do not compensate too much References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19184 ) Change subject: trxcon/scheduler: fix subst_frame_loss(): do not compensate too much ...................................................................... trxcon/scheduler: fix subst_frame_loss(): do not compensate too much It's not something that we should be trying to fix, if the whole TDMA multi-frame is lost. For some yet unknown reason, sometimes the difference between the last processed TDMA frame number and the current one is so huge, so trxcon eats a lot of CPU trying to compensate nearly the whole TDMA hyper-frame: sched_trx.c:640 Too many (>104) contiguous TDMA frames elapsed (2715647) since the last processed fn=633 (current fn=632) Let's just print a warning and do not compensate more than one TDMA multi-frame period corresponding to the current layout. Change-Id: I56251d0d2f6fa19195ff105d3bdfbc22df6db8cd --- M src/host/trxcon/sched_trx.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/84/19184/1 diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index 79e6f88..9195b33 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -640,6 +640,7 @@ LOGP(DSCHD, LOGL_NOTICE, "Too many (>%u) contiguous TDMA frames elapsed (%u) " "since the last processed fn=%u (current %u)\n", mf->period, elapsed, lchan->tdma.last_proc, fn); + return -EIO; } else if (elapsed == 0) { LOGP(DSCHD, LOGL_ERROR, "No TDMA frames elapsed since the last processed " "fn=%u, must be a bug?\n", lchan->tdma.last_proc); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I56251d0d2f6fa19195ff105d3bdfbc22df6db8cd Gerrit-Change-Number: 19184 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 09:39:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 09:39:39 +0000 Subject: Change in osmo-mgw[master]: refactor: use msgb to receive, pass and send RTP packets In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18913 ) Change subject: refactor: use msgb to receive, pass and send RTP packets ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3af40b63bc49f8636d4e7ea2f8f83bb67f6619ee Gerrit-Change-Number: 18913 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 08 Jul 2020 09:39:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 09:40:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 09:40:40 +0000 Subject: Change in osmo-bsc[master]: SI2quater: allow storing 48 EARFCNs In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19180 ) Change subject: SI2quater: allow storing 48 EARFCNs ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iabeed10053ee5899b4def3509aedd25abb2410a9 Gerrit-Change-Number: 19180 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 09:40:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 09:42:22 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 09:42:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add first test to verify System Information on RSL startup In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 ) Change subject: bsc: add first test to verify System Information on RSL startup ...................................................................... Patch Set 10: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 10 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 09:42:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 09:43:02 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 09:43:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add SI2quater tests for multiple EARFCNs In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 ) Change subject: bsc: add SI2quater tests for multiple EARFCNs ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I45382f88686ca60e68569e93569fc4cfb63a0e0d Gerrit-Change-Number: 19152 Gerrit-PatchSet: 7 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 09:43:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 09:45:48 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 09:45:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: more SI2quater EUTRAN ARFCN tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 ) Change subject: bsc: more SI2quater EUTRAN ARFCN tests ...................................................................... Patch Set 2: Isn't there a better way to write those tests instead of spanning a thousand lines? For instanace keeping all numbers in a record and then filling the list with a for loop. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I99bf9b3381812d1db6fd0757f65995bae48da776 Gerrit-Change-Number: 19181 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 09:45:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 09:47:19 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 09:47:19 +0000 Subject: Change in osmo-bts[master]: l1sap: do not print redundant info in l1sap_chan_act() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19182 ) Change subject: l1sap: do not print redundant info in l1sap_chan_act() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8a1dd7da7098fe8c8a015459608d9134821fb322 Gerrit-Change-Number: 19182 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 09:47:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 09:48:18 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 09:48:18 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: subst_frame_loss(): print current TDMA fn In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19183 ) Change subject: trxcon/scheduler: subst_frame_loss(): print current TDMA fn ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3d769ba3cbadc19bac0b25224460af8f06d0d776 Gerrit-Change-Number: 19183 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 09:48:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 09:49:54 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 09:49:54 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix subst_frame_loss(): do not compensate too much In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19184 ) Change subject: trxcon/scheduler: fix subst_frame_loss(): do not compensate too much ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I56251d0d2f6fa19195ff105d3bdfbc22df6db8cd Gerrit-Change-Number: 19184 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 09:49:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 8 10:08:24 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 08 Jul 2020 10:08:24 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f059b26605cc_4b782ae16d96c6103152f4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 68s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 68s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 68s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 68s] | | [ 68s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 68s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 68s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 68s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 68s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 68s] 2425 | MHD_start_daemon (unsigned int flags, [ 68s] | ^~~~~~~~~~~~~~~~ [ 68s] cc1: all warnings being treated as errors [ 68s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 68s] make[3]: *** Waiting for unfinished jobs.... [ 68s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 68s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 68s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 68s] make[1]: *** [Makefile:166: all] Error 2 [ 68s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 68s] dh_auto_build: error: cd build && make -j16 "INSTALL=install --strip-program=true" returned exit code 2 [ 68s] make: *** [debian/rules:9: build] Error 25 [ 68s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 68s] ### VM INTERACTION START ### [ 71s] [ 63.339053] sysrq: SysRq : Power Off [ 71s] [ 63.345541] reboot: Power down [ 71s] ### VM INTERACTION END ### [ 71s] [ 71s] goat03 failed "build ulfius_2.5.2-4.1.dsc" at Wed Jul 8 10:08:22 UTC 2020. [ 71s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 8 10:08:41 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 08 Jul 2020 10:08:41 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f059b4680694_4b782ae16d96c610315497@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 193s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 193s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 193s] 268 | access_handler, server, [ 193s] | ^~~~~~~~~~~~~~ [ 193s] | | [ 193s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 193s] In file included from ../lib/sbi/server.c:23: [ 193s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 193s] 2425 | MHD_start_daemon (unsigned int flags, [ 193s] | ^~~~~~~~~~~~~~~~ [ 193s] cc1: some warnings being treated as errors [ 193s] [2089/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o' -c ../lib/sbi/path.c [ 193s] [2090/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-sm.c.o' -c ../src/mme/s1ap-sm.c [ 193s] [2091/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -c ../src/mme/s1ap-build.c [ 193s] [2092/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -c ../lib/sbi/nnrf-build.c [ 193s] [2093/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 194s] [2094/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -c ../src/mme/emm-handler.c [ 195s] [2095/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 195s] ninja: build stopped: subcommand failed. [ 195s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j8 -v returned exit code 1 [ 195s] make: *** [debian/rules:11: binary] Error 25 [ 195s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 195s] ### VM INTERACTION START ### [ 198s] [ 185.554812] sysrq: SysRq : Power Off [ 198s] [ 185.561454] reboot: Power down [ 198s] ### VM INTERACTION END ### [ 198s] [ 198s] lamb19 failed "build open5gs_1.3.0.20200708.dsc" at Wed Jul 8 10:08:32 UTC 2020. [ 198s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 8 10:08:58 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 08 Jul 2020 10:08:58 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f059b471962e_4b782ae16d96c610315537@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 66s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 66s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 66s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 66s] | | [ 66s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 66s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 66s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 66s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 66s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 66s] 2425 | MHD_start_daemon (unsigned int flags, [ 66s] | ^~~~~~~~~~~~~~~~ [ 66s] cc1: all warnings being treated as errors [ 66s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 66s] make[3]: *** Waiting for unfinished jobs.... [ 66s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 66s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 66s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 66s] make[1]: *** [Makefile:166: all] Error 2 [ 66s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 66s] dh_auto_build: error: cd build && make -j3 "INSTALL=install --strip-program=true" returned exit code 2 [ 66s] make: *** [debian/rules:9: build] Error 25 [ 66s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 66s] ### VM INTERACTION START ### [ 69s] [ 62.154976] sysrq: SysRq : Power Off [ 69s] [ 62.156789] reboot: Power down [ 70s] ### VM INTERACTION END ### [ 70s] [ 70s] build84 failed "build ulfius_2.5.2-4.1.dsc" at Wed Jul 8 10:08:42 UTC 2020. [ 70s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 8 10:26:00 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 8 Jul 2020 10:26:00 +0000 Subject: Change in osmo-pcu[master]: tbf_dl: uint8_t is enough to store a TA value In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19175 ) Change subject: tbf_dl: uint8_t is enough to store a TA value ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I38aa063ae30ca5680fef6252d2cef22cea98c123 Gerrit-Change-Number: 19175 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 08 Jul 2020 10:26:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 10:27:42 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 8 Jul 2020 10:27:42 +0000 Subject: Change in osmo-ggsn[master]: gtp: queue_test: Fix printf gcc warn under ARM In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/19173 ) Change subject: gtp: queue_test: Fix printf gcc warn under ARM ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/19173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie9530cdd191386ca3f6c336684f81c4582c4d962 Gerrit-Change-Number: 19173 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 08 Jul 2020 10:27:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 10:28:38 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 8 Jul 2020 10:28:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cosmetic: pcu: Fix whitespacing typos In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19172 ) Change subject: cosmetic: pcu: Fix whitespacing typos ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I38f752f709e593d1cfd3489a6ac590360f22a10f Gerrit-Change-Number: 19172 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 08 Jul 2020 10:28:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 10:30:35 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 8 Jul 2020 10:30:35 +0000 Subject: Change in docker-playground[master]: ttcn3-bts: Fix most OML test failing after osmo-bts shutdown optimiza... In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19171 ) Change subject: ttcn3-bts: Fix most OML test failing after osmo-bts shutdown optimization ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I10d3e1ef8325dd78f9ae2b95fbfd1c6d893bf8a4 Gerrit-Change-Number: 19171 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 10:30:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 10:32:54 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 8 Jul 2020 10:32:54 +0000 Subject: Change in osmo-bts[master]: pcu_sock: Avoid presenting TS from disabled TRX as available to PCU In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19116 ) Change subject: pcu_sock: Avoid presenting TS from disabled TRX as available to PCU ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4b24faf3a8fe5846b9394fea8faf9d37cc0ac9ff Gerrit-Change-Number: 19116 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 10:32:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 10:34:50 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 8 Jul 2020 10:34:50 +0000 Subject: Change in osmo-bts[master]: bts-trx: Don't set OPSTATE enabled during trx_init In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19155 ) Change subject: bts-trx: Don't set OPSTATE enabled during trx_init ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib36a073cae5e1522821a04d8806648562f4e0f5b Gerrit-Change-Number: 19155 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 08 Jul 2020 10:34:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 10:36:45 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 8 Jul 2020 10:36:45 +0000 Subject: Change in osmo-bts[master]: bts-virt: Don't rely on gsmtap_makemsg() returning NULL for GSMTAP_CH... In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19161 ) Change subject: bts-virt: Don't rely on gsmtap_makemsg() returning NULL for GSMTAP_CHANNEL_UNKNOWN ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I233afd930d3e43f7b120d40192c7c192102e38d9 Gerrit-Change-Number: 19161 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 08 Jul 2020 10:36:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 10:39:01 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 8 Jul 2020 10:39:01 +0000 Subject: Change in libosmocore[master]: Revert "gsmtap_makemsg_ex: NULL for unknown chan_type" In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19067 ) Change subject: Revert "gsmtap_makemsg_ex: NULL for unknown chan_type" ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ebaa89cc3422df1d7fd2365a6176cb2902d1c67 Gerrit-Change-Number: 19067 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Wed, 08 Jul 2020 10:39:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 10:40:22 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 8 Jul 2020 10:40:22 +0000 Subject: Change in osmo-bts[master]: Move gsm_bts code gsm-data.* => bts.* In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19123 ) Change subject: Move gsm_bts code gsm-data.* => bts.* ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0a4219e3f64f625ee8b364bf408b8d2bcc8085c5 Gerrit-Change-Number: 19123 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 08 Jul 2020 10:40:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 10:41:32 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 8 Jul 2020 10:41:32 +0000 Subject: Change in osmo-bts[master]: Move nm_state and Mo related code gsm_data.* => oml.* In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19122 ) Change subject: Move nm_state and Mo related code gsm_data.* => oml.* ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I57ea9c4ddbe5443b9b6afe3f8e6b38170d0e5a0e Gerrit-Change-Number: 19122 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 08 Jul 2020 10:41:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 11:02:28 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 8 Jul 2020 11:02:28 +0000 Subject: Change in osmo-gsm-tester[master]: enb_amarisoft: add option to enable and configure DL AWGN channel References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185 ) Change subject: enb_amarisoft: add option to enable and configure DL AWGN channel ...................................................................... enb_amarisoft: add option to enable and configure DL AWGN channel expose option to enable DL AWGN noise and make SNR configurable Change-Id: Ib248e87e5abd855d4c974eab42ec40828c6e1d40 --- M src/osmo_gsm_tester/obj/enb.py M src/osmo_gsm_tester/obj/enb_amarisoft.py M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl 3 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/85/19185/1 diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py index d9fe1a5..be48887 100644 --- a/src/osmo_gsm_tester/obj/enb.py +++ b/src/osmo_gsm_tester/obj/enb.py @@ -36,6 +36,8 @@ 'rf_dev_args': schema.STR, 'additional_args[]': schema.STR, 'enable_measurements': schema.BOOL_STR, + 'enable_dl_awgn': schema.BOOL_STR, + 'dl_awgn_snr': schema.INT, 'a1_report_type': schema.STR, 'a1_report_value': schema.INT, 'a1_hysteresis': schema.INT, diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py index 4b24844..5ba9224 100644 --- a/src/osmo_gsm_tester/obj/enb_amarisoft.py +++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py @@ -160,6 +160,9 @@ self.enable_measurements = util.str2bool(values['enb'].get('enable_measurements', 'false')) config.overlay(values, dict(enb={'enable_measurements': self.enable_measurements})) + config.overlay(values, dict(enb={'enable_dl_awgn': util.str2bool(values['enb'].get('enable_dl_awgn', 'false'))})) + config.overlay(values, dict(enb={'dl_awgn_snr': values['enb'].get('dl_awgn_snr', 30)})) + # We need to set some specific variables programatically here to match IP addresses: if self._conf.get('rf_dev_type') == 'zmq': base_srate = self.num_prb2base_srate(self.num_prb()) diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl index 09532cc..7896ecb 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl @@ -38,6 +38,13 @@ /* RF driver configuration */ include "amarisoft_rf_driver.cfg", +% if enb.enable_dl_awgn: + channel_dl: { + type: "awgn", + snr: ${enb.dl_awgn_snr} + }, +% endif + mme_list: [ { s1ap_bind_addr: "${enb.addr}", -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib248e87e5abd855d4c974eab42ec40828c6e1d40 Gerrit-Change-Number: 19185 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 11:02:28 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 8 Jul 2020 11:02:28 +0000 Subject: Change in osmo-gsm-tester[master]: rfemu_minicircuits: reset attenuation to zero in dtor References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19186 ) Change subject: rfemu_minicircuits: reset attenuation to zero in dtor ...................................................................... rfemu_minicircuits: reset attenuation to zero in dtor this avoids issues when the channel emulation stops in the middle of a high attenuation values and the device is left in this state. Change-Id: I9aeafc68bf81b8932aac4cb28040b9aea6bfcbdb --- M src/osmo_gsm_tester/obj/rfemu_minicircuits.py 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/86/19186/1 diff --git a/src/osmo_gsm_tester/obj/rfemu_minicircuits.py b/src/osmo_gsm_tester/obj/rfemu_minicircuits.py index 6214040..c501dcf 100644 --- a/src/osmo_gsm_tester/obj/rfemu_minicircuits.py +++ b/src/osmo_gsm_tester/obj/rfemu_minicircuits.py @@ -42,6 +42,10 @@ raise log.Error('No "port" attribute provided in supply conf!') self.set_name('minicircuits(%s:%r)' % (self.addr, self.ports)) + def __del__(self): + self.dbg('Resetting channel attenuation to zero') + self.set_attenuation(0) + def _url_prefix(self): #http://10.12.1.216/:SetAttPerChan:1:0_2:0_3:0_4:0 return 'http://' + self.addr -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I9aeafc68bf81b8932aac4cb28040b9aea6bfcbdb Gerrit-Change-Number: 19186 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 11:02:29 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 8 Jul 2020 11:02:29 +0000 Subject: Change in osmo-gsm-tester[master]: srsue.conf.tmpl: use UE cat 8 whenever more than one carrier is confi... References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19187 ) Change subject: srsue.conf.tmpl: use UE cat 8 whenever more than one carrier is configured ...................................................................... srsue.conf.tmpl: use UE cat 8 whenever more than one carrier is configured Change-Id: Id96827960cac436b8ac363e28c2b0ab7b6acf57f --- M src/osmo_gsm_tester/templates/srsue.conf.tmpl 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/87/19187/1 diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl b/src/osmo_gsm_tester/templates/srsue.conf.tmpl index f1a5333..a75be23 100644 --- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl @@ -145,7 +145,7 @@ # mbms_service_port: Port of the MBMS service ##################################################################### [rrc] -% if int(ue.num_carriers) == 2: +% if int(ue.num_carriers) > 1: ue_category = 7 release = 10 % else: -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19187 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Id96827960cac436b8ac363e28c2b0ab7b6acf57f Gerrit-Change-Number: 19187 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 11:02:29 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 8 Jul 2020 11:02:29 +0000 Subject: Change in osmo-gsm-tester[master]: enb_amarisoft: add support for PHY signal log file References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19188 ) Change subject: enb_amarisoft: add support for PHY signal log file ...................................................................... enb_amarisoft: add support for PHY signal log file when phy.signal=1 is set in the log_options, the eNB will dump a binary file that needs to be copied back as well Change-Id: I63d13cb74572ac065d5a3fcfb1632552d0a6dbc6 --- M src/osmo_gsm_tester/obj/enb_amarisoft.py 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/88/19188/1 diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py index 5ba9224..3db64d0 100644 --- a/src/osmo_gsm_tester/obj/enb_amarisoft.py +++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py @@ -49,6 +49,7 @@ CFGFILE_RF = 'amarisoft_rf_driver.cfg' CFGFILE_DRB = 'amarisoft_drb.cfg' LOGFILE = 'lteenb.log' + PHY_SIGNAL_FILE = 'lteenb.log.bin' def __init__(self, testenv, conf): super().__init__(testenv, conf, 'amarisoftenb') @@ -92,6 +93,7 @@ # copy back files (may not exist, for instance if there was an early error of process): try: self.rem_host.scpfrom('scp-back-log', self.remote_log_file, self.log_file) + self.rem_host.scpfrom('scp-back-phy-signal-log', self.remote_phy_signal_file, self.phy_signal_file) except Exception as e: self.log(repr(e)) @@ -140,6 +142,7 @@ self.config_rf_file = self.run_dir.child(AmarisoftENB.CFGFILE_RF) self.config_drb_file = self.run_dir.child(AmarisoftENB.CFGFILE_DRB) self.log_file = self.run_dir.child(AmarisoftENB.LOGFILE) + self.phy_signal_file = self.run_dir.child(AmarisoftENB.PHY_SIGNAL_FILE) if not self._run_node.is_local(): self.rem_host = remote.RemoteHost(self.run_dir, self._run_node.ssh_user(), self._run_node.ssh_addr()) @@ -153,6 +156,7 @@ self.remote_config_rf_file = remote_run_dir.child(AmarisoftENB.CFGFILE_RF) self.remote_config_drb_file = remote_run_dir.child(AmarisoftENB.CFGFILE_DRB) self.remote_log_file = remote_run_dir.child(AmarisoftENB.LOGFILE) + self.remote_phy_signal_file = remote_run_dir.child(AmarisoftENB.PHY_SIGNAL_FILE) values = super().configure(['amarisoft', 'amarisoftenb']) @@ -192,6 +196,9 @@ logfile = self.log_file if self._run_node.is_local() else self.remote_log_file config.overlay(values, dict(enb=dict(log_filename=logfile))) + phy_signal_file = self.phy_signal_file if self._run_node.is_local() else self.remote_phy_signal_file + config.overlay(values, dict(enb=dict(phy_signal_file=phy_signal_file))) + # rf driver is shared between amarisoft enb and ue, so it has a # different cfg namespace 'trx'. Copy needed values over there: config.overlay(values, dict(trx=dict(rf_dev_type=values['enb'].get('rf_dev_type', None), -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I63d13cb74572ac065d5a3fcfb1632552d0a6dbc6 Gerrit-Change-Number: 19188 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 11:02:29 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 8 Jul 2020 11:02:29 +0000 Subject: Change in osmo-gsm-tester[master]: jenkins-build-srslte.sh: pass extra configuration_opts to build_repo References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19189 ) Change subject: jenkins-build-srslte.sh: pass extra configuration_opts to build_repo ...................................................................... jenkins-build-srslte.sh: pass extra configuration_opts to build_repo this allows to pass extra CMake opts to, e.g., enable address sanitizer Change-Id: I6fd00025a7225b1e075704d69354a8eb5e7f30ec --- M contrib/jenkins-build-srslte.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/89/19189/1 diff --git a/contrib/jenkins-build-srslte.sh b/contrib/jenkins-build-srslte.sh index dd75e86..80e4ffc 100755 --- a/contrib/jenkins-build-srslte.sh +++ b/contrib/jenkins-build-srslte.sh @@ -8,6 +8,6 @@ . "$(dirname "$0")/jenkins-build-common.sh" #TODO: make sure libconfig, zeroMQ is installed -build_repo $project_name +build_repo $project_name $configure_opts create_bin_tgz "srsue srsenb srsepc" -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I6fd00025a7225b1e075704d69354a8eb5e7f30ec Gerrit-Change-Number: 19189 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 11:04:00 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 8 Jul 2020 11:04:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP_Test: fix test expectation in TC_crcx_wildcarded_exhaust References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19190 ) Change subject: MGCP_Test: fix test expectation in TC_crcx_wildcarded_exhaust ...................................................................... MGCP_Test: fix test expectation in TC_crcx_wildcarded_exhaust The testcase TC_crcx_wildcarded_exhaust assumes a wrong number of endpoints. Since osmo-mgw has a wrongly solved off-by-one in its endpoint allocation it allocates the wrong number of endpoints. This is now fixed, lets now also fix the test expection. (The failure of TC_crcx_wildcarded_exhaust also causes TC_crcx_dlcx_30ep to fail.) Depends: Change id I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Change-Id: I73344ef8793cc81df0a1815bb8d890e7849cdd20 Related: OS#2659 --- M mgw/MGCP_Test.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/19190/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index be4e634..6caef79 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -885,7 +885,7 @@ /* test valid wildcarded CRCX */ testcase TC_crcx_wildcarded_exhaust() runs on dummy_CT { - const integer n_endpoints := 32; + const integer n_endpoints := 31; var integer i; var template MgcpCommand cmd; var MgcpResponse resp; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I73344ef8793cc81df0a1815bb8d890e7849cdd20 Gerrit-Change-Number: 19190 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 11:27:13 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 11:27:13 +0000 Subject: Change in osmo-bts[master]: pcu_sock: Avoid presenting TS from disabled TRX as available to PCU In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19116 ) Change subject: pcu_sock: Avoid presenting TS from disabled TRX as available to PCU ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4b24faf3a8fe5846b9394fea8faf9d37cc0ac9ff Gerrit-Change-Number: 19116 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 11:27:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 11:29:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 11:29:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP_Test: fix test expectation in TC_crcx_wildcarded_exhaust In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19190 ) Change subject: MGCP_Test: fix test expectation in TC_crcx_wildcarded_exhaust ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I73344ef8793cc81df0a1815bb8d890e7849cdd20 Gerrit-Change-Number: 19190 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 11:29:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 11:35:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 11:35:46 +0000 Subject: Change in osmo-bts[master]: pcu_sock: Avoid presenting TS from disabled TRX as available to PCU In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19116 ) Change subject: pcu_sock: Avoid presenting TS from disabled TRX as available to PCU ...................................................................... Patch Set 2: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4b24faf3a8fe5846b9394fea8faf9d37cc0ac9ff Gerrit-Change-Number: 19116 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 11:35:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 11:35:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 11:35:52 +0000 Subject: Change in osmo-bts[master]: bts-trx: Implement ramp up/down during ADM state change In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18967 ) Change subject: bts-trx: Implement ramp up/down during ADM state change ...................................................................... Patch Set 7: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7a7b0a0c24779349f142215f0bb32b72c86ce70 Gerrit-Change-Number: 18967 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 11:35:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 11:36:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 11:36:06 +0000 Subject: Change in osmo-bts[master]: pcu_sock: Avoid presenting TS from disabled TRX as available to PCU In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19116 ) Change subject: pcu_sock: Avoid presenting TS from disabled TRX as available to PCU ...................................................................... pcu_sock: Avoid presenting TS from disabled TRX as available to PCU Change-Id: I4b24faf3a8fe5846b9394fea8faf9d37cc0ac9ff --- M src/common/pcu_sock.c 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index f4a8c0a..5fa0e19 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -219,6 +220,13 @@ info_ind->trx[i].pdch_mask = 0; info_ind->trx[i].arfcn = trx->arfcn; info_ind->trx[i].hlayer1 = trx_get_hlayer1(trx); + if (trx->mo.nm_state.operational != NM_OPSTATE_ENABLED || + trx->mo.nm_state.administrative != NM_STATE_UNLOCKED) { + LOGPTRX(trx, DPCU, LOGL_INFO, "unavailable for PCU (op=%s adm=%s)\n", + abis_nm_opstate_name(trx->mo.nm_state.operational), + abis_nm_admin_name(trx->mo.nm_state.administrative)); + continue; + } for (j = 0; j < 8; j++) { ts = &trx->ts[j]; if (ts->mo.nm_state.operational == NM_OPSTATE_ENABLED -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4b24faf3a8fe5846b9394fea8faf9d37cc0ac9ff Gerrit-Change-Number: 19116 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 11:36:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 11:36:07 +0000 Subject: Change in osmo-bts[master]: bts-trx: Implement ramp up/down during ADM state change In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18967 ) Change subject: bts-trx: Implement ramp up/down during ADM state change ...................................................................... bts-trx: Implement ramp up/down during ADM state change Ramp down when BTS is administratevly locked, and ramp up when it becomes unlocked again. Af ramping down, bts_model_trx_deact_rf is called to make sure all channels are released. power_ramp_start() is dropped from inside bts_model_trx_deact_rf since it's not the proper place. In there we simply want to instantaneously drop RF. Related: SYS#4920 Change-Id: Ib7a7b0a0c24779349f142215f0bb32b72c86ce70 --- M src/osmo-bts-trx/l1_if.c 1 file changed, 75 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved daniel: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 638a674..4cdb108 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -41,10 +41,12 @@ #include #include #include +#include #include "l1_if.h" #include "trx_if.h" +#define RF_DISABLED_mdB to_mdB(-10) static const uint8_t transceiver_chan_types[_GSM_PCHAN_MAX] = { [GSM_PCHAN_NONE] = 8, @@ -138,15 +140,15 @@ return trx_sched_set_lchan(&l1h->l1s, gsm_lchan2chan_nr(lchan), LID_SACCH, false); } -static void l1if_trx_start_power_ramp(struct gsm_bts_trx *trx) +static int l1if_trx_start_power_ramp(struct gsm_bts_trx *trx, ramp_compl_cb_t ramp_compl_cb) { struct phy_instance *pinst = trx_phy_instance(trx); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; if (l1h->config.forced_max_power_red == -1) - power_ramp_start(trx, get_p_nominal_mdBm(trx), 0, NULL); + return power_ramp_start(trx, get_p_nominal_mdBm(trx), 0, ramp_compl_cb); else - power_ramp_start(trx, get_p_max_out_mdBm(trx) - to_mdB(l1h->config.forced_max_power_red), 1, NULL); + return power_ramp_start(trx, get_p_max_out_mdBm(trx) - to_mdB(l1h->config.forced_max_power_red), 1, ramp_compl_cb); } /* Sets the nominal power, in dB */ @@ -162,13 +164,14 @@ trx->power_params.trx_p_max_out_mdBm); /* If TRX is not yet powered, delay ramping until it's ON */ - if (!nom_pwr_changed || !pinst->phy_link->u.osmotrx.powered) + if (!nom_pwr_changed || !pinst->phy_link->u.osmotrx.powered || + trx->mo.nm_state.administrative == NM_STATE_UNLOCKED) return; /* We are already ON and we got new information about nominal power, so * let's make sure we adapt the tx power to it */ - l1if_trx_start_power_ramp(trx); + l1if_trx_start_power_ramp(trx, NULL); } static void l1if_getnompower_cb(struct trx_l1h *l1h, int nominal_power, int rc) @@ -223,7 +226,8 @@ /* Begin to ramp up the power on all TRX associated with this phy */ llist_for_each_entry(pinst, &plink->instances, list) { - l1if_trx_start_power_ramp(pinst->trx); + if (pinst->trx->mo.nm_state.administrative == NM_STATE_UNLOCKED) + l1if_trx_start_power_ramp(pinst->trx, NULL); } } else if (rc != 0 && plink->state != PHY_LINK_SHUTDOWN) { trx_sched_clock_stopped(pinst->trx->bts); @@ -424,12 +428,6 @@ pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) { lchan_set_state(&trx->ts[0].lchan[CCCH_LCHAN], LCHAN_S_INACTIVE); } - /* FIXME: There's currently no way to communicate to osmo-trx through - * TRXC that a specific TRX processing shall be paused. Let's simply - * make sure that at least we don't transmit with power on it by setting - * a rather low value: - */ - power_ramp_start(trx, to_mdB(-10), 1, NULL); return 0; } @@ -505,7 +503,8 @@ /* Begin to ramp up the power if power reduction is set by OML and TRX is already running. Otherwise skip, power ramping will be started after TRX is running */ - if (plink->u.osmotrx.powered && l1h->config.forced_max_power_red == -1) + if (plink->u.osmotrx.powered && l1h->config.forced_max_power_red == -1 && + trx->mo.nm_state.administrative == NM_STATE_UNLOCKED) power_ramp_start(pinst->trx, get_p_nominal_mdBm(pinst->trx), 0, NULL); return 0; @@ -866,12 +865,72 @@ return rc; } +static void bts_model_chg_adm_state_ramp_compl_cb(struct gsm_bts_trx *trx) +{ + LOGPTRX(trx, DL1C, LOGL_INFO, "power ramp due to ADM STATE change finished\n"); + trx->mo.procedure_pending = 0; + if (trx->mo.nm_state.administrative == NM_STATE_LOCKED) { + bts_model_trx_deact_rf(trx); + pcu_tx_info_ind(); + } +} + int bts_model_chg_adm_state(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj, uint8_t adm_state) { - /* blindly accept all state changes */ - mo->nm_state.administrative = adm_state; - return oml_mo_statechg_ack(mo); + struct gsm_bts_trx *trx; + struct phy_instance *pinst; + int i, rc = 0; + + switch (mo->obj_class) { + case NM_OC_RADIO_CARRIER: + trx = (struct gsm_bts_trx *) obj; + pinst = trx_phy_instance(trx); + + /* Begin to ramp the power if TRX is already running. Otherwise + * skip, power ramping will be started after TRX is running */ + if (!pinst->phy_link->u.osmotrx.powered) + break; + + if (mo->procedure_pending) { + LOGPTRX(trx, DL1C, LOGL_ERROR, "Discarding adm change command: " + "pending procedure on RC %d\n", + ((struct gsm_bts_trx *)obj)->nr); + rc = -1; + break; + } + switch (adm_state) { + case NM_STATE_LOCKED: + mo->procedure_pending = 1; + rc = power_ramp_start(trx, RF_DISABLED_mdB, 1, bts_model_chg_adm_state_ramp_compl_cb); + break; + case NM_STATE_UNLOCKED: + mo->procedure_pending = 1; + /* Activate timeslots in scheduler and start power ramp up */ + for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + trx_set_ts(ts); + } + rc = l1if_trx_start_power_ramp(trx, bts_model_chg_adm_state_ramp_compl_cb); + if (rc == 0) { + mo->nm_state.administrative = adm_state; + pcu_tx_info_ind(); + return oml_mo_statechg_ack(mo); + } + break; + default: + break; + } + break; + default: + break; + } + + if (rc == 0) { + mo->nm_state.administrative = adm_state; + return oml_mo_statechg_ack(mo); + } else + return oml_mo_statechg_nack(mo, NM_NACK_REQ_NOT_GRANT); } int bts_model_oml_estab(struct gsm_bts *bts) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7a7b0a0c24779349f142215f0bb32b72c86ce70 Gerrit-Change-Number: 18967 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 11:36:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 11:36:07 +0000 Subject: Change in osmo-bts[master]: gsm_data.h: Use enum type for NM state fields In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19117 ) Change subject: gsm_data.h: Use enum type for NM state fields ...................................................................... gsm_data.h: Use enum type for NM state fields Change-Id: I21fa1688a0c8a3788a5ecedd5912f596a69a1beb --- M include/osmo-bts/gsm_data.h M src/common/oml.c 2 files changed, 6 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 7b4d456..97f5cde 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -83,9 +83,9 @@ /* Network Management State */ struct gsm_nm_state { - uint8_t operational; - uint8_t administrative; - uint8_t availability; + enum abis_nm_op_state operational; + enum abis_nm_adm_state administrative; + enum abis_nm_avail_state availability; }; struct gsm_abis_mo { diff --git a/src/common/oml.c b/src/common/oml.c index 5f64d52..63287f0 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -314,6 +314,7 @@ int oml_tx_state_changed(const struct gsm_abis_mo *mo) { struct msgb *nmsg; + uint8_t avail_state; nmsg = oml_msgb_alloc(); if (!nmsg) @@ -323,7 +324,8 @@ msgb_tv_put(nmsg, NM_ATT_OPER_STATE, mo->nm_state.operational); /* 9.4.7 Availability Status */ - msgb_tl16v_put(nmsg, NM_ATT_AVAIL_STATUS, 1, &mo->nm_state.availability); + avail_state = (uint8_t) mo->nm_state.availability; + msgb_tl16v_put(nmsg, NM_ATT_AVAIL_STATUS, 1, &avail_state); /* 9.4.4 Administrative Status -- not in spec but also sent by nanobts */ msgb_tv_put(nmsg, NM_ATT_ADM_STATE, mo->nm_state.administrative); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I21fa1688a0c8a3788a5ecedd5912f596a69a1beb Gerrit-Change-Number: 19117 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 11:36:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 11:36:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cosmetic: pcu: Fix whitespacing typos In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19172 ) Change subject: cosmetic: pcu: Fix whitespacing typos ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I38f752f709e593d1cfd3489a6ac590360f22a10f Gerrit-Change-Number: 19172 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 11:36:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 11:36:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 11:36:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cosmetic: pcu: Fix whitespacing typos In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19172 ) Change subject: cosmetic: pcu: Fix whitespacing typos ...................................................................... cosmetic: pcu: Fix whitespacing typos Change-Id: I38f752f709e593d1cfd3489a6ac590360f22a10f --- M pcu/PCU_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Hoernchen: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 641b978..10a9275 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -2024,10 +2024,10 @@ execute( TC_force_two_phase_access() ); execute( TC_mt_ping_pong() ); execute( TC_mt_ping_pong_with_dl_racap() ); - execute (TC_ul_intermediate_retrans() ); + execute( TC_ul_intermediate_retrans() ); execute( TC_imm_ass_dl_block_retrans() ); execute( TC_dl_flow_more_blocks() ); - execute (TC_ul_flow_multiple_llc_blocks() ); + execute( TC_ul_flow_multiple_llc_blocks() ); execute( TC_paging_cs_from_bts() ); execute( TC_paging_cs_from_sgsn_sign_ptmsi() ); execute( TC_paging_cs_from_sgsn_sign() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I38f752f709e593d1cfd3489a6ac590360f22a10f Gerrit-Change-Number: 19172 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 11:46:38 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 8 Jul 2020 11:46:38 +0000 Subject: Change in osmo-bsc[master]: lchan_rtp_fsm: make _fsm_timer_cb and _fsm_cleanup static References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19191 ) Change subject: lchan_rtp_fsm: make _fsm_timer_cb and _fsm_cleanup static ...................................................................... lchan_rtp_fsm: make _fsm_timer_cb and _fsm_cleanup static The functions lchan_rtp_fsm_timer_cb() and lchan_rtp_fsm_cleanup() only used in lchan_rtp_fsm.c, lets make them static. Change-Id: I31940aff166ccd7a9612574536674e4e483a3cb9 --- M src/osmo-bsc/lchan_rtp_fsm.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/91/19191/1 diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 4be9790..d01c0a7 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -729,7 +729,7 @@ {} }; -int lchan_rtp_fsm_timer_cb(struct osmo_fsm_inst *fi) +static int lchan_rtp_fsm_timer_cb(struct osmo_fsm_inst *fi) { struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); lchan->release.in_error = true; @@ -738,7 +738,7 @@ return 0; } -void lchan_rtp_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) +static void lchan_rtp_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) { struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); if (lchan->mgw_endpoint_ci_bts) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19191 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I31940aff166ccd7a9612574536674e4e483a3cb9 Gerrit-Change-Number: 19191 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 11:50:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 11:50:40 +0000 Subject: Change in osmo-bsc[master]: lchan_rtp_fsm: make _fsm_timer_cb and _fsm_cleanup static In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19191 ) Change subject: lchan_rtp_fsm: make _fsm_timer_cb and _fsm_cleanup static ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19191 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I31940aff166ccd7a9612574536674e4e483a3cb9 Gerrit-Change-Number: 19191 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 08 Jul 2020 11:50:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 12:06:19 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 12:06:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RLCMAC: Improve support of Pkt Ul AckNack messages References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19192 ) Change subject: RLCMAC: Improve support of Pkt Ul AckNack messages ...................................................................... RLCMAC: Improve support of Pkt Ul AckNack messages Change-Id: I8586248f435b1a70042ea25f633b75542bbc14aa --- M library/RLCMAC_CSN1_Templates.ttcn M library/RLCMAC_CSN1_Types.ttcn 2 files changed, 48 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/19192/1 diff --git a/library/RLCMAC_CSN1_Templates.ttcn b/library/RLCMAC_CSN1_Templates.ttcn index 9f53c3f..0d7de99 100644 --- a/library/RLCMAC_CSN1_Templates.ttcn +++ b/library/RLCMAC_CSN1_Templates.ttcn @@ -217,15 +217,34 @@ multi_block_alloc := omit }; - template UlAckNackGprs tr_UlAckNackGprs(template GprsTlli tlli := *) := { + template AckNackDescription tr_AckNackDescription(template BIT1 final_ack := ?) := { + final_ack := final_ack, + starting_seq_nr := ?, + receive_block_bitmap := ? + }; + + template UlAckNackGprsAdditionsRel99 tr_UlAckNackGprsAdditionsRel99(template boolean tbf_est := ?) := { + ext_pkt_ta_present := ?, + ext_pkt_ta := *, + tbf_est := tbf_est + }; + + template UlAckNackGprs tr_UlAckNackGprs(template GprsTlli tlli := *, + template AckNackDescription acknack_desc := ?, + template UlAckNackGprsAdditionsRel99 rel99 := *) := { ch_coding_cmd := ?, - ack_nack_desc := ?, + ack_nack_desc := acknack_desc, cont_res_tlli_present := ?, cont_res_tlli := tlli, pkt_ta_present := ?, pkt_ta := *, pwr_ctrl_present := ?, - pwr_ctrl := * + pwr_ctrl := *, + extension_bits_present := ?, + extension_bits := *, + not_used := '0'B, + rel99_present := ?, + rel99 := rel99 }; template UlAckNackEgprs tr_UlAckNackEgprs(template GprsTlli tlli := *) := { diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index ee02a8a..20c2d81 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -416,6 +416,15 @@ variant (repeated_pageinfo) "PRESENCE(repeated_pageinfo_present = '1'B)" }; + /* 12.26 Extension Bits IE */ + type record ExtensionBits { + uint6_t extension_length, + bitstring spare_bits + } with { + variant (extension_length) "LENGTHTO(spare_bits) - 1" + variant (extension_length) "UNIT(bits)" + }; + /* 11.2.28 Uplink Ack/Nack */ type enumerated ChCodingCommand { CH_CODING_CS1 ('00'B), @@ -423,6 +432,15 @@ CH_CODING_CS3 ('10'B), CH_CODING_CS4 ('11'B) } with { variant "FIELDLENGTH(2)" }; + type record UlAckNackGprsAdditionsRel99 { + BIT1 ext_pkt_ta_present, + BIT2 ext_pkt_ta optional, + boolean tbf_est + /* TODO: Rel5 ,... */ + } with { + variant (ext_pkt_ta) "PRESENCE(ext_pkt_ta_present = '1'B)" + variant (tbf_est) "FIELDLENGTH(1)" + }; type record UlAckNackGprs { ChCodingCommand ch_coding_cmd, AckNackDescription ack_nack_desc, @@ -431,12 +449,18 @@ BIT1 pkt_ta_present, PacketTimingAdvance pkt_ta optional, BIT1 pwr_ctrl_present, - PowerControlParameters pwr_ctrl optional - /* TODO: Extension Bits, Rel5 ,... */ + PowerControlParameters pwr_ctrl optional, + BIT1 extension_bits_present, + ExtensionBits extension_bits optional, + BIT1 not_used ('0'B), + BIT1 rel99_present, + UlAckNackGprsAdditionsRel99 rel99 optional } with { variant (cont_res_tlli) "PRESENCE(cont_res_tlli_present = '1'B)" variant (pkt_ta) "PRESENCE(pkt_ta_present = '1'B)" variant (pwr_ctrl) "PRESENCE(pwr_ctrl_present = '1'B)" + variant (extension_bits) "PRESENCE(extension_bits_present = '1'B)" + variant (rel99) "PRESENCE(rel99_present = '1'B)" variant (cont_res_tlli) "BYTEORDER(first)" }; type record UlAckNackEgprs { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8586248f435b1a70042ea25f633b75542bbc14aa Gerrit-Change-Number: 19192 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 12:18:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 12:18:53 +0000 Subject: Change in osmo-gsm-tester[master]: enb_amarisoft: add option to enable and configure DL AWGN channel In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185 ) Change subject: enb_amarisoft: add option to enable and configure DL AWGN channel ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185/1/src/osmo_gsm_tester/obj/enb_amarisoft.py File src/osmo_gsm_tester/obj/enb_amarisoft.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185/1/src/osmo_gsm_tester/obj/enb_amarisoft.py at 164 PS1, Line 164: config.overlay(values, dict(enb={'dl_awgn_snr': values['enb'].get('dl_awgn_snr', 30)})) Looks like you only really need to add 30 to defaults.conf and get rid of this line? Same on the one above, add "false" in defaults.conf and get rid of the default part of get(). BTW, I don't know the details about those values, but it may make sense to completely remove enable_dl_awgn and enable/disable it based on a specific dl_awgn_snr, like -1 or -1000 or 0 or whatever. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib248e87e5abd855d4c974eab42ec40828c6e1d40 Gerrit-Change-Number: 19185 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 12:18:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 12:20:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 12:20:35 +0000 Subject: Change in osmo-gsm-tester[master]: rfemu_minicircuits: reset attenuation to zero in dtor In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19186 ) Change subject: rfemu_minicircuits: reset attenuation to zero in dtor ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I9aeafc68bf81b8932aac4cb28040b9aea6bfcbdb Gerrit-Change-Number: 19186 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 12:20:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 12:26:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 12:26:00 +0000 Subject: Change in osmo-gsm-tester[master]: srsue.conf.tmpl: use UE cat 8 whenever more than one carrier is confi... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19187 ) Change subject: srsue.conf.tmpl: use UE cat 8 whenever more than one carrier is configured ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19187 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Id96827960cac436b8ac363e28c2b0ab7b6acf57f Gerrit-Change-Number: 19187 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 12:26:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 12:27:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 12:27:28 +0000 Subject: Change in osmo-gsm-tester[master]: enb_amarisoft: add support for PHY signal log file In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19188 ) Change subject: enb_amarisoft: add support for PHY signal log file ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19188/1/src/osmo_gsm_tester/obj/enb_amarisoft.py File src/osmo_gsm_tester/obj/enb_amarisoft.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19188/1/src/osmo_gsm_tester/obj/enb_amarisoft.py at 96 PS1, Line 96: self.rem_host.scpfrom('scp-back-phy-signal-log', self.remote_phy_signal_file, self.phy_signal_file) Better put it in a separate try except block, so that if log_file is not there for whatever reason, we may still be able to retreive phy_signal_file. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I63d13cb74572ac065d5a3fcfb1632552d0a6dbc6 Gerrit-Change-Number: 19188 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 12:27:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 12:27:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 12:27:44 +0000 Subject: Change in osmo-gsm-tester[master]: jenkins-build-srslte.sh: pass extra configuration_opts to build_repo In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19189 ) Change subject: jenkins-build-srslte.sh: pass extra configuration_opts to build_repo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I6fd00025a7225b1e075704d69354a8eb5e7f30ec Gerrit-Change-Number: 19189 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 12:27:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 12:36:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 12:36:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19177 ) Change subject: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic251339afb9caa23d9a4e7bdb135d42a36a203d5 Gerrit-Change-Number: 19177 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 12:36:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 12:37:26 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 12:37:26 +0000 Subject: Change in docker-playground[master]: ttcn3-bts: Fix most OML test failing after osmo-bts shutdown optimiza... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19171 ) Change subject: ttcn3-bts: Fix most OML test failing after osmo-bts shutdown optimization ...................................................................... Patch Set 1: Code-Review+2 Adding +2 myself and merging since this patch is fixing the OML tests -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I10d3e1ef8325dd78f9ae2b95fbfd1c6d893bf8a4 Gerrit-Change-Number: 19171 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 12:37:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 12:37:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 12:37:29 +0000 Subject: Change in docker-playground[master]: ttcn3-bts: Fix most OML test failing after osmo-bts shutdown optimiza... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19171 ) Change subject: ttcn3-bts: Fix most OML test failing after osmo-bts shutdown optimization ...................................................................... ttcn3-bts: Fix most OML test failing after osmo-bts shutdown optimization Since osmo-bts.git 0a6bdb024f5429a35c56178496158c9b1c3ee032, the process is quickly terminated during shutdown if no TRX is running. Since in the OML tests the TTCN3 components implements the OML IPA server side, most of the time when osmo-bts starts it finds no one listening on the address and exits immediately. This makes respawn.sh script run osmo-bts lots of times per seconds (since osmo-bts terminates quicker now). As a result, it quickly consumes the 500 launch threshold and exits without starting osmo-bts being launched anymore. As a result, only first tests pass, and all the later ones fail because osmo-bts never connects. Let's add a sleep 1 between respawns in respawn.sh only when running OML tests (not needed in the others since there's an osmo-bsc always running). This also clears a lot of output in the logs of osmo-bts processes restarting over and over again. Change-Id: I10d3e1ef8325dd78f9ae2b95fbfd1c6d893bf8a4 --- M osmo-bts-master/respawn.sh M ttcn3-bts-test/jenkins.sh 2 files changed, 11 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, approved; Verified Hoernchen: Looks good to me, but someone else must approve diff --git a/osmo-bts-master/respawn.sh b/osmo-bts-master/respawn.sh index 2413916..31a8c06 100755 --- a/osmo-bts-master/respawn.sh +++ b/osmo-bts-master/respawn.sh @@ -2,6 +2,8 @@ trap "kill 0" EXIT +SLEEP_BEFORE_RESPAWN=${SLEEP_BEFORE_RESPAWN:-0} + i=0 max_i=500 while [ $i -lt $max_i ]; do @@ -10,6 +12,10 @@ LAST_PID=$! wait $LAST_PID echo "$i: stopped pid $LAST_PID with status $?" + if [ $SLEEP_BEFORE_RESPAWN -gt 0 ]; then + echo "sleeping $SLEEP_BEFORE_RESPAWN seconds..." + sleep $SLEEP_BEFORE_RESPAWN + fi i=$(expr $i + 1) done echo "exiting after $max_i runs" diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index d85c82f..c32682c 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -24,6 +24,7 @@ start_bts() { local variant variant="$1" + sleep_time_respawn="$2" echo Starting container with BTS if [ -z "$variant" ]; then echo ERROR: You have to specify a BTS variant @@ -34,6 +35,7 @@ --ulimit core=-1 \ -v $VOL_BASE_DIR/bts:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ + -e "SLEEP_BEFORE_RESPAWN=$sleep_time_respawn" \ --name ${BUILD_TAG}-bts -d \ $DOCKER_ARGS \ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ @@ -127,7 +129,7 @@ # 1) classic test suite with BSC for OML and trxcon+fake_trx start_bsc -start_bts trx +start_bts trx 0 start_fake_trx start_trxcon start_testsuite @@ -139,7 +141,7 @@ docker container kill ${BUILD_TAG}-fake_trx docker container kill ${BUILD_TAG}-bts cp virtphy/osmo-bts.cfg $VOL_BASE_DIR/bts/ -start_bts virtual +start_bts virtual 0 start_virtphy # ... and execute the testsuite again with different cfg cp virtphy/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester/ @@ -151,7 +153,7 @@ docker container kill ${BUILD_TAG}-virtphy docker container kill ${BUILD_TAG}-bts cp oml/osmo-bts.cfg $VOL_BASE_DIR/bts/ -start_bts trx +start_bts trx 1 start_fake_trx start_trxcon # ... and execute the testsuite again with different cfg -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I10d3e1ef8325dd78f9ae2b95fbfd1c6d893bf8a4 Gerrit-Change-Number: 19171 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 14:09:54 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 14:09:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: more SI2quater EUTRAN ARFCN tests In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 ) Change subject: bsc: more SI2quater EUTRAN ARFCN tests ...................................................................... Patch Set 2: > Patch Set 2: > > Isn't there a better way to write those tests instead of spanning a thousand lines? For instanace keeping all numbers in a record and then filling the list with a for loop. IIUC templates can't be built like that, but am not 100% sure; just know i tried something like that in a different version of the patch and ttcn3 complained about something that would have worked with a plain record, but didn't with a template. But also i don't mind using some more lines to save development time in this case, things are already taking a multiple of the estimated effort... -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I99bf9b3381812d1db6fd0757f65995bae48da776 Gerrit-Change-Number: 19181 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 14:09:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 14:11:45 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 14:11:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RestOctets: add SI2quater EUTRAN templates In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 ) Change subject: library/GSM_RestOctets: add SI2quater EUTRAN templates ...................................................................... Patch Set 4: My last comments were on the previous patch set, so please go ahead and CR, this patch set is complete -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4162cc39ad351f5e96f5941116a424adc44efaa2 Gerrit-Change-Number: 19114 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-Comment-Date: Wed, 08 Jul 2020 14:11:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 14:32:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 14:32:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RestOctets: add SI2quater EUTRAN templates In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 ) Change subject: library/GSM_RestOctets: add SI2quater EUTRAN templates ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4162cc39ad351f5e96f5941116a424adc44efaa2 Gerrit-Change-Number: 19114 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Wed, 08 Jul 2020 14:32:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 14:35:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 14:35:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: more SI2quater EUTRAN ARFCN tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 ) Change subject: bsc: more SI2quater EUTRAN ARFCN tests ...................................................................... Patch Set 2: Code-Review-1 It's not some more lines, it's 1k lines. I see no reason why you cannot do it with a loop, by writing template helpers if needed. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I99bf9b3381812d1db6fd0757f65995bae48da776 Gerrit-Change-Number: 19181 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 14:35:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:19:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jul 2020 15:19:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19177 ) Change subject: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic251339afb9caa23d9a4e7bdb135d42a36a203d5 Gerrit-Change-Number: 19177 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 15:19:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:19:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jul 2020 15:19:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RLCMAC: Improve support of Pkt Ul AckNack messages In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19192 ) Change subject: RLCMAC: Improve support of Pkt Ul AckNack messages ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8586248f435b1a70042ea25f633b75542bbc14aa Gerrit-Change-Number: 19192 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 08 Jul 2020 15:19:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:19:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jul 2020 15:19:58 +0000 Subject: Change in osmo-bts[master]: Move nm_state and Mo related code gsm_data.* => oml.* In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19122 ) Change subject: Move nm_state and Mo related code gsm_data.* => oml.* ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I57ea9c4ddbe5443b9b6afe3f8e6b38170d0e5a0e Gerrit-Change-Number: 19122 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 08 Jul 2020 15:19:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:20:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jul 2020 15:20:28 +0000 Subject: Change in osmo-bts[master]: Move gsm_bts code gsm-data.* => bts.* In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19123 ) Change subject: Move gsm_bts code gsm-data.* => bts.* ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0a4219e3f64f625ee8b364bf408b8d2bcc8085c5 Gerrit-Change-Number: 19123 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 08 Jul 2020 15:20:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:20:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jul 2020 15:20:34 +0000 Subject: Change in osmo-bts[master]: Move nm_state and Mo related code gsm_data.* => oml.* In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19122 ) Change subject: Move nm_state and Mo related code gsm_data.* => oml.* ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I57ea9c4ddbe5443b9b6afe3f8e6b38170d0e5a0e Gerrit-Change-Number: 19122 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 08 Jul 2020 15:20:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:24:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jul 2020 15:24:48 +0000 Subject: Change in osmo-bts[master]: Move struct gsm_bts_trx: gsm_data.* & bts.* => trx.* In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19124 ) Change subject: Move struct gsm_bts_trx: gsm_data.* & bts.* => trx.* ...................................................................... Patch Set 2: Code-Review-1 I'm also not entirely happy with this 'fragmentation'. But what I find even more problematic is the use of the generic term 'trx' which can mean a ton of d iffernt things, including being misunderstood as relted to osmo-bts-trx [only]. The idea about gsm_data*.h was that the core data model of bts/trx/ts/lchan is all represented there. Now if you think it is wise to split this (I think it's probably more annoying as it means you have to add more #includes to all files), then I think at the very least the header files should be called gsm_data_{bts,trx,...}.h to clearly indicate what they are about. You might also call them like the core struct they are about like gsm_bts.h gsm_bts_trx.h, ... but just 'trx' is really too easy to get wrong. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iebaf5b221c48b571f45408af867ce6f9c0cd9f4a Gerrit-Change-Number: 19124 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 08 Jul 2020 15:24:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:25:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jul 2020 15:25:41 +0000 Subject: Change in osmo-bts[master]: bts-trx: introduce TRX provisioning FSM In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19167 ) Change subject: bts-trx: introduce TRX provisioning FSM ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2a00c23df15840e33fbb232c9e1dd6db128f63f6 Gerrit-Change-Number: 19167 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 08 Jul 2020 15:25:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:26:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jul 2020 15:26:00 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: subst_frame_loss(): print current TDMA fn In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19183 ) Change subject: trxcon/scheduler: subst_frame_loss(): print current TDMA fn ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3d769ba3cbadc19bac0b25224460af8f06d0d776 Gerrit-Change-Number: 19183 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 15:26:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:26:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jul 2020 15:26:25 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix subst_frame_loss(): do not compensate too much In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19184 ) Change subject: trxcon/scheduler: fix subst_frame_loss(): do not compensate too much ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I56251d0d2f6fa19195ff105d3bdfbc22df6db8cd Gerrit-Change-Number: 19184 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 15:26:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:26:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jul 2020 15:26:30 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: subst_frame_loss(): print current TDMA fn In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19183 ) Change subject: trxcon/scheduler: subst_frame_loss(): print current TDMA fn ...................................................................... trxcon/scheduler: subst_frame_loss(): print current TDMA fn Change-Id: I3d769ba3cbadc19bac0b25224460af8f06d0d776 --- M src/host/trxcon/sched_trx.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index b6087ef..79e6f88 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -638,8 +638,8 @@ elapsed = GSM_TDMA_FN_SUB(fn, lchan->tdma.last_proc); if (elapsed > mf->period) { LOGP(DSCHD, LOGL_NOTICE, "Too many (>%u) contiguous TDMA frames elapsed (%u) " - "since the last processed fn=%u\n", mf->period, - elapsed, lchan->tdma.last_proc); + "since the last processed fn=%u (current %u)\n", + mf->period, elapsed, lchan->tdma.last_proc, fn); } else if (elapsed == 0) { LOGP(DSCHD, LOGL_ERROR, "No TDMA frames elapsed since the last processed " "fn=%u, must be a bug?\n", lchan->tdma.last_proc); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3d769ba3cbadc19bac0b25224460af8f06d0d776 Gerrit-Change-Number: 19183 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:26:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jul 2020 15:26:30 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix subst_frame_loss(): do not compensate too much In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19184 ) Change subject: trxcon/scheduler: fix subst_frame_loss(): do not compensate too much ...................................................................... trxcon/scheduler: fix subst_frame_loss(): do not compensate too much It's not something that we should be trying to fix, if the whole TDMA multi-frame is lost. For some yet unknown reason, sometimes the difference between the last processed TDMA frame number and the current one is so huge, so trxcon eats a lot of CPU trying to compensate nearly the whole TDMA hyper-frame: sched_trx.c:640 Too many (>104) contiguous TDMA frames elapsed (2715647) since the last processed fn=633 (current fn=632) Let's just print a warning and do not compensate more than one TDMA multi-frame period corresponding to the current layout. Change-Id: I56251d0d2f6fa19195ff105d3bdfbc22df6db8cd --- M src/host/trxcon/sched_trx.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index 79e6f88..9195b33 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -640,6 +640,7 @@ LOGP(DSCHD, LOGL_NOTICE, "Too many (>%u) contiguous TDMA frames elapsed (%u) " "since the last processed fn=%u (current %u)\n", mf->period, elapsed, lchan->tdma.last_proc, fn); + return -EIO; } else if (elapsed == 0) { LOGP(DSCHD, LOGL_ERROR, "No TDMA frames elapsed since the last processed " "fn=%u, must be a bug?\n", lchan->tdma.last_proc); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I56251d0d2f6fa19195ff105d3bdfbc22df6db8cd Gerrit-Change-Number: 19184 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:27:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jul 2020 15:27:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_RestOctets: SI2quater fixup: rename "Cell List" to "Repeated Cells" In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19179 ) Change subject: GSM_RestOctets: SI2quater fixup: rename "Cell List" to "Repeated Cells" ...................................................................... GSM_RestOctets: SI2quater fixup: rename "Cell List" to "Repeated Cells" So far the naming is so that the EUTRAN_NeighborCell sounds like it reflects a single E-ARFCN, while in fact it contains a list of E-ARFCNs. In 3GPP TS 48.018 it is more accurately named "Neighbor Cells", in plural. There is another "list layer" that allows repeating these lists of E-ARFCNs, which the spec names Repeated Neighbor Cells, i.e. have a list of (=repeat) the lists of E-ARFCNs. Repeated Neighbor Cells = { // first cells list Neighbor Cells = { cell descriptions = { { e_arfcn = 1, meas_bw = 3 }, { e_arfcn = 2, meas_bw = 3 }, { e_arfcn = 3, meas_bw = 3 }, }, prio, thresh, ... }, // second cells list Neighbor Cells = { cell descriptions = { { e_arfcn = 4, meas_bw = 3 }, { e_arfcn = 5, meas_bw = 3 }, { e_arfcn = 6, meas_bw = 3 }, }, prio, thresh, ... }, ... } Adjust the naming of the SI2quaterRestOctets members to more closely resemble this structure, adopting the naming in 3GPP TS 48.018: EUTRAN_NeighborCell -> EUTRAN_NeighborCells because it is really a collection of multiple E-ARFCNs EUTRAN_NeighborCells -> EUTRAN_RepeatedNeighborCells because it is a list of E-ARFCN lists, and 3GPP TS 48.018 names it "Repeated Neighbor Cells". Also rename the EUTRAN_NotAllowedCells accordingly. Change-Id: Ib11d72c04cdb8997ec97321257fb58b2c113e790 --- M library/GSM_RestOctets.ttcn 1 file changed, 10 insertions(+), 10 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn index 3bc9349..39f15bb 100644 --- a/library/GSM_RestOctets.ttcn +++ b/library/GSM_RestOctets.ttcn @@ -350,11 +350,11 @@ EUTRAN_GPRSMeasParamsDescOpt gprs_meas_params_desc, /* { 1 < Repeated E-UTRAN Neighbour Cells > } ** 0 */ - EUTRAN_NeighbourCells neigh_cell_list optional, - BIT1 neigh_cell_list_term ('0'B), + EUTRAN_RepeatedNeighbourCells repeated_neigh_cells optional, + BIT1 repeated_neigh_cells_term ('0'B), /* { 1 < Repeated E-UTRAN Not Allowed Cells > } ** 0 */ - EUTRAN_NotAllowedCells not_allowed_cell_list optional, - BIT1 not_allowed_cell_list_term ('0'B), + EUTRAN_RepeatedNotAllowedCells repeated_not_allowed_cells optional, + BIT1 repeated_not_allowed_cells_term ('0'B), /* { 1 < Repeated E-UTRAN PCID to TA mapping > } ** 0 */ EUTRAN_PCID2TAMaps pcid2ta_map_list optional, BIT1 pcid2ta_map_list_term ('0'B) @@ -376,9 +376,9 @@ variant (desc) "PRESENCE(presence = '1'B)" }; -/* Repeated E-UTRAN Neighbour Cell List */ -private type record of EUTRAN_NeighbourCell EUTRAN_NeighbourCells; -private type record EUTRAN_NeighbourCell { +/* Repeated E-UTRAN Neighbour Cells */ +private type record of EUTRAN_NeighbourCells EUTRAN_RepeatedNeighbourCells; +private type record EUTRAN_NeighbourCells { BIT1 item_ind ('1'B), /* { 1 < Repeated E-UTRAN Neighbour Cells > } ** 0 */ EUTRAN_CellDescs cell_desc_list optional, @@ -409,9 +409,9 @@ variant (meas_bw) "PRESENCE(meas_bw_presence = '1'B)" }; -/* Repeated E-UTRAN Not Allowed Cell List */ -private type record of EUTRAN_NotAllowedCell EUTRAN_NotAllowedCells; -private type record EUTRAN_NotAllowedCell { +/* Repeated E-UTRAN Not Allowed Cells */ +private type record of EUTRAN_NotAllowedCells EUTRAN_RepeatedNotAllowedCells; +private type record EUTRAN_NotAllowedCells { BIT1 item_ind ('1'B), /* FIXME: Not Allowed Cells : < PCID Group IE > (not implemented) */ BIT1 pcid_group_presence ('0'B), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19179 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib11d72c04cdb8997ec97321257fb58b2c113e790 Gerrit-Change-Number: 19179 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:27:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jul 2020 15:27:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_SystemInformation: add SI2quater In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 ) Change subject: GSM_SystemInformation: add SI2quater ...................................................................... GSM_SystemInformation: add SI2quater Change-Id: I879c37eb51ece55d79346c6bf1a4951c3f11c77e --- M library/GSM_SystemInformation.ttcn 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/GSM_SystemInformation.ttcn b/library/GSM_SystemInformation.ttcn index 0639eef..3c3d96c 100644 --- a/library/GSM_SystemInformation.ttcn +++ b/library/GSM_SystemInformation.ttcn @@ -143,6 +143,10 @@ RestOctets rest_octets length(0..4) } with { variant "" }; + type record SystemInformationType2quater { + SI2quaterRestOctets rest_octets + } with { variant "" }; + /* 44.018 9.1.35 */ type record SystemInformationType3 { SysinfoCellIdentity cell_id, @@ -204,6 +208,7 @@ SystemInformationType2 si2, SystemInformationType2bis si2bis, SystemInformationType2ter si2ter, + SystemInformationType2quater si2quater, SystemInformationType3 si3, SystemInformationType4 si4, SystemInformationType5 si5, @@ -220,6 +225,7 @@ si2, header.message_type = SYSTEM_INFORMATION_TYPE_2; si2bis, header.message_type = SYSTEM_INFORMATION_TYPE_2bis; si2ter, header.message_type = SYSTEM_INFORMATION_TYPE_2ter; + si2quater, header.message_type = SYSTEM_INFORMATION_TYPE_2quater; si3, header.message_type = SYSTEM_INFORMATION_TYPE_3; si4, header.message_type = SYSTEM_INFORMATION_TYPE_4; si5, header.message_type = SYSTEM_INFORMATION_TYPE_5; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I879c37eb51ece55d79346c6bf1a4951c3f11c77e Gerrit-Change-Number: 19149 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:27:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jul 2020 15:27:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: split f_init_bts() from f_init() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19150 ) Change subject: bsc: split f_init_bts() from f_init() ...................................................................... bsc: split f_init_bts() from f_init() For SI tests, it is necessary to first startup the VTY, then issue some config commands, and only then start up the BTSes. By this separation that can be done by: f_init(nr_bts := 0); f_vty_transceive(...); f_init_bts(bts_idx := 0); Will be used by upcoming System Information tests. Change-Id: I24afb07735c3827f52760214fcb7a239190c3402 --- M bsc/BSC_Tests.ttcn 1 file changed, 12 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index f25c75d..f6e1b2c 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -433,7 +433,6 @@ function f_init(integer nr_bts := NUM_BTS, boolean handler_mode := false, boolean allow_osmux := false, integer nr_msc := 1, float guard_timeout := 30.0) runs on test_CT { var integer bssap_idx; - var integer i; if (g_initialized) { return; @@ -469,15 +468,20 @@ f_init_mgcp("VirtMSC"); - for (i := 0; i < nr_bts; i := i+1) { - /* wait until osmo-bts-omldummy has respawned */ - f_wait_oml(i, "degraded", 5.0); - /* start RSL connection */ - f_ipa_rsl_start(bts[i].rsl, mp_bsc_ip, mp_bsc_rsl_port, i, handler_mode); - /* wait until BSC tells us "connected" */ - f_wait_oml(i, "connected", 5.0); + for (var integer i := 0; i < nr_bts; i := i+1) { + f_init_bts(i, handler_mode); } +} +function f_init_bts(integer bts_idx := 0, boolean handler_mode := false) +runs on test_CT { + /* wait until osmo-bts-omldummy has respawned */ + f_wait_oml(bts_idx, "degraded", 5.0); + + /* start RSL connection */ + f_ipa_rsl_start(bts[bts_idx].rsl, mp_bsc_ip, mp_bsc_rsl_port, bts_idx, handler_mode); + /* wait until BSC tells us "connected" */ + f_wait_oml(bts_idx, "connected", 5.0); } /* expect to receive a RSL message matching a specified template on a given BTS / stream */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I24afb07735c3827f52760214fcb7a239190c3402 Gerrit-Change-Number: 19150 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:27:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jul 2020 15:27:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: change f_bts_0_cfg() to take a VTY port arg In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19151 ) Change subject: bsc: change f_bts_0_cfg() to take a VTY port arg ...................................................................... bsc: change f_bts_0_cfg() to take a VTY port arg Remove the 'runs on' clause, add a VTY port argument. That allows using this function also on the test_CT. Will be used by upcoming System Information tests. Change-Id: Ib059d9690f92f5f76025bca2b84496716a2a4cf0 --- M bsc/BSC_Tests.ttcn 1 file changed, 16 insertions(+), 16 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: 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 f6e1b2c..784375a 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -3020,7 +3020,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); f_establish_fully(ass_cmd, exp_compl); - f_bts_0_cfg({"neighbor bts 1"}); + f_bts_0_cfg(BSCVTY, {"neighbor bts 1"}); var HandoverState hs := { rr_ho_cmpl_seen := false, @@ -3102,7 +3102,7 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); f_establish_fully(ass_req, exp_compl); - f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"}); + f_bts_0_cfg(BSCVTY, {"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -3169,7 +3169,7 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); f_establish_fully(ass_req, exp_compl); - f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"}); + f_bts_0_cfg(BSCVTY, {"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -3216,7 +3216,7 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); f_establish_fully(ass_req, exp_compl); - f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"}); + f_bts_0_cfg(BSCVTY, {"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -3301,7 +3301,7 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); f_establish_fully(ass_req, exp_compl); - f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"}); + f_bts_0_cfg(BSCVTY, {"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -3760,13 +3760,13 @@ type record of charstring Commands; -private function f_bts_0_cfg(Commands cmds := {}) runs on MSC_ConnHdlr +private function f_bts_0_cfg(TELNETasp_PT pt, Commands cmds := {}) { - f_vty_enter_cfg_bts(BSCVTY, 0); + f_vty_enter_cfg_bts(pt, 0); for (var integer i := 0; i < sizeof(cmds); i := i+1) { - f_vty_transceive(BSCVTY, cmds[i]); + f_vty_transceive(pt, cmds[i]); } - f_vty_transceive(BSCVTY, "end"); + f_vty_transceive(pt, "end"); } private function f_cs7_inst_0_cfg(TELNETasp_PT pt, Commands cmds := {}) @@ -3920,7 +3920,7 @@ */ log("f_tc_ho_neighbor_config: 1. No 'neighbor' config"); - f_bts_0_cfg({"no neighbors"}); + f_bts_0_cfg(BSCVTY, {"no neighbors"}); f_probe_for_handover("1.a", "HO to bts 1 works, implicitly listed as neighbor (legacy behavior when none are configured)", "handover any to arfcn 871 bsic 11", true); @@ -3948,7 +3948,7 @@ */ log("f_tc_ho_neighbor_config: 2. explicit local neighbor: 'neighbor bts 1'"); - f_bts_0_cfg({"neighbor bts 1"}); + f_bts_0_cfg(BSCVTY, {"neighbor bts 1"}); f_sleep(0.5); f_probe_for_handover("2.a", "HO to bts 1 works, explicitly listed as neighbor", @@ -3970,7 +3970,7 @@ */ log("f_tc_ho_neighbor_config: 3. explicit local neighbor: 'neighbor bts 2'"); - f_bts_0_cfg({"no neighbors", "neighbor bts 2"}); + f_bts_0_cfg(BSCVTY, {"no neighbors", "neighbor bts 2"}); f_sleep(0.5); f_probe_for_handover("3.a", "HO to bts 1 doesn't work, not listed as neighbor", @@ -3991,7 +3991,7 @@ */ log("f_tc_ho_neighbor_config: 4. explicit remote neighbor: 'neighbor lac 99 arfcn 123 bsic 45'"); - f_bts_0_cfg({"no neighbors", "neighbor lac 99 arfcn 123 bsic 45"}); + f_bts_0_cfg(BSCVTY, {"no neighbors", "neighbor lac 99 arfcn 123 bsic 45"}); f_sleep(0.5); f_probe_for_handover("4.a", "HO to bts 1 doesn't work, not listed as neighbor", @@ -4015,7 +4015,7 @@ */ log("f_tc_ho_neighbor_config: 5. explicit remote neighbor re-using ARFCN+BSIC: 'neighbor lac 99 arfcn 871 bsic 12'"); - f_bts_0_cfg({"no neighbors", "neighbor lac 99 arfcn 871 bsic 12"}); + f_bts_0_cfg(BSCVTY, {"no neighbors", "neighbor lac 99 arfcn 871 bsic 12"}); f_sleep(0.5); f_probe_for_handover("5.a", "HO to 871-12 triggers inter-BSC HO (ignoring local cells with same ARFCN+BSIC)", @@ -4034,7 +4034,7 @@ log("f_tc_ho_neighbor_config: 6. config error: explicit local and remote neighbors with ambiguous ARFCN+BSIC:" & " 'neighbor bts 2; neighbor lac 99 arfcn 871 bsic 12'"); - f_bts_0_cfg({"no neighbors", "neighbor bts 2", "neighbor lac 99 arfcn 871 bsic 12"}); + f_bts_0_cfg(BSCVTY, {"no neighbors", "neighbor bts 2", "neighbor lac 99 arfcn 871 bsic 12"}); f_sleep(0.5); f_probe_for_handover("6.a", "HO to 871-12 is ambiguous = error", @@ -4053,7 +4053,7 @@ log("f_tc_ho_neighbor_config: 7. explicit local and remote neighbors:" & " 'neighbor bts 2; neighbor lac 99 arfcn 123 bsic 45'"); - f_bts_0_cfg({"no neighbors", "neighbor bts 2", "neighbor lac 99 arfcn 123 bsic 45"}); + f_bts_0_cfg(BSCVTY, {"no neighbors", "neighbor bts 2", "neighbor lac 99 arfcn 123 bsic 45"}); f_sleep(0.5); f_probe_for_handover("7.a", "HO to 871-12 does HO to bts 2", -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib059d9690f92f5f76025bca2b84496716a2a4cf0 Gerrit-Change-Number: 19151 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:28:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jul 2020 15:28:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RestOctets: add SI2quater EUTRAN templates In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 ) Change subject: library/GSM_RestOctets: add SI2quater EUTRAN templates ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4162cc39ad351f5e96f5941116a424adc44efaa2 Gerrit-Change-Number: 19114 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Wed, 08 Jul 2020 15:28:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:28:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jul 2020 15:28:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add first test to verify System Information on RSL startup In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 ) Change subject: bsc: add first test to verify System Information on RSL startup ...................................................................... Patch Set 10: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 10 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 15:28:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:29:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jul 2020 15:29:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add SI2quater tests for multiple EARFCNs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 ) Change subject: bsc: add SI2quater tests for multiple EARFCNs ...................................................................... Patch Set 7: Code-Review+1 I'd suggest to add at least one large EARFCN number, exhausting all of the bits that the field has (to ensure we're not cutting it short one or more bits). -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I45382f88686ca60e68569e93569fc4cfb63a0e0d Gerrit-Change-Number: 19152 Gerrit-PatchSet: 7 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 15:29:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:36:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 15:36:44 +0000 Subject: Change in osmo-pcu[master]: tbf_dl: uint8_t is enough to store a TA value In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19175 ) Change subject: tbf_dl: uint8_t is enough to store a TA value ...................................................................... Patch Set 1: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I38aa063ae30ca5680fef6252d2cef22cea98c123 Gerrit-Change-Number: 19175 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 15:36:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:36:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 15:36:46 +0000 Subject: Change in osmo-pcu[master]: tbf_dl: uint8_t is enough to store a TA value In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19175 ) Change subject: tbf_dl: uint8_t is enough to store a TA value ...................................................................... tbf_dl: uint8_t is enough to store a TA value According to 3GPP TS 44.018 sec 10.5.2.40, Timing Advance value is 8 bit and range is 0-63 (0-219 on GSM400). So there's no need for 16 bits to store it. uint8_t is used in all other places in the code. Change-Id: I38aa063ae30ca5680fef6252d2cef22cea98c123 --- M src/tbf_dl.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve Hoernchen: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 02aaa3a..e6be3c3 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -138,7 +138,7 @@ { bool ss; int8_t use_trx; - uint16_t ta = GSM48_TA_INVALID; + uint8_t ta = GSM48_TA_INVALID; struct gprs_rlcmac_ul_tbf *ul_tbf = NULL, *old_ul_tbf; struct gprs_rlcmac_dl_tbf *dl_tbf = NULL; GprsMs *ms; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I38aa063ae30ca5680fef6252d2cef22cea98c123 Gerrit-Change-Number: 19175 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:38:50 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 15:38:50 +0000 Subject: Change in osmo-bts[master]: common: Avoid changing OPSTATE to Enabled upon RSL up In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19156 ) Change subject: common: Avoid changing OPSTATE to Enabled upon RSL up ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iefb5c4e1097233b5c31e4d621c544d51516af678 Gerrit-Change-Number: 19156 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 08 Jul 2020 15:38:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:40:10 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 15:40:10 +0000 Subject: Change in osmo-bts[master]: bts-trx: Remove unused function l1if_provision_transceiver() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19162 ) Change subject: bts-trx: Remove unused function l1if_provision_transceiver() ...................................................................... Patch Set 1: Code-Review+1 Huh, was it unused all the time? o_O -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I509fdbc7883f227cef4b7e46cb68fa2418c63f97 Gerrit-Change-Number: 19162 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 08 Jul 2020 15:40:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:41:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 15:41:00 +0000 Subject: Change in osmo-bts[master]: bts-trx: Remove unused function l1if_provision_transceiver() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19162 ) Change subject: bts-trx: Remove unused function l1if_provision_transceiver() ...................................................................... Patch Set 1: > Patch Set 1: Code-Review+1 > > Huh, was it unused all the time? o_O It most probably ended up unused during one of my refactoring around 1-2 years ago. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I509fdbc7883f227cef4b7e46cb68fa2418c63f97 Gerrit-Change-Number: 19162 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 15:41:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:41:48 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 15:41:48 +0000 Subject: Change in osmo-bts[master]: Move nm_state and Mo related code gsm_data.* => oml.* In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19122 ) Change subject: Move nm_state and Mo related code gsm_data.* => oml.* ...................................................................... Move nm_state and Mo related code gsm_data.* => oml.* Change-Id: I57ea9c4ddbe5443b9b6afe3f8e6b38170d0e5a0e --- M include/osmo-bts/gsm_data.h M include/osmo-bts/oml.h M src/common/gsm_data.c M src/common/oml.c 4 files changed, 168 insertions(+), 175 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 97f5cde..2e8ff46 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -28,6 +28,7 @@ #include #include +#include #define GSM_FR_BITS 260 #define GSM_EFR_BITS 244 @@ -81,30 +82,6 @@ struct pcu_sock_state; struct smscb_msg; -/* Network Management State */ -struct gsm_nm_state { - enum abis_nm_op_state operational; - enum abis_nm_adm_state administrative; - enum abis_nm_avail_state availability; -}; - -struct gsm_abis_mo { - /* A-bis OML Object Class */ - uint8_t obj_class; - /* is there still some procedure pending? */ - uint8_t procedure_pending; - /* A-bis OML Object Instance */ - struct abis_om_obj_inst obj_inst; - /* human-readable name */ - const char *name; - /* NM State */ - struct gsm_nm_state nm_state; - /* Attributes configured in this MO */ - struct tlv_parsed *nm_attr; - /* BTS to which this MO belongs */ - struct gsm_bts *bts; -}; - #define MAX_A5_KEY_LEN (128/8) #define RSL_ENC_ALG_A5(x) (x+1) @@ -762,19 +739,6 @@ return lchan->name; } -void gsm_abis_mo_reset(struct gsm_abis_mo *mo); - -struct gsm_abis_mo * -gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, - const struct abis_om_obj_inst *obj_inst); - -struct gsm_nm_state * -gsm_objclass2nmstate(struct gsm_bts *bts, uint8_t obj_class, - const struct abis_om_obj_inst *obj_inst); -void * -gsm_objclass2obj(struct gsm_bts *bts, uint8_t obj_class, - const struct abis_om_obj_inst *obj_inst); - uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan); uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan, enum gsm_phys_chan_config as_pchan); diff --git a/include/osmo-bts/oml.h b/include/osmo-bts/oml.h index b92a974..484e210 100644 --- a/include/osmo-bts/oml.h +++ b/include/osmo-bts/oml.h @@ -8,6 +8,29 @@ struct msgb; struct gsm_lchan; +/* Network Management State */ +struct gsm_nm_state { + enum abis_nm_op_state operational; + enum abis_nm_adm_state administrative; + enum abis_nm_avail_state availability; +}; + +struct gsm_abis_mo { + /* A-bis OML Object Class */ + uint8_t obj_class; + /* is there still some procedure pending? */ + uint8_t procedure_pending; + /* A-bis OML Object Instance */ + struct abis_om_obj_inst obj_inst; + /* human-readable name */ + const char *name; + /* NM State */ + struct gsm_nm_state nm_state; + /* Attributes configured in this MO */ + struct tlv_parsed *nm_attr; + /* BTS to which this MO belongs */ + struct gsm_bts *bts; +}; int oml_init(struct gsm_abis_mo *mo); int down_oml(struct gsm_bts *bts, struct msgb *msg); @@ -46,4 +69,15 @@ int oml_tx_failure_event_rep(const struct gsm_abis_mo *mo, enum abis_nm_severity severity, uint16_t cause_value, const char *fmt, ...); +void gsm_mo_init(struct gsm_abis_mo *mo, struct gsm_bts *bts, + uint8_t obj_class, uint8_t p1, uint8_t p2, uint8_t p3); + +struct gsm_abis_mo *gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, + const struct abis_om_obj_inst *obj_inst); + +struct gsm_nm_state *gsm_objclass2nmstate(struct gsm_bts *bts, uint8_t obj_class, + const struct abis_om_obj_inst *obj_inst); +void *gsm_objclass2obj(struct gsm_bts *bts, uint8_t obj_class, + const struct abis_om_obj_inst *obj_inst); + #endif // _OML_H */ diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c index 7239440..57f33ae 100644 --- a/src/common/gsm_data.c +++ b/src/common/gsm_data.c @@ -54,24 +54,6 @@ {} }; -void gsm_abis_mo_reset(struct gsm_abis_mo *mo) -{ - mo->nm_state.operational = NM_OPSTATE_NULL; - mo->nm_state.availability = NM_AVSTATE_POWER_OFF; - mo->nm_state.administrative = NM_STATE_LOCKED; -} - -static void gsm_mo_init(struct gsm_abis_mo *mo, struct gsm_bts *bts, - uint8_t obj_class, uint8_t p1, uint8_t p2, uint8_t p3) -{ - mo->bts = bts; - mo->obj_class = obj_class; - mo->obj_inst.bts_nr = p1; - mo->obj_inst.trx_nr = p2; - mo->obj_inst.ts_nr = p3; - gsm_abis_mo_reset(mo); -} - const struct value_string bts_attribute_names[] = { OSMO_VALUE_STRING(BTS_TYPE_VARIANT), OSMO_VALUE_STRING(BTS_SUB_MODEL), @@ -429,126 +411,6 @@ return ts2str; } -/* obtain the MO structure for a given object instance */ -struct gsm_abis_mo * -gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, - const struct abis_om_obj_inst *obj_inst) -{ - struct gsm_bts_trx *trx; - struct gsm_abis_mo *mo = NULL; - - switch (obj_class) { - case NM_OC_BTS: - mo = &bts->mo; - break; - case NM_OC_RADIO_CARRIER: - if (obj_inst->trx_nr >= bts->num_trx) { - return NULL; - } - trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); - mo = &trx->mo; - break; - case NM_OC_BASEB_TRANSC: - if (obj_inst->trx_nr >= bts->num_trx) { - return NULL; - } - trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); - mo = &trx->bb_transc.mo; - break; - case NM_OC_CHANNEL: - if (obj_inst->trx_nr >= bts->num_trx) { - return NULL; - } - trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); - if (obj_inst->ts_nr >= TRX_NR_TS) - return NULL; - mo = &trx->ts[obj_inst->ts_nr].mo; - break; - case NM_OC_SITE_MANAGER: - mo = &bts->site_mgr.mo; - break; - case NM_OC_GPRS_NSE: - mo = &bts->gprs.nse.mo; - break; - case NM_OC_GPRS_CELL: - mo = &bts->gprs.cell.mo; - break; - case NM_OC_GPRS_NSVC: - if (obj_inst->trx_nr >= ARRAY_SIZE(bts->gprs.nsvc)) - return NULL; - mo = &bts->gprs.nsvc[obj_inst->trx_nr].mo; - break; - } - return mo; -} - -/* obtain the gsm_nm_state data structure for a given object instance */ -struct gsm_nm_state * -gsm_objclass2nmstate(struct gsm_bts *bts, uint8_t obj_class, - const struct abis_om_obj_inst *obj_inst) -{ - struct gsm_abis_mo *mo; - - mo = gsm_objclass2mo(bts, obj_class, obj_inst); - if (!mo) - return NULL; - - return &mo->nm_state; -} - -/* obtain the in-memory data structure of a given object instance */ -void * -gsm_objclass2obj(struct gsm_bts *bts, uint8_t obj_class, - const struct abis_om_obj_inst *obj_inst) -{ - struct gsm_bts_trx *trx; - void *obj = NULL; - - switch (obj_class) { - case NM_OC_BTS: - obj = bts; - break; - case NM_OC_RADIO_CARRIER: - if (obj_inst->trx_nr >= bts->num_trx) { - return NULL; - } - trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); - obj = trx; - break; - case NM_OC_BASEB_TRANSC: - if (obj_inst->trx_nr >= bts->num_trx) { - return NULL; - } - trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); - obj = &trx->bb_transc; - break; - case NM_OC_CHANNEL: - if (obj_inst->trx_nr >= bts->num_trx) { - return NULL; - } - trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); - if (obj_inst->ts_nr >= TRX_NR_TS) - return NULL; - obj = &trx->ts[obj_inst->ts_nr]; - break; - case NM_OC_SITE_MANAGER: - obj = &bts->site_mgr; - break; - case NM_OC_GPRS_NSE: - obj = &bts->gprs.nse; - break; - case NM_OC_GPRS_CELL: - obj = &bts->gprs.cell; - break; - case NM_OC_GPRS_NSVC: - if (obj_inst->trx_nr >= ARRAY_SIZE(bts->gprs.nsvc)) - return NULL; - obj = &bts->gprs.nsvc[obj_inst->trx_nr]; - break; - } - return obj; -} - /* See Table 10.5.25 of GSM04.08 */ static uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan, uint8_t ts_nr, uint8_t lchan_nr) diff --git a/src/common/oml.c b/src/common/oml.c index 63287f0..1be4f89 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1503,3 +1503,136 @@ return 0; } + +void gsm_mo_init(struct gsm_abis_mo *mo, struct gsm_bts *bts, + uint8_t obj_class, uint8_t p1, uint8_t p2, uint8_t p3) +{ + mo->bts = bts; + mo->obj_class = obj_class; + mo->obj_inst.bts_nr = p1; + mo->obj_inst.trx_nr = p2; + mo->obj_inst.ts_nr = p3; + mo->nm_state.operational = NM_OPSTATE_NULL; + mo->nm_state.availability = NM_AVSTATE_POWER_OFF; + mo->nm_state.administrative = NM_STATE_LOCKED; +} + +/* obtain the MO structure for a given object instance */ +struct gsm_abis_mo * +gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, + const struct abis_om_obj_inst *obj_inst) +{ + struct gsm_bts_trx *trx; + struct gsm_abis_mo *mo = NULL; + + switch (obj_class) { + case NM_OC_BTS: + mo = &bts->mo; + break; + case NM_OC_RADIO_CARRIER: + if (obj_inst->trx_nr >= bts->num_trx) { + return NULL; + } + trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); + mo = &trx->mo; + break; + case NM_OC_BASEB_TRANSC: + if (obj_inst->trx_nr >= bts->num_trx) { + return NULL; + } + trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); + mo = &trx->bb_transc.mo; + break; + case NM_OC_CHANNEL: + if (obj_inst->trx_nr >= bts->num_trx) { + return NULL; + } + trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); + if (obj_inst->ts_nr >= TRX_NR_TS) + return NULL; + mo = &trx->ts[obj_inst->ts_nr].mo; + break; + case NM_OC_SITE_MANAGER: + mo = &bts->site_mgr.mo; + break; + case NM_OC_GPRS_NSE: + mo = &bts->gprs.nse.mo; + break; + case NM_OC_GPRS_CELL: + mo = &bts->gprs.cell.mo; + break; + case NM_OC_GPRS_NSVC: + if (obj_inst->trx_nr >= ARRAY_SIZE(bts->gprs.nsvc)) + return NULL; + mo = &bts->gprs.nsvc[obj_inst->trx_nr].mo; + break; + } + return mo; +} + +/* obtain the gsm_nm_state data structure for a given object instance */ +struct gsm_nm_state * +gsm_objclass2nmstate(struct gsm_bts *bts, uint8_t obj_class, + const struct abis_om_obj_inst *obj_inst) +{ + struct gsm_abis_mo *mo; + + mo = gsm_objclass2mo(bts, obj_class, obj_inst); + if (!mo) + return NULL; + + return &mo->nm_state; +} + +/* obtain the in-memory data structure of a given object instance */ +void * +gsm_objclass2obj(struct gsm_bts *bts, uint8_t obj_class, + const struct abis_om_obj_inst *obj_inst) +{ + struct gsm_bts_trx *trx; + void *obj = NULL; + + switch (obj_class) { + case NM_OC_BTS: + obj = bts; + break; + case NM_OC_RADIO_CARRIER: + if (obj_inst->trx_nr >= bts->num_trx) { + return NULL; + } + trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); + obj = trx; + break; + case NM_OC_BASEB_TRANSC: + if (obj_inst->trx_nr >= bts->num_trx) { + return NULL; + } + trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); + obj = &trx->bb_transc; + break; + case NM_OC_CHANNEL: + if (obj_inst->trx_nr >= bts->num_trx) { + return NULL; + } + trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); + if (obj_inst->ts_nr >= TRX_NR_TS) + return NULL; + obj = &trx->ts[obj_inst->ts_nr]; + break; + case NM_OC_SITE_MANAGER: + obj = &bts->site_mgr; + break; + case NM_OC_GPRS_NSE: + obj = &bts->gprs.nse; + break; + case NM_OC_GPRS_CELL: + obj = &bts->gprs.cell; + break; + case NM_OC_GPRS_NSVC: + if (obj_inst->trx_nr >= ARRAY_SIZE(bts->gprs.nsvc)) + return NULL; + obj = &bts->gprs.nsvc[obj_inst->trx_nr]; + break; + } + return obj; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I57ea9c4ddbe5443b9b6afe3f8e6b38170d0e5a0e Gerrit-Change-Number: 19122 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 15:41:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 15:41:49 +0000 Subject: Change in osmo-bts[master]: Move gsm_bts code gsm-data.* => bts.* In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19123 ) Change subject: Move gsm_bts code gsm-data.* => bts.* ...................................................................... Move gsm_bts code gsm-data.* => bts.* bts.h refers to struct gsm_bts object, but we still had a bunch of stuff in bulky gsm_data.* from old days. Let's move stuff where it belongs to start clean up of gsm_data. Change-Id: I0a4219e3f64f625ee8b364bf408b8d2bcc8085c5 --- M include/osmo-bts/bts.h M include/osmo-bts/gsm_data.h M src/common/bts.c M src/common/bts_shutdown_fsm.c M src/common/gsm_data.c M src/common/load_indication.c M src/common/msg_utils.c M src/common/scheduler.c M src/common/sysinfo.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-sysmo/sysmobts_vty.c M src/osmo-bts-trx/trx_vty.c 12 files changed, 479 insertions(+), 487 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, but someone else must approve laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 63412f9..cb8787f 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -24,8 +24,299 @@ BTS_CTR_AGCH_DELETED, }; +/* Used by OML layer for BTS Attribute reporting */ +enum bts_attribute { + BTS_TYPE_VARIANT, + BTS_SUB_MODEL, + TRX_PHY_VERSION, +}; +const char *btsatttr2str(enum bts_attribute v); + +enum gsm_bts_type_variant { + BTS_UNKNOWN, + BTS_OSMO_LITECELL15, + BTS_OSMO_OC2G, + BTS_OSMO_OCTPHY, + BTS_OSMO_SYSMO, + BTS_OSMO_TRX, + BTS_OSMO_VIRTUAL, + BTS_OSMO_OMLDUMMY, + _NUM_BTS_VARIANT +}; +const char *btsvariant2str(enum gsm_bts_type_variant v); + +/* TODO: add a brief description of this flag */ +#define BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP (1 << 0) +/* When this flag is set then the measurement data is included in + * (PRIM_PH_DATA) and struct ph_tch_param (PRIM_TCH). Otherwise the + * measurement data is passed using a separate MPH INFO MEAS IND. + * (See also ticket: OS#2977) */ +#define BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB (1 << 1) + +/* BTS implementation flags (internal use, not exposed via OML) */ +#define bts_internal_flag_get(bts, flag) \ + ((bts->flags & (typeof(bts->flags)) flag) != 0) +#define bts_internal_flag_set(bts, flag) \ + bts->flags |= (typeof(bts->flags)) flag + +struct gsm_bts_gprs_nsvc { + struct gsm_bts *bts; + /* data read via VTY config file, to configure the BTS + * via OML from BSC */ + int id; + uint16_t nsvci; + uint16_t local_port; /* on the BTS */ + uint16_t remote_port; /* on the SGSN */ + uint32_t remote_ip; /* on the SGSN */ + + struct gsm_abis_mo mo; +}; + +struct gprs_rlc_cfg { + uint16_t parameter[_NUM_RLC_PAR]; + struct { + uint16_t repeat_time; /* ms */ + uint8_t repeat_count; + } paging; + uint32_t cs_mask; /* bitmask of gprs_cs */ + uint8_t initial_cs; + uint8_t initial_mcs; +}; + +struct bts_smscb_state { + struct llist_head queue; /* list of struct smscb_msg */ + int queue_len; + struct rate_ctr_group *ctrs; + struct smscb_msg *cur_msg; /* current SMS-CB */ + struct smscb_msg *default_msg; /* default broadcast message; NULL if none */ +}; + +/* One BTS */ +struct gsm_bts { + /* list header in net->bts_list */ + struct llist_head list; + + /* number of the BTS in network */ + uint8_t nr; + /* human readable name / description */ + char *description; + /* Cell Identity */ + uint16_t cell_identity; + /* location area code of this BTS */ + uint16_t location_area_code; + /* Base Station Identification Code (BSIC), lower 3 bits is BCC, + * which is used as TSC for the CCCH */ + uint8_t bsic; + /* type of BTS */ + enum gsm_bts_type_variant variant; + enum gsm_band band; + char version[MAX_VERSION_LENGTH]; + char sub_model[MAX_VERSION_LENGTH]; + + /* public features of a given BTS (set/reported via OML) */ + struct bitvec *features; + /* implementation flags of a given BTS (not exposed via OML) */ + uint16_t flags; + + /* Connected PCU version (if any) */ + char pcu_version[MAX_VERSION_LENGTH]; + + /* maximum Tx power that the MS is permitted to use in this cell */ + int ms_max_power; + + /* how do we talk OML with this TRX? */ + struct e1inp_sign_link *oml_link; + struct timespec oml_conn_established_timestamp; + + /* Abis network management O&M handle */ + struct gsm_abis_mo mo; + + /* number of this BTS on given E1 link */ + uint8_t bts_nr; + + /* DTX features of this BTS */ + bool dtxd; + + /* CCCH is on C0 */ + struct gsm_bts_trx *c0; + + struct { + struct gsm_abis_mo mo; + } site_mgr; + + /* bitmask of all SI that are present/valid in si_buf */ + uint32_t si_valid; + /* 3GPP TS 44.018 Table 10.5.2.33b.1 INDEX and COUNT for SI2quater */ + uint8_t si2q_index; /* distinguish individual SI2quater messages */ + uint8_t si2q_count; /* si2q_index for the last (highest indexed) individual SI2quater message */ + /* buffers where we put the pre-computed SI */ + sysinfo_buf_t si_buf[_MAX_SYSINFO_TYPE][SI2Q_MAX_NUM]; + /* offsets used while generating SI2quater */ + size_t e_offset; + size_t u_offset; + /* decoded SI3 rest octets - *unmodified* as received from BSC */ + struct osmo_gsm48_si_ro_info si3_ro_decoded; + /* is SI3 GPRS Indicator currently disabled due to lack of PCU connection? */ + bool si3_gprs_ind_disabled; + + /* ip.access Unit ID's have Site/BTS/TRX layout */ + union { + struct { + uint16_t site_id; + uint16_t bts_id; + uint32_t flags; + uint32_t rsl_ip; + } ip_access; + }; + + /* Not entirely sure how ip.access specific this is */ + struct { + struct { + struct gsm_abis_mo mo; + uint16_t nsei; + uint8_t timer[7]; + } nse; + struct { + struct gsm_abis_mo mo; + uint16_t bvci; + uint8_t timer[11]; + struct gprs_rlc_cfg rlc_cfg; + } cell; + struct gsm_bts_gprs_nsvc nsvc[2]; + uint8_t rac; + } gprs; + + /* transceivers */ + int num_trx; + struct llist_head trx_list; + + struct rate_ctr_group *ctrs; + bool supp_meas_toa256; + + struct { + /* Interference Boundaries for OML */ + int16_t boundary[6]; + uint8_t intave; + } interference; + unsigned int t200_ms[7]; + unsigned int t3105_ms; + struct { + uint8_t overload_period; + struct { + /* Input parameters from OML */ + uint8_t load_ind_thresh; /* percent */ + uint8_t load_ind_period; /* seconds */ + /* Internal data */ + struct osmo_timer_list timer; + unsigned int pch_total; + unsigned int pch_used; + } ccch; + struct { + /* Input parameters from OML */ + int16_t busy_thresh; /* in dBm */ + uint16_t averaging_slots; + /* Internal data */ + unsigned int total; /* total nr */ + unsigned int busy; /* above busy_thresh */ + unsigned int access; /* access bursts */ + } rach; + } load; + uint8_t ny1; + uint8_t max_ta; + + /* AGCH queuing */ + struct { + struct llist_head queue; + int length; + int max_length; + + int thresh_level; /* Cleanup threshold in percent of max len */ + int low_level; /* Low water mark in percent of max len */ + int high_level; /* High water mark in percent of max len */ + + /* TODO: Use a rate counter group instead */ + uint64_t dropped_msgs; + uint64_t merged_msgs; + uint64_t rejected_msgs; + uint64_t agch_msgs; + uint64_t pch_msgs; + } agch_queue; + + struct { + uint8_t *prim_notif; /* ETWS primary notification (NULL if none) */ + ssize_t prim_notif_len; /* Length of prim_notif; expected 56 bytes */ + uint8_t page_size; + uint8_t num_pages; /* total number of pages */ + uint8_t next_page; /* next page number to be sent */ + bool pni; /* Primary Notification Identifier */ + } etws; + + struct paging_state *paging_state; + char *bsc_oml_host; + struct llist_head oml_queue; + unsigned int rtp_jitter_buf_ms; + bool rtp_jitter_adaptive; + + uint16_t rtp_port_range_start; + uint16_t rtp_port_range_end; + uint16_t rtp_port_range_next; + int rtp_ip_dscp; + + struct { + uint8_t ciphers; /* flags A5/1==0x1, A5/2==0x2, A5/3==0x4 */ + } support; + struct { + uint8_t tc4_ctr; + } si; + struct gsm_time gsm_time; + /* frame number statistics (FN in PH-RTS.ind vs. PH-DATA.ind */ + struct { + int32_t min; /* minimum observed */ + int32_t max; /* maximum observed */ + int32_t avg256; /* accumulator */ + uint32_t avg_count; /* number of samples accumulated in avg256 */ + uint32_t avg_window; /* number of averages in avg_count */ + } fn_stats; + /* Radio Link Timeout counter. -1 disables timeout for + * lab/measurement purpose */ + int radio_link_timeout; + + int ul_power_target; /* Uplink Rx power target */ + + /* used by the sysmoBTS to adjust band */ + uint8_t auto_band; + + /* State for SMSCB (Cell Broadcast) for BASIC and EXTENDED channel */ + struct bts_smscb_state smscb_basic; + struct bts_smscb_state smscb_extended; + int smscb_queue_tgt_len; /* ideal/target queue length */ + int smscb_queue_max_len; /* maximum queue length */ + int smscb_queue_hyst; /* hysteresis for CBCH load indications */ + + int16_t min_qual_rach; /* minimum link quality (in centiBels) for Access Bursts */ + int16_t min_qual_norm; /* minimum link quality (in centiBels) for Normal Bursts */ + uint16_t max_ber10k_rach; /* Maximum permitted RACH BER in 0.01% */ + + struct { + char *sock_path; + } pcu; + + struct osmo_fsm_inst *shutdown_fi; /* FSM instance to manage shutdown procedure during process exit */ + struct osmo_tdef *T_defs; /* Timer defines */ + + void *model_priv; /* Allocated by bts_model, contains model specific data pointer */ +}; + +extern const struct value_string bts_impl_flag_desc[]; extern void *tall_bts_ctx; +#define GSM_BTS_SI2Q(bts, i) (struct gsm48_system_information_type_2quater *)((bts)->si_buf[SYSINFO_TYPE_2quater][i]) +#define GSM_BTS_HAS_SI(bts, i) ((bts)->si_valid & (1 << i)) +#define GSM_BTS_SI(bts, i) (void *)((bts)->si_buf[i][0]) + +struct gsm_bts *gsm_bts_alloc(void *talloc_ctx, uint8_t bts_num); +struct gsm_bts *gsm_bts_num(struct gsm_network *net, int num); + int bts_init(struct gsm_bts *bts); int bts_trx_init(struct gsm_bts_trx *trx); void bts_shutdown(struct gsm_bts *bts, const char *reason); @@ -39,7 +330,7 @@ int bts_agch_max_queue_length(int T, int bcch_conf); int bts_ccch_copy_msg(struct gsm_bts *bts, uint8_t *out_buf, struct gsm_time *gt, int is_ag_res); - +int bts_supports_cipher(struct gsm_bts *bts, int rsl_cipher); uint8_t *bts_sysinfo_get(struct gsm_bts *bts, const struct gsm_time *g_time); void regenerate_si3_restoctets(struct gsm_bts *bts); uint8_t *lchan_sacch_get(struct gsm_lchan *lchan); @@ -60,4 +351,7 @@ int32_t bts_get_avg_fn_advance(struct gsm_bts *bts); +/* return the gsm_lchan for the CBCH (if it exists at all) */ +struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts); + #endif /* _BTS_H */ diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 2e8ff46..0bb7761 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -386,59 +386,8 @@ struct gsm_bts_trx_ts ts[TRX_NR_TS]; }; -#define GSM_BTS_SI2Q(bts, i) (struct gsm48_system_information_type_2quater *)((bts)->si_buf[SYSINFO_TYPE_2quater][i]) -#define GSM_BTS_HAS_SI(bts, i) ((bts)->si_valid & (1 << i)) -#define GSM_BTS_SI(bts, i) (void *)((bts)->si_buf[i][0]) #define GSM_LCHAN_SI(lchan, i) (void *)((lchan)->si.buf[i][0]) -enum gsm_bts_type_variant { - BTS_UNKNOWN, - BTS_OSMO_LITECELL15, - BTS_OSMO_OC2G, - BTS_OSMO_OCTPHY, - BTS_OSMO_SYSMO, - BTS_OSMO_TRX, - BTS_OSMO_VIRTUAL, - BTS_OSMO_OMLDUMMY, - _NUM_BTS_VARIANT -}; - -/* Used by OML layer for BTS Attribute reporting */ -enum bts_attribute { - BTS_TYPE_VARIANT, - BTS_SUB_MODEL, - TRX_PHY_VERSION, -}; - -/* BTS implementation flags (internal use, not exposed via OML) */ -#define bts_internal_flag_get(bts, flag) \ - ((bts->flags & (typeof(bts->flags)) flag) != 0) -#define bts_internal_flag_set(bts, flag) \ - bts->flags |= (typeof(bts->flags)) flag - -/* TODO: add a brief description of this flag */ -#define BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP (1 << 0) -/* When this flag is set then the measurement data is included in - * (PRIM_PH_DATA) and struct ph_tch_param (PRIM_TCH). Otherwise the - * measurement data is passed using a separate MPH INFO MEAS IND. - * (See also ticket: OS#2977) */ -#define BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB (1 << 1) - -extern const struct value_string bts_impl_flag_desc[]; - -struct gsm_bts_gprs_nsvc { - struct gsm_bts *bts; - /* data read via VTY config file, to configure the BTS - * via OML from BSC */ - int id; - uint16_t nsvci; - uint16_t local_port; /* on the BTS */ - uint16_t remote_port; /* on the SGSN */ - uint32_t remote_ip; /* on the SGSN */ - - struct gsm_abis_mo mo; -}; - enum gprs_rlc_par { RLC_T3142, RLC_T3169, @@ -471,257 +420,13 @@ _NUM_GRPS_CS }; -struct gprs_rlc_cfg { - uint16_t parameter[_NUM_RLC_PAR]; - struct { - uint16_t repeat_time; /* ms */ - uint8_t repeat_count; - } paging; - uint32_t cs_mask; /* bitmask of gprs_cs */ - uint8_t initial_cs; - uint8_t initial_mcs; -}; - -struct bts_smscb_state { - struct llist_head queue; /* list of struct smscb_msg */ - int queue_len; - struct rate_ctr_group *ctrs; - struct smscb_msg *cur_msg; /* current SMS-CB */ - struct smscb_msg *default_msg; /* default broadcast message; NULL if none */ -}; - /* The amount of time within which a sudden disconnect of a newly established * OML connection will cause a special warning to be logged. */ #define OSMO_BTS_OML_CONN_EARLY_DISCONNECT 10 /* in seconds */ -/* One BTS */ -struct gsm_bts { - /* list header in net->bts_list */ - struct llist_head list; - - /* number of the BTS in network */ - uint8_t nr; - /* human readable name / description */ - char *description; - /* Cell Identity */ - uint16_t cell_identity; - /* location area code of this BTS */ - uint16_t location_area_code; - /* Base Station Identification Code (BSIC), lower 3 bits is BCC, - * which is used as TSC for the CCCH */ - uint8_t bsic; - /* type of BTS */ - enum gsm_bts_type_variant variant; - enum gsm_band band; - char version[MAX_VERSION_LENGTH]; - char sub_model[MAX_VERSION_LENGTH]; - - /* public features of a given BTS (set/reported via OML) */ - struct bitvec *features; - /* implementation flags of a given BTS (not exposed via OML) */ - uint16_t flags; - - /* Connected PCU version (if any) */ - char pcu_version[MAX_VERSION_LENGTH]; - - /* maximum Tx power that the MS is permitted to use in this cell */ - int ms_max_power; - - /* how do we talk OML with this TRX? */ - struct e1inp_sign_link *oml_link; - struct timespec oml_conn_established_timestamp; - - /* Abis network management O&M handle */ - struct gsm_abis_mo mo; - - /* number of this BTS on given E1 link */ - uint8_t bts_nr; - - /* DTX features of this BTS */ - bool dtxd; - - /* CCCH is on C0 */ - struct gsm_bts_trx *c0; - - struct { - struct gsm_abis_mo mo; - } site_mgr; - - /* bitmask of all SI that are present/valid in si_buf */ - uint32_t si_valid; - /* 3GPP TS 44.018 Table 10.5.2.33b.1 INDEX and COUNT for SI2quater */ - uint8_t si2q_index; /* distinguish individual SI2quater messages */ - uint8_t si2q_count; /* si2q_index for the last (highest indexed) individual SI2quater message */ - /* buffers where we put the pre-computed SI */ - sysinfo_buf_t si_buf[_MAX_SYSINFO_TYPE][SI2Q_MAX_NUM]; - /* offsets used while generating SI2quater */ - size_t e_offset; - size_t u_offset; - /* decoded SI3 rest octets - *unmodified* as received from BSC */ - struct osmo_gsm48_si_ro_info si3_ro_decoded; - /* is SI3 GPRS Indicator currently disabled due to lack of PCU connection? */ - bool si3_gprs_ind_disabled; - - /* ip.access Unit ID's have Site/BTS/TRX layout */ - union { - struct { - uint16_t site_id; - uint16_t bts_id; - uint32_t flags; - uint32_t rsl_ip; - } ip_access; - }; - - /* Not entirely sure how ip.access specific this is */ - struct { - struct { - struct gsm_abis_mo mo; - uint16_t nsei; - uint8_t timer[7]; - } nse; - struct { - struct gsm_abis_mo mo; - uint16_t bvci; - uint8_t timer[11]; - struct gprs_rlc_cfg rlc_cfg; - } cell; - struct gsm_bts_gprs_nsvc nsvc[2]; - uint8_t rac; - } gprs; - - /* transceivers */ - int num_trx; - struct llist_head trx_list; - - struct rate_ctr_group *ctrs; - bool supp_meas_toa256; - - struct { - /* Interference Boundaries for OML */ - int16_t boundary[6]; - uint8_t intave; - } interference; - unsigned int t200_ms[7]; - unsigned int t3105_ms; - struct { - uint8_t overload_period; - struct { - /* Input parameters from OML */ - uint8_t load_ind_thresh; /* percent */ - uint8_t load_ind_period; /* seconds */ - /* Internal data */ - struct osmo_timer_list timer; - unsigned int pch_total; - unsigned int pch_used; - } ccch; - struct { - /* Input parameters from OML */ - int16_t busy_thresh; /* in dBm */ - uint16_t averaging_slots; - /* Internal data */ - unsigned int total; /* total nr */ - unsigned int busy; /* above busy_thresh */ - unsigned int access; /* access bursts */ - } rach; - } load; - uint8_t ny1; - uint8_t max_ta; - - /* AGCH queuing */ - struct { - struct llist_head queue; - int length; - int max_length; - - int thresh_level; /* Cleanup threshold in percent of max len */ - int low_level; /* Low water mark in percent of max len */ - int high_level; /* High water mark in percent of max len */ - - /* TODO: Use a rate counter group instead */ - uint64_t dropped_msgs; - uint64_t merged_msgs; - uint64_t rejected_msgs; - uint64_t agch_msgs; - uint64_t pch_msgs; - } agch_queue; - - struct { - uint8_t *prim_notif; /* ETWS primary notification (NULL if none) */ - ssize_t prim_notif_len; /* Length of prim_notif; expected 56 bytes */ - uint8_t page_size; - uint8_t num_pages; /* total number of pages */ - uint8_t next_page; /* next page number to be sent */ - bool pni; /* Primary Notification Identifier */ - } etws; - - struct paging_state *paging_state; - char *bsc_oml_host; - struct llist_head oml_queue; - unsigned int rtp_jitter_buf_ms; - bool rtp_jitter_adaptive; - - uint16_t rtp_port_range_start; - uint16_t rtp_port_range_end; - uint16_t rtp_port_range_next; - int rtp_ip_dscp; - - struct { - uint8_t ciphers; /* flags A5/1==0x1, A5/2==0x2, A5/3==0x4 */ - } support; - struct { - uint8_t tc4_ctr; - } si; - struct gsm_time gsm_time; - /* frame number statistics (FN in PH-RTS.ind vs. PH-DATA.ind */ - struct { - int32_t min; /* minimum observed */ - int32_t max; /* maximum observed */ - int32_t avg256; /* accumulator */ - uint32_t avg_count; /* number of samples accumulated in avg256 */ - uint32_t avg_window; /* number of averages in avg_count */ - } fn_stats; - /* Radio Link Timeout counter. -1 disables timeout for - * lab/measurement purpose */ - int radio_link_timeout; - - int ul_power_target; /* Uplink Rx power target */ - - /* used by the sysmoBTS to adjust band */ - uint8_t auto_band; - - /* State for SMSCB (Cell Broadcast) for BASIC and EXTENDED channel */ - struct bts_smscb_state smscb_basic; - struct bts_smscb_state smscb_extended; - int smscb_queue_tgt_len; /* ideal/target queue length */ - int smscb_queue_max_len; /* maximum queue length */ - int smscb_queue_hyst; /* hysteresis for CBCH load indications */ - - int16_t min_qual_rach; /* minimum link quality (in centiBels) for Access Bursts */ - int16_t min_qual_norm; /* minimum link quality (in centiBels) for Normal Bursts */ - uint16_t max_ber10k_rach; /* Maximum permitted RACH BER in 0.01% */ - - struct { - char *sock_path; - } pcu; - - struct osmo_fsm_inst *shutdown_fi; /* FSM instance to manage shutdown procedure during process exit */ - struct osmo_tdef *T_defs; /* Timer defines */ - - void *model_priv; /* Allocated by bts_model, contains model specific data pointer */ -}; - - -struct gsm_bts *gsm_bts_alloc(void *talloc_ctx, uint8_t bts_num); -struct gsm_bts *gsm_bts_num(struct gsm_network *net, int num); - struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts); struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num); -enum bts_attribute str2btsattr(const char *s); -const char *btsatttr2str(enum bts_attribute v); - -enum gsm_bts_type_variant str2btsvariant(const char *arg); -const char *btsvariant2str(enum gsm_bts_type_variant v); extern const struct value_string gsm_pchant_names[13]; extern const struct value_string gsm_pchant_descs[13]; @@ -743,18 +448,9 @@ uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan, enum gsm_phys_chan_config as_pchan); -/* return the gsm_lchan for the CBCH (if it exists at all) */ -struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts); - #define BSIC2BCC(bsic) ((bsic) & 0x3) -static inline uint8_t gsm_ts_tsc(const struct gsm_bts_trx_ts *ts) -{ - if (ts->tsc != -1) - return ts->tsc; - else - return ts->trx->bts->bsic & 7; -} +uint8_t gsm_ts_tsc(const struct gsm_bts_trx_ts *ts); struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr, int *rc); @@ -773,10 +469,6 @@ /* cipher code */ #define CIPHER_A5(x) (1 << (x-1)) -int bts_supports_cipher(struct gsm_bts *bts, int rsl_cipher); - bool ts_is_pdch(const struct gsm_bts_trx_ts *ts); -int bts_model_check_cm_mode(enum gsm_phys_chan_config pchan, enum gsm48_chan_mode cm); - #endif /* _GSM_DATA_H */ diff --git a/src/common/bts.c b/src/common/bts.c index dccb098..2f6a700 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -50,6 +51,7 @@ #include #include #include +#include #define MIN_QUAL_RACH 50 /* minimum link quality (in centiBels) for Access Bursts */ #define MIN_QUAL_NORM -5 /* minimum link quality (in centiBels) for Normal Bursts */ @@ -122,6 +124,152 @@ cbch_ctr_desc }; +static struct osmo_tdef bts_T_defs[] = { + /* T-1: FIXME: Ideally should be dynamically calculated per trx at + * shutdown start based on params below, and highest trx value taken: + * + VTY's power-ramp step-interval. + * + Amount of steps needed (taking into account how many dB each step moves). + * + Extra time to get response back for each step. + * For now we simply give 5 mins, which should be enough for any + * acceptable setup, while still ensuring will timeout at some point if + * something fails in the ramp down procedure. + */ + { .T=-1, .default_val=300, .desc="Time after which osmo-bts exits if regular ramp down during shut down process does not finish (s)" }, + { .T=-2, .default_val=3, .desc="Time after which osmo-bts exits if requesting transceivers to stop during shut down process does not finish (s)" }, + {} +}; + +static const uint8_t bts_nse_timer_default[] = { 3, 3, 3, 3, 30, 3, 10 }; +static const uint8_t bts_cell_timer_default[] = + { 3, 3, 3, 3, 3, 10, 3, 10, 3, 10, 3 }; +static const struct gprs_rlc_cfg rlc_cfg_default = { + .parameter = { + [RLC_T3142] = 20, + [RLC_T3169] = 5, + [RLC_T3191] = 5, + [RLC_T3193] = 160, /* 10ms */ + [RLC_T3195] = 5, + [RLC_N3101] = 10, + [RLC_N3103] = 4, + [RLC_N3105] = 8, + [CV_COUNTDOWN] = 15, + [T_DL_TBF_EXT] = 250 * 10, /* ms */ + [T_UL_TBF_EXT] = 250 * 10, /* ms */ + }, + .paging = { + .repeat_time = 5 * 50, /* ms */ + .repeat_count = 3, + }, + .cs_mask = 0x1fff, + .initial_cs = 2, + .initial_mcs = 6, +}; + +const struct value_string osmo_bts_variant_names[_NUM_BTS_VARIANT + 1] = { + { BTS_UNKNOWN, "unknown" }, + { BTS_OSMO_LITECELL15, "osmo-bts-lc15" }, + { BTS_OSMO_OC2G, "osmo-bts-oc2g" }, + { BTS_OSMO_OCTPHY, "osmo-bts-octphy" }, + { BTS_OSMO_SYSMO, "osmo-bts-sysmo" }, + { BTS_OSMO_TRX, "osmo-bts-trx" }, + { BTS_OSMO_VIRTUAL, "osmo-bts-virtual" }, + { BTS_OSMO_OMLDUMMY, "osmo-bts-omldummy" }, + { 0, NULL } +}; + +const char *btsvariant2str(enum gsm_bts_type_variant v) +{ + return get_value_string(osmo_bts_variant_names, v); +} + +const struct value_string bts_attribute_names[] = { + OSMO_VALUE_STRING(BTS_TYPE_VARIANT), + OSMO_VALUE_STRING(BTS_SUB_MODEL), + OSMO_VALUE_STRING(TRX_PHY_VERSION), + { 0, NULL } +}; + +const char *btsatttr2str(enum bts_attribute v) +{ + return get_value_string(bts_attribute_names, v); +} + +const struct value_string bts_impl_flag_desc[] = { + { BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP, "DSP/HW based MS Power Control Loop" }, + { BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB, "Measurement and Payload data combined" }, + { 0, NULL } +}; + +struct gsm_bts *gsm_bts_alloc(void *ctx, uint8_t bts_num) +{ + struct gsm_bts *bts = talloc_zero(ctx, struct gsm_bts); + int i; + + if (!bts) + return NULL; + + bts->nr = bts_num; + bts->num_trx = 0; + INIT_LLIST_HEAD(&bts->trx_list); + bts->ms_max_power = 15; /* dBm */ + + bts->T_defs = bts_T_defs; + osmo_tdefs_reset(bts->T_defs); + bts->shutdown_fi = osmo_fsm_inst_alloc(&bts_shutdown_fsm, bts, bts, + LOGL_INFO, NULL); + osmo_fsm_inst_update_id_f(bts->shutdown_fi, "bts%d", bts->nr); + + gsm_mo_init(&bts->mo, bts, NM_OC_BTS, + bts->nr, 0xff, 0xff); + gsm_mo_init(&bts->site_mgr.mo, bts, NM_OC_SITE_MANAGER, + 0xff, 0xff, 0xff); + + for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++) { + bts->gprs.nsvc[i].bts = bts; + bts->gprs.nsvc[i].id = i; + gsm_mo_init(&bts->gprs.nsvc[i].mo, bts, NM_OC_GPRS_NSVC, + bts->nr, i, 0xff); + } + memcpy(&bts->gprs.nse.timer, bts_nse_timer_default, + sizeof(bts->gprs.nse.timer)); + gsm_mo_init(&bts->gprs.nse.mo, bts, NM_OC_GPRS_NSE, + bts->nr, 0xff, 0xff); + memcpy(&bts->gprs.cell.timer, bts_cell_timer_default, + sizeof(bts->gprs.cell.timer)); + gsm_mo_init(&bts->gprs.cell.mo, bts, NM_OC_GPRS_CELL, + bts->nr, 0xff, 0xff); + memcpy(&bts->gprs.cell.rlc_cfg, &rlc_cfg_default, + sizeof(bts->gprs.cell.rlc_cfg)); + + /* create our primary TRX. It will be initialized during bts_init() */ + bts->c0 = gsm_bts_trx_alloc(bts); + if (!bts->c0) { + talloc_free(bts); + return NULL; + } + bts->c0->ts[0].pchan = GSM_PCHAN_CCCH_SDCCH4; + + bts->features = bitvec_alloc(MAX_BTS_FEATURES / 8, bts); + OSMO_ASSERT(bts->features != NULL); + + return bts; +} + +struct gsm_bts *gsm_bts_num(struct gsm_network *net, int num) +{ + struct gsm_bts *bts; + + if (num >= net->num_bts) + return NULL; + + llist_for_each_entry(bts, &net->bts_list, list) { + if (bts->nr == num) + return bts; + } + + return NULL; +} + /* Initialize the BTS data structures, called before config * file reading */ int bts_init(struct gsm_bts *bts) @@ -817,3 +965,24 @@ return 0; } + +/* return the gsm_lchan for the CBCH (if it exists at all) */ +struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts) +{ + struct gsm_lchan *lchan = NULL; + struct gsm_bts_trx *trx = bts->c0; + + if (trx->ts[0].pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) + lchan = &trx->ts[0].lchan[2]; + else { + int i; + for (i = 0; i < 8; i++) { + if (trx->ts[i].pchan == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) { + lchan = &trx->ts[i].lchan[2]; + break; + } + } + } + + return lchan; +} diff --git a/src/common/bts_shutdown_fsm.c b/src/common/bts_shutdown_fsm.c index d55b1cd..c81a4ab 100644 --- a/src/common/bts_shutdown_fsm.c +++ b/src/common/bts_shutdown_fsm.c @@ -28,6 +28,7 @@ #include #include #include +#include #define X(s) (1 << (s)) diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c index 57f33ae..c63793c 100644 --- a/src/common/gsm_data.c +++ b/src/common/gsm_data.c @@ -30,74 +30,13 @@ #include #include #include -#include #include #include #include #include -#include - -static struct osmo_tdef bts_T_defs[] = { - /* T-1: FIXME: Ideally should be dynamically calculated per trx at - * shutdown start based on params below, and highest trx value taken: - * + VTY's power-ramp step-interval. - * + Amount of steps needed (taking into account how many dB each step moves). - * + Extra time to get response back for each step. - * For now we simply give 5 mins, which should be enough for any - * acceptable setup, while still ensuring will timeout at some point if - * something fails in the ramp down procedure. - */ - { .T=-1, .default_val=300, .desc="Time after which osmo-bts exits if regular ramp down during shut down process does not finish (s)" }, - { .T=-2, .default_val=3, .desc="Time after which osmo-bts exits if requesting transceivers to stop during shut down process does not finish (s)" }, - {} -}; - -const struct value_string bts_attribute_names[] = { - OSMO_VALUE_STRING(BTS_TYPE_VARIANT), - OSMO_VALUE_STRING(BTS_SUB_MODEL), - OSMO_VALUE_STRING(TRX_PHY_VERSION), - { 0, NULL } -}; - -enum bts_attribute str2btsattr(const char *s) -{ - return get_string_value(bts_attribute_names, s); -} - -const char *btsatttr2str(enum bts_attribute v) -{ - return get_value_string(bts_attribute_names, v); -} - -const struct value_string osmo_bts_variant_names[_NUM_BTS_VARIANT + 1] = { - { BTS_UNKNOWN, "unknown" }, - { BTS_OSMO_LITECELL15, "osmo-bts-lc15" }, - { BTS_OSMO_OC2G, "osmo-bts-oc2g" }, - { BTS_OSMO_OCTPHY, "osmo-bts-octphy" }, - { BTS_OSMO_SYSMO, "osmo-bts-sysmo" }, - { BTS_OSMO_TRX, "osmo-bts-trx" }, - { BTS_OSMO_VIRTUAL, "osmo-bts-virtual" }, - { BTS_OSMO_OMLDUMMY, "osmo-bts-omldummy" }, - { 0, NULL } -}; - -enum gsm_bts_type_variant str2btsvariant(const char *arg) -{ - return get_string_value(osmo_bts_variant_names, arg); -} - -const char *btsvariant2str(enum gsm_bts_type_variant v) -{ - return get_value_string(osmo_bts_variant_names, v); -} - -const struct value_string bts_impl_flag_desc[] = { - { BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP, "DSP/HW based MS Power Control Loop" }, - { BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB, "Measurement and Payload data combined" }, - { 0, NULL } -}; +#include const struct value_string gsm_pchant_names[13] = { { GSM_PCHAN_NONE, "NONE" }, @@ -164,21 +103,6 @@ return get_value_string(lchan_s_names, s); } -struct gsm_bts *gsm_bts_num(struct gsm_network *net, int num) -{ - struct gsm_bts *bts; - - if (num >= net->num_bts) - return NULL; - - llist_for_each_entry(bts, &net->bts_list, list) { - if (bts->nr == num) - return bts; - } - - return NULL; -} - struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts) { struct gsm_bts_trx *trx = talloc_zero(bts, struct gsm_bts_trx); @@ -233,88 +157,6 @@ return trx; } - -static const uint8_t bts_nse_timer_default[] = { 3, 3, 3, 3, 30, 3, 10 }; -static const uint8_t bts_cell_timer_default[] = - { 3, 3, 3, 3, 3, 10, 3, 10, 3, 10, 3 }; -static const struct gprs_rlc_cfg rlc_cfg_default = { - .parameter = { - [RLC_T3142] = 20, - [RLC_T3169] = 5, - [RLC_T3191] = 5, - [RLC_T3193] = 160, /* 10ms */ - [RLC_T3195] = 5, - [RLC_N3101] = 10, - [RLC_N3103] = 4, - [RLC_N3105] = 8, - [CV_COUNTDOWN] = 15, - [T_DL_TBF_EXT] = 250 * 10, /* ms */ - [T_UL_TBF_EXT] = 250 * 10, /* ms */ - }, - .paging = { - .repeat_time = 5 * 50, /* ms */ - .repeat_count = 3, - }, - .cs_mask = 0x1fff, - .initial_cs = 2, - .initial_mcs = 6, -}; - -struct gsm_bts *gsm_bts_alloc(void *ctx, uint8_t bts_num) -{ - struct gsm_bts *bts = talloc_zero(ctx, struct gsm_bts); - int i; - - if (!bts) - return NULL; - - bts->nr = bts_num; - bts->num_trx = 0; - INIT_LLIST_HEAD(&bts->trx_list); - bts->ms_max_power = 15; /* dBm */ - - bts->T_defs = bts_T_defs; - osmo_tdefs_reset(bts->T_defs); - bts->shutdown_fi = osmo_fsm_inst_alloc(&bts_shutdown_fsm, bts, bts, - LOGL_INFO, NULL); - osmo_fsm_inst_update_id_f(bts->shutdown_fi, "bts%d", bts->nr); - - gsm_mo_init(&bts->mo, bts, NM_OC_BTS, - bts->nr, 0xff, 0xff); - gsm_mo_init(&bts->site_mgr.mo, bts, NM_OC_SITE_MANAGER, - 0xff, 0xff, 0xff); - - for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++) { - bts->gprs.nsvc[i].bts = bts; - bts->gprs.nsvc[i].id = i; - gsm_mo_init(&bts->gprs.nsvc[i].mo, bts, NM_OC_GPRS_NSVC, - bts->nr, i, 0xff); - } - memcpy(&bts->gprs.nse.timer, bts_nse_timer_default, - sizeof(bts->gprs.nse.timer)); - gsm_mo_init(&bts->gprs.nse.mo, bts, NM_OC_GPRS_NSE, - bts->nr, 0xff, 0xff); - memcpy(&bts->gprs.cell.timer, bts_cell_timer_default, - sizeof(bts->gprs.cell.timer)); - gsm_mo_init(&bts->gprs.cell.mo, bts, NM_OC_GPRS_CELL, - bts->nr, 0xff, 0xff); - memcpy(&bts->gprs.cell.rlc_cfg, &rlc_cfg_default, - sizeof(bts->gprs.cell.rlc_cfg)); - - /* create our primary TRX. It will be initialized during bts_init() */ - bts->c0 = gsm_bts_trx_alloc(bts); - if (!bts->c0) { - talloc_free(bts); - return NULL; - } - bts->c0->ts[0].pchan = GSM_PCHAN_CCCH_SDCCH4; - - bts->features = bitvec_alloc(MAX_BTS_FEATURES / 8, bts); - OSMO_ASSERT(bts->features != NULL); - - return bts; -} - struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num) { struct gsm_bts_trx *trx; @@ -499,25 +341,12 @@ return gsm_pchan2chan_nr(as_pchan, lchan->ts->nr, lchan->nr); } -/* return the gsm_lchan for the CBCH (if it exists at all) */ -struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts) +uint8_t gsm_ts_tsc(const struct gsm_bts_trx_ts *ts) { - struct gsm_lchan *lchan = NULL; - struct gsm_bts_trx *trx = bts->c0; - - if (trx->ts[0].pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) - lchan = &trx->ts[0].lchan[2]; - else { - int i; - for (i = 0; i < 8; i++) { - if (trx->ts[i].pchan == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) { - lchan = &trx->ts[i].lchan[2]; - break; - } - } - } - - return lchan; + if (ts->tsc != -1) + return ts->tsc; + else + return ts->trx->bts->bsic & 7; } /* determine logical channel based on TRX and channel number IE */ diff --git a/src/common/load_indication.c b/src/common/load_indication.c index 8d9b56f..c9b2645 100644 --- a/src/common/load_indication.c +++ b/src/common/load_indication.c @@ -27,6 +27,7 @@ #include #include #include +#include static void reset_load_counters(struct gsm_bts *bts) { diff --git a/src/common/msg_utils.c b/src/common/msg_utils.c index 52b0566..1817849 100644 --- a/src/common/msg_utils.c +++ b/src/common/msg_utils.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 3068918..7375a1a 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -42,6 +42,7 @@ #include #include #include +#include extern void *tall_bts_ctx; diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c index f5bc3c8..4a86c4e 100644 --- a/src/common/sysinfo.c +++ b/src/common/sysinfo.c @@ -25,6 +25,7 @@ #include #include #include +#include /* properly increment SI2q index and return SI2q data for scheduling */ static inline uint8_t *get_si2q_inc_index(struct gsm_bts *bts) diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c index 0adc8fe..c03b411 100644 --- a/src/osmo-bts-octphy/l1_if.c +++ b/src/osmo-bts-octphy/l1_if.c @@ -43,6 +43,7 @@ #include #include #include +#include #include "l1_if.h" #include "l1_oml.h" diff --git a/src/osmo-bts-sysmo/sysmobts_vty.c b/src/osmo-bts-sysmo/sysmobts_vty.c index 0653f01..7876612 100644 --- a/src/osmo-bts-sysmo/sysmobts_vty.c +++ b/src/osmo-bts-sysmo/sysmobts_vty.c @@ -45,6 +45,7 @@ #include #include #include +#include #include "femtobts.h" #include "l1_if.h" diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index 2e52958..fb75a4e 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -42,6 +42,7 @@ #include #include #include +#include #include "l1_if.h" #include "trx_if.h" -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0a4219e3f64f625ee8b364bf408b8d2bcc8085c5 Gerrit-Change-Number: 19123 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 16:08:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 16:08:44 +0000 Subject: Change in osmo-pcu[master]: encoding: Encode TA as unsigned and check validty against GSM48_TA_IN... In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/19176 to look at the new patch set (#2). Change subject: encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID ...................................................................... encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID According to 3GPP TS 44.018 sec 10.5.2.40, Timing Advance value is 8 bit and range is 0-63 (0-219 on GSM400). unsigned value (uint8_t) is used everywhere else, so avoid using a signed one here, and simply check for GSM48_TA_INVALID here.ch we use everywhere else to initialize when the value is not known. Ideally we should check for value based on band. Change-Id: I82b13561d0fe5ebafb5c3a8b9a501045c29809bc --- M src/encoding.cpp 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/76/19176/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I82b13561d0fe5ebafb5c3a8b9a501045c29809bc Gerrit-Change-Number: 19176 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 16:08:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 16:08:45 +0000 Subject: Change in osmo-pcu[master]: encoding.cpp: Fix missing spacing in function param References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19193 ) Change subject: encoding.cpp: Fix missing spacing in function param ...................................................................... encoding.cpp: Fix missing spacing in function param Change-Id: I4f30a0cea615d57cd7783a92ae782790c8075a6c --- M src/encoding.cpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/93/19193/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index 32358c3..92944f0 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -580,7 +580,7 @@ bitvec_write_field(dest, &wp,0x0,1); // Message escape bitvec_write_field(dest, &wp, mcs_chan_code(tbf->current_cs()), 2); // CHANNEL_CODING_COMMAND bitvec_write_field(dest, &wp,0x1,1); // TLLI_BLOCK_CHANNEL_CODING - write_ta_ie(dest, wp,tbf->ta(), ta_idx, ta_ts); + write_ta_ie(dest, wp, tbf->ta(), ta_idx, ta_ts); } else { /* EPGRS */ bitvec_write_field(dest, &wp,0x1,1); // Message escape bitvec_write_field(dest, &wp,0x0,2); // EGPRS message contents @@ -594,7 +594,7 @@ bitvec_write_field(dest, &wp,0x0,1); // No ARAC RETRANSMISSION REQUEST bitvec_write_field(dest, &wp,0x1,1); // TLLI_BLOCK_CHANNEL_CODING bitvec_write_field(dest, &wp,0x0,1); // No BEP_PERIOD2 - write_ta_ie(dest, wp,tbf->ta(), ta_idx, ta_ts); + write_ta_ie(dest, wp, tbf->ta(), ta_idx, ta_ts); bitvec_write_field(dest, &wp,0x0,1); // No Packet Extended Timing Advance } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4f30a0cea615d57cd7783a92ae782790c8075a6c Gerrit-Change-Number: 19193 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 16:28:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 16:28:27 +0000 Subject: Change in osmo-bts[master]: Move struct gsm_bts_trx: gsm_data.* & bts.* => trx.* In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19124 ) Change subject: Move struct gsm_bts_trx: gsm_data.* & bts.* => trx.* ...................................................................... Patch Set 2: The main issue here is the day that it was decided osmo-bts-trx was a good name for an osmo-bts backend, because from that point onwards it's really difficult to figure out whether one talks about the backend (osmo-trx) or simply a bts' trx. But that of course cannot be changed, and we need to live with it. I'll rename it to bts_trx.c/h since we already have bts.c -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iebaf5b221c48b571f45408af867ce6f9c0cd9f4a Gerrit-Change-Number: 19124 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 08 Jul 2020 16:28:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 16:47:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 16:47:57 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19194 ) Change subject: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request ...................................................................... pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request There's no real good explanation on why the DL TBF is dropped there, since PKT RESOUCE REQUEST is used basically during UL TBF establishment. Also, as decribed by TS 44.060 11.2.16 "Packet Resource Request": """ This message is sent on the PACCH by the mobile station to the network to request a change in the uplink resources assigned. """ Change-Id: Iab4afb66f0d671f7ad54909d2685a1613e12ab4d --- M src/pdch.cpp M tests/tbf/TbfTest.err 2 files changed, 0 insertions(+), 36 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/94/19194/1 diff --git a/src/pdch.cpp b/src/pdch.cpp index 6bddbfd..98d7678 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -549,7 +549,6 @@ if (request->ID.UnionType) { struct gprs_rlcmac_ul_tbf *ul_tbf; - struct gprs_rlcmac_dl_tbf *dl_tbf; uint32_t tlli = request->ID.u.TLLI; bool found = true; @@ -564,7 +563,6 @@ if (found) { ul_tbf = ms->ul_tbf(); - dl_tbf = ms->dl_tbf(); /* We got a RACH so the MS was in packet idle mode and thus * didn't have any active TBFs */ if (ul_tbf) { @@ -573,12 +571,6 @@ tlli); tbf_free(ul_tbf); } - if (dl_tbf) { - LOGPTBFUL(dl_tbf, LOGL_NOTICE, - "Got RACH from TLLI=0x%08x while TBF still exists. Release pending DL TBF\n", - tlli); - tbf_free(dl_tbf); - } } LOGP(DRLCMAC, LOGL_DEBUG, "MS requests UL TBF " diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 0d097ee..6eb86cf 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -1885,13 +1885,6 @@ Found TFI=0. +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) Got RACH from TLLI=0xf1223344 while TBF still exists. Release pending DL TBF -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) changes state from ASSIGN to RELEASING -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=RELEASING) free -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=RELEASING) stopping timer T0 [freeing TBF] -PDCH(TS 7, TRX 0): Detaching TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=RELEASING), 0 TBFs, USFs = 00, TFIs = 00000000. -Detaching TBF from MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=RELEASING) -********** DL-TBF ends here ********** MS requests UL TBF in packet resource request of single block, so we provide one: ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/0 @@ -1925,27 +1918,6 @@ TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) [DOWNLINK] UPLINK ASSIGNED TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_WAIT_ACK to GPRS_RLCMAC_UL_ASS_NONE TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes state from ASSIGN to FLOW -********** DL-TBF starts here ********** -Allocating DL TBF: MS_CLASS=1/0 -[DL] Slot Allocation (Algorithm A) for class 1 -- Skipping TS 0, because not enabled -- Skipping TS 1, because not enabled -- Skipping TS 2, because not enabled -- Skipping TS 3, because not enabled -- Skipping TS 4, because not enabled -- Skipping TS 5, because not enabled -- Skipping TS 6, because not enabled -[DL] Assign downlink TS=7 TFI=0 -PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL), 1 TBFs, USFs = 01, TFIs = 00000001. -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NULL) -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 80 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) Trigger downlink assignment on PACCH -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NULL) Send dowlink assignment on PACCH, because TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) exists -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) changes DL ASS state from GPRS_RLCMAC_DL_ASS_NONE to GPRS_RLCMAC_DL_ASS_SEND_ASS -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NULL) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) set ass. type PACCH [prev CCCH:0, PACCH:0] -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) starting timer T0 [assignment (PACCH)] with 2 sec. 0 microsec, cur_fn=0 Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) UL DATA TFI=0 received (V(Q)=0 .. V(R)=0) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) restarting timer T3169 [acked (data)] with 5 sec. 0 microsec, cur_fn=0 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iab4afb66f0d671f7ad54909d2685a1613e12ab4d Gerrit-Change-Number: 19194 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 16:47:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 16:47:58 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19195 ) Change subject: pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in MS RadioAccCap ...................................................................... pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in MS RadioAccCap If the information is not found in the message, 0 (unknown MS class) will be returned. If the MS already had some previous information on the MS class, let's not lose it by setting it back to 0. Take the opportunity to drop related log lines which are no needed, since set_(egprs_)ms_class() functions already log the value changes. Change-Id: Icd52209fd4395d78dc770e7869d1b1fe45a18ca0 --- M src/pdch.cpp M tests/tbf/TbfTest.err 2 files changed, 6 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/95/19195/1 diff --git a/src/pdch.cpp b/src/pdch.cpp index 98d7678..3436e5b 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -588,20 +588,13 @@ } if (request->Exist_MS_Radio_Access_capability2) { uint8_t ms_class, egprs_ms_class; - ms_class = Decoding::get_ms_class_by_capability( - &request->MS_Radio_Access_capability2); - ms->set_ms_class(ms_class); - egprs_ms_class = - Decoding::get_egprs_ms_class_by_capability( - &request->MS_Radio_Access_capability2); - ms->set_egprs_ms_class(egprs_ms_class); + ms_class = Decoding::get_ms_class_by_capability(&request->MS_Radio_Access_capability2); + egprs_ms_class = Decoding::get_egprs_ms_class_by_capability(&request->MS_Radio_Access_capability2); + if (ms_class) + ms->set_ms_class(ms_class); + if (egprs_ms_class) + ms->set_egprs_ms_class(egprs_ms_class); } - if (!ms->ms_class()) - LOGP(DRLCMAC, LOGL_NOTICE, "MS does not give us a class.\n"); - if (ms->egprs_ms_class()) - LOGP(DRLCMAC, LOGL_INFO, - "MS supports EGPRS multislot class %d.\n", - ms->egprs_ms_class()); ul_tbf = tbf_alloc_ul(bts_data(), ms, trx_no(), tlli); if (!ul_tbf) { diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 6eb86cf..800d4f8 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -3111,7 +3111,6 @@ Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 -MS supports EGPRS multislot class 1. ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -3202,7 +3201,6 @@ Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 -MS supports EGPRS multislot class 1. ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -5840,7 +5838,6 @@ Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 -MS supports EGPRS multislot class 1. ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -6004,7 +6001,6 @@ Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 -MS supports EGPRS multislot class 1. ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -6329,7 +6325,6 @@ Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 -MS supports EGPRS multislot class 1. ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -7910,7 +7905,6 @@ MS requests UL TBF in packet resource request of single block, but there is no resource request scheduled! Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 -MS supports EGPRS multislot class 11. ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=11/11 [UL] Slot Allocation (Algorithm A) for class 11 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Icd52209fd4395d78dc770e7869d1b1fe45a18ca0 Gerrit-Change-Number: 19195 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 16:47:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 16:47:58 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Fix wrong annoying log line about non-scheduled ResourceReq... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19196 ) Change subject: pdch.cpp: Fix wrong annoying log line about non-scheduled ResourceReq received ...................................................................... pdch.cpp: Fix wrong annoying log line about non-scheduled ResourceReq received It's perfectly fine receiving a Resource Request message under some circumstances (as stated in the comment added in the commit). To print issues only under non-expected circumstances, the function rcv_resource_request need to be refactored: * Destroying older UL_TBF is delayed because it is needed further down. * When the old UL_TBF is FINISHED, it's an acceptable time to receive a Resource request, so we check if that's the case and don't print a warning in that case. Change-Id: I4b4367126d6a16055cd2f45afc4a6b9c15a7c980 --- M src/pdch.cpp M tests/tbf/TbfTest.err 2 files changed, 22 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/96/19196/1 diff --git a/src/pdch.cpp b/src/pdch.cpp index 3436e5b..cee92dc 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -550,42 +550,35 @@ if (request->ID.UnionType) { struct gprs_rlcmac_ul_tbf *ul_tbf; uint32_t tlli = request->ID.u.TLLI; - bool found = true; + bool ms_found = true; GprsMs *ms = bts()->ms_by_tlli(tlli); if (!ms) { - found = false; + ms_found = false; ms = bts()->ms_alloc(0, 0); /* ms class updated later */ } + ul_tbf = ms->ul_tbf(); /* hence ul_tbf may be NULL */ /* Keep the ms, even if it gets idle temporarily */ GprsMs::Guard guard(ms); - if (found) { - ul_tbf = ms->ul_tbf(); - /* We got a RACH so the MS was in packet idle mode and thus - * didn't have any active TBFs */ - if (ul_tbf) { - LOGPTBFUL(ul_tbf, LOGL_NOTICE, - "Got RACH from TLLI=0x%08x while TBF still exists. Killing pending UL TBF\n", - tlli); - tbf_free(ul_tbf); - } - } - LOGP(DRLCMAC, LOGL_DEBUG, "MS requests UL TBF " "in packet resource request of single " "block, so we provide one:\n"); sba = bts()->sba()->find(this, fn); - if (!sba) { - LOGP(DRLCMAC, LOGL_NOTICE, "MS requests UL TBF " - "in packet resource request of single " - "block, but there is no resource request " - "scheduled!\n"); - } else { + if (sba) { ms->set_ta(sba->ta); bts()->sba()->free_sba(sba); + } else if (!ul_tbf || !ul_tbf->state_is(GPRS_RLCMAC_FINISHED)) { + LOGPTBFUL(ul_tbf, LOGL_NOTICE, + "MS requests UL TBF in PACKET RESOURCE REQ of " + "single block, but there is no resource request " + "scheduled!\n"); } + /* else: Resource Request can be received even if not scheduled + by the network since it's used by MS to re-establish a new UL + TBF when last one has finished. */ + if (request->Exist_MS_Radio_Access_capability2) { uint8_t ms_class, egprs_ms_class; ms_class = Decoding::get_ms_class_by_capability(&request->MS_Radio_Access_capability2); @@ -596,6 +589,14 @@ ms->set_egprs_ms_class(egprs_ms_class); } + /* Get rid of previous finished UL TBF before providing a new one */ + if (ms_found && ul_tbf) { + if (!ul_tbf->state_is(GPRS_RLCMAC_FINISHED)) + LOGPTBFUL(ul_tbf, LOGL_NOTICE, + "Got PACKET RESOURCE REQ while TBF not finished, killing pending UL TBF\n"); + tbf_free(ul_tbf); + } + ul_tbf = tbf_alloc_ul(bts_data(), ms, trx_no(), tlli); if (!ul_tbf) { handle_tbf_reject(bts_data(), ms, tlli, diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 800d4f8..29c8eb3 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -7902,7 +7902,7 @@ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 MS requests UL TBF in packet resource request of single block, so we provide one: -MS requests UL TBF in packet resource request of single block, but there is no resource request scheduled! +(no TBF) MS requests UL TBF in PACKET RESOURCE REQ of single block, but there is no resource request scheduled! Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 ********** UL-TBF starts here ********** -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4b4367126d6a16055cd2f45afc4a6b9c15a7c980 Gerrit-Change-Number: 19196 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 16:47:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 16:47:59 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Store TLLI promply on newly created TLLI in rcv_resource_re... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19197 ) Change subject: pdch.cpp: Store TLLI promply on newly created TLLI in rcv_resource_request ...................................................................... pdch.cpp: Store TLLI promply on newly created TLLI in rcv_resource_request The TLLI is tried to be updated later anyway during tbf_alloc_ul(), but this way it's clear that information is stored where it belongs as soon as possible. The change already shows clearer log lines in TbfTest.err. Change-Id: I20ce4eb94ecf85ce2835275d0056d9ecd1b558c3 --- M src/pdch.cpp M tests/tbf/TbfTest.err 2 files changed, 91 insertions(+), 90 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/97/19197/1 diff --git a/src/pdch.cpp b/src/pdch.cpp index cee92dc..856da75 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -556,6 +556,7 @@ if (!ms) { ms_found = false; ms = bts()->ms_alloc(0, 0); /* ms class updated later */ + ms->set_tlli(tlli); } ul_tbf = ms->ul_tbf(); /* hence ul_tbf may be NULL */ diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 29c8eb3..195d850 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -1521,9 +1521,10 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/0 [UL] Slot Allocation (Algorithm A) for class 1 @@ -1537,11 +1538,10 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH) @@ -1602,9 +1602,10 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/0 [UL] Slot Allocation (Algorithm A) for class 1 @@ -1618,11 +1619,10 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH) @@ -1731,9 +1731,10 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf5667788, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf5667788, TA 220 -> 7 +Modifying MS object, TLLI = 0xf5667788, MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/0 [UL] Slot Allocation (Algorithm A) for class 1 @@ -1747,11 +1748,10 @@ [UL] Assign uplink TS=7 TFI=1 USF=1 PDCH(TS 7, TRX 0): Attaching TBF(TFI=1 TLLI=0x00000000 DIR=UL STATE=NULL), 2 TBFs, USFs = 03, TFIs = 00000003. TBF(TFI=1 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=1 TLLI=0x00000000 DIR=UL STATE=NULL) -TBF(TFI=1 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=1 TLLI=0x00000000 DIR=UL STATE=NULL) changes state from NULL to ASSIGN -TBF(TFI=1 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf5667788, not yet confirmed +Attaching TBF to MS object, TLLI = 0xf5667788, TBF = TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=NULL) +TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=NULL) changes state from NULL to ASSIGN +TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS Received RTS for PDCH: TRX=0 TS=7 FN=2654335 block_nr=11 scheduling USF=0 for required uplink resource of UL TFI=0 @@ -1797,9 +1797,10 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/0 [UL] Slot Allocation (Algorithm A) for class 1 @@ -1813,11 +1814,10 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2 @@ -1939,9 +1939,10 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/0 [UL] Slot Allocation (Algorithm A) for class 1 @@ -1955,11 +1956,10 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2 @@ -2085,9 +2085,10 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/0 [UL] Slot Allocation (Algorithm A) for class 1 @@ -2101,11 +2102,10 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2 @@ -3107,10 +3107,11 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 -Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, EGPRS MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -3125,13 +3126,12 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(0) slots(1) ws_pdch(0) +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(0) slots(1) ws_pdch(0) ws(64) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) @@ -3197,10 +3197,11 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 -Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, EGPRS MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -3215,13 +3216,12 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(0) slots(1) ws_pdch(0) +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(0) slots(1) ws_pdch(0) ws(64) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) @@ -5834,10 +5834,11 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 -Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, EGPRS MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -5852,13 +5853,12 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(0) slots(1) ws_pdch(0) +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(0) slots(1) ws_pdch(0) ws(64) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) @@ -5997,10 +5997,11 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 -Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, EGPRS MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -6015,13 +6016,12 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(0) slots(1) ws_pdch(0) +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(0) slots(1) ws_pdch(0) ws(64) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) @@ -6321,10 +6321,11 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 -Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, EGPRS MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -6339,13 +6340,12 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 192, base(128) slots(1) ws_pdch(64) +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 192, base(128) slots(1) ws_pdch(64) ws(192) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) @@ -7901,10 +7901,11 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xffeeddcc, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: (no TBF) MS requests UL TBF in PACKET RESOURCE REQ of single block, but there is no resource request scheduled! -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 -Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +Modifying MS object, TLLI = 0xffeeddcc, MS class 0 -> 11 +Modifying MS object, TLLI = 0xffeeddcc, EGPRS MS class 0 -> 11 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=11/11 [UL] Slot Allocation (Algorithm A) for class 11 @@ -7918,7 +7919,6 @@ - Skipping TS 7, because no USF available [UL] algo A (suggested TRX: 0): failed to allocate a TS, no USF available No PDCH resource -Modifying MS object, UL TLLI: 0x00000000 -> 0xffeeddcc, not yet confirmed TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) changes state from NULL to ASSIGN Attaching TBF to MS object, TLLI = 0xffeeddcc, TBF = TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN) TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I20ce4eb94ecf85ce2835275d0056d9ecd1b558c3 Gerrit-Change-Number: 19197 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 8 17:25:50 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 08 Jul 2020 17:25:50 +0000 Subject: Build failure of network:osmocom:latest/orcania in openSUSE_Factory_ARM/armv7l In-Reply-To: References: Message-ID: <5f0601d15a9c8_e232b1f494da6002738c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/orcania/openSUSE_Factory_ARM/armv7l Package network:osmocom:latest/orcania failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:latest orcania Last lines of build log: getbinaries: missing packages: python3-base libpython3_8-1_0 (worker was obs-arm-5:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 8 17:31:17 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 08 Jul 2020 17:31:17 +0000 Subject: Build failure of network:osmocom:nightly/orcania in openSUSE_Factory_ARM/armv7l In-Reply-To: References: Message-ID: <5f0602f62c1b7_e232b1f494da60054226@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/orcania/openSUSE_Factory_ARM/armv7l Package network:osmocom:nightly/orcania failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly orcania Last lines of build log: getbinaries: missing packages: python3-base libpython3_8-1_0 (worker was armbuild02:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 8 17:57:15 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 08 Jul 2020 17:57:15 +0000 Subject: Build failure of network:osmocom:nightly/sofia-sip in openSUSE_Factory_ARM/armv7l In-Reply-To: References: Message-ID: <5f06091ec0ee0_e232b1f494da6008574d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/sofia-sip/openSUSE_Factory_ARM/armv7l Package network:osmocom:nightly/sofia-sip failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly sofia-sip Last lines of build log: getbinaries: missing packages: python3-base libpython3_8-1_0 (worker was obs-arm-6:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 8 19:43:15 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 8 Jul 2020 19:43:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: extend rach content tests with emergency call References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19198 ) Change subject: BTS_Tests: extend rach content tests with emergency call ...................................................................... BTS_Tests: extend rach content tests with emergency call The testcase tests if a CHANNEL REQUEST on the RACH leads to the correct CHANNEL REQUIRED message on RSL level. When a MS is sending a CHANNEL REQUEST to establish an emergency call, it uses a slightly different layout for the request reference (RA). Lets add another similar testcase (TC_rach_content_emerg) to cover the emergency call situation as well. Change-Id: Ie5b7af3e93efaa6d0b412d3b1c77bc9514424f52 Related: OS#4549 --- M bts/BTS_Tests.ttcn 1 file changed, 35 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/19198/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 1ff0c61..587e14a 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1296,6 +1296,14 @@ return false; } +private function ra_is_emerg(OCT1 ra) return boolean { + /* See also: 3GPP TS 04.08, Table 9.9, ra=101xxxxx */ + if ((ra and4b 'E0'O == 'A0'O) and (ra and4b '1F'O != '1F'O)) { + return true; + } + return false; +} + /* generate a random RACH for circuit-switched */ private function f_rnd_ra_cs() return OCT1 { var OCT1 ra; @@ -1305,6 +1313,15 @@ return ra; } +/* generate a random RACH for emergency */ +private function f_rnd_ra_emerg() return OCT1 { + var OCT1 ra; + do { + ra := f_rnd_octstring(1); + } while (not ra_is_emerg(ra)); + return ra; +} + /* generate a random RACH for packet-switched */ private function f_rnd_ra_ps() return OCT1 { var OCT1 ra; @@ -1321,7 +1338,7 @@ } /* Send 1000 RACH requests and check their RA+FN on the RSL side */ -testcase TC_rach_content() runs on test_CT { +private function f_TC_rach_content(boolean emerg) runs on test_CT { f_init(); f_init_l1ctl(); f_l1_tune(L1CTL); @@ -1329,7 +1346,12 @@ var GsmFrameNumber fn_last := 0; var boolean test_failed := false; for (var integer i := 0; i < 1000; i := i+1) { - var OCT1 ra := f_rnd_ra_cs(); + var OCT1 ra := f_rnd_ra_emerg(); + if (emerg == true) { + ra := f_rnd_ra_emerg(); + } else { + ra := f_rnd_ra_cs(); + } var GsmFrameNumber fn := f_L1CTL_RACH(L1CTL, oct2int(ra)); if (fn == fn_last) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Two RACH in same FN?!?"); @@ -1359,6 +1381,16 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } +/* Normal variant */ +testcase TC_rach_content() runs on test_CT { + f_TC_rach_content(emerg := false); +} + +/* Emergency call variant */ +testcase TC_rach_content_emerg() runs on test_CT { + f_TC_rach_content(emerg := true); +} + /* Send 1000 RACH Requests (flood ~ 89/s) and count if count(Abis) == count(Um) */ testcase TC_rach_count() runs on test_CT { f_init(); @@ -6683,6 +6715,7 @@ execute( TC_sacch_chan_act_ho_async() ); execute( TC_sacch_chan_act_ho_sync() ); execute( TC_rach_content() ); + execute( TC_rach_content_emerg() ); execute( TC_rach_count() ); execute( TC_rach_max_ta() ); execute( TC_ho_rach() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie5b7af3e93efaa6d0b412d3b1c77bc9514424f52 Gerrit-Change-Number: 19198 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 20:10:54 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 20:10:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: extend rach content tests with emergency call In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19198 ) Change subject: BTS_Tests: extend rach content tests with emergency call ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie5b7af3e93efaa6d0b412d3b1c77bc9514424f52 Gerrit-Change-Number: 19198 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 08 Jul 2020 20:10:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 20:42:25 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 20:42:25 +0000 Subject: Change in osmo-pcu[master]: encoding: Encode TA as unsigned and check validty against GSM48_TA_IN... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19176 ) Change subject: encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I82b13561d0fe5ebafb5c3a8b9a501045c29809bc Gerrit-Change-Number: 19176 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 20:42:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 20:42:38 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 20:42:38 +0000 Subject: Change in osmo-pcu[master]: encoding.cpp: Fix missing spacing in function param In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19193 ) Change subject: encoding.cpp: Fix missing spacing in function param ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4f30a0cea615d57cd7783a92ae782790c8075a6c Gerrit-Change-Number: 19193 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 08 Jul 2020 20:42:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 20:52:19 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 20:52:19 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19194 ) Change subject: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request ...................................................................... Patch Set 1: Damn, it was really hard to find this change in the git's history after so many refactoring changes... Here it is: commit 5f93f855a77928bb77f47f104e6e3ff0bfac74d1 Author: Jacob Erlbeck Date: Thu Jan 21 20:48:39 2016 +0100 tbf: Do not reuse old TBF after RACH requests Currently existing TBF can be reused after an MS has sent a RACH request. Since the MS can be or most probably is in packet idle mode in that case, the TBF are no longer usable even if they share the PDCHs and the control TS with the new one. There are occasional freezes where the MS does no longer react to messages sent on the PACCH. This change aborts all pending TBFs if a new TBF is or has been established via RACH. Sponsored-by: On-Waves ehf -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iab4afb66f0d671f7ad54909d2685a1613e12ab4d Gerrit-Change-Number: 19194 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 08 Jul 2020 20:52:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 20:55:13 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 20:55:13 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19195 ) Change subject: pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in MS RadioAccCap ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Icd52209fd4395d78dc770e7869d1b1fe45a18ca0 Gerrit-Change-Number: 19195 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 08 Jul 2020 20:55:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 21:03:42 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 21:03:42 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Store TLLI promply on newly created TLLI in rcv_resource_re... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19197 ) Change subject: pdch.cpp: Store TLLI promply on newly created TLLI in rcv_resource_request ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I20ce4eb94ecf85ce2835275d0056d9ecd1b558c3 Gerrit-Change-Number: 19197 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 08 Jul 2020 21:03:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 21:05:44 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 21:05:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP_Test: fix test expectation in TC_crcx_wildcarded_exhaust In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19190 ) Change subject: MGCP_Test: fix test expectation in TC_crcx_wildcarded_exhaust ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I73344ef8793cc81df0a1815bb8d890e7849cdd20 Gerrit-Change-Number: 19190 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 21:05:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 21:06:18 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 21:06:18 +0000 Subject: Change in osmo-bsc[master]: lchan_rtp_fsm: make _fsm_timer_cb and _fsm_cleanup static In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19191 ) Change subject: lchan_rtp_fsm: make _fsm_timer_cb and _fsm_cleanup static ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19191 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I31940aff166ccd7a9612574536674e4e483a3cb9 Gerrit-Change-Number: 19191 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 21:06:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 21:11:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 8 Jul 2020 21:11:53 +0000 Subject: Change in osmo-e1d[master]: migrate to proper allocated USB Prodict ID References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19199 ) Change subject: migrate to proper allocated USB Prodict ID ...................................................................... migrate to proper allocated USB Prodict ID The 0xe1e1 was a neat hack in the early days, but now 0x6145 has been allocated within the Openmoko USB VendorID. The current device firmware already uses the new ProductID, let's change it here, too. Change-Id: Iea6087ce02c931c796d9c9cae89cdf5b5e0b28c5 --- M src/usb.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/99/19199/1 diff --git a/src/usb.c b/src/usb.c index 578bc34..e8cd212 100644 --- a/src/usb.c +++ b/src/usb.c @@ -39,7 +39,7 @@ #define USB_VID 0x1d50 -#define USB_PID 0xe1e1 +#define USB_PID 0x6145 libusb_context *g_usb = NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Iea6087ce02c931c796d9c9cae89cdf5b5e0b28c5 Gerrit-Change-Number: 19199 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 21:21:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 21:21:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: extend rach content tests with emergency call In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19198 ) Change subject: BTS_Tests: extend rach content tests with emergency call ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie5b7af3e93efaa6d0b412d3b1c77bc9514424f52 Gerrit-Change-Number: 19198 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 21:21:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 21:21:37 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 21:21:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: more SI2quater EUTRAN ARFCN tests In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 ) Change subject: bsc: more SI2quater EUTRAN ARFCN tests ...................................................................... Patch Set 2: > It's not some more lines, it's 1k lines. I see no reason why you cannot do it with a loop, by writing template helpers if needed. What is the problem with lines? We have enough disc space and CPU; the test works; no-one reads BSC_Tests.ttcn top to bottom. I've already reduced the patches massively in terms of lines. I can spend time to make it more nifty and optimal, but why? It's not like the test would change. IMHO this is a cosmetic issue and not worth blocking progress and spending sysmocom time on. I tried to compose "record of" templates functionally and it didn't work. If you insist I can try again but I still think it's not worth it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I99bf9b3381812d1db6fd0757f65995bae48da776 Gerrit-Change-Number: 19181 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 21:21:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 21:24:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 21:24:20 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19194 ) Change subject: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request ...................................................................... Patch Set 1: I don't think this really backs up the fact that it's needed to release DL TBF upon a Packet Resource Request resceived... it's rather simply fixing the way it was being released. Do you understand it differently? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iab4afb66f0d671f7ad54909d2685a1613e12ab4d Gerrit-Change-Number: 19194 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 08 Jul 2020 21:24:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 21:26:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 21:26:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: more SI2quater EUTRAN ARFCN tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 ) Change subject: bsc: more SI2quater EUTRAN ARFCN tests ...................................................................... Patch Set 2: Let's see what other think about this topic. I think this needs to be compressed but I won't oppose if others are fine with it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I99bf9b3381812d1db6fd0757f65995bae48da776 Gerrit-Change-Number: 19181 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 21:26:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 21:46:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 8 Jul 2020 21:46:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: more SI2quater EUTRAN ARFCN tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 ) Change subject: bsc: more SI2quater EUTRAN ARFCN tests ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181/2/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181/2/bsc/BSC_Tests.ttcn at 2186 PS2, Line 2186: tr_SI2quaterRestOctets_EUTRAN( Something like: template tr_SI2quaterRestOctets_EUTRAN_foobar(idx, count, earfcn1, earfcn2, earfcn3) modifies tr_SI2quaterRestOctets_EUTRAN { ... fill here template based on params.... } for (i:= 0; i<33; i+=1) { sic.si2quater[i] := tr_SI2quaterRestOctets_EUTRAN_foobar(i, count, f_randr(1), f_randr(1), f_randr(1)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I99bf9b3381812d1db6fd0757f65995bae48da776 Gerrit-Change-Number: 19181 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 21:46:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 22:30:59 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 22:30:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add first test to verify System Information on RSL startup In-Reply-To: References: Message-ID: Hello pespin, fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 to look at the new patch set (#11). Change subject: bsc: add first test to verify System Information on RSL startup ...................................................................... bsc: add first test to verify System Information on RSL startup Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 --- M bsc/BSC_Tests.ttcn M bsc/gen_links.sh 2 files changed, 439 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/19062/11 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 11 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 22:30:59 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 22:30:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add SI2quater tests for multiple EARFCNs In-Reply-To: References: Message-ID: Hello pespin, fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 to look at the new patch set (#8). Change subject: bsc: add SI2quater tests for multiple EARFCNs ...................................................................... bsc: add SI2quater tests for multiple EARFCNs Shows bug OS#4652 in osmo-bsc, fixed by I5df269f713456a6ccbb874d6b7faac4a6f123c67 Change-Id: I45382f88686ca60e68569e93569fc4cfb63a0e0d --- M bsc/BSC_Tests.ttcn 1 file changed, 153 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/19152/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I45382f88686ca60e68569e93569fc4cfb63a0e0d Gerrit-Change-Number: 19152 Gerrit-PatchSet: 8 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 22:30:59 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 22:30:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: more SI2quater EUTRAN ARFCN tests In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 to look at the new patch set (#3). Change subject: bsc: more SI2quater EUTRAN ARFCN tests ...................................................................... bsc: more SI2quater EUTRAN ARFCN tests Add more EUTRAN ARFCNs, reaching the maximum allowed amount. Add tests with 12, 23, 42 EARFCNs, just for the sake of testing some arbitrary numbers. Add tests with 32 and 33 EARFCNs because before osmo-bsc Iabeed10053ee5899b4def3509aedd25abb2410a9, only 32 EARFCNs could be stored by osmo-bsc. Add a test with 48 EARFCNs to verify the maximum amount of EARFCNs and maximum amount of SI2quater multiplexes works as expected. Add a test with 49 EARFCNs to verify the VTY error response when adding too many EARFCNs, and showing that osmo-bsc still sends 16 SI2quater with 48 EARFCNs. Depends: Iabeed10053ee5899b4def3509aedd25abb2410a9 (osmo-bsc) Change-Id: I99bf9b3381812d1db6fd0757f65995bae48da776 --- M bsc/BSC_Tests.ttcn M library/GSM_RestOctets.ttcn 2 files changed, 99 insertions(+), 116 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/19181/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I99bf9b3381812d1db6fd0757f65995bae48da776 Gerrit-Change-Number: 19181 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 22:32:02 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 22:32:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add first test to verify System Information on RSL startup In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 ) Change subject: bsc: add first test to verify System Information on RSL startup ...................................................................... Patch Set 11: Code-Review+2 re-add previous +2 after trivial whitespace fixes -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 11 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 22:32:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 22:51:19 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 22:51:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: SI2quater EARFCNs: span entire value range of EARFCNs References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19200 ) Change subject: bsc: SI2quater EARFCNs: span entire value range of EARFCNs ...................................................................... bsc: SI2quater EARFCNs: span entire value range of EARFCNs Change-Id: I992771826d57669d06887c776303f85ef22f6c71 --- M bsc/BSC_Tests.ttcn 1 file changed, 27 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/00/19200/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index cba7e03..1cd196c 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1711,19 +1711,40 @@ f_init_bts_and_check_sysinfo(0, expect_si := SystemInformationConfig_default); } +/* We're testing SI2quater with lists of EARFCNs. Instead of just incrementing EARFCNs, also pick some from the edges of + * the entire value range. This function provides the same EARFCN numbers for the same earfcn_index */ +private function f_test_si2quater_earfcn_by_idx(integer earfcn_index) return uint16_t +{ + if (earfcn_index == 0) { + /* E-ARFCN 111 is already added in the osmo-bsc.cfg */ + return 111; + } + if (earfcn_index == 1) { + return 1; + } + if (earfcn_index == 2) { + return 0; + } + if (earfcn_index == 3) { + return 65535; + } + return 23 * (earfcn_index - 3); +} + function f_test_si2quater(integer total_earfcns, template SystemInformationConfig expect_si) runs on test_CT { f_init(0); /* E-ARFCN 111 is already added in the osmo-bsc.cfg, so only add more arfcns if total_earfcns > 1 */ for (var integer i := 1; i < total_earfcns; i := i + 1) { - f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list add earfcn " & int2str(22 + i) & " thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3"}); + f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list add earfcn " & int2str(f_test_si2quater_earfcn_by_idx(i)) + & " thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3"}); } f_init_bts_and_check_sysinfo(0, expect_si := expect_si); for (var integer i := 1; i < total_earfcns; i := i + 1) { - f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list del earfcn " & int2str(22 + i)}); + f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list del earfcn " & int2str(f_test_si2quater_earfcn_by_idx(i))}); } } @@ -1733,11 +1754,7 @@ var integer si2quater_count := (count + 2) / 3; for (var integer i := 0; i < count; i := i + 1) { - var integer earfcn := 22 + i; - /* First earfcn is 111 from osmo-bsc.cfg */ - if (i == 0) { - earfcn := 111; - } + var integer earfcn := f_test_si2quater_earfcn_by_idx(i); var integer index := i / 3; var integer earfcn_index := i mod 3; if (index >= lengthof(si2quater)) { @@ -1808,7 +1825,8 @@ f_init(0); for (var integer i := 1; i < 48; i := i + 1) { - f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list add earfcn " & int2str(22 + i) & " thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3"}); + f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list add earfcn " & int2str(f_test_si2quater_earfcn_by_idx(i)) + & " thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3"}); } /* The 49th EARFCN no longer fits, expect VTY error */ @@ -1828,7 +1846,7 @@ f_init_bts_and_check_sysinfo(0, expect_si := sic); for (var integer i := 1; i < 48; i := i + 1) { - f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list del earfcn " & int2str(22 + i)}); + f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list del earfcn " & int2str(f_test_si2quater_earfcn_by_idx(i))}); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I992771826d57669d06887c776303f85ef22f6c71 Gerrit-Change-Number: 19200 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 22:52:39 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 22:52:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add SI2quater tests for multiple EARFCNs In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 ) Change subject: bsc: add SI2quater tests for multiple EARFCNs ...................................................................... Patch Set 8: > I'd suggest to add at least one large EARFCN number, exhausting all of the bits that the field has (to ensure we're not cutting it short one or more bits). that's a good idea, adding this in https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19200 I992771826d57669d06887c776303f85ef22f6c71 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I45382f88686ca60e68569e93569fc4cfb63a0e0d Gerrit-Change-Number: 19152 Gerrit-PatchSet: 8 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 22:52:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 22:54:50 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 22:54:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: more SI2quater EUTRAN ARFCN tests In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 ) Change subject: bsc: more SI2quater EUTRAN ARFCN tests ...................................................................... Patch Set 3: it's a bit more intricate with the lists inside lists... but i got some working code now, a bit surprised that the template problem i faced before didn't show up this time. it's a lot shorter, but it's also a lot harder to understand what the tests are expecting, see function f_tr_si2quater_earfcns(). And above function only works for exactly this test series, when adding other SI2quater bits the nr of earfcns that fit / how they spread across SI2quater changes. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I99bf9b3381812d1db6fd0757f65995bae48da776 Gerrit-Change-Number: 19181 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 22:54:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 22:55:32 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 22:55:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: more SI2quater EUTRAN ARFCN tests In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 ) Change subject: bsc: more SI2quater EUTRAN ARFCN tests ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181/3/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181/3/bsc/BSC_Tests.ttcn at 1746 PS3, Line 1746: si2quater[index].rel_additions.rel5.rel6.rel7.rel8.prio_eutran_params_desc.desc.eutran_params_desc.desc.repeated_neigh_cells[0].cell_desc_list[earfcn_index] := tr_EUTRAN_CellDesc_default(e_arfcn := earfcn); (how mad is this) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I99bf9b3381812d1db6fd0757f65995bae48da776 Gerrit-Change-Number: 19181 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 22:55:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 22:59:47 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 22:59:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RestOctets: add SI2quater EUTRAN templates In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 ) Change subject: library/GSM_RestOctets: add SI2quater EUTRAN templates ...................................................................... library/GSM_RestOctets: add SI2quater EUTRAN templates Will be used in upcoming System Information tests. Change-Id: I4162cc39ad351f5e96f5941116a424adc44efaa2 --- M library/GSM_RestOctets.ttcn 1 file changed, 133 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn index 39f15bb..2b43751 100644 --- a/library/GSM_RestOctets.ttcn +++ b/library/GSM_RestOctets.ttcn @@ -378,7 +378,7 @@ /* Repeated E-UTRAN Neighbour Cells */ private type record of EUTRAN_NeighbourCells EUTRAN_RepeatedNeighbourCells; -private type record EUTRAN_NeighbourCells { +type record EUTRAN_NeighbourCells { BIT1 item_ind ('1'B), /* { 1 < Repeated E-UTRAN Neighbour Cells > } ** 0 */ EUTRAN_CellDescs cell_desc_list optional, @@ -398,8 +398,8 @@ }; /* Repeated E-UTRAN Cell Description (E-ARFCN & Measurement Bandwidth) List */ -private type record of EUTRAN_CellDesc EUTRAN_CellDescs; -private type record EUTRAN_CellDesc { +type record of EUTRAN_CellDesc EUTRAN_CellDescs; +type record EUTRAN_CellDesc { BIT1 item_ind ('1'B), uint16_t e_arfcn, BIT1 meas_bw_presence, // 0/1 @@ -513,6 +513,136 @@ rel_additions := { rel5_presence := CSN1_L, rel5 := omit } }; +template SI2quaterRestOctets tro_SI2quaterRestOctets_rel8_EUTRAN +modifies tro_SI2quaterRestOctets_base +:= { + ba_ind := ?, + ba_3g_ind := ?, + mp_change_mark := ?, + si2quater_index := ?, + si2quater_count := ?, + + rel_additions := { + rel5_presence := CSN1_H, + rel5 := { + umts_add_meas_params_desc := { presence := '0'B, desc := omit }, + umts_add_meas_params_desc2 := { presence := '0'B, desc := omit }, + rel6_presence := CSN1_H, + rel6 := { + umts_ccn_active := '0'B, + rel7_presence := CSN1_H, + rel7 := { + rep700 := { presence := '0'B, val := omit }, + rep810 := { presence := '0'B, val := omit }, + rel8_presence := CSN1_H, + rel8 := { + prio_eutran_params_desc := { + presence := '1'B, + desc := { + sc_prio_params_desc := { presence := '0'B, desc := omit }, + utran_prio_params_desc := { presence := '0'B, desc := omit }, + eutran_params_desc := { + presence := '1'B, + desc := { + ccn_active := ?, + e_start := ?, + e_stop := ?, + meas_params_desc := { presence := '0'B, desc := omit }, + gprs_meas_params_desc := { presence := '0'B, desc := omit }, + repeated_neigh_cells := *, + repeated_neigh_cells_term := '0'B, + repeated_not_allowed_cells := omit, + repeated_not_allowed_cells_term := '0'B, + pcid2ta_map_list := omit, + pcid2ta_map_list_term := '0'B + } + } + } + }, + utran_csg_desc := { presence := '0'B, desc := omit }, + eutran_csg_desc := { presence := '0'B, desc := omit } + } + } + } + } + } +}; + +template EUTRAN_CellDesc tr_EUTRAN_CellDesc(template (present) uint16_t e_arfcn := ?, + template (present) BIT1 meas_bw_presence := ?, + template uint3_t meas_bw := *) +:= { + item_ind := '1'B, + e_arfcn := e_arfcn, + meas_bw_presence := meas_bw_presence, + meas_bw := meas_bw +} + +/* Defaults correspond to osmo-bsc cfg: + * si2quater neighbor-list add earfcn 111 thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3 + */ +template EUTRAN_NeighbourCells tr_EUTRAN_NeighbourCells(template (present) EUTRAN_CellDescs cell_desc_list := { tr_EUTRAN_CellDesc }, + template (present) BIT1 prio_presence := ?, + template uint3_t prio := *, + template (present) uint5_t thresh_high := ?, + template (present) BIT1 thresh_low_presence := ?, + template uint5_t thresh_low := *, + template (present) BIT1 qrxlevmin_presence := ?, + template uint5_t qrxlevmin := *) +:= { + item_ind := '1'B, + cell_desc_list := cell_desc_list, + cell_desc_list_term := '0'B, + prio_presence := prio_presence, + prio := prio, + thresh_high := thresh_high, + thresh_low_presence := thresh_low_presence, + thresh_low := thresh_low, + qrxlevmin_presence := qrxlevmin_presence, + qrxlevmin := qrxlevmin +}; + +template SI2quaterRestOctets tr_SI2quaterRestOctets_EUTRAN( + template integer index := 0, + template integer count := 0, + template EUTRAN_RepeatedNeighbourCells repeated_neigh_cells := { tr_EUTRAN_NeighbourCells } +) modifies tro_SI2quaterRestOctets_rel8_EUTRAN := { + si2quater_index := index, + si2quater_count := count, + rel_additions := { + rel5 := { + rel6 := { + rel7 := { + rel8 := { + prio_eutran_params_desc := { + desc := { + sc_prio_params_desc := { + presence := '1'B, + desc := { + geran_priority := 0, + thresh_priority_search := 0, + thresh_gsm_low := 0, + h_prio := 0, + t_reselection := 0 + } + }, + eutran_params_desc := { + desc := { + ccn_active := '0'B, + e_start := '1'B, + e_stop := '1'B, + repeated_neigh_cells := repeated_neigh_cells + } + } + } + } + } + } + } + } + } +}; + /* 10.5.2.34 SI 3 Rest Octets */ type record SI3RestOctets { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4162cc39ad351f5e96f5941116a424adc44efaa2 Gerrit-Change-Number: 19114 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 22:59:48 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 22:59:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add first test to verify System Information on RSL startup In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 ) Change subject: bsc: add first test to verify System Information on RSL startup ...................................................................... bsc: add first test to verify System Information on RSL startup Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 --- M bsc/BSC_Tests.ttcn M bsc/gen_links.sh 2 files changed, 439 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 784375a..c7a6e38 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -59,6 +59,9 @@ import from SCCPasp_Types all; +import from GSM_SystemInformation all; +import from GSM_RestOctets all; + const integer NUM_BTS := 3; const integer NUM_MSC := 3; const float T3101_MAX := 12.0; @@ -84,6 +87,358 @@ { "mscpool:subscr:paged", 0 } }; +/* Set of all System Information received during one RSL port's startup. + * Note that some System Information may be sent on RSL, but lacking actual SI data, to indicate that the BTS should not + * broadcast that SI type. That will be reflected as 'omit' here. + */ +type record SystemInformationConfig { + SystemInformationType1 si1 optional, + SystemInformationType2 si2 optional, + SystemInformationType2bis si2bis optional, + SystemInformationType2ter si2ter optional, + record of SI2quaterRestOctets si2quater optional, + SystemInformationType3 si3 optional, + SystemInformationType4 si4 optional, + /* TODO: replace with proper decoding of SI13, implement SI13 in GSM_SystemInformation.ttcn */ + octetstring si13 optional, + SystemInformationType5 si5 optional, + SystemInformationType5bis si5bis optional, + SystemInformationType5ter si5ter optional, + SystemInformationType6 si6 optional +}; + +const SystemInformationConfig SystemInformationConfig_omit := { + si1 := omit, + si2 := omit, + si2bis := omit, + si2ter := omit, + si2quater := omit, + si3 := omit, + si4 := omit, + si13 := omit, + si5 := omit, + si5bis := omit, + si5ter := omit, + si6 := omit +}; + +/* tr_EUTRAN_CellDesc with defaults used in BSC_Tests.ttcn */ +template EUTRAN_CellDesc tr_EUTRAN_CellDesc_default(template (present) uint16_t e_arfcn := ?, + template uint3_t meas_bw := 3) +:= tr_EUTRAN_CellDesc(e_arfcn := e_arfcn, + meas_bw_presence := '1'B, + meas_bw := meas_bw); + +/* tr_EUTRAN_NeighbourCells with defaults used in BSC_Tests.ttcn */ +template EUTRAN_NeighbourCells tr_EUTRAN_NeighbourCells_default(template EUTRAN_CellDescs cell_desc_list := { tr_EUTRAN_CellDesc_default }, + template uint3_t prio := 3, + template (present) uint5_t thresh_high := 20, + template uint5_t thresh_low := 10, + template uint5_t qrxlevmin := 22) +:= tr_EUTRAN_NeighbourCells( + cell_desc_list := cell_desc_list, + prio_presence := '1'B, + prio := prio, + thresh_high := thresh_high, + thresh_low_presence := '1'B, + thresh_low := thresh_low, + qrxlevmin_presence := '1'B, + qrxlevmin := qrxlevmin); + +template SystemInformationConfig SystemInformationConfig_default := { + si1 := { + cell_chan_desc := '8FB38000000000000000000000000000'O, + rach_control := { + max_retrans := RACH_MAX_RETRANS_7, + tx_integer := '1001'B, + cell_barr_access := false, + re_not_allowed := true, + acc := '0000010000000000'B + }, + rest_octets := ? + }, + si2 := { + bcch_freq_list := '00000000000000000000000000000000'O, + ncc_permitted := '11111111'B, + rach_control := { + max_retrans := RACH_MAX_RETRANS_7, + tx_integer := '1001'B, + cell_barr_access := false, + re_not_allowed := true, + acc := '0000010000000000'B + } + }, + si2bis := omit, + si2ter := { + extd_bcch_freq_list := '8E320000000000000000000000000800'O, + rest_octets := ? + }, + si2quater := { + tr_SI2quaterRestOctets_EUTRAN( repeated_neigh_cells := { tr_EUTRAN_NeighbourCells_default } ) + }, + si3 := { + cell_id := 0, + lai := { + mcc_mnc := '001F01'H, + lac := 1 + }, + ctrl_chan_desc := { + msc_r99 := true, + att := true, + bs_ag_blks_res := 1, + ccch_conf := CCHAN_DESC_1CCCH_COMBINED, + si22ind := false, + cbq3 := CBQ3_IU_MODE_NOT_SUPPORTED, + spare := '00'B, + bs_pa_mfrms := 3, + t3212 := 30 + }, + cell_options := { + dn_ind := false, + pwrc := false, + dtx := MS_SHALL_USE_UL_DTX, + radio_link_tout_div4 := 7 + }, + cell_sel_par := { + cell_resel_hyst_2dB := 2, + ms_txpwr_max_cch := 7, + acs := '0'B, + neci := true, + rxlev_access_min := 0 + }, + rach_control := { + max_retrans := RACH_MAX_RETRANS_7, + tx_integer := '1001'B, + cell_barr_access := false, + re_not_allowed := true, + acc := '0000010000000000'B + }, + rest_octets := { + sel_params := { + presence := '0'B, + params := omit + }, + pwr_offset := { + presence := '0'B, + offset := omit + }, + si_2ter_ind := '1'B, + early_cm_ind := '0'B, + sched_where := { + presence := '0'B, + where := omit + }, + gprs_ind := { + presence := '1'B, + ind := { + ra_colour := 0, + si13_pos := '0'B + } + }, + umts_early_cm_ind := '1'B, + si2_quater_ind := { + presence := '1'B, + ind := '0'B + }, + iu_mode_ind := omit, + si21_ind := { + presence := '0'B, + pos := omit + } + } + }, + si4 := { + lai := { + mcc_mnc := '001F01'H, + lac := 1 + }, + cell_sel_par := { + cell_resel_hyst_2dB := 2, + ms_txpwr_max_cch := 7, + acs := '0'B, + neci := true, + rxlev_access_min := 0 + }, + rach_control := { + max_retrans := RACH_MAX_RETRANS_7, + tx_integer := '1001'B, + cell_barr_access := false, + re_not_allowed := true, + acc := '0000010000000000'B + }, + cbch_chan_desc := omit, + cbch_mobile_alloc := omit, + rest_octets := { + sel_params := { + presence := '0'B, + params := omit + }, + pwr_offset := { + presence := '0'B, + offset := omit + }, + gprs_ind := { + presence := '1'B, + ind := { + ra_colour := 0, + si13_pos := '0'B + } + }, + s_presence := '0'B, + s := omit + } + }, + si13 := '9000185A6FC9E08410AB2B2B2B2B2B2B2B2B2B2B'O, + si5 := { + bcch_freq_list := '10000000000000000000000000000000'O + }, + si5bis := omit, + si5ter := { + extd_bcch_freq_list := '9E050020000000000000000000000000'O + }, + si6 := { + cell_id := 0, + lai := { + mcc_mnc := '001F01'H, + lac := 1 + }, + cell_options := { + dtx_ext := '1'B, + pwrc := false, + dtx := '01'B, + radio_link_timeout := '0111'B + }, + ncc_permitted := '11111111'B, + rest_octets := ? + } + }; + + +/* List of all the System Information received on all RSL ports */ +type record of SystemInformationConfig SystemInformationConfig_list; + +function f_sysinfo_dec_raw(inout SystemInformationConfig si, RSL_Message rsl) +{ + var RSL_IE_Body sysinfo_type_ie; + var RSL_IE_SysinfoType si_type; + var octetstring data; + + if (f_rsl_find_ie(rsl, RSL_IE_SYSINFO_TYPE, sysinfo_type_ie) == false) { + setverdict(fail, "Cannot find RSL_IE_SYSINFO_TYPE"); + mtc.stop; + } + si_type := sysinfo_type_ie.sysinfo_type; + + if (rsl.msg_type == RSL_MT_BCCH_INFO) { + var RSL_IE_Body bcch_ie; + if (f_rsl_find_ie(rsl, RSL_IE_FULL_BCCH_INFO, bcch_ie)) { + data := bcch_ie.other.payload; + } + } else if (rsl.msg_type == RSL_MT_SACCH_FILL) { + var RSL_IE_Body l3_ie; + if (f_rsl_find_ie(rsl, RSL_IE_L3_INFO, l3_ie)) { + data := l3_ie.l3_info.payload; + } + } else { + setverdict(fail, "Don't understand this System Information message"); + mtc.stop; + } + + var boolean handled := false; + + if (rsl.msg_type == RSL_MT_BCCH_INFO) { + handled := true; + + if (si_type == RSL_SYSTEM_INFO_1) { + if (not isbound(data)) { + si.si1 := omit; + } else { + si.si1 := dec_SystemInformation(data).payload.si1; + } + } else if (si_type == RSL_SYSTEM_INFO_2) { + if (not isbound(data)) { + si.si2 := omit; + } else { + si.si2 := dec_SystemInformation(data).payload.si2; + } + } else if (si_type == RSL_SYSTEM_INFO_2bis) { + if (not isbound(data)) { + si.si2bis := omit; + } else { + si.si2bis := dec_SystemInformation(data).payload.si2bis; + } + } else if (si_type == RSL_SYSTEM_INFO_2ter) { + if (not isbound(data)) { + si.si2ter := omit; + } else { + si.si2ter := dec_SystemInformation(data).payload.si2ter; + } + } else if (si_type == RSL_SYSTEM_INFO_2quater) { + if (not isbound(data)) { + si.si2quater := {}; + } else { + var SystemInformationType2quater decoded := dec_SystemInformation(data).payload.si2quater; + /* this is a *record* of SI2quaterRestOctets! (multiplexed) */ + si.si2quater[decoded.rest_octets.si2quater_index] := decoded.rest_octets; + } + } else if (si_type == RSL_SYSTEM_INFO_3) { + if (not isbound(data)) { + si.si3 := omit; + } else { + si.si3 := dec_SystemInformation(data).payload.si3; + } + } else if (si_type == RSL_SYSTEM_INFO_4) { + if (not isbound(data)) { + si.si4 := omit; + } else { + si.si4 := dec_SystemInformation(data).payload.si4; + } + } else if (si_type == RSL_SYSTEM_INFO_13) { + if (not isbound(data)) { + si.si13 := omit; + } else { + si.si13 := dec_SystemInformation(data).payload.other; + } + } else { + handled := false; + } + } else if (rsl.msg_type == RSL_MT_SACCH_FILL) { + handled := true; + + if (si_type == RSL_SYSTEM_INFO_5) { + if (not isbound(data)) { + si.si5 := omit; + } else { + si.si5 := dec_SystemInformation(data).payload.si5; + } + } else if (si_type == RSL_SYSTEM_INFO_5bis) { + if (not isbound(data)) { + si.si5bis := omit; + } else { + si.si5bis := dec_SystemInformation(data).payload.si5bis; + } + } else if (si_type == RSL_SYSTEM_INFO_5ter) { + if (not isbound(data)) { + si.si5ter := omit; + } else { + si.si5ter := dec_SystemInformation(data).payload.si5ter; + } + } else if (si_type == RSL_SYSTEM_INFO_6) { + if (not isbound(data)) { + si.si6 := omit; + } else { + si.si6 := dec_SystemInformation(data).payload.si6; + } + } else { + handled := false; + } + } + + if (not handled) { + setverdict(fail, "Unexpected SI type in ", rsl.msg_type, " message: ", si_type); + } +} + type component test_CT extends CTRL_Adapter_CT { /* Array of per-BTS state */ var BTS_State bts[NUM_BTS]; @@ -117,6 +472,9 @@ timer T_guard := 30.0; var CounterNameValsList g_ctr_msc; + + /* System Information bytes as received during RSL startup, for each RSL[idx]. */ + var SystemInformationConfig_list g_system_information := {}; } modulepar { @@ -425,6 +783,54 @@ f_vty_transceive(BSCVTY, "logp lglobal notice " & log_msg); } +private function f_sysinfo_seen(integer rsl_idx, RSL_Message rsl) runs on test_CT +{ + if (rsl_idx >= lengthof(g_system_information)) { + g_system_information[rsl_idx] := SystemInformationConfig_omit + } + f_sysinfo_dec_raw(g_system_information[rsl_idx], rsl); +} + +altstep as_catch_RSL_sysinfo(integer rsl_idx) runs on test_CT { + var ASP_RSL_Unitdata rx_rsl_ud; + + /* For handler_mode := false, receiving the RSL bootstrap messages directly on IPA_RSL */ + [] IPA_RSL[rsl_idx].receive(tr_ASP_RSL_UD(tr_RSL_NO_BCCH_INFO)) -> value rx_rsl_ud { + f_sysinfo_seen(rsl_idx, rx_rsl_ud.rsl); + repeat; + } + [] IPA_RSL[rsl_idx].receive(tr_ASP_RSL_UD(tr_RSL_BCCH_INFO)) -> value rx_rsl_ud { + f_sysinfo_seen(rsl_idx, rx_rsl_ud.rsl); + repeat; + } + [] IPA_RSL[rsl_idx].receive(tr_ASP_RSL_UD(tr_RSL_NO_SACCH_FILL)) -> value rx_rsl_ud { + f_sysinfo_seen(rsl_idx, rx_rsl_ud.rsl); + repeat; + } + [] IPA_RSL[rsl_idx].receive(tr_ASP_RSL_UD(tr_RSL_SACCH_FILL)) -> value rx_rsl_ud { + f_sysinfo_seen(rsl_idx, rx_rsl_ud.rsl); + repeat; + } + + /* For handler_mode := true, receiving the RSL bootstrap messages via RSL_Emulation */ + [] RSL_CCHAN[rsl_idx].receive(tr_ASP_RSL_UD(tr_RSL_NO_BCCH_INFO)) -> value rx_rsl_ud { + f_sysinfo_seen(rsl_idx, rx_rsl_ud.rsl); + repeat; + } + [] RSL_CCHAN[rsl_idx].receive(tr_ASP_RSL_UD(tr_RSL_BCCH_INFO)) -> value rx_rsl_ud { + f_sysinfo_seen(rsl_idx, rx_rsl_ud.rsl); + repeat; + } + [] RSL_CCHAN[rsl_idx].receive(tr_ASP_RSL_UD(tr_RSL_NO_SACCH_FILL)) -> value rx_rsl_ud { + f_sysinfo_seen(rsl_idx, rx_rsl_ud.rsl); + repeat; + } + [] RSL_CCHAN[rsl_idx].receive(tr_ASP_RSL_UD(tr_RSL_SACCH_FILL)) -> value rx_rsl_ud { + f_sysinfo_seen(rsl_idx, rx_rsl_ud.rsl); + repeat; + } +} + /* global initialization function * \param nr_bts Number of BTSs we should start/bring up * \param handler_mode Start an RSL_Emulation_CT component (true) or not (false). @@ -484,6 +890,32 @@ f_wait_oml(bts_idx, "connected", 5.0); } +function f_init_bts_and_check_sysinfo(integer bts_idx := 0, boolean handler_mode := false, + template SystemInformationConfig expect_si) +runs on test_CT { + var default sysinfo := activate(as_catch_RSL_sysinfo(bts_idx)); + + f_init_bts(bts_idx, handler_mode); + + /* Give some time to (hopefully/most likely) collect all system informations from RSL startup. + * We could stop as soon as all expected SI are received, but then we might miss SI that we don't expect and + * that might be sent afterwards. So rather give a generous timeout and be quite sure to catch all SI. + */ + f_sleep(5.0); + log("RSL ", bts_idx, " SYSTEM INFORMATION: ", g_system_information[bts_idx]); + + deactivate(sysinfo); + + if (match(g_system_information[bts_idx], expect_si)) { + setverdict(pass); + } else { + log("RSL ", bts_idx, ": EXPECTED SI: ", expect_si); + log("RSL ", bts_idx, ": GOT SI: ", g_system_information[bts_idx]); + setverdict(fail, "received SI does not match expectations"); + return; + } +} + /* expect to receive a RSL message matching a specified template on a given BTS / stream */ function f_exp_ipa_rx(integer bts_nr, template RSL_Message t_rx, float t_secs := 2.0, IpaStreamId sid := IPAC_PROTO_RSL_TRX0) runs on test_CT return RSL_Message { @@ -1273,8 +1705,10 @@ setverdict(pass); } - - +testcase TC_si_default() runs on test_CT { + f_init(0); + f_init_bts_and_check_sysinfo(0, expect_si := SystemInformationConfig_default); +} testcase TC_ctrl_msc_connection_status() runs on test_CT { var charstring ctrl_resp; @@ -5237,6 +5671,8 @@ execute( TC_ctrl_location() ); } + execute( TC_si_default() ); + /* RSL DCHAN Channel ACtivation / Deactivation */ execute( TC_chan_act_noreply() ); execute( TC_chan_act_counter() ); diff --git a/bsc/gen_links.sh b/bsc/gen_links.sh index a936ef3..343cc1c 100755 --- a/bsc/gen_links.sh +++ b/bsc/gen_links.sh @@ -67,7 +67,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn RAN_Adapter.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn RAN_Adapter.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn GSM_SystemInformation.ttcn GSM_RestOctets.ttcn " FILES+="CBSP_Types.ttcn CBSP_Templates.ttcn " FILES+="CBSP_CodecPort.ttcn CBSP_CodecPort_CtrlFunct.ttcn CBSP_CodecPort_CtrlFunctdef.cc CBSP_Adapter.ttcn " gen_links $DIR $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6a8ef404087efee491390dc1d2452ac323f145f0 Gerrit-Change-Number: 19062 Gerrit-PatchSet: 11 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 23:00:33 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 23:00:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: SI2quater EARFCNs: span entire value range of EARFCNs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19200 ) Change subject: bsc: SI2quater EARFCNs: span entire value range of EARFCNs ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19200/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19200/1/bsc/BSC_Tests.ttcn at 1718 PS1, Line 1718: if Feel free to use 'select' statement here (like 'switch' in C). -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I992771826d57669d06887c776303f85ef22f6c71 Gerrit-Change-Number: 19200 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 08 Jul 2020 23:00:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 23:00:44 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 23:00:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add SI2quater tests for multiple EARFCNs In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 ) Change subject: bsc: add SI2quater tests for multiple EARFCNs ...................................................................... Patch Set 8: Code-Review+2 combining previous +1s after a patch set of trivial whitespace fixes -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I45382f88686ca60e68569e93569fc4cfb63a0e0d Gerrit-Change-Number: 19152 Gerrit-PatchSet: 8 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 23:00:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 23:01:19 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 23:01:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add SI2quater tests for multiple EARFCNs In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 ) Change subject: bsc: add SI2quater tests for multiple EARFCNs ...................................................................... bsc: add SI2quater tests for multiple EARFCNs Shows bug OS#4652 in osmo-bsc, fixed by I5df269f713456a6ccbb874d6b7faac4a6f123c67 Change-Id: I45382f88686ca60e68569e93569fc4cfb63a0e0d --- M bsc/BSC_Tests.ttcn 1 file changed, 153 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index c7a6e38..f1aea75 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1710,6 +1710,154 @@ f_init_bts_and_check_sysinfo(0, expect_si := SystemInformationConfig_default); } +function f_test_si2quater(integer total_earfcns, template SystemInformationConfig expect_si) runs on test_CT { + + f_init(0); + + /* E-ARFCN 111 is already added in the osmo-bsc.cfg, so only add more arfcns if total_earfcns > 1 */ + for (var integer i := 1; i < total_earfcns; i := i + 1) { + f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list add earfcn " & int2str(22 + i) & " thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3"}); + } + + f_init_bts_and_check_sysinfo(0, expect_si := expect_si); + + for (var integer i := 1; i < total_earfcns; i := i + 1) { + f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list del earfcn " & int2str(22 + i)}); + } +} + +testcase TC_si2quater_2_earfcns() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + sic.si2quater := { + tr_SI2quaterRestOctets_EUTRAN( + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells_default( + cell_desc_list := { + tr_EUTRAN_CellDesc_default(e_arfcn := 111), + tr_EUTRAN_CellDesc_default(e_arfcn := 23) + } + ) + } + ) + }; + f_test_si2quater(2, sic); +} + +testcase TC_si2quater_3_earfcns() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + sic.si2quater := { + tr_SI2quaterRestOctets_EUTRAN( + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells_default( + cell_desc_list := { + tr_EUTRAN_CellDesc_default(e_arfcn := 111), + tr_EUTRAN_CellDesc_default(e_arfcn := 23), + tr_EUTRAN_CellDesc_default(e_arfcn := 24) + } + ) + } + ) + }; + f_test_si2quater(3, sic); +} + +testcase TC_si2quater_4_earfcns() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + sic.si2quater := { + tr_SI2quaterRestOctets_EUTRAN( + index := 0, + count := 1, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells_default( + cell_desc_list := { + tr_EUTRAN_CellDesc_default(e_arfcn := 111), + tr_EUTRAN_CellDesc_default(e_arfcn := 23), + tr_EUTRAN_CellDesc_default(e_arfcn := 24) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 1, + count := 1, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells_default( + cell_desc_list := { + tr_EUTRAN_CellDesc_default(e_arfcn := 25) + } + ) + } + ) + }; + f_test_si2quater(4, sic); +} + +testcase TC_si2quater_5_earfcns() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + sic.si2quater := { + tr_SI2quaterRestOctets_EUTRAN( + index := 0, + count := 1, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells_default( + cell_desc_list := { + tr_EUTRAN_CellDesc_default(e_arfcn := 111), + tr_EUTRAN_CellDesc_default(e_arfcn := 23), + tr_EUTRAN_CellDesc_default(e_arfcn := 24) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 1, + count := 1, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells_default( + cell_desc_list := { + tr_EUTRAN_CellDesc_default(e_arfcn := 25), + tr_EUTRAN_CellDesc_default(e_arfcn := 26) + } + ) + } + ) + }; + f_test_si2quater(5, sic); +} + +testcase TC_si2quater_6_earfcns() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + sic.si2quater := { + tr_SI2quaterRestOctets_EUTRAN( + index := 0, + count := 1, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells_default( + cell_desc_list := { + tr_EUTRAN_CellDesc_default(e_arfcn := 111), + tr_EUTRAN_CellDesc_default(e_arfcn := 23), + tr_EUTRAN_CellDesc_default(e_arfcn := 24) + } + ) + } + ), + tr_SI2quaterRestOctets_EUTRAN( + index := 1, + count := 1, + repeated_neigh_cells := { + tr_EUTRAN_NeighbourCells_default( + cell_desc_list := { + tr_EUTRAN_CellDesc_default(e_arfcn := 25), + tr_EUTRAN_CellDesc_default(e_arfcn := 26), + tr_EUTRAN_CellDesc_default(e_arfcn := 27) + } + ) + } + ) + }; + f_test_si2quater(6, sic); +} + + testcase TC_ctrl_msc_connection_status() runs on test_CT { var charstring ctrl_resp; @@ -5672,6 +5820,11 @@ } execute( TC_si_default() ); + execute( TC_si2quater_2_earfcns() ); + execute( TC_si2quater_3_earfcns() ); + execute( TC_si2quater_4_earfcns() ); + execute( TC_si2quater_5_earfcns() ); + execute( TC_si2quater_6_earfcns() ); /* RSL DCHAN Channel ACtivation / Deactivation */ execute( TC_chan_act_noreply() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I45382f88686ca60e68569e93569fc4cfb63a0e0d Gerrit-Change-Number: 19152 Gerrit-PatchSet: 8 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 23:04:29 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 23:04:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: SI2quater EARFCNs: span entire value range of EARFCNs In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19200 to look at the new patch set (#2). Change subject: bsc: SI2quater EARFCNs: span entire value range of EARFCNs ...................................................................... bsc: SI2quater EARFCNs: span entire value range of EARFCNs Change-Id: I992771826d57669d06887c776303f85ef22f6c71 --- M bsc/BSC_Tests.ttcn 1 file changed, 31 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/00/19200/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I992771826d57669d06887c776303f85ef22f6c71 Gerrit-Change-Number: 19200 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 23:08:18 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 23:08:18 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: check TDMA frame order, drop out of order bursts References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19201 ) Change subject: trxcon/scheduler: check TDMA frame order, drop out of order bursts ...................................................................... trxcon/scheduler: check TDMA frame order, drop out of order bursts When running together with fake_trx.py (mostly used back-end), it is currently possible that Downlink bursts are received in a wrong order if more than one transceiver is configured (multi-trx mode). This is how it looks like: 20200708201455837 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=629 rssi=-86 toa=0 20200708201455837 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=629 ts=3 bid=1 20200708201455841 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=630 rssi=-86 toa=0 20200708201455841 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=630 ts=3 bid=2 20200708201455846 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=631 rssi=-86 toa=0 20200708201455846 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=631 ts=3 bid=3 20200708201455846 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=633 (!) rssi=-86 toa=0 20200708201455846 DSCHD NOTICE sched_trx.c:663 Substituting (!) lost TDMA frame 632 on TCH/F 20200708201455846 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=632 ts=3 bid=0 20200708201455846 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=633 ts=3 bid=1 20200708201455849 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=632 (!) rssi=-86 toa=0 20200708201455849 DTRXD NOTICE sched_trx.c:640 Too many (>104) contiguous TDMA frames elapsed (2715647) since the last processed fn=633 (current fn=632) so here a burst with TDMA fn=633 was received earlier than a burst with TDMA fn=632. The burst loss detection logic considered the latter one as lost, and substituted it with a dummy burst. When finally the out-of-order burst with TDMA fn=632 was received, we got the large number of allegedly elapsed frames: ((632 + 2715648) - 633) % 2715648 == 2715647 Given that late bursts get substituted, the best thing we can do is to reject them and log an error. Passing them the the logical channel handler (again) might lead to undefined behaviour. Change-Id: I873c8555ea2ca190b1689227bb0fdcba87188772 Related: OS#4658, OS#4546 --- M src/host/trxcon/sched_trx.c 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/01/19201/1 diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index 9195b33..6b872cd 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -719,6 +719,16 @@ if (!lchan->active) return 0; + /* Check TDMA frame order (a race condition is possible with fake_trx.py, see OS#4658) */ + if (fn < lchan->tdma.last_proc) { + /* This burst has already been substituted by a dummy burst (all bits set to zero), + * so better drop it. Otherwise we risk to get undefined behavior in handler(). */ + LOGP(DSCHD, LOGL_ERROR, "(%s on TS %u) Rx burst with fn=%u older " + "than the last processed fn=%u => dropping...\n", + trx_lchan_desc[lchan->type].name, tn, fn, lchan->tdma.last_proc); + return -EALREADY; + } + /* Compensate lost TDMA frames (if any) */ subst_frame_loss(lchan, handler, fn); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I873c8555ea2ca190b1689227bb0fdcba87188772 Gerrit-Change-Number: 19201 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 23:17:31 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 23:17:31 +0000 Subject: Change in osmo-hlr[master]: manual: describe subscriber import by SQL In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/19052 ) Change subject: manual: describe subscriber import by SQL ...................................................................... Patch Set 1: tumbleweed -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/19052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3246e6d5364215a71c33b5aca876deab7b6cfd70 Gerrit-Change-Number: 19052 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 23:17:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 23:18:39 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 23:18:39 +0000 Subject: Change in osmo-msc[master]: is_reset_msg: use proper enum for rc value In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19129 ) Change subject: is_reset_msg: use proper enum for rc value ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/19129/1/src/libmsc/ran_peer.c File src/libmsc/ran_peer.c: https://gerrit.osmocom.org/c/osmo-msc/+/19129/1/src/libmsc/ran_peer.c at 215 PS1, Line 215: 1 > SCCP_RAN_MSG_RESET? argh damn -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I88b6204bc3ffac06f92bfc87639ce503b2da24bc Gerrit-Change-Number: 19129 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 08 Jul 2020 23:18:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 23:19:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 23:19:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: SI2quater EARFCNs: span entire value range of EARFCNs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19200 ) Change subject: bsc: SI2quater EARFCNs: span entire value range of EARFCNs ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I992771826d57669d06887c776303f85ef22f6c71 Gerrit-Change-Number: 19200 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 08 Jul 2020 23:19:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 23:20:31 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 23:20:31 +0000 Subject: Change in osmo-msc[master]: is_reset_msg: use proper enum for rc value In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/19129 to look at the new patch set (#2). Change subject: is_reset_msg: use proper enum for rc value ...................................................................... is_reset_msg: use proper enum for rc value Change-Id: I88b6204bc3ffac06f92bfc87639ce503b2da24bc --- M src/libmsc/ran_peer.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/29/19129/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I88b6204bc3ffac06f92bfc87639ce503b2da24bc Gerrit-Change-Number: 19129 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 23:22:32 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 8 Jul 2020 23:22:32 +0000 Subject: Change in osmo-msc[master]: is_reset_msg: use proper enum for rc value In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19129 ) Change subject: is_reset_msg: use proper enum for rc value ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I88b6204bc3ffac06f92bfc87639ce503b2da24bc Gerrit-Change-Number: 19129 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 08 Jul 2020 23:22:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 23:23:50 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 23:23:50 +0000 Subject: Change in osmo-mgw[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18927 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... Patch Set 3: > You cannot fail if it doesn't match since you also get output from other git repositories in there (lib dependencies). true. I'm still for generating it automatically and not build the vty reference in cross compilation. It's worth it to always have an up-to-date vty reference and not drag outdated vtyref data along for ages in the git source tree without anyone noticing. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I526af21134087e2b43b9ada59c93f636ae242e24 Gerrit-Change-Number: 18927 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 08 Jul 2020 23:23:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 8 23:53:40 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 8 Jul 2020 23:53:40 +0000 Subject: Change in osmo-msc[master]: is_reset_msg: use proper enum for rc value In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19129 ) Change subject: is_reset_msg: use proper enum for rc value ...................................................................... is_reset_msg: use proper enum for rc value Change-Id: I88b6204bc3ffac06f92bfc87639ce503b2da24bc --- M src/libmsc/ran_peer.c 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/ran_peer.c b/src/libmsc/ran_peer.c index 80ce558..001dfb1 100644 --- a/src/libmsc/ran_peer.c +++ b/src/libmsc/ran_peer.c @@ -204,18 +204,18 @@ struct ran_peer *rp = fi->priv; struct ran_peer_ev_ctx *ctx = data; struct msgb *msg = ctx->msg; - int rc; + enum reset_msg_type is_reset; int supports_osmux; switch (event) { case RAN_PEER_EV_MSG_UP_CL: - rc = rp->sri->ran->sccp_ran_ops.is_reset_msg(rp->sri, fi, msg, &supports_osmux); + is_reset = rp->sri->ran->sccp_ran_ops.is_reset_msg(rp->sri, fi, msg, &supports_osmux); ran_peer_update_osmux_support(rp, supports_osmux); - switch (rc) { - case 1: + switch (is_reset) { + case SCCP_RAN_MSG_RESET: osmo_fsm_inst_dispatch(fi, RAN_PEER_EV_RX_RESET, msg); return; - case 2: + case SCCP_RAN_MSG_RESET_ACK: osmo_fsm_inst_dispatch(fi, RAN_PEER_EV_RX_RESET_ACK, msg); return; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I88b6204bc3ffac06f92bfc87639ce503b2da24bc Gerrit-Change-Number: 19129 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 00:11:40 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jul 2020 00:11:40 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: check TDMA frame order, drop out of order bursts In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19201 ) Change subject: trxcon/scheduler: check TDMA frame order, drop out of order bursts ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmocom-bb/+/19201/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/19201/1//COMMIT_MSG at 40 PS1, Line 40: is to reject them and log an error. Passing them the the logical the the https://gerrit.osmocom.org/c/osmocom-bb/+/19201/1/src/host/trxcon/sched_trx.c File src/host/trxcon/sched_trx.c: https://gerrit.osmocom.org/c/osmocom-bb/+/19201/1/src/host/trxcon/sched_trx.c at 727 PS1, Line 727: "than the last processed fn=%u => dropping...\n", (the entire string put on the second line would be nicer; I'd drop the "...") just a thought, if this happens regularly with multi trx, then maybe the ERROR log would be too aggressive? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I873c8555ea2ca190b1689227bb0fdcba87188772 Gerrit-Change-Number: 19201 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 09 Jul 2020 00:11:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 00:19:35 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jul 2020 00:19:35 +0000 Subject: Change in osmo-pcu[master]: encoding: Encode TA as unsigned and check validty against GSM48_TA_IN... In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19176 ) Change subject: encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID ...................................................................... Patch Set 2: (4 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/19176/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/19176/2//COMMIT_MSG at 7 PS2, Line 7: encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID validity https://gerrit.osmocom.org/c/osmo-pcu/+/19176/2//COMMIT_MSG at 12 PS2, Line 12: here.ch we use everywhere else to initialize when the : value is not known. ? https://gerrit.osmocom.org/c/osmo-pcu/+/19176/2/src/encoding.cpp File src/encoding.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/19176/2/src/encoding.cpp at 553 PS2, Line 553: int8_t ta_idx but this is still signed? https://gerrit.osmocom.org/c/osmo-pcu/+/19176/2/src/encoding.cpp at 583 PS2, Line 583: ta_idx and the signed gets passed as unsigned? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I82b13561d0fe5ebafb5c3a8b9a501045c29809bc Gerrit-Change-Number: 19176 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Thu, 09 Jul 2020 00:19:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 00:26:48 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jul 2020 00:26:48 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in... In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19195 ) Change subject: pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in MS RadioAccCap ...................................................................... Patch Set 1: (1 comment) vadim seems awfully sure about this, but https://gerrit.osmocom.org/c/osmo-pcu/+/19195/1/src/pdch.cpp File src/pdch.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/19195/1/src/pdch.cpp at a604 PS1, Line 604: ms->egprs_ms_class()); isn't this interesting to still see in, say, a DEBUG log? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Icd52209fd4395d78dc770e7869d1b1fe45a18ca0 Gerrit-Change-Number: 19195 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: neels Gerrit-Comment-Date: Thu, 09 Jul 2020 00:26:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 00:34:41 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jul 2020 00:34:41 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Fix wrong annoying log line about non-scheduled ResourceReq... In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19196 ) Change subject: pdch.cpp: Fix wrong annoying log line about non-scheduled ResourceReq received ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/19196/1/src/pdch.cpp File src/pdch.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/19196/1/src/pdch.cpp at 574 PS1, Line 574: "MS requests UL TBF in PACKET RESOURCE REQ of " (seems odd to trivially tweak the log message to uppercase; in the test log other logging still prints it lowercase. maybe use 120 width?) https://gerrit.osmocom.org/c/osmo-pcu/+/19196/1/src/pdch.cpp at 580 PS1, Line 580: TBF when last one has finished. */ (comment '*'s) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4b4367126d6a16055cd2f45afc4a6b9c15a7c980 Gerrit-Change-Number: 19196 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 09 Jul 2020 00:34:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 00:36:16 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jul 2020 00:36:16 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Store TLLI promply on newly created TLLI in rcv_resource_re... In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19197 ) Change subject: pdch.cpp: Store TLLI promply on newly created TLLI in rcv_resource_request ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I20ce4eb94ecf85ce2835275d0056d9ecd1b558c3 Gerrit-Change-Number: 19197 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 09 Jul 2020 00:36:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 00:41:18 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jul 2020 00:41:18 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: be more specific about E1 trunks In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19103 ) Change subject: mgcp_vty: be more specific about E1 trunks ...................................................................... Patch Set 6: Code-Review-1 (2 comments) https://gerrit.osmocom.org/c/osmo-mgw/+/19103/6/src/libosmo-mgcp/mgcp_vty.c File src/libosmo-mgcp/mgcp_vty.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19103/6/src/libosmo-mgcp/mgcp_vty.c at 858 PS6, Line 858: "trunk e1 <1-64>", "Configure Trunk\n" "E1 trunk\n" "Trunk Nr\n") do we need compatibility for old 'trunk <1-64>' command? https://gerrit.osmocom.org/c/osmo-mgw/+/19103/6/src/libosmo-mgcp/mgcp_vty.c at 897 PS6, Line 897: vty_out(vty, " trunk-e1 %d%s", trunk->trunk_nr, VTY_NEWLINE); above you wrote "trunk e1" so I doubt this can be parsed -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e Gerrit-Change-Number: 19103 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 00:41:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 00:53:46 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jul 2020 00:53:46 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: add function to generate e1-endpoint names In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19075 ) Change subject: mgcp_client: add function to generate e1-endpoint names ...................................................................... Patch Set 7: (4 comments) https://gerrit.osmocom.org/c/osmo-mgw/+/19075/7/src/libosmo-mgcp-client/mgcp_client.c File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19075/7/src/libosmo-mgcp-client/mgcp_client.c at 909 PS7, Line 909: e1-0 the example says "e1-0" but trunk_id is <1-64>? https://gerrit.osmocom.org/c/osmo-mgw/+/19075/7/src/libosmo-mgcp-client/mgcp_client.c at 915 PS7, Line 915: static const uint8_t valid_offsets[] = { 0, 0, 4, 0, 2, 4, 6, 0, 1, 2, 3, 4, 5, 6, 7 }; like last time, the const ones don't need to be static, or rather they should be further up in the .c file as global consts, and also it looks like there already are const arrays with the same numbers that this is code dup for https://gerrit.osmocom.org/c/osmo-mgw/+/19075/7/src/libosmo-mgcp-client/mgcp_client.c at 917 PS7, Line 917: static char endpoint[MGCP_ENDPOINT_MAXLEN]; recently we're moving away from static char buffers and favor functions that write to a target buffer, or ones that use a talloc ctx to return talloc_asprinft() string. https://gerrit.osmocom.org/c/osmo-mgw/+/19075/7/src/libosmo-mgcp-client/mgcp_client.c at 931 PS7, Line 931: return NULL; it seems odd to do this validation in a function that provides a string from numbers. Consider that you'd like to log an endpoint that is invalid, this function then won't produce a string for it. It might be good to be able to output: Invalid endpoint: ds/e1-1/s-0/su99-17 Instead of Cannot compose MGCP e1-endpoint name, E1-timeslot number (0) is invalid! Invalid endpoint: NULL or in other words only produce the "invalid" error logs at a point where we are taking in parameters from the user and explicitly validate them. (now I see laforge said something similar in an earlier patch set) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iec35b5bae8a7b07ddb3559f7114a24dcd10e8f14 Gerrit-Change-Number: 19075 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Thu, 09 Jul 2020 00:53:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 00:57:01 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jul 2020 00:57:01 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: use define constant to define max number of E1 subslots In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19118 ) Change subject: mgcp_endp: use define constant to define max number of E1 subslots ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/19118/4/src/libosmo-mgcp/mgcp_endp.c File src/libosmo-mgcp/mgcp_endp.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19118/4/src/libosmo-mgcp/mgcp_endp.c at 527 PS4, Line 527: 15 Now you fixed it from 16 to 15, but I meant rather use the MGCP_ENDP_E1_SUBSLOTS constant here? That does define the row length, right? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If7cb74e486946aff09e22abf8a8885bf0693f34e Gerrit-Change-Number: 19118 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 00:57:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 00:57:32 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jul 2020 00:57:32 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp.c: cosmetic: fix sourcecode formatting In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19178 ) Change subject: mgcp_endp.c: cosmetic: fix sourcecode formatting ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib83442d9a033b96c304bfd5e81206405d98d2ed5 Gerrit-Change-Number: 19178 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 00:57:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 00:57:40 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jul 2020 00:57:40 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp.c: cosmetic: fix sourcecode formatting In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19178 ) Change subject: mgcp_endp.c: cosmetic: fix sourcecode formatting ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib83442d9a033b96c304bfd5e81206405d98d2ed5 Gerrit-Change-Number: 19178 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 00:57:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 00:59:55 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jul 2020 00:59:55 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: remove double check In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19119 ) Change subject: mgcp_trunk: remove double check ...................................................................... Patch Set 5: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/19119/2/src/libosmo-mgcp/mgcp_trunk.c File src/libosmo-mgcp/mgcp_trunk.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19119/2/src/libosmo-mgcp/mgcp_trunk.c at 164 PS2, Line 164: return mgcp_trunk_by_num(cfg, MGCP_TRUNK_E1, trunk_nr); > It looks to me like now mgcp_trunk_by_name() no longer works for epname that contain the virtual tru [?] still an issue IIUC -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I91fb8cf6e3b077ba8f18fdbcd071275c6fd7cacd Gerrit-Change-Number: 19119 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 00:59:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 01:03:06 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jul 2020 01:03:06 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: do not access endpoint array elements directly In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19120 ) Change subject: mgcp_test: do not access endpoint array elements directly ...................................................................... Patch Set 5: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/19120/5/tests/mgcp/mgcp_test.c File tests/mgcp/mgcp_test.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19120/5/tests/mgcp/mgcp_test.c at 611 PS5, Line 611: sizeof(last_endpoint)); (OSMO_STRLCPY_ARRAY() can do the sizeof() for you) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic950c427f23be4a792af94972554637c2b0fbdf2 Gerrit-Change-Number: 19120 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 01:03:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 01:12:22 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jul 2020 01:12:22 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: fix endpoint number configuration In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19121 ) Change subject: mgcp_vty: fix endpoint number configuration ...................................................................... Patch Set 5: (2 comments) https://gerrit.osmocom.org/c/osmo-mgw/+/19121/5/include/osmocom/mgcp/mgcp_trunk.h File include/osmocom/mgcp/mgcp_trunk.h: https://gerrit.osmocom.org/c/osmo-mgw/+/19121/5/include/osmocom/mgcp/mgcp_trunk.h at 51 PS5, Line 51: } v; that's a bit drastically short, but ok :) https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_vty.c File src/libosmo-mgcp/mgcp_vty.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19121/2/src/libosmo-mgcp/mgcp_vty.c at 936 PS2, Line 936: vty_out(vty, " timeslot first %u%s", > You are probably right, this patch is more about adding features. [?] after laforge questions that these values should be configurable at all, it adds to the argument that you should maybe rather add the configurability in a separate patch, and just fix the off-by-one problem in this patch -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Gerrit-Change-Number: 19121 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 09 Jul 2020 01:12:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 01:15:23 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jul 2020 01:15:23 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: add function to claim an endpoint In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19166 ) Change subject: mgcp_endp: add function to claim an endpoint ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/osmo-mgw/+/19166/3/src/libosmo-mgcp/mgcp_endp.c File src/libosmo-mgcp/mgcp_endp.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19166/3/src/libosmo-mgcp/mgcp_endp.c at 154 PS3, Line 154: initializes endpoint can't see any endp initialization in this implementation https://gerrit.osmocom.org/c/osmo-mgw/+/19166/3/src/libosmo-mgcp/mgcp_endp.c at 155 PS3, Line 155: * \param[in] endp endpoint to release */ "to release"? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I402ac43dffd2c85789e4f0308a540e227063cc28 Gerrit-Change-Number: 19166 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-Comment-Date: Thu, 09 Jul 2020 01:15:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 01:16:24 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jul 2020 01:16:24 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: use talloc_zero_array instead of _talloc_zero_array In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19174 ) Change subject: mgcp_trunk: use talloc_zero_array instead of _talloc_zero_array ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I27549585016a7998e9233c52f6d86429fc75f509 Gerrit-Change-Number: 19174 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 09 Jul 2020 01:16:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jul 9 01:34:16 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 09 Jul 2020 01:34:16 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5f0674325132f_e232b1f494da60021009a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/open5gs failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 116s] Build dir: /usr/src/packages/BUILD/obj-x86_64-linux-gnu [ 116s] Build type: native build [ 116s] [ 116s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 116s] [ 116s] A full log can be found at /usr/src/packages/BUILD/obj-x86_64-linux-gnu/meson-logs/meson-log.txt [ 116s] cd obj-x86_64-linux-gnu && tail -v -n \+0 meson-logs/meson-log.txt [ 116s] ==> meson-logs/meson-log.txt <== [ 116s] Build started at 2020-07-09T01:34:05.879077 [ 116s] Main binary: /usr/bin/python3 [ 116s] Python system: Linux [ 116s] The Meson build system [ 116s] Version: 0.45.1 [ 116s] Source dir: /usr/src/packages/BUILD [ 116s] Build dir: /usr/src/packages/BUILD/obj-x86_64-linux-gnu [ 116s] Build type: native build [ 116s] [ 116s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 116s] dh_auto_configure: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 116s] debian/rules:11: recipe for target 'binary' failed [ 116s] make: *** [binary] Error 2 [ 116s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 116s] ### VM INTERACTION START ### [ 119s] [ 109.281455] sysrq: SysRq : Power Off [ 119s] [ 109.287799] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] lamb16 failed "build open5gs_1.3.0.20200709.dsc" at Thu Jul 9 01:34:09 UTC 2020. [ 119s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 9 01:34:50 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 09 Jul 2020 01:34:50 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f0674514c10e_e232b1f494da60021029c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/xUbuntu_18.04/i586 Package network:osmocom:nightly/open5gs failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 180s] Build dir: /usr/src/packages/BUILD/obj-i686-linux-gnu [ 180s] Build type: native build [ 180s] [ 180s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 180s] [ 180s] A full log can be found at /usr/src/packages/BUILD/obj-i686-linux-gnu/meson-logs/meson-log.txt [ 180s] cd obj-i686-linux-gnu && tail -v -n \+0 meson-logs/meson-log.txt [ 180s] ==> meson-logs/meson-log.txt <== [ 180s] Build started at 2020-07-09T01:34:32.696858 [ 180s] Main binary: /usr/bin/python3 [ 180s] Python system: Linux [ 180s] The Meson build system [ 180s] Version: 0.45.1 [ 180s] Source dir: /usr/src/packages/BUILD [ 180s] Build dir: /usr/src/packages/BUILD/obj-i686-linux-gnu [ 180s] Build type: native build [ 180s] [ 180s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 180s] dh_auto_configure: cd obj-i686-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/i386-linux-gnu --libexecdir=lib/i386-linux-gnu returned exit code 1 [ 180s] debian/rules:11: recipe for target 'binary' failed [ 180s] make: *** [binary] Error 2 [ 180s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 180s] ### VM INTERACTION START ### [ 183s] [ 148.488367] sysrq: SysRq : Power Off [ 183s] [ 148.491876] reboot: Power down [ 183s] ### VM INTERACTION END ### [ 183s] [ 183s] cloud129 failed "build open5gs_1.3.0.20200709.dsc" at Thu Jul 9 01:34:36 UTC 2020. [ 183s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 9 01:35:59 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 09 Jul 2020 01:35:59 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f06748be0566_e232b1f494da6002105c0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 227s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 227s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 227s] 268 | access_handler, server, [ 227s] | ^~~~~~~~~~~~~~ [ 227s] | | [ 227s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 227s] In file included from ../lib/sbi/server.c:23: [ 227s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 227s] 2425 | MHD_start_daemon (unsigned int flags, [ 227s] | ^~~~~~~~~~~~~~~~ [ 227s] cc1: some warnings being treated as errors [ 227s] [2091/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/s1ap-build.c.o' -c ../src/mme/s1ap-build.c [ 227s] [2092/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/path.c.o' -c ../lib/sbi/path.c [ 227s] [2093/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 227s] [2094/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-build.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-build.c.o' -c ../src/mme/emm-build.c [ 227s] [2095/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o' -MF 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/esm-sm.c.o' -c ../src/mme/esm-sm.c [ 227s] [2096/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -MF 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/emm-handler.c.o' -c ../src/mme/emm-handler.c [ 229s] [2097/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 229s] ninja: build stopped: subcommand failed. [ 229s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j8 -v returned exit code 1 [ 229s] make: *** [debian/rules:11: binary] Error 25 [ 229s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 229s] ### VM INTERACTION START ### [ 232s] [ 218.195051] sysrq: SysRq : Power Off [ 232s] [ 218.199784] reboot: Power down [ 232s] ### VM INTERACTION END ### [ 232s] [ 232s] lamb05 failed "build open5gs_1.3.0.20200709.dsc" at Thu Jul 9 01:35:42 UTC 2020. [ 232s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 9 01:37:08 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 09 Jul 2020 01:37:08 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f0674c93a42f_e232b1f494da6002109e7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Testing/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 261s] [2088/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/contrib_multipart_parser.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/contrib_multipart_parser.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/contrib_multipart_parser.c.o' -c ../lib/sbi/contrib/multipart_parser.c [ 261s] [2089/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -c ../lib/sbi/server.c [ 261s] FAILED: lib/sbi/9848b6c@@ogssbi at sha/server.c.o [ 261s] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/server.c.o' -c ../lib/sbi/server.c [ 261s] ../lib/sbi/server.c: In function ?ogs_sbi_server_start?: [ 261s] ../lib/sbi/server.c:268:17: error: passing argument 5 of ?MHD_start_daemon? from incompatible pointer type [-Werror=incompatible-pointer-types] [ 261s] 268 | access_handler, server, [ 261s] | ^~~~~~~~~~~~~~ [ 261s] | | [ 261s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 261s] In file included from ../lib/sbi/server.c:23: [ 261s] /usr/include/microhttpd.h:2425:1: note: expected ?MHD_AccessHandlerCallback? {aka ?enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} but argument is of type ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)? {aka ?int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)?} [ 261s] 2425 | MHD_start_daemon (unsigned int flags, [ 261s] | ^~~~~~~~~~~~~~~~ [ 261s] cc1: some warnings being treated as errors [ 261s] [2090/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/message.c.o' -c ../lib/sbi/message.c [ 261s] [2091/2409] cc -Ilib/sbi/9848b6c@@ogssbi at sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/x86_64-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -MF 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o.d' -o 'lib/sbi/9848b6c@@ogssbi at sha/nnrf-build.c.o' -c ../lib/sbi/nnrf-build.c [ 264s] [2092/2409] cc -Isrc/mme/e6d01c5@@mme at sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme at sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme at sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 264s] ninja: build stopped: subcommand failed. [ 264s] dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j4 -v returned exit code 1 [ 264s] make: *** [debian/rules:11: binary] Error 25 [ 264s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 264s] ### VM INTERACTION START ### [ 267s] [ 253.454924] sysrq: SysRq : Power Off [ 267s] [ 253.477867] reboot: Power down [ 267s] ### VM INTERACTION END ### [ 267s] [ 267s] cloud119 failed "build open5gs_1.3.0.20200709.dsc" at Thu Jul 9 01:36:51 UTC 2020. [ 267s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jul 9 07:13:22 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jul 2020 07:13:22 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: check TDMA frame order, drop out of order bursts In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19201 ) Change subject: trxcon/scheduler: check TDMA frame order, drop out of order bursts ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmocom-bb/+/19201/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/19201/1//COMMIT_MSG at 40 PS1, Line 40: is to reject them and log an error. Passing them the the logical > the the Done https://gerrit.osmocom.org/c/osmocom-bb/+/19201/1/src/host/trxcon/sched_trx.c File src/host/trxcon/sched_trx.c: https://gerrit.osmocom.org/c/osmocom-bb/+/19201/1/src/host/trxcon/sched_trx.c at 727 PS1, Line 727: "than the last processed fn=%u => dropping...\n", > (the entire string put on the second line would be nicer; I'd drop the "...") [?] Actually, it does not happen regularly. Maybe once per two test cases from ttcn3-bts-test (new freq. hopping ones), so I think ERROR is ok. Unfortunately trxcon uses NOTICE just like INFO, so this one should be more noticeable, at least for now. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I873c8555ea2ca190b1689227bb0fdcba87188772 Gerrit-Change-Number: 19201 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 09 Jul 2020 07:13:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 07:13:28 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jul 2020 07:13:28 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: check TDMA frame order, drop out of order bursts In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/19201 to look at the new patch set (#2). Change subject: trxcon/scheduler: check TDMA frame order, drop out of order bursts ...................................................................... trxcon/scheduler: check TDMA frame order, drop out of order bursts When running together with fake_trx.py (mostly used back-end), it is currently possible that Downlink bursts are received in a wrong order if more than one transceiver is configured (multi-trx mode). This is how it looks like: DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=629 rssi=-86 toa=0 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=629 ts=3 bid=1 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=630 rssi=-86 toa=0 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=630 ts=3 bid=2 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=631 rssi=-86 toa=0 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=631 ts=3 bid=3 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=633 (!) rssi=-86 toa=0 DSCHD NOTICE sched_trx.c:663 Substituting (!) lost TDMA frame 632 on TCH/F DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=632 ts=3 bid=0 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=633 ts=3 bid=1 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=632 (!) rssi=-86 toa=0 DTRXD NOTICE sched_trx.c:640 Too many (>104) contiguous TDMA frames elapsed (2715647) since the last processed fn=633 (current fn=632) so here a burst with TDMA fn=633 was received earlier than a burst with TDMA fn=632. The burst loss detection logic considered the latter one as lost, and substituted it with a dummy burst. When finally the out-of-order burst with TDMA fn=632 was received, we got the large number of allegedly elapsed frames: ((632 + 2715648) - 633) % 2715648 == 2715647 Given that late bursts get substituted, the best thing we can do is to reject them and log an error. Passing them to the logical channel handler (again) might lead to undefined behaviour. Change-Id: I873c8555ea2ca190b1689227bb0fdcba87188772 Related: OS#4658, OS#4546 --- M src/host/trxcon/sched_trx.c 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/01/19201/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I873c8555ea2ca190b1689227bb0fdcba87188772 Gerrit-Change-Number: 19201 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 07:29:08 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jul 2020 07:29:08 +0000 Subject: Change in osmo-pcu[master]: encoding: Encode TA as unsigned and check validty against GSM48_TA_IN... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19176 ) Change subject: encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/19176/2/src/encoding.cpp File src/encoding.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/19176/2/src/encoding.cpp at 553 PS2, Line 553: int8_t ta_idx > but this is still signed? This is actually the Timing Advance Index on PTCCH/U, it's not the Timing Advance value itself. I would love to see this one getting unsigned too in separate change ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I82b13561d0fe5ebafb5c3a8b9a501045c29809bc Gerrit-Change-Number: 19176 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Thu, 09 Jul 2020 07:29:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 07:46:25 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jul 2020 07:46:25 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19194 ) Change subject: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request ...................................................................... Patch Set 1: > Patch Set 1: > > I don't think this really backs up the fact that it's needed to release DL TBF upon a Packet Resource Request resceived... it's rather simply fixing the way it was being released. > > Do you understand it differently? Sorry, I don't have a strong opinion here. It looks like we should dig deeper into the history and the related specs. It's interesting that the commit message I found yesterday is basically an implicit revert of his other commit: commit ae0a799f4472a75912b444cc2f09361aaea27963 Author: Jacob Erlbeck Date: Tue Sep 1 11:28:25 2015 +0200 bts: Release DL TBF instead of killing in rcv_resource_request Currently an existing DL TBF is freed immediately, when a resource request is received. This makes sense since the MS might have dropped it when switching to the PDCH signaled via the AGCH for the SBA. But if the TBF still is assumed to exist on the MS side, there might be TFI collisions if the old TBF object is not kept to block its TFI for some time. This commit changes rcv_resource_request to call release() instead of tbf_free() on the DL TBF object (if it exists). Sponsored-by: On-Waves ehf This piece of code has been changed so many times, see also: e91bd3babd5c04a154f296607b401a5050dcba31 cf6ae9d12f9bf406a8f164f8109410d01328d913 and this one seems to be the origin: commit 99a107dbeef03b2e80aff82023cdfc5c10109b5b Author: Andreas Eversberg Date: Thu Sep 27 09:21:52 2012 +0200 Free existing UL/DL TBF, if RACH has been received from MS In this case the mobile has lost existing flows, so it make sense to free them. The TFI(s) can be re-used immidiately, because they are not associated by MS anymore. So it looks like it was done on purpose, and then changed +100500 times. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iab4afb66f0d671f7ad54909d2685a1613e12ab4d Gerrit-Change-Number: 19194 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 09 Jul 2020 07:46:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 07:59:00 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jul 2020 07:59:00 +0000 Subject: Change in osmo-hlr[master]: manual: describe subscriber import by SQL In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/19052 ) Change subject: manual: describe subscriber import by SQL ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/19052/1/doc/manuals/chapters/subscribers.adoc File doc/manuals/chapters/subscribers.adoc: https://gerrit.osmocom.org/c/osmo-hlr/+/19052/1/doc/manuals/chapters/subscribers.adoc at 148 PS1, Line 148: choose subscriber IDs that are not yet in use Hmm, don't we use something like AUTOINCREMENT [1]? Or wait, there seems to be no need to use it: """ On an INSERT, if the ROWID or INTEGER PRIMARY KEY column is not explicitly given a value, then it will be filled automatically with an unused integer, usually one more than the largest ROWID currently in use. This is true *regardless* of whether or not the AUTOINCREMENT keyword is used. """ [1] https://www.sqlite.org/autoinc.html https://gerrit.osmocom.org/c/osmo-hlr/+/19052/1/doc/manuals/chapters/subscribers.adoc at 160 PS1, Line 160: id So I guess you can simply omit this field, and sqlite will pick a unique value for you? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/19052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3246e6d5364215a71c33b5aca876deab7b6cfd70 Gerrit-Change-Number: 19052 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 07:59:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:02:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:02:32 +0000 Subject: Change in osmo-pcu[master]: encoding: Encode TA as unsigned and check validty against GSM48_TA_IN... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19176 ) Change subject: encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/19176/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/19176/2//COMMIT_MSG at 12 PS2, Line 12: here.ch we use everywhere else to initialize when the : value is not known. > ? Ack https://gerrit.osmocom.org/c/osmo-pcu/+/19176/2/src/encoding.cpp File src/encoding.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/19176/2/src/encoding.cpp at 553 PS2, Line 553: int8_t ta_idx > This is actually the Timing Advance Index on PTCCH/U, it's not the Timing Advance value itself. [?] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I82b13561d0fe5ebafb5c3a8b9a501045c29809bc Gerrit-Change-Number: 19176 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-CC: neels Gerrit-Comment-Date: Thu, 09 Jul 2020 10:02:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:02:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:02:45 +0000 Subject: Change in osmo-pcu[master]: encoding.cpp: Fix missing spacing in function param In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19193 ) Change subject: encoding.cpp: Fix missing spacing in function param ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4f30a0cea615d57cd7783a92ae782790c8075a6c Gerrit-Change-Number: 19193 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 09 Jul 2020 10:02:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:04:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:04:37 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19194 ) Change subject: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/19194/1/src/pdch.cpp File src/pdch.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/19194/1/src/pdch.cpp at 570 PS1, Line 570: RACH this is then also wrong. We're processing a packet resource request, not RACH here. The comment above, too. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iab4afb66f0d671f7ad54909d2685a1613e12ab4d Gerrit-Change-Number: 19194 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 09 Jul 2020 10:04:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:05:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:05:50 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19195 ) Change subject: pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in MS RadioAccCap ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/19195/1/src/pdch.cpp File src/pdch.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/19195/1/src/pdch.cpp at a604 PS1, Line 604: ms->egprs_ms_class()); > isn't this interesting to still see in, say, a DEBUG log? the commitlog states it is already logged in another place. https://gerrit.osmocom.org/c/osmo-pcu/+/19195/1/tests/tbf/TbfTest.err File tests/tbf/TbfTest.err: https://gerrit.osmocom.org/c/osmo-pcu/+/19195/1/tests/tbf/TbfTest.err at a3113 PS1, Line 3113: EGPRS MS class 0 -> 1 likely this is where it is logged already, just one line above. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Icd52209fd4395d78dc770e7869d1b1fe45a18ca0 Gerrit-Change-Number: 19195 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-Comment-Date: Thu, 09 Jul 2020 10:05:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:07:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:07:46 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Store TLLI promply on newly created TLLI in rcv_resource_re... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19197 ) Change subject: pdch.cpp: Store TLLI promply on newly created TLLI in rcv_resource_request ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I20ce4eb94ecf85ce2835275d0056d9ecd1b558c3 Gerrit-Change-Number: 19197 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 09 Jul 2020 10:07:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:09:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:09:50 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: check TDMA frame order, drop out of order bursts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19201 ) Change subject: trxcon/scheduler: check TDMA frame order, drop out of order bursts ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I873c8555ea2ca190b1689227bb0fdcba87188772 Gerrit-Change-Number: 19201 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 09 Jul 2020 10:09:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:11:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:11:57 +0000 Subject: Change in osmocom-bb[master]: l1ctl: preserve TS configuration for HR channels In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/18095 ) Change subject: l1ctl: preserve TS configuration for HR channels ...................................................................... Patch Set 1: Code-Review-2 Every L1CTL connection handles one real or virtual MS, and hence only one active dedicated channel. There can never be more than one dedicated chanel active concurrently. You need multiple connections to one L1CTL socket, or multiple L1CTL sockets with one connection each in order to model this. I think this should be abandoned. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/18095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3ac0ae22c40e3cb99c44f1156000c6909f739ad4 Gerrit-Change-Number: 18095 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 10:11:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:12:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:12:11 +0000 Subject: Change in osmocom-bb[master]: l1ctl: do not explicitly decativate all lchans on L1CTL_DM_EST_REQ In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/18094 ) Change subject: l1ctl: do not explicitly decativate all lchans on L1CTL_DM_EST_REQ ...................................................................... Patch Set 1: Code-Review-2 Every L1CTL connection handles one real or virtual MS, and hence only one active dedicated channel. There can never be more than one dedicated chanel active concurrently. You need multiple connections to one L1CTL socket, or multiple L1CTL sockets with one connection each in order to model this. I think this should be abandoned. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/18094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iad309b7aacdead986a7a5ad52bf712b6c6197b66 Gerrit-Change-Number: 18094 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 09 Jul 2020 10:12:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:12:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:12:43 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: use talloc_zero_array instead of _talloc_zero_array In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19174 ) Change subject: mgcp_trunk: use talloc_zero_array instead of _talloc_zero_array ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I27549585016a7998e9233c52f6d86429fc75f509 Gerrit-Change-Number: 19174 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 09 Jul 2020 10:12:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:21:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:21:51 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: be more specific about E1 trunks In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19103 ) Change subject: mgcp_vty: be more specific about E1 trunks ...................................................................... Patch Set 6: Code-Review-1 (2 comments) https://gerrit.osmocom.org/c/osmo-mgw/+/19103/6/src/libosmo-mgcp/mgcp_vty.c File src/libosmo-mgcp/mgcp_vty.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19103/6/src/libosmo-mgcp/mgcp_vty.c at 858 PS6, Line 858: "trunk e1 <1-64>", "Configure Trunk\n" "E1 trunk\n" "Trunk Nr\n") > do we need compatibility for old 'trunk <1-64>' command? I don't think so, because the existing code in osmo-mgw for E1 trunks did not work anyway. So there cannot be any people with [reasonable, working] config files that end up in trouble here. https://gerrit.osmocom.org/c/osmo-mgw/+/19103/6/src/libosmo-mgcp/mgcp_vty.c at 897 PS6, Line 897: vty_out(vty, " trunk-e1 %d%s", trunk->trunk_nr, VTY_NEWLINE); > above you wrote "trunk e1" so I doubt this can be parsed I think we may also want some kind of dispatch here. After all, we iterate over the global list of trunks (g_cfg->trunks) and not just the list of E1 trunks. So either a )the list always only contains E1 trunks (which it doesn't, as the virtual trunk is part of the list). If this were true, we could keep this patch as-is but rename the list to g_cfg->e1_trunks. b) the list contains all kinds of trunks. In this case, * if we have a E1 trunk specific node, and a specific config_write_ for E1, we ust also make sure that we actually only dump trunks of E1 Type here, and skip all others * alternatively, keep the node name and hence also the config_write function shared (non E1 specific), but simply have a switch statement inside this function dispatching different trunk types. This current patch is, IMHO, creating a more confusing situation than we currently have. We should be careful to avoid this. I personally think that we should keep a common/shared trunk node and not rename the NODE define / name nor this function. All that should be renamed is the 'trunk ...' VTY command to make it E1 specific, in order for us to be able to introduce compatible etensions later on. But to be honest, we could also do that even with the existing 'trunk <1-64>', command: It could later be extended to 'trunk <1-64 [(foo|bar|buz)]' with an implicit default to E1. or we handle it like we handle bts models in OsmBSC: With an explicit 'type (foo|bar|baz)' command within the 'trunk' node. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e Gerrit-Change-Number: 19103 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 10:21:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:33:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:33:10 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: fix endpoint number configuration In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19121 ) Change subject: mgcp_vty: fix endpoint number configuration ...................................................................... Patch Set 5: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/19121/3/src/libosmo-mgcp/mgcp_trunk.c File src/libosmo-mgcp/mgcp_trunk.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19121/3/src/libosmo-mgcp/mgcp_trunk.c at 45 PS3, Line 45: trunk->virtual.vty_number_endpoints = 32; : trunk->e1.vty_timeslot_first = 1; : trunk->e1.vty_timeslot_num = 2; > Just thought that a bit of flexibility would not hurt. [?] we should open timeslots at the time of a CRCX. IF it succeeds - great. If it fails -> return an error message. I think adding code complexity about ranges, or even configuration complexity does not serve any purpose here (other than open up new ways of how things can go wrong). So either we allocate all endpoints for all timeslots (15*30=450 per E1 trunk) at start-up, or we dynamically allocate them by demand whenever we get the related CRCX. Pre-allocating all of them sounds like a bit of a waste, at 64 trunks * 450 we end up with 28800 endpoints. Not sure how large our data structures are, but even if an endpoint would be 1kB, it's "only" 28MB of total RAM _if_ somebody went for full 64 trunks. Not elegant, but not a big desaster with todays memory sizes. And if we are worried about this, we could make the creation of sub-slot endpoints optional, i.e. allow only 64k slots for the non-Abis cases (A interface, classic ISDN) and only go for the full I.460 in Abis use cases. Honestly, I don't think it's worth spending any effort in optimization now. So let's just allocate all possible endpoints for each E1 trunk at startup/config time and avoid additional complexity about ranges. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Gerrit-Change-Number: 19121 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 10:33:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: dexter Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:35:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:35:18 +0000 Subject: Change in osmo-mgw[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18927 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... Patch Set 3: Code-Review+1 > Patch Set 3: > > > You cannot fail if it doesn't match since you also get output from other git repositories in there (lib dependencies). > > true. > > I'm still for generating it automatically and not build the vty reference in cross compilation. It's worth it to always have an up-to-date vty reference and not drag outdated vtyref data along for ages in the git source tree without anyone noticing. I can accept that (even though I dislike it). The questio is: Will this patch create fall-out? I guess not in the OBS builds, as they (even those for raspbian) are built "natively", and not cross-compiled. The sysmocom OE builds are cross-compiled. Might be worth checking if they disable the build of manuals before merging this. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I526af21134087e2b43b9ada59c93f636ae242e24 Gerrit-Change-Number: 18927 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 10:35:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:41:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:41:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: SI2quater EARFCNs: span entire value range of EARFCNs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19200 ) Change subject: bsc: SI2quater EARFCNs: span entire value range of EARFCNs ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I992771826d57669d06887c776303f85ef22f6c71 Gerrit-Change-Number: 19200 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 09 Jul 2020 10:41:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:41:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:41:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: more SI2quater EUTRAN ARFCN tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 ) Change subject: bsc: more SI2quater EUTRAN ARFCN tests ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I99bf9b3381812d1db6fd0757f65995bae48da776 Gerrit-Change-Number: 19181 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 10:41:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:43:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:43:28 +0000 Subject: Change in osmo-bts[master]: l1sap: do not print redundant info in l1sap_chan_act() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19182 ) Change subject: l1sap: do not print redundant info in l1sap_chan_act() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8a1dd7da7098fe8c8a015459608d9134821fb322 Gerrit-Change-Number: 19182 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 10:43:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:43:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:43:33 +0000 Subject: Change in osmo-bts[master]: l1sap: do not print redundant info in l1sap_chan_act() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19182 ) Change subject: l1sap: do not print redundant info in l1sap_chan_act() ...................................................................... l1sap: do not print redundant info in l1sap_chan_act() LOGPLCHAN() prepends the BTS/TRX/TS numbers itself. Change-Id: I8a1dd7da7098fe8c8a015459608d9134821fb322 --- M src/common/l1sap.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 17a6c5d..e05ec78 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1729,8 +1729,7 @@ struct gsm48_chan_desc *cd; int rc; - LOGPLCHAN(lchan, DL1C, LOGL_INFO, "activating channel chan_nr=%s trx=%d\n", - rsl_chan_nr_str(chan_nr), trx->nr); + LOGPLCHAN(lchan, DL1C, LOGL_INFO, "activating channel %s\n", rsl_chan_nr_str(chan_nr)); /* osmo-pcu calls this without a valid 'tp' parameter, so we * need to make sure ew don't crash here */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8a1dd7da7098fe8c8a015459608d9134821fb322 Gerrit-Change-Number: 19182 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:43:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:43:54 +0000 Subject: Change in osmo-bsc[master]: SI2quater: allow storing 48 EARFCNs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19180 ) Change subject: SI2quater: allow storing 48 EARFCNs ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iabeed10053ee5899b4def3509aedd25abb2410a9 Gerrit-Change-Number: 19180 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 10:43:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:43:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:43:57 +0000 Subject: Change in osmo-bsc[master]: SI2quater: allow storing 48 EARFCNs In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19180 ) Change subject: SI2quater: allow storing 48 EARFCNs ...................................................................... SI2quater: allow storing 48 EARFCNs Up to 16 SI2quater are multiplexed; each fits 3 EARFCNS, so the practical maximum is 48 (of course depending on how many bits are used by other SI2quater elements). Change-Id: Iabeed10053ee5899b4def3509aedd25abb2410a9 --- M include/osmocom/bsc/gsm_data.h 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index ce18d1b..0f5fc54 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -393,7 +393,10 @@ #define A38_XOR_MAX_KEY_LEN 16 #define A38_COMP128_KEY_LEN 16 #define RSL_ENC_ALG_A5(x) (x+1) -#define MAX_EARFCN_LIST 32 +/* Up to 16 SI2quater are multiplexed; each fits 3 EARFCNS, so the practical maximum is 3*16. + * The real maximum that fits in a total of 16 SI2quater rest octets also depends on the bits left by other SI2quater + * rest octets elements, so to really fit 48 EARFCNs most other SI2quater elements need to be omitted. */ +#define MAX_EARFCN_LIST (3*16) /* is the data link established? who established it? */ #define LCHAN_SAPI_UNUSED 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iabeed10053ee5899b4def3509aedd25abb2410a9 Gerrit-Change-Number: 19180 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:46:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:46:38 +0000 Subject: Change in osmo-mgw[master]: refactor: use msgb to receive, pass and send RTP packets In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18913 ) Change subject: refactor: use msgb to receive, pass and send RTP packets ...................................................................... Patch Set 4: Code-Review+1 +1. assigning to dexter to determine if it should be merged now; I don't want his work for E1 support to clash with this all over the place. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3af40b63bc49f8636d4e7ea2f8f83bb67f6619ee Gerrit-Change-Number: 18913 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: dexter Gerrit-Comment-Date: Thu, 09 Jul 2020 10:46:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:46:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:46:59 +0000 Subject: Change in libosmocore[master]: gprs_ns.h: add missing prototype gprs_ns_rcvmsg() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19138 ) Change subject: gprs_ns.h: add missing prototype gprs_ns_rcvmsg() ...................................................................... gprs_ns.h: add missing prototype gprs_ns_rcvmsg() gprs_ns_rcvmsg is already exported, but never declared. Change-Id: I7edc5f4fb6e1fda059e35ea0988d0ef42208aa50 --- M include/osmocom/gprs/gprs_ns.h 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/gprs/gprs_ns.h b/include/osmocom/gprs/gprs_ns.h index 65c7df3..af25825 100644 --- a/include/osmocom/gprs/gprs_ns.h +++ b/include/osmocom/gprs/gprs_ns.h @@ -188,6 +188,11 @@ /* main function for higher layers (BSSGP) to send NS messages */ int gprs_ns_sendmsg(struct gprs_ns_inst *nsi, struct msgb *msg); +/* Receive incoming NS message from underlying transport layer */ +int gprs_ns_rcvmsg(struct gprs_ns_inst *nsi, struct msgb *msg, + struct sockaddr_in *saddr, enum gprs_ns_ll ll); + + int gprs_ns_tx_alive(struct gprs_nsvc *nsvc); int gprs_ns_tx_alive_ack(struct gprs_nsvc *nsvc); int gprs_ns_tx_reset(struct gprs_nsvc *nsvc, uint8_t cause); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7edc5f4fb6e1fda059e35ea0988d0ef42208aa50 Gerrit-Change-Number: 19138 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:47:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:47:37 +0000 Subject: Change in libosmocore[master]: socket.h: introduce osmo_sockaddr to hold v4 and v6 endpoints In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19141 ) Change subject: socket.h: introduce osmo_sockaddr to hold v4 and v6 endpoints ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If80172373735193401af872b18e1ff00c93880e7 Gerrit-Change-Number: 19141 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 10:47:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:51:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:51:10 +0000 Subject: Change in libosmocore[master]: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19143 ) Change subject: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd ...................................................................... Patch Set 2: (4 comments) https://gerrit.osmocom.org/c/libosmocore/+/19143/2/src/socket.c File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/19143/2/src/socket.c at 448 PS2, Line 448: #define OSMO_SOCKADDR_TO_STR(sockaddr) \ > I don't get how this macro is supposed to work. [?] Ack https://gerrit.osmocom.org/c/libosmocore/+/19143/2/src/socket.c at 451 PS2, Line 451: strcpy(sastr.ip, "Invalid IP") > osmo_strlcpy Ack https://gerrit.osmocom.org/c/libosmocore/+/19143/2/src/socket.c at 453 PS2, Line 453: int osmo_sock_init3(uint16_t type, uint8_t proto, > Missing documentation Ack https://gerrit.osmocom.org/c/libosmocore/+/19143/2/src/socket.c at 931 PS2, Line 931: return osmo_fd_init_ofd(ofd, osmo_sock_init3(type, proto, local, remote, flags)); > passing -1 to osmo_fd_init_ofd if osmo_sock_init3 fails? No thanks. Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 09 Jul 2020 10:51:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:52:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:52:18 +0000 Subject: Change in libosmocore[master]: socket.c add osmo_sockaddr_valid() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19144 ) Change subject: socket.c add osmo_sockaddr_valid() ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19144/2/src/socket.c File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/19144/2/src/socket.c at 1532 PS2, Line 1532: if (addr->u.sas.ss_family == AF_INET) { > So indeed you are using one of the fields in a substruct of the union to find out the type. [?] it's a non-issue AFAICT, see my comment to another patch. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib6fb050e1bfe3f3a8d8bbe5e762351ce6b7cc48c Gerrit-Change-Number: 19144 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 09 Jul 2020 10:52:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:53:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:53:36 +0000 Subject: Change in libosmocore[master]: socket.c: fix osmo_sock_get_ip_and_port for IPv6 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19147 ) Change subject: socket.c: fix osmo_sock_get_ip_and_port for IPv6 ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19147/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/19147/1//COMMIT_MSG at 9 PS1, Line 9: The struct sockaddr is too small for IPv6. IPv6 has a 16 byte address, while > Hmm I thought struct sockaddr was a struct big enough to hold any address? 'struct sockaddr_storage' is large enough for [at leaast] IPv4 and IPv6. I don't think 'struct sockaddr' should ever be used directly , other than some kind of abstract data type to which you cast pointers when calling socket API. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4e69d814367168c05f0da161ec9b705db36ad096 Gerrit-Change-Number: 19147 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 10:53:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:55:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:55:16 +0000 Subject: Change in libosmocore[master]: bts_features: add feature BTS_FEAT_IPV6_NSVC In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19145 ) Change subject: bts_features: add feature BTS_FEAT_IPV6_NSVC ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19145/2/include/osmocom/gsm/bts_features.h File include/osmocom/gsm/bts_features.h: https://gerrit.osmocom.org/c/libosmocore/+/19145/2/include/osmocom/gsm/bts_features.h at 28 PS2, Line 28: BTS_FEAT_IPV6_NSVC, > What's the point in using this? Why not simply using a correct IP address type when configuring (con [?] The NSVC remote IP address is specified in the BSC config file. IT is passed in vendor-specific OML IEs to the BTS. Existing versions of (nanobts, osmo-bts) only support IPv4 here. So we need a way how the BSC can identify if the BTS (and the BTS-colocated PCU) support the new additional IE for IPv6 address. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 Gerrit-Change-Number: 19145 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 10:55:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 10:56:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 10:56:47 +0000 Subject: Change in libosmocore[master]: gsm 12.21: add osmocom specific NM_ATT_OSMO_NS_LINK_CFG In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19146 ) Change subject: gsm 12.21: add osmocom specific NM_ATT_OSMO_NS_LINK_CFG ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19146/2/include/osmocom/gsm/protocol/gsm_12_21.h File include/osmocom/gsm/protocol/gsm_12_21.h: https://gerrit.osmocom.org/c/libosmocore/+/19146/2/include/osmocom/gsm/protocol/gsm_12_21.h at 514 PS2, Line 514: , /* not sure if it is legal to have two enum members map to the same value (NM_ATT_BS11_PASSWORD just a few lines above). We may have to eithe use unique values, or move to a different enum or #defines for the osmcoom specific NM_ATT. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic261bc43a07fa741b97a9c6ec5a9ed6f5ecae588 Gerrit-Change-Number: 19146 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 10:56:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 11:10:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 11:10:10 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: check TDMA frame order, drop out of order bursts In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19201 ) Change subject: trxcon/scheduler: check TDMA frame order, drop out of order bursts ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmocom-bb/+/19201/2/src/host/trxcon/sched_trx.c File src/host/trxcon/sched_trx.c: https://gerrit.osmocom.org/c/osmocom-bb/+/19201/2/src/host/trxcon/sched_trx.c at 723 PS2, Line 723: if (fn < lchan->tdma.last_proc) { Don't you need to consider wrap around in here? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I873c8555ea2ca190b1689227bb0fdcba87188772 Gerrit-Change-Number: 19201 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 11:10:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 11:14:26 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jul 2020 11:14:26 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: check TDMA frame order, drop out of order bursts In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19201 ) Change subject: trxcon/scheduler: check TDMA frame order, drop out of order bursts ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmocom-bb/+/19201/2/src/host/trxcon/sched_trx.c File src/host/trxcon/sched_trx.c: https://gerrit.osmocom.org/c/osmocom-bb/+/19201/2/src/host/trxcon/sched_trx.c at 723 PS2, Line 723: if (fn < lchan->tdma.last_proc) { > Don't you need to consider wrap around in here? Nice catch! Thanks. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I873c8555ea2ca190b1689227bb0fdcba87188772 Gerrit-Change-Number: 19201 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 11:14:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 11:15:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 11:15:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: more SI2quater EUTRAN ARFCN tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 ) Change subject: bsc: more SI2quater EUTRAN ARFCN tests ...................................................................... Patch Set 3: Code-Review+2 Thanks, that looks a lot better now. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I99bf9b3381812d1db6fd0757f65995bae48da776 Gerrit-Change-Number: 19181 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 11:15:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 11:33:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 11:33:58 +0000 Subject: Change in osmo-bts[master]: Move struct gsm_bts_trx: gsm_data.* & bts.* => bts_trx.* In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19124 to look at the new patch set (#3). Change subject: Move struct gsm_bts_trx: gsm_data.* & bts.* => bts_trx.* ...................................................................... Move struct gsm_bts_trx: gsm_data.* & bts.* => bts_trx.* Move all struct gsm_bts_trx references from bulky gsm_data to its own file containing all related definitions and implementations. Also move a few functions clearly related to that object which were placed in bts.* Change-Id: Iebaf5b221c48b571f45408af867ce6f9c0cd9f4a --- M include/osmo-bts/Makefile.am M include/osmo-bts/bts.h A include/osmo-bts/bts_trx.h M include/osmo-bts/gsm_data.h M include/osmo-bts/phy_link.h M src/common/Makefile.am M src/common/abis.c M src/common/bts.c M src/common/bts_ctrl_lookup.c A src/common/bts_trx.c M src/common/gsm_data.c M src/common/sysinfo.c M src/common/tx_power.c 13 files changed, 283 insertions(+), 237 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/24/19124/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iebaf5b221c48b571f45408af867ce6f9c0cd9f4a Gerrit-Change-Number: 19124 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 11:33:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 11:33:58 +0000 Subject: Change in osmo-bts[master]: common: Avoid changing OPSTATE to Enabled upon RSL up In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19156 to look at the new patch set (#2). Change subject: common: Avoid changing OPSTATE to Enabled upon RSL up ...................................................................... common: Avoid changing OPSTATE to Enabled upon RSL up the RSL link has nothing to do regarding the state of the Radio Carrier, as in it being up is not enough to have a working (enabled) Radio Carrier. Change-Id: Iefb5c4e1097233b5c31e4d621c544d51516af678 --- M src/common/bts_trx.c 1 file changed, 2 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/56/19156/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iefb5c4e1097233b5c31e4d621c544d51516af678 Gerrit-Change-Number: 19156 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 11:38:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 11:38:03 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19194 ) Change subject: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/19194/1/src/pdch.cpp File src/pdch.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/19194/1/src/pdch.cpp at 570 PS1, Line 570: RACH > this is then also wrong. We're processing a packet resource request, not RACH here. [?] Indeed, it's wrong, but unrelated to this patch. I'm fixing it in next commits. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iab4afb66f0d671f7ad54909d2685a1613e12ab4d Gerrit-Change-Number: 19194 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 09 Jul 2020 11:38:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 11:38:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 11:38:31 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19195 ) Change subject: pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in MS RadioAccCap ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/19195/1/tests/tbf/TbfTest.err File tests/tbf/TbfTest.err: https://gerrit.osmocom.org/c/osmo-pcu/+/19195/1/tests/tbf/TbfTest.err at a3113 PS1, Line 3113: EGPRS MS class 0 -> 1 > likely this is where it is logged already, just one line above. Indeed. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Icd52209fd4395d78dc770e7869d1b1fe45a18ca0 Gerrit-Change-Number: 19195 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Thu, 09 Jul 2020 11:38:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 11:40:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 11:40:30 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Fix wrong annoying log line about non-scheduled ResourceReq... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19196 ) Change subject: pdch.cpp: Fix wrong annoying log line about non-scheduled ResourceReq received ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/19196/1/src/pdch.cpp File src/pdch.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/19196/1/src/pdch.cpp at 574 PS1, Line 574: "MS requests UL TBF in PACKET RESOURCE REQ of " > (seems odd to trivially tweak the log message to uppercase; in the test log other logging still prin [?] Uppercase is already used in other log lines in this file, and it matches what wireshark uses, as well as making it easier to understand it's a packet type and not some description. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4b4367126d6a16055cd2f45afc4a6b9c15a7c980 Gerrit-Change-Number: 19196 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 11:40:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 11:41:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 11:41:05 +0000 Subject: Change in osmo-pcu[master]: encoding: Encode TA as unsigned and check validty against GSM48_TA_IN... In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/19176 to look at the new patch set (#3). Change subject: encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID ...................................................................... encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID According to 3GPP TS 44.018 sec 10.5.2.40, Timing Advance value is 8 bit and range is 0-63 (0-219 on GSM400). Unsigned value (uint8_t) is used everywhere else, so avoid using a signed one here, and simply check for GSM48_TA_INVALID here, which we use everywhere else to initialize when the value is not known. Ideally we should check for value based on band, but it makes more sense to check that when receiving the data and storing in in set_ta(). Change-Id: I82b13561d0fe5ebafb5c3a8b9a501045c29809bc --- M src/encoding.cpp 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/76/19176/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I82b13561d0fe5ebafb5c3a8b9a501045c29809bc Gerrit-Change-Number: 19176 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 11:41:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 11:41:05 +0000 Subject: Change in osmo-pcu[master]: encoding.cpp: Fix missing spacing in function param In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/19193 to look at the new patch set (#2). Change subject: encoding.cpp: Fix missing spacing in function param ...................................................................... encoding.cpp: Fix missing spacing in function param Change-Id: I4f30a0cea615d57cd7783a92ae782790c8075a6c --- M src/encoding.cpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/93/19193/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4f30a0cea615d57cd7783a92ae782790c8075a6c Gerrit-Change-Number: 19193 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 11:41:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 11:41:05 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/19194 to look at the new patch set (#2). Change subject: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request ...................................................................... pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request There's no real good explanation on why the DL TBF is dropped there, since PKT RESOUCE REQUEST is used basically during UL TBF establishment. Also, as decribed by TS 44.060 11.2.16 "Packet Resource Request": """ This message is sent on the PACCH by the mobile station to the network to request a change in the uplink resources assigned. """ Change-Id: Iab4afb66f0d671f7ad54909d2685a1613e12ab4d --- M src/pdch.cpp M tests/tbf/TbfTest.err 2 files changed, 0 insertions(+), 36 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/94/19194/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iab4afb66f0d671f7ad54909d2685a1613e12ab4d Gerrit-Change-Number: 19194 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 11:41:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 11:41:05 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in... In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/19195 to look at the new patch set (#2). Change subject: pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in MS RadioAccCap ...................................................................... pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in MS RadioAccCap If the information is not found in the message, 0 (unknown MS class) will be returned. If the MS already had some previous information on the MS class, let's not lose it by setting it back to 0. Take the opportunity to drop related log lines which are no needed, since set_(egprs_)ms_class() functions already log the value changes. Change-Id: Icd52209fd4395d78dc770e7869d1b1fe45a18ca0 --- M src/pdch.cpp M tests/tbf/TbfTest.err 2 files changed, 6 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/95/19195/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Icd52209fd4395d78dc770e7869d1b1fe45a18ca0 Gerrit-Change-Number: 19195 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 11:41:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 11:41:05 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Fix wrong annoying log line about non-scheduled ResourceReq... In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/19196 to look at the new patch set (#2). Change subject: pdch.cpp: Fix wrong annoying log line about non-scheduled ResourceReq received ...................................................................... pdch.cpp: Fix wrong annoying log line about non-scheduled ResourceReq received It's perfectly fine receiving a Resource Request message under some circumstances (as stated in the comment added in the commit). To print issues only under non-expected circumstances, the function rcv_resource_request need to be refactored: * Destroying older UL_TBF is delayed because it is needed further down. * When the old UL_TBF is FINISHED, it's an acceptable time to receive a Resource request, so we check if that's the case and don't print a warning in that case. Change-Id: I4b4367126d6a16055cd2f45afc4a6b9c15a7c980 --- M src/pdch.cpp M tests/tbf/TbfTest.err 2 files changed, 22 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/96/19196/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4b4367126d6a16055cd2f45afc4a6b9c15a7c980 Gerrit-Change-Number: 19196 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 11:41:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 11:41:05 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Store TLLI promptly on newly created TLLI in rcv_resource_r... In-Reply-To: References: Message-ID: Hello fixeria, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/19197 to look at the new patch set (#2). Change subject: pdch.cpp: Store TLLI promptly on newly created TLLI in rcv_resource_request ...................................................................... pdch.cpp: Store TLLI promptly on newly created TLLI in rcv_resource_request The TLLI is tried to be updated later anyway during tbf_alloc_ul(), but this way it's clear that information is stored where it belongs as soon as possible. The change already shows clearer log lines in TbfTest.err. Change-Id: I20ce4eb94ecf85ce2835275d0056d9ecd1b558c3 --- M src/pdch.cpp M tests/tbf/TbfTest.err 2 files changed, 91 insertions(+), 90 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/97/19197/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I20ce4eb94ecf85ce2835275d0056d9ecd1b558c3 Gerrit-Change-Number: 19197 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 11:43:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 11:43:45 +0000 Subject: Change in libosmocore[master]: Revert "gsmtap_makemsg_ex: NULL for unknown chan_type" In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19067 ) Change subject: Revert "gsmtap_makemsg_ex: NULL for unknown chan_type" ...................................................................... Patch Set 2: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ebaa89cc3422df1d7fd2365a6176cb2902d1c67 Gerrit-Change-Number: 19067 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Thu, 09 Jul 2020 11:43:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 11:43:48 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 11:43:48 +0000 Subject: Change in libosmocore[master]: Revert "gsmtap_makemsg_ex: NULL for unknown chan_type" In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19067 ) Change subject: Revert "gsmtap_makemsg_ex: NULL for unknown chan_type" ...................................................................... Revert "gsmtap_makemsg_ex: NULL for unknown chan_type" Reverting due to being completely normal for some applications to submit usning this channel type when decoding/parsing failed and hence not being able to determine channel type. This reverts Change-Id Ib4147a33a75c3cf425c30da8b0678c7fba8a371d (commit 12f93be6073ed89055862baafbfe0e08e50ed17a.) Change-Id: I6ebaa89cc3422df1d7fd2365a6176cb2902d1c67 --- M src/gsmtap_util.c 1 file changed, 1 insertion(+), 5 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Hoernchen: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gsmtap_util.c b/src/gsmtap_util.c index 8674f1c..9a0ac02 100644 --- a/src/gsmtap_util.c +++ b/src/gsmtap_util.c @@ -169,8 +169,7 @@ * \param[in] snr Signal/Noise Ratio (SNR) * \param[in] data Pointer to data buffer * \param[in] len Length of \ref data - * \return dynamically allocated message buffer containing data, - * or NULL for unknown chan_type + * \return dynamically allocated message buffer containing data * * This function will allocate a new msgb and fill it with a GSMTAP * header containing the information @@ -183,9 +182,6 @@ struct gsmtap_hdr *gh; uint8_t *dst; - if (chan_type == GSMTAP_CHANNEL_UNKNOWN) - return NULL; - msg = msgb_alloc(sizeof(*gh) + len, "gsmtap_tx"); if (!msg) return NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ebaa89cc3422df1d7fd2365a6176cb2902d1c67 Gerrit-Change-Number: 19067 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 11:44:09 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 11:44:09 +0000 Subject: Change in osmo-bts[master]: bts-virt: Don't rely on gsmtap_makemsg() returning NULL for GSMTAP_CH... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19161 ) Change subject: bts-virt: Don't rely on gsmtap_makemsg() returning NULL for GSMTAP_CHANNEL_UNKNOWN ...................................................................... Patch Set 1: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I233afd930d3e43f7b120d40192c7c192102e38d9 Gerrit-Change-Number: 19161 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 11:44:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 11:44:12 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 11:44:12 +0000 Subject: Change in osmo-bts[master]: bts-virt: Don't rely on gsmtap_makemsg() returning NULL for GSMTAP_CH... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19161 ) Change subject: bts-virt: Don't rely on gsmtap_makemsg() returning NULL for GSMTAP_CHANNEL_UNKNOWN ...................................................................... bts-virt: Don't rely on gsmtap_makemsg() returning NULL for GSMTAP_CHANNEL_UNKNOWN commit d211c490cad38f2009943121d57bdb7df8eee9b0 avoided sending GSMTAP packets on the virtual Um interface with type GSMTAP_CHANNEL_UNKNOWN by relying on gsmtap_makemsg returning NULL. But that's not the corect approach since it's totally fine to be sending GSMTAP_CHANNEL_UNKNOWN on some GSMTAP cases (for instance when the program fails to infer the type when decoding a message), since then this way one can study pcap files and find the offending encoded messages which failed to be decoded. This patch goes togehter with revert patch introduced in libosmocore as explained in the commit referred above. Change-Id: I233afd930d3e43f7b120d40192c7c192102e38d9 --- M src/osmo-bts-virtual/scheduler_virtbts.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Hoernchen: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c index 1c2b057..466e864 100644 --- a/src/osmo-bts-virtual/scheduler_virtbts.c +++ b/src/osmo-bts-virtual/scheduler_virtbts.c @@ -78,9 +78,12 @@ else gsmtap_chantype = chantype_rsl2gsmtap2(rsl_chantype, chdesc->link_id, is_voice_frame); /* the logical channel type */ - if (gsmtap_chantype == GSMTAP_CHANNEL_UNKNOWN) + if (gsmtap_chantype == GSMTAP_CHANNEL_UNKNOWN) { LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Tx GSMTAP for RSL channel type 0x%02x: cannot send, this" " channel type is unknown in GSMTAP\n", rsl_chantype); + msgb_free(msg); + return; + } #if MODULO_HYPERFRAME /* Restart fn after every superframe (26 * 51 frames) to simulate hyperframe overflow each 6 seconds. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I233afd930d3e43f7b120d40192c7c192102e38d9 Gerrit-Change-Number: 19161 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 12:25:12 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Thu, 9 Jul 2020 12:25:12 +0000 Subject: Change in osmo-gsm-tester[master]: enb_amarisoft: add support for PHY signal log file In-Reply-To: References: Message-ID: srs_andre has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19188 ) Change subject: enb_amarisoft: add support for PHY signal log file ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19188/1/src/osmo_gsm_tester/obj/enb_amarisoft.py File src/osmo_gsm_tester/obj/enb_amarisoft.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19188/1/src/osmo_gsm_tester/obj/enb_amarisoft.py at 96 PS1, Line 96: self.rem_host.scpfrom('scp-back-phy-signal-log', self.remote_phy_signal_file, self.phy_signal_file) > Better put it in a separate try except block, so that if log_file is not there for whatever reason, [?] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I63d13cb74572ac065d5a3fcfb1632552d0a6dbc6 Gerrit-Change-Number: 19188 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-Comment-Date: Thu, 09 Jul 2020 12:25:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 12:27:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 12:27:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: extend rach content tests with emergency call In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19198 ) Change subject: BTS_Tests: extend rach content tests with emergency call ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie5b7af3e93efaa6d0b412d3b1c77bc9514424f52 Gerrit-Change-Number: 19198 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 12:27:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 12:28:30 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Thu, 9 Jul 2020 12:28:30 +0000 Subject: Change in osmo-gsm-tester[master]: enb_amarisoft: add option to enable and configure DL AWGN channel In-Reply-To: References: Message-ID: srs_andre has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185 ) Change subject: enb_amarisoft: add option to enable and configure DL AWGN channel ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185/1/src/osmo_gsm_tester/obj/enb_amarisoft.py File src/osmo_gsm_tester/obj/enb_amarisoft.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185/1/src/osmo_gsm_tester/obj/enb_amarisoft.py at 164 PS1, Line 164: config.overlay(values, dict(enb={'dl_awgn_snr': values['enb'].get('dl_awgn_snr', 30)})) > Looks like you only really need to add 30 to defaults.conf and get rid of this line? [?] Good idea about the false in the defaults.conf. But I think the boolean to enable/disable it is still needed. Note that basically any real value is a valid SNR. Ok, -1000 is not realistic but I guess rather than using such a magic number we can have the boolean and make it explicit. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib248e87e5abd855d4c974eab42ec40828c6e1d40 Gerrit-Change-Number: 19185 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: srs_andre Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 12:28:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 12:30:26 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Thu, 9 Jul 2020 12:30:26 +0000 Subject: Change in osmo-gsm-tester[master]: enb_amarisoft: add option to enable and configure DL AWGN channel In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185 to look at the new patch set (#2). Change subject: enb_amarisoft: add option to enable and configure DL AWGN channel ...................................................................... enb_amarisoft: add option to enable and configure DL AWGN channel expose option to enable DL AWGN noise and make SNR configurable Change-Id: Ib248e87e5abd855d4c974eab42ec40828c6e1d40 --- M src/osmo_gsm_tester/obj/enb.py M src/osmo_gsm_tester/obj/enb_amarisoft.py M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl M sysmocom/defaults.conf 4 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/85/19185/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib248e87e5abd855d4c974eab42ec40828c6e1d40 Gerrit-Change-Number: 19185 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: srs_andre Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 12:30:26 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Thu, 9 Jul 2020 12:30:26 +0000 Subject: Change in osmo-gsm-tester[master]: enb_amarisoft: add support for PHY signal log file In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19188 to look at the new patch set (#2). Change subject: enb_amarisoft: add support for PHY signal log file ...................................................................... enb_amarisoft: add support for PHY signal log file when phy.signal=1 is set in the log_options, the eNB will dump a binary file that needs to be copied back as well Change-Id: I63d13cb74572ac065d5a3fcfb1632552d0a6dbc6 --- M src/osmo_gsm_tester/obj/enb_amarisoft.py 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/88/19188/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I63d13cb74572ac065d5a3fcfb1632552d0a6dbc6 Gerrit-Change-Number: 19188 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 12:30:27 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Thu, 9 Jul 2020 12:30:27 +0000 Subject: Change in osmo-gsm-tester[master]: srsepc.conf.tmpl: zero-pad mnc and mcc in config References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19202 ) Change subject: srsepc.conf.tmpl: zero-pad mnc and mcc in config ...................................................................... srsepc.conf.tmpl: zero-pad mnc and mcc in config srsEPC expect zero-padding MNC/MCC in config file. However, 001 and mcc will end up as 1 in the rendered template. Therefore, they need to be formatted correctly. Change-Id: Ie63cd1b15b961e493a6dcbd7e5a4fbabe0bb6f33 --- M src/osmo_gsm_tester/templates/srsepc.conf.tmpl 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/02/19202/1 diff --git a/src/osmo_gsm_tester/templates/srsepc.conf.tmpl b/src/osmo_gsm_tester/templates/srsepc.conf.tmpl index f855127..830cd32 100644 --- a/src/osmo_gsm_tester/templates/srsepc.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsepc.conf.tmpl @@ -24,8 +24,8 @@ mme_code = 0x1a mme_group = 0x0001 tac = 0x0007 -mcc = ${epc.mcc} -mnc = ${epc.mnc} +mcc = ${'{0:03}'.format(int(epc.mcc))} +mnc = ${'{0:02}'.format(int(epc.mnc))} mme_bind_addr = ${epc.run_addr} apn = srsapn dns_addr = 8.8.8.8 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ie63cd1b15b961e493a6dcbd7e5a4fbabe0bb6f33 Gerrit-Change-Number: 19202 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 12:34:22 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 12:34:22 +0000 Subject: Change in osmo-gsm-tester[master]: enb_amarisoft: add support for PHY signal log file In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19188 ) Change subject: enb_amarisoft: add support for PHY signal log file ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I63d13cb74572ac065d5a3fcfb1632552d0a6dbc6 Gerrit-Change-Number: 19188 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-Comment-Date: Thu, 09 Jul 2020 12:34:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 12:35:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 12:35:30 +0000 Subject: Change in osmo-gsm-tester[master]: enb_amarisoft: add option to enable and configure DL AWGN channel In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185 ) Change subject: enb_amarisoft: add option to enable and configure DL AWGN channel ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185/1/src/osmo_gsm_tester/obj/enb_amarisoft.py File src/osmo_gsm_tester/obj/enb_amarisoft.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185/1/src/osmo_gsm_tester/obj/enb_amarisoft.py at 164 PS1, Line 164: config.overlay(values, dict(enb={'dl_awgn_snr': values['enb'].get('dl_awgn_snr', 30)})) > Good idea about the false in the defaults.conf. [?] Fine with keeping the enable_ var then, simply work on the defaults.conf part. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib248e87e5abd855d4c974eab42ec40828c6e1d40 Gerrit-Change-Number: 19185 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: srs_andre Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 12:35:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: srs_andre Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 12:39:01 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Thu, 9 Jul 2020 12:39:01 +0000 Subject: Change in osmo-gsm-tester[master]: enb_amarisoft: add option to enable and configure DL AWGN channel In-Reply-To: References: Message-ID: srs_andre has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185 ) Change subject: enb_amarisoft: add option to enable and configure DL AWGN channel ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185/1/src/osmo_gsm_tester/obj/enb_amarisoft.py File src/osmo_gsm_tester/obj/enb_amarisoft.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185/1/src/osmo_gsm_tester/obj/enb_amarisoft.py at 164 PS1, Line 164: config.overlay(values, dict(enb={'dl_awgn_snr': values['enb'].get('dl_awgn_snr', 30)})) > Fine with keeping the enable_ var then, simply work on the defaults.conf part. Should be done. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib248e87e5abd855d4c974eab42ec40828c6e1d40 Gerrit-Change-Number: 19185 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: srs_andre Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 12:39:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: srs_andre Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 12:40:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 12:40:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: extend rach content tests with emergency call In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19198 ) Change subject: BTS_Tests: extend rach content tests with emergency call ...................................................................... BTS_Tests: extend rach content tests with emergency call The testcase tests if a CHANNEL REQUEST on the RACH leads to the correct CHANNEL REQUIRED message on RSL level. When a MS is sending a CHANNEL REQUEST to establish an emergency call, it uses a slightly different layout for the request reference (RA). Lets add another similar testcase (TC_rach_content_emerg) to cover the emergency call situation as well. Change-Id: Ie5b7af3e93efaa6d0b412d3b1c77bc9514424f52 Related: OS#4549 --- M bts/BTS_Tests.ttcn 1 file changed, 35 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 1ff0c61..587e14a 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1296,6 +1296,14 @@ return false; } +private function ra_is_emerg(OCT1 ra) return boolean { + /* See also: 3GPP TS 04.08, Table 9.9, ra=101xxxxx */ + if ((ra and4b 'E0'O == 'A0'O) and (ra and4b '1F'O != '1F'O)) { + return true; + } + return false; +} + /* generate a random RACH for circuit-switched */ private function f_rnd_ra_cs() return OCT1 { var OCT1 ra; @@ -1305,6 +1313,15 @@ return ra; } +/* generate a random RACH for emergency */ +private function f_rnd_ra_emerg() return OCT1 { + var OCT1 ra; + do { + ra := f_rnd_octstring(1); + } while (not ra_is_emerg(ra)); + return ra; +} + /* generate a random RACH for packet-switched */ private function f_rnd_ra_ps() return OCT1 { var OCT1 ra; @@ -1321,7 +1338,7 @@ } /* Send 1000 RACH requests and check their RA+FN on the RSL side */ -testcase TC_rach_content() runs on test_CT { +private function f_TC_rach_content(boolean emerg) runs on test_CT { f_init(); f_init_l1ctl(); f_l1_tune(L1CTL); @@ -1329,7 +1346,12 @@ var GsmFrameNumber fn_last := 0; var boolean test_failed := false; for (var integer i := 0; i < 1000; i := i+1) { - var OCT1 ra := f_rnd_ra_cs(); + var OCT1 ra := f_rnd_ra_emerg(); + if (emerg == true) { + ra := f_rnd_ra_emerg(); + } else { + ra := f_rnd_ra_cs(); + } var GsmFrameNumber fn := f_L1CTL_RACH(L1CTL, oct2int(ra)); if (fn == fn_last) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Two RACH in same FN?!?"); @@ -1359,6 +1381,16 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } +/* Normal variant */ +testcase TC_rach_content() runs on test_CT { + f_TC_rach_content(emerg := false); +} + +/* Emergency call variant */ +testcase TC_rach_content_emerg() runs on test_CT { + f_TC_rach_content(emerg := true); +} + /* Send 1000 RACH Requests (flood ~ 89/s) and count if count(Abis) == count(Um) */ testcase TC_rach_count() runs on test_CT { f_init(); @@ -6683,6 +6715,7 @@ execute( TC_sacch_chan_act_ho_async() ); execute( TC_sacch_chan_act_ho_sync() ); execute( TC_rach_content() ); + execute( TC_rach_content_emerg() ); execute( TC_rach_count() ); execute( TC_rach_max_ta() ); execute( TC_ho_rach() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie5b7af3e93efaa6d0b412d3b1c77bc9514424f52 Gerrit-Change-Number: 19198 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 13:13:58 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 9 Jul 2020 13:13:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: extend TC_chan_act_ack_noest with emergency call References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19203 ) Change subject: BSC_Tests: extend TC_chan_act_ack_noest with emergency call ...................................................................... BSC_Tests: extend TC_chan_act_ack_noest with emergency call TC_chan_act_ack_noest requests a channel and then releases it again. However, this does not test yet what happens if the requestor (BTS) uses a request reference that indicates an emergancy call. Depending on the configuration the BSC should reject or allow the channel to be established. Change-Id: If828c0f5786d89efa7608f38d648e2a2b8f6f675 Related: OS#4549 --- M bsc/BSC_Tests.ttcn 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/19203/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index f1aea75..7762906 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -972,13 +972,13 @@ } /* CHAN RQD -> CHAN ACT -> CHAN ACT ACK -> RF CHAN REL */ -testcase TC_chan_act_ack_noest() runs on test_CT { +private function f_TC_chan_act_ack_noest(OCT1 ra := '23'O) runs on test_CT { var RSL_Message rx_rsl; f_init(1); /* Send CHAN RQD and wait for allocation; acknowledge it */ - var RslChannelNr chan_nr := f_chreq_act_ack(); + var RslChannelNr chan_nr := f_chreq_act_ack(ra); /* expect BSC to disable the channel again if there's no RLL EST IND */ rx_rsl := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL), T3101_MAX); @@ -986,6 +986,17 @@ setverdict(pass); } +/* Normal variant */ +testcase TC_chan_act_ack_noest() runs on test_CT { + f_TC_chan_act_ack_noest(); +} + +/* Emergency call variant */ +testcase TC_chan_act_ack_noest_emerg() runs on test_CT { + /* See also: 3GPP TS 04.08, Table 9.9, ra=101xxxxx */ + f_TC_chan_act_ack_noest(ra := 'A5'O); +} + /* Test behavior if MSC never answers to CR */ testcase TC_chan_act_ack_est_ind_noreply() runs on test_CT { var RslLinkId main_dcch := valueof(ts_RslLinkID_DCCH(0)); @@ -5830,6 +5841,7 @@ execute( TC_chan_act_noreply() ); execute( TC_chan_act_counter() ); execute( TC_chan_act_ack_noest() ); + execute( TC_chan_act_ack_noest_emerg() ); execute( TC_chan_act_ack_est_ind_noreply() ); execute( TC_chan_act_ack_est_ind_refused() ); execute( TC_chan_act_nack() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If828c0f5786d89efa7608f38d648e2a2b8f6f675 Gerrit-Change-Number: 19203 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 13:27:50 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jul 2020 13:27:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: more SI2quater EUTRAN ARFCN tests In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 ) Change subject: bsc: more SI2quater EUTRAN ARFCN tests ...................................................................... bsc: more SI2quater EUTRAN ARFCN tests Add more EUTRAN ARFCNs, reaching the maximum allowed amount. Add tests with 12, 23, 42 EARFCNs, just for the sake of testing some arbitrary numbers. Add tests with 32 and 33 EARFCNs because before osmo-bsc Iabeed10053ee5899b4def3509aedd25abb2410a9, only 32 EARFCNs could be stored by osmo-bsc. Add a test with 48 EARFCNs to verify the maximum amount of EARFCNs and maximum amount of SI2quater multiplexes works as expected. Add a test with 49 EARFCNs to verify the VTY error response when adding too many EARFCNs, and showing that osmo-bsc still sends 16 SI2quater with 48 EARFCNs. Depends: Iabeed10053ee5899b4def3509aedd25abb2410a9 (osmo-bsc) Change-Id: I99bf9b3381812d1db6fd0757f65995bae48da776 --- M bsc/BSC_Tests.ttcn M library/GSM_RestOctets.ttcn 2 files changed, 99 insertions(+), 116 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index f1aea75..cba7e03 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -61,6 +61,7 @@ import from GSM_SystemInformation all; import from GSM_RestOctets all; +import from TCCConversion_Functions all; const integer NUM_BTS := 3; const integer NUM_MSC := 3; @@ -96,7 +97,7 @@ SystemInformationType2 si2 optional, SystemInformationType2bis si2bis optional, SystemInformationType2ter si2ter optional, - record of SI2quaterRestOctets si2quater optional, + SI2quaterRestOctetsList si2quater optional, SystemInformationType3 si3 optional, SystemInformationType4 si4 optional, /* TODO: replace with proper decoding of SI13, implement SI13 in GSM_SystemInformation.ttcn */ @@ -1726,135 +1727,109 @@ } } -testcase TC_si2quater_2_earfcns() runs on test_CT { +private function f_tr_si2quater_earfcns(integer count) return template SI2quaterRestOctetsList +{ + var template SI2quaterRestOctetsList si2quater := {}; + var integer si2quater_count := (count + 2) / 3; + + for (var integer i := 0; i < count; i := i + 1) { + var integer earfcn := 22 + i; + /* First earfcn is 111 from osmo-bsc.cfg */ + if (i == 0) { + earfcn := 111; + } + var integer index := i / 3; + var integer earfcn_index := i mod 3; + if (index >= lengthof(si2quater)) { + si2quater[index] := tr_SI2quaterRestOctets_EUTRAN(index := index, count := si2quater_count - 1); + } + si2quater[index].rel_additions.rel5.rel6.rel7.rel8.prio_eutran_params_desc.desc.eutran_params_desc.desc.repeated_neigh_cells[0].cell_desc_list[earfcn_index] := tr_EUTRAN_CellDesc_default(e_arfcn := earfcn); + } + + return si2quater; +} + +private function f_tc_si2quater_n_earfcns(integer n) runs on test_CT +{ var template SystemInformationConfig sic := SystemInformationConfig_default; - sic.si2quater := { - tr_SI2quaterRestOctets_EUTRAN( - repeated_neigh_cells := { - tr_EUTRAN_NeighbourCells_default( - cell_desc_list := { - tr_EUTRAN_CellDesc_default(e_arfcn := 111), - tr_EUTRAN_CellDesc_default(e_arfcn := 23) - } - ) - } - ) - }; - f_test_si2quater(2, sic); + sic.si2quater := f_tr_si2quater_earfcns(n); + f_test_si2quater(n, sic); +} + +testcase TC_si2quater_2_earfcns() runs on test_CT { + f_tc_si2quater_n_earfcns(2); } testcase TC_si2quater_3_earfcns() runs on test_CT { - var template SystemInformationConfig sic := SystemInformationConfig_default; - sic.si2quater := { - tr_SI2quaterRestOctets_EUTRAN( - repeated_neigh_cells := { - tr_EUTRAN_NeighbourCells_default( - cell_desc_list := { - tr_EUTRAN_CellDesc_default(e_arfcn := 111), - tr_EUTRAN_CellDesc_default(e_arfcn := 23), - tr_EUTRAN_CellDesc_default(e_arfcn := 24) - } - ) - } - ) - }; - f_test_si2quater(3, sic); + f_tc_si2quater_n_earfcns(3); } testcase TC_si2quater_4_earfcns() runs on test_CT { - var template SystemInformationConfig sic := SystemInformationConfig_default; - sic.si2quater := { - tr_SI2quaterRestOctets_EUTRAN( - index := 0, - count := 1, - repeated_neigh_cells := { - tr_EUTRAN_NeighbourCells_default( - cell_desc_list := { - tr_EUTRAN_CellDesc_default(e_arfcn := 111), - tr_EUTRAN_CellDesc_default(e_arfcn := 23), - tr_EUTRAN_CellDesc_default(e_arfcn := 24) - } - ) - } - ), - tr_SI2quaterRestOctets_EUTRAN( - index := 1, - count := 1, - repeated_neigh_cells := { - tr_EUTRAN_NeighbourCells_default( - cell_desc_list := { - tr_EUTRAN_CellDesc_default(e_arfcn := 25) - } - ) - } - ) - }; - f_test_si2quater(4, sic); + f_tc_si2quater_n_earfcns(4); } testcase TC_si2quater_5_earfcns() runs on test_CT { - var template SystemInformationConfig sic := SystemInformationConfig_default; - sic.si2quater := { - tr_SI2quaterRestOctets_EUTRAN( - index := 0, - count := 1, - repeated_neigh_cells := { - tr_EUTRAN_NeighbourCells_default( - cell_desc_list := { - tr_EUTRAN_CellDesc_default(e_arfcn := 111), - tr_EUTRAN_CellDesc_default(e_arfcn := 23), - tr_EUTRAN_CellDesc_default(e_arfcn := 24) - } - ) - } - ), - tr_SI2quaterRestOctets_EUTRAN( - index := 1, - count := 1, - repeated_neigh_cells := { - tr_EUTRAN_NeighbourCells_default( - cell_desc_list := { - tr_EUTRAN_CellDesc_default(e_arfcn := 25), - tr_EUTRAN_CellDesc_default(e_arfcn := 26) - } - ) - } - ) - }; - f_test_si2quater(5, sic); + f_tc_si2quater_n_earfcns(5); } testcase TC_si2quater_6_earfcns() runs on test_CT { + f_tc_si2quater_n_earfcns(6); +} + +testcase TC_si2quater_12_earfcns() runs on test_CT { + f_tc_si2quater_n_earfcns(12); +} + +testcase TC_si2quater_23_earfcns() runs on test_CT { + f_tc_si2quater_n_earfcns(23); +} + +testcase TC_si2quater_32_earfcns() runs on test_CT { + f_tc_si2quater_n_earfcns(32); +} + +testcase TC_si2quater_33_earfcns() runs on test_CT { + f_tc_si2quater_n_earfcns(33); +} + +testcase TC_si2quater_42_earfcns() runs on test_CT { + f_tc_si2quater_n_earfcns(42); +} + +testcase TC_si2quater_48_earfcns() runs on test_CT { + f_tc_si2quater_n_earfcns(48); +} + +/* verify the VTY error response when adding too many EARFCNs, and showing that osmo-bsc still sends 16 SI2quater with + * 48 EARFCNs. */ +testcase TC_si2quater_49_earfcns() runs on test_CT { var template SystemInformationConfig sic := SystemInformationConfig_default; - sic.si2quater := { - tr_SI2quaterRestOctets_EUTRAN( - index := 0, - count := 1, - repeated_neigh_cells := { - tr_EUTRAN_NeighbourCells_default( - cell_desc_list := { - tr_EUTRAN_CellDesc_default(e_arfcn := 111), - tr_EUTRAN_CellDesc_default(e_arfcn := 23), - tr_EUTRAN_CellDesc_default(e_arfcn := 24) - } - ) - } - ), - tr_SI2quaterRestOctets_EUTRAN( - index := 1, - count := 1, - repeated_neigh_cells := { - tr_EUTRAN_NeighbourCells_default( - cell_desc_list := { - tr_EUTRAN_CellDesc_default(e_arfcn := 25), - tr_EUTRAN_CellDesc_default(e_arfcn := 26), - tr_EUTRAN_CellDesc_default(e_arfcn := 27) - } - ) - } - ) - }; - f_test_si2quater(6, sic); + sic.si2quater := f_tr_si2quater_earfcns(48); /* 48, not 49! */ + f_init(0); + + for (var integer i := 1; i < 48; i := i + 1) { + f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list add earfcn " & int2str(22 + i) & " thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3"}); + } + + /* The 49th EARFCN no longer fits, expect VTY error */ + f_vty_enter_cfg_bts(BSCVTY, 0); + var charstring vty_error; + vty_error := f_vty_transceive_ret(BSCVTY, + "si2quater neighbor-list add earfcn 70 thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3") + f_vty_transceive(BSCVTY, "end"); + + if (f_strstr(vty_error, "Unable to add ARFCN 70") >= 0) { + log("Got expected VTY error: ", vty_error); + setverdict(pass); + } else { + setverdict(fail, "Expected the 49th EUTRAN ARFCN to be rejected by vty config, got: ", vty_error); + } + + f_init_bts_and_check_sysinfo(0, expect_si := sic); + + for (var integer i := 1; i < 48; i := i + 1) { + f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list del earfcn " & int2str(22 + i)}); + } } @@ -5825,6 +5800,13 @@ execute( TC_si2quater_4_earfcns() ); execute( TC_si2quater_5_earfcns() ); execute( TC_si2quater_6_earfcns() ); + execute( TC_si2quater_12_earfcns() ); + execute( TC_si2quater_23_earfcns() ); + execute( TC_si2quater_32_earfcns() ); + execute( TC_si2quater_33_earfcns() ); + execute( TC_si2quater_42_earfcns() ); + execute( TC_si2quater_48_earfcns() ); + execute( TC_si2quater_49_earfcns() ); /* RSL DCHAN Channel ACtivation / Deactivation */ execute( TC_chan_act_noreply() ); diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn index 2b43751..d47e510 100644 --- a/library/GSM_RestOctets.ttcn +++ b/library/GSM_RestOctets.ttcn @@ -52,6 +52,7 @@ * so we should make sure that unused bits contain proper padding. */ variant "PADDING(yes), PADDING_PATTERN('00101011'B)" }; +type record of SI2quaterRestOctets SI2quaterRestOctetsList; /* Measurement Parameters Description */ private type record MeasParamsDescOpt { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I99bf9b3381812d1db6fd0757f65995bae48da776 Gerrit-Change-Number: 19181 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 13:27:51 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jul 2020 13:27:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: SI2quater EARFCNs: span entire value range of EARFCNs In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19200 ) Change subject: bsc: SI2quater EARFCNs: span entire value range of EARFCNs ...................................................................... bsc: SI2quater EARFCNs: span entire value range of EARFCNs Change-Id: I992771826d57669d06887c776303f85ef22f6c71 --- M bsc/BSC_Tests.ttcn 1 file changed, 31 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index cba7e03..cc7346f 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1711,19 +1711,44 @@ f_init_bts_and_check_sysinfo(0, expect_si := SystemInformationConfig_default); } +/* We're testing SI2quater with lists of EARFCNs. Instead of just incrementing EARFCNs, also pick some from the edges of + * the entire value range. This function provides the same EARFCN numbers for the same earfcn_index */ +private function f_test_si2quater_earfcn_by_idx(integer earfcn_index) return uint16_t +{ + select (earfcn_index) { + case (0) { + /* E-ARFCN 111 is already added in the osmo-bsc.cfg */ + return 111; + } + case (1) { + return 1; + } + case (2) { + return 0; + } + case (3) { + return 65535; + } + case else { + return 23 * (earfcn_index - 3); + } + } +} + function f_test_si2quater(integer total_earfcns, template SystemInformationConfig expect_si) runs on test_CT { f_init(0); /* E-ARFCN 111 is already added in the osmo-bsc.cfg, so only add more arfcns if total_earfcns > 1 */ for (var integer i := 1; i < total_earfcns; i := i + 1) { - f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list add earfcn " & int2str(22 + i) & " thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3"}); + f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list add earfcn " & int2str(f_test_si2quater_earfcn_by_idx(i)) + & " thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3"}); } f_init_bts_and_check_sysinfo(0, expect_si := expect_si); for (var integer i := 1; i < total_earfcns; i := i + 1) { - f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list del earfcn " & int2str(22 + i)}); + f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list del earfcn " & int2str(f_test_si2quater_earfcn_by_idx(i))}); } } @@ -1733,11 +1758,7 @@ var integer si2quater_count := (count + 2) / 3; for (var integer i := 0; i < count; i := i + 1) { - var integer earfcn := 22 + i; - /* First earfcn is 111 from osmo-bsc.cfg */ - if (i == 0) { - earfcn := 111; - } + var integer earfcn := f_test_si2quater_earfcn_by_idx(i); var integer index := i / 3; var integer earfcn_index := i mod 3; if (index >= lengthof(si2quater)) { @@ -1808,7 +1829,8 @@ f_init(0); for (var integer i := 1; i < 48; i := i + 1) { - f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list add earfcn " & int2str(22 + i) & " thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3"}); + f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list add earfcn " & int2str(f_test_si2quater_earfcn_by_idx(i)) + & " thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3"}); } /* The 49th EARFCN no longer fits, expect VTY error */ @@ -1828,7 +1850,7 @@ f_init_bts_and_check_sysinfo(0, expect_si := sic); for (var integer i := 1; i < 48; i := i + 1) { - f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list del earfcn " & int2str(22 + i)}); + f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list del earfcn " & int2str(f_test_si2quater_earfcn_by_idx(i))}); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I992771826d57669d06887c776303f85ef22f6c71 Gerrit-Change-Number: 19200 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 13:31:36 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jul 2020 13:31:36 +0000 Subject: Change in osmo-mgw[master]: refactor: use msgb to receive, pass and send RTP packets In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18913 ) Change subject: refactor: use msgb to receive, pass and send RTP packets ...................................................................... Patch Set 4: > Patch Set 4: Code-Review+1 > > +1. assigning to dexter to determine if it should be merged now; I don't want his work for E1 support to clash with this all over the place. yes, that's also why I think it would be good to get this patch in rather earlier than later, so that we can reduce merge conflicts -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3af40b63bc49f8636d4e7ea2f8f83bb67f6619ee Gerrit-Change-Number: 18913 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 13:31:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 13:33:04 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 9 Jul 2020 13:33:04 +0000 Subject: Change in osmo-mgw[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18927 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... Patch Set 3: > I can accept that (even though I dislike it). The questio is: Will this patch create fall-out? I guess not in the OBS builds, as they (even those for raspbian) are built "natively", and not cross-compiled. The sysmocom OE builds are cross-compiled. Might be worth checking if they disable the build of manuals before merging this. even if they build the vty reference, they would still build a vty reference from a different build... -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I526af21134087e2b43b9ada59c93f636ae242e24 Gerrit-Change-Number: 18927 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 13:33:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 13:42:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 13:42:23 +0000 Subject: Change in osmo-gsm-tester[master]: enb_amarisoft: add option to enable and configure DL AWGN channel In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185 ) Change subject: enb_amarisoft: add option to enable and configure DL AWGN channel ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib248e87e5abd855d4c974eab42ec40828c6e1d40 Gerrit-Change-Number: 19185 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-Comment-Date: Thu, 09 Jul 2020 13:42:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 13:42:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 13:42:57 +0000 Subject: Change in osmo-gsm-tester[master]: srsepc.conf.tmpl: zero-pad mnc and mcc in config In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19202 ) Change subject: srsepc.conf.tmpl: zero-pad mnc and mcc in config ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ie63cd1b15b961e493a6dcbd7e5a4fbabe0bb6f33 Gerrit-Change-Number: 19202 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 13:42:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 13:43:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 13:43:00 +0000 Subject: Change in osmo-gsm-tester[master]: enb_amarisoft: add option to enable and configure DL AWGN channel In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185 ) Change subject: enb_amarisoft: add option to enable and configure DL AWGN channel ...................................................................... enb_amarisoft: add option to enable and configure DL AWGN channel expose option to enable DL AWGN noise and make SNR configurable Change-Id: Ib248e87e5abd855d4c974eab42ec40828c6e1d40 --- M src/osmo_gsm_tester/obj/enb.py M src/osmo_gsm_tester/obj/enb_amarisoft.py M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl M sysmocom/defaults.conf 4 files changed, 13 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py index d9fe1a5..be48887 100644 --- a/src/osmo_gsm_tester/obj/enb.py +++ b/src/osmo_gsm_tester/obj/enb.py @@ -36,6 +36,8 @@ 'rf_dev_args': schema.STR, 'additional_args[]': schema.STR, 'enable_measurements': schema.BOOL_STR, + 'enable_dl_awgn': schema.BOOL_STR, + 'dl_awgn_snr': schema.INT, 'a1_report_type': schema.STR, 'a1_report_value': schema.INT, 'a1_hysteresis': schema.INT, diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py index 4b24844..c7a9810 100644 --- a/src/osmo_gsm_tester/obj/enb_amarisoft.py +++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py @@ -160,6 +160,8 @@ self.enable_measurements = util.str2bool(values['enb'].get('enable_measurements', 'false')) config.overlay(values, dict(enb={'enable_measurements': self.enable_measurements})) + config.overlay(values, dict(enb={'enable_dl_awgn': util.str2bool(values['enb'].get('enable_dl_awgn', 'false'))})) + # We need to set some specific variables programatically here to match IP addresses: if self._conf.get('rf_dev_type') == 'zmq': base_srate = self.num_prb2base_srate(self.num_prb()) diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl index 09532cc..7896ecb 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl @@ -38,6 +38,13 @@ /* RF driver configuration */ include "amarisoft_rf_driver.cfg", +% if enb.enable_dl_awgn: + channel_dl: { + type: "awgn", + snr: ${enb.dl_awgn_snr} + }, +% endif + mme_list: [ { s1ap_bind_addr: "${enb.addr}", diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf index 2c99e04..dd97456 100644 --- a/sysmocom/defaults.conf +++ b/sysmocom/defaults.conf @@ -113,6 +113,8 @@ transmission_mode: 1 num_cells: 1 enable_measurements: false + enable_dl_awgn: false + dl_awgn_snr: 30 a1_report_type: rsrp a1_report_value: -105 a1_hysteresis: 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib248e87e5abd855d4c974eab42ec40828c6e1d40 Gerrit-Change-Number: 19185 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 13:43:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 13:43:00 +0000 Subject: Change in osmo-gsm-tester[master]: rfemu_minicircuits: reset attenuation to zero in dtor In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19186 ) Change subject: rfemu_minicircuits: reset attenuation to zero in dtor ...................................................................... rfemu_minicircuits: reset attenuation to zero in dtor this avoids issues when the channel emulation stops in the middle of a high attenuation values and the device is left in this state. Change-Id: I9aeafc68bf81b8932aac4cb28040b9aea6bfcbdb --- M src/osmo_gsm_tester/obj/rfemu_minicircuits.py 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/obj/rfemu_minicircuits.py b/src/osmo_gsm_tester/obj/rfemu_minicircuits.py index 6214040..c501dcf 100644 --- a/src/osmo_gsm_tester/obj/rfemu_minicircuits.py +++ b/src/osmo_gsm_tester/obj/rfemu_minicircuits.py @@ -42,6 +42,10 @@ raise log.Error('No "port" attribute provided in supply conf!') self.set_name('minicircuits(%s:%r)' % (self.addr, self.ports)) + def __del__(self): + self.dbg('Resetting channel attenuation to zero') + self.set_attenuation(0) + def _url_prefix(self): #http://10.12.1.216/:SetAttPerChan:1:0_2:0_3:0_4:0 return 'http://' + self.addr -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I9aeafc68bf81b8932aac4cb28040b9aea6bfcbdb Gerrit-Change-Number: 19186 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 13:43:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 13:43:01 +0000 Subject: Change in osmo-gsm-tester[master]: srsue.conf.tmpl: use UE cat 8 whenever more than one carrier is confi... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19187 ) Change subject: srsue.conf.tmpl: use UE cat 8 whenever more than one carrier is configured ...................................................................... srsue.conf.tmpl: use UE cat 8 whenever more than one carrier is configured Change-Id: Id96827960cac436b8ac363e28c2b0ab7b6acf57f --- M src/osmo_gsm_tester/templates/srsue.conf.tmpl 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl b/src/osmo_gsm_tester/templates/srsue.conf.tmpl index f1a5333..a75be23 100644 --- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl @@ -145,7 +145,7 @@ # mbms_service_port: Port of the MBMS service ##################################################################### [rrc] -% if int(ue.num_carriers) == 2: +% if int(ue.num_carriers) > 1: ue_category = 7 release = 10 % else: -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19187 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Id96827960cac436b8ac363e28c2b0ab7b6acf57f Gerrit-Change-Number: 19187 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 13:43:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 13:43:01 +0000 Subject: Change in osmo-gsm-tester[master]: enb_amarisoft: add support for PHY signal log file In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19188 ) Change subject: enb_amarisoft: add support for PHY signal log file ...................................................................... enb_amarisoft: add support for PHY signal log file when phy.signal=1 is set in the log_options, the eNB will dump a binary file that needs to be copied back as well Change-Id: I63d13cb74572ac065d5a3fcfb1632552d0a6dbc6 --- M src/osmo_gsm_tester/obj/enb_amarisoft.py 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py index c7a9810..657cb2e 100644 --- a/src/osmo_gsm_tester/obj/enb_amarisoft.py +++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py @@ -49,6 +49,7 @@ CFGFILE_RF = 'amarisoft_rf_driver.cfg' CFGFILE_DRB = 'amarisoft_drb.cfg' LOGFILE = 'lteenb.log' + PHY_SIGNAL_FILE = 'lteenb.log.bin' def __init__(self, testenv, conf): super().__init__(testenv, conf, 'amarisoftenb') @@ -95,6 +96,11 @@ except Exception as e: self.log(repr(e)) + try: + self.rem_host.scpfrom('scp-back-phy-signal-log', self.remote_phy_signal_file, self.phy_signal_file) + except Exception as e: + self.log(repr(e)) + def start(self, epc): self.log('Starting AmarisoftENB') self._epc = epc @@ -140,6 +146,7 @@ self.config_rf_file = self.run_dir.child(AmarisoftENB.CFGFILE_RF) self.config_drb_file = self.run_dir.child(AmarisoftENB.CFGFILE_DRB) self.log_file = self.run_dir.child(AmarisoftENB.LOGFILE) + self.phy_signal_file = self.run_dir.child(AmarisoftENB.PHY_SIGNAL_FILE) if not self._run_node.is_local(): self.rem_host = remote.RemoteHost(self.run_dir, self._run_node.ssh_user(), self._run_node.ssh_addr()) @@ -153,6 +160,7 @@ self.remote_config_rf_file = remote_run_dir.child(AmarisoftENB.CFGFILE_RF) self.remote_config_drb_file = remote_run_dir.child(AmarisoftENB.CFGFILE_DRB) self.remote_log_file = remote_run_dir.child(AmarisoftENB.LOGFILE) + self.remote_phy_signal_file = remote_run_dir.child(AmarisoftENB.PHY_SIGNAL_FILE) values = super().configure(['amarisoft', 'amarisoftenb']) @@ -191,6 +199,9 @@ logfile = self.log_file if self._run_node.is_local() else self.remote_log_file config.overlay(values, dict(enb=dict(log_filename=logfile))) + phy_signal_file = self.phy_signal_file if self._run_node.is_local() else self.remote_phy_signal_file + config.overlay(values, dict(enb=dict(phy_signal_file=phy_signal_file))) + # rf driver is shared between amarisoft enb and ue, so it has a # different cfg namespace 'trx'. Copy needed values over there: config.overlay(values, dict(trx=dict(rf_dev_type=values['enb'].get('rf_dev_type', None), -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I63d13cb74572ac065d5a3fcfb1632552d0a6dbc6 Gerrit-Change-Number: 19188 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 13:43:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 13:43:01 +0000 Subject: Change in osmo-gsm-tester[master]: jenkins-build-srslte.sh: pass extra configuration_opts to build_repo In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19189 ) Change subject: jenkins-build-srslte.sh: pass extra configuration_opts to build_repo ...................................................................... jenkins-build-srslte.sh: pass extra configuration_opts to build_repo this allows to pass extra CMake opts to, e.g., enable address sanitizer Change-Id: I6fd00025a7225b1e075704d69354a8eb5e7f30ec --- M contrib/jenkins-build-srslte.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins-build-srslte.sh b/contrib/jenkins-build-srslte.sh index dd75e86..80e4ffc 100755 --- a/contrib/jenkins-build-srslte.sh +++ b/contrib/jenkins-build-srslte.sh @@ -8,6 +8,6 @@ . "$(dirname "$0")/jenkins-build-common.sh" #TODO: make sure libconfig, zeroMQ is installed -build_repo $project_name +build_repo $project_name $configure_opts create_bin_tgz "srsue srsenb srsepc" -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I6fd00025a7225b1e075704d69354a8eb5e7f30ec Gerrit-Change-Number: 19189 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 13:43:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 13:43:01 +0000 Subject: Change in osmo-gsm-tester[master]: srsepc.conf.tmpl: zero-pad mnc and mcc in config In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19202 ) Change subject: srsepc.conf.tmpl: zero-pad mnc and mcc in config ...................................................................... srsepc.conf.tmpl: zero-pad mnc and mcc in config srsEPC expect zero-padding MNC/MCC in config file. However, 001 and mcc will end up as 1 in the rendered template. Therefore, they need to be formatted correctly. Change-Id: Ie63cd1b15b961e493a6dcbd7e5a4fbabe0bb6f33 --- M src/osmo_gsm_tester/templates/srsepc.conf.tmpl 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/templates/srsepc.conf.tmpl b/src/osmo_gsm_tester/templates/srsepc.conf.tmpl index f855127..830cd32 100644 --- a/src/osmo_gsm_tester/templates/srsepc.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsepc.conf.tmpl @@ -24,8 +24,8 @@ mme_code = 0x1a mme_group = 0x0001 tac = 0x0007 -mcc = ${epc.mcc} -mnc = ${epc.mnc} +mcc = ${'{0:03}'.format(int(epc.mcc))} +mnc = ${'{0:02}'.format(int(epc.mnc))} mme_bind_addr = ${epc.run_addr} apn = srsapn dns_addr = 8.8.8.8 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ie63cd1b15b961e493a6dcbd7e5a4fbabe0bb6f33 Gerrit-Change-Number: 19202 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 13:56:02 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Thu, 9 Jul 2020 13:56:02 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_mme: make sure mcc/mnc are zero padded References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19204 ) Change subject: amarisoft_mme: make sure mcc/mnc are zero padded ...................................................................... amarisoft_mme: make sure mcc/mnc are zero padded same as for srsEPC this is also required for Amarisoft MME to support, i.e. 001/01 Change-Id: I80a84e01ec9530c285634452d7c18c17bdd595ce --- M src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/04/19204/1 diff --git a/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl index 5fcc74a..da681da 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl @@ -39,7 +39,7 @@ s1ap_bind_addr: "${epc.run_addr}", - plmn: "${epc.mcc}${epc.mnc}", + plmn: "${'{0:03}'.format(int(epc.mcc))}${'{0:02}'.format(int(epc.mnc))}", mme_group_id: 32769, mme_code: 1, -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I80a84e01ec9530c285634452d7c18c17bdd595ce Gerrit-Change-Number: 19204 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 14:17:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 14:17:11 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_mme: make sure mcc/mnc are zero padded In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19204 ) Change subject: amarisoft_mme: make sure mcc/mnc are zero padded ...................................................................... Patch Set 1: did you know that there are 2-digit and 3-digit MNCs? So 001-01 is different from 001-001, this is why treating either of the two values as integers is always leading to confusign bugs. The SIM card contains an explicit field that encodes the MNC length, as otherwise the UE would not know where the MCC/MNC prefix of the IMSI ends. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I80a84e01ec9530c285634452d7c18c17bdd595ce Gerrit-Change-Number: 19204 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 09 Jul 2020 14:17:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 14:19:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 14:19:41 +0000 Subject: Change in osmo-mgw[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18927 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I526af21134087e2b43b9ada59c93f636ae242e24 Gerrit-Change-Number: 18927 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 14:19:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 14:20:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 14:20:17 +0000 Subject: Change in osmo-mgw[master]: add osmo-mgw --vty-ref-xml: dump VTY ref XML to stdout In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18926 ) Change subject: add osmo-mgw --vty-ref-xml: dump VTY ref XML to stdout ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia988ea1c3f5169bdb4d21f2f05933665711cfcbf Gerrit-Change-Number: 18926 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 09 Jul 2020 14:20:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 14:20:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 14:20:32 +0000 Subject: Change in osmo-msc[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/18925 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... Patch Set 3: Code-Review+1 This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/18925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib872e7979c5b5a9da1347a3f326307844cf76536 Gerrit-Change-Number: 18925 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 09 Jul 2020 14:20:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 14:21:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 14:21:14 +0000 Subject: Change in osmo-mgw[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18927 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I526af21134087e2b43b9ada59c93f636ae242e24 Gerrit-Change-Number: 18927 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 14:21:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 14:21:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 14:21:17 +0000 Subject: Change in osmo-mgw[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18927 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... Removed Verified+1 by laforge -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I526af21134087e2b43b9ada59c93f636ae242e24 Gerrit-Change-Number: 18927 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 14:21:18 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 14:21:18 +0000 Subject: Change in osmo-mgw[master]: add osmo-mgw --vty-ref-xml: dump VTY ref XML to stdout In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18926 ) Change subject: add osmo-mgw --vty-ref-xml: dump VTY ref XML to stdout ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia988ea1c3f5169bdb4d21f2f05933665711cfcbf Gerrit-Change-Number: 18926 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 14:21:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 14:52:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 14:52:30 +0000 Subject: Change in osmo-trx[master]: Introduce rate counters to detect issues in received Dl bursts from TRXD References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/19205 ) Change subject: Introduce rate counters to detect issues in received Dl bursts from TRXD ...................................................................... Introduce rate counters to detect issues in received Dl bursts from TRXD This ones together with rate counters already available in lower layers allows to understand better the source of the problem with stalled tx bursts. Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 --- M CommonLibs/osmo_signal.h M CommonLibs/trx_rate_ctr.cpp M CommonLibs/trx_rate_ctr.h M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h 5 files changed, 68 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/05/19205/1 diff --git a/CommonLibs/osmo_signal.h b/CommonLibs/osmo_signal.h index de17b1d..5cd90c6 100644 --- a/CommonLibs/osmo_signal.h +++ b/CommonLibs/osmo_signal.h @@ -61,4 +61,7 @@ struct trx_counters { size_t chan; unsigned int tx_stale_bursts; /* Amount of Tx bursts dropped to to arriving too late from TRXD */ + unsigned int tx_trxd_fn_repeated; + unsigned int tx_trxd_fn_outoforder; + unsigned int tx_trxd_fn_skipped; }; diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp index 76aff7d..c74602a 100644 --- a/CommonLibs/trx_rate_ctr.cpp +++ b/CommonLibs/trx_rate_ctr.cpp @@ -103,6 +103,9 @@ { TRX_CTR_DEV_TX_DROP_EV, "tx_drop_events" }, { TRX_CTR_DEV_TX_DROP_SMPL, "tx_drop_samples" }, { TRX_CTR_TRX_TX_STALE_BURSTS, "tx_stale_bursts" }, + { TRX_CTR_TRX_TRXD_FN_REPEATED, "tx_trxd_fn_repeated" }, + { TRX_CTR_TRX_TRXD_FN_OUTOFORDER, "tx_trxd_fn_outoforder" }, + { TRX_CTR_TRX_TRXD_FN_SKIPPED, "tx_trxd_fn_skipped" }, { 0, NULL } }; @@ -114,6 +117,9 @@ [TRX_CTR_DEV_TX_DROP_EV] = { "device:tx_drop_events", "Number of times Tx samples were dropped by HW" }, [TRX_CTR_DEV_TX_DROP_SMPL] = { "device:tx_drop_samples", "Number of Tx samples dropped by HW" }, [TRX_CTR_TRX_TX_STALE_BURSTS] = { "trx:tx_stale_bursts", "Number of Tx burts dropped by TRX due to arriving too late" }, + [TRX_CTR_TRX_TRXD_FN_REPEATED] = { "trx:tx_trxd_fn_repeated", "Number of Tx burts received from TRXD with repeated FN" }, + [TRX_CTR_TRX_TRXD_FN_OUTOFORDER] = { "trx:tx_trxd_fn_outoforder","Number of Tx burts received from TRXD with a past FN" }, + [TRX_CTR_TRX_TRXD_FN_SKIPPED] = { "trx:tx_trxd_fn_skipped", "Number of Tx burts potentially skipped due to FN jumps" }, }; static const struct rate_ctr_group_desc trx_chan_ctr_group_desc = { @@ -166,6 +172,12 @@ LOGCHAN(chan, DMAIN, INFO) << "rate_ctr update"; ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TX_STALE_BURSTS]; rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_stale_bursts - ctr->current); + ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TRXD_FN_REPEATED]; + rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_trxd_fn_repeated - ctr->current); + ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TRXD_FN_OUTOFORDER]; + rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_trxd_fn_outoforder - ctr->current); + ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TRXD_FN_SKIPPED]; + rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_trxd_fn_skipped - ctr->current); /* Mark as done */ trx_ctrs_pending[chan].chan = PENDING_CHAN_NONE; } diff --git a/CommonLibs/trx_rate_ctr.h b/CommonLibs/trx_rate_ctr.h index 588ac2f..cef3c21 100644 --- a/CommonLibs/trx_rate_ctr.h +++ b/CommonLibs/trx_rate_ctr.h @@ -11,6 +11,9 @@ TRX_CTR_DEV_TX_DROP_EV, TRX_CTR_DEV_TX_DROP_SMPL, TRX_CTR_TRX_TX_STALE_BURSTS, + TRX_CTR_TRX_TRXD_FN_REPEATED, + TRX_CTR_TRX_TRXD_FN_OUTOFORDER, + TRX_CTR_TRX_TRXD_FN_SKIPPED, }; struct ctr_threshold { diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 2ae5eda..01714db 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -52,6 +52,14 @@ /* Number of running values use in noise average */ #define NOISE_CNT 20 + +static void dispatch_trx_rate_ctr_change(TransceiverState *state, unsigned int chan) { + thread_enable_cancel(false); + state->ctrs.chan = chan; + osmo_signal_dispatch(SS_DEVICE, S_TRX_COUNTER_CHANGE, &state->ctrs); + thread_enable_cancel(true); +} + TransceiverState::TransceiverState() : mRetrans(false), mNoiseLev(0.0), mNoises(NOISE_CNT), mPower(0.0) { @@ -437,12 +445,8 @@ delete burst; } - if (stale_bursts_changed) { - thread_enable_cancel(false); - state->ctrs.chan = i; - osmo_signal_dispatch(SS_DEVICE, S_TRX_COUNTER_CHANGE, &state->ctrs); - thread_enable_cancel(true); - } + if (stale_bursts_changed) + dispatch_trx_rate_ctr_change(state, i); TN = nowTime.TN(); modFN = nowTime.FN() % state->fillerModulus[TN]; @@ -461,7 +465,7 @@ } delete burst; - } + } //else { rate_counter() } } mRadioInterface->driveTransmitRadio(bursts, zeros); @@ -1001,6 +1005,7 @@ struct trxd_hdr_v01_dl *dl; char buffer[sizeof(*dl) + EDGE_BURST_NBITS]; uint32_t fn; + uint8_t tn; // check data socket msgLen = read(mDataSockets[chan], buffer, sizeof(buffer)); @@ -1029,6 +1034,7 @@ /* Convert TDMA FN to the host endianness */ fn = osmo_load32be(&dl->common.fn); + tn = dl->common.tn; /* Make sure we support the received header format */ switch (dl->common.version) { @@ -1044,14 +1050,45 @@ LOGCHAN(chan, DTRXDDL, DEBUG) << "Rx TRXD message (hdr_ver=" << unsigned(dl->common.version) << "): fn=" << fn << ", tn=" << unsigned(dl->common.tn) << ", burst_len=" << burstLen; + TransceiverState *state = &mStates[chan]; + GSM::Time currTime = GSM::Time(fn, tn); + + /* Verify proper FN order in DL stream */ + if (state->first_dl_fn_rcv[tn]) { + int32_t delta = GSM::FNDelta(currTime.FN(), state->last_dl_time_rcv[tn].FN()); + if (delta == 1) { + /* usual expected scenario, continue code flow */ + } else if (delta == 0) { + LOGCHAN(chan, DTRXDDL, NOTICE) << "Rx TRXD msg with repeated FN " << currTime; + state->ctrs.tx_trxd_fn_repeated++; + dispatch_trx_rate_ctr_change(state, chan); + return true; + } else if (delta < 0) { + LOGCHAN(chan, DTRXDDL, NOTICE) << "Rx TRXD msg with previous FN " << currTime + << " vs last " << state->last_dl_time_rcv[tn]; + state->ctrs.tx_trxd_fn_outoforder++; + dispatch_trx_rate_ctr_change(state, chan); + /* Allow adding radio vector below, since it gets sorted in the queue */ + } else { /* some FN was lost in the middle */ + LOGCHAN(chan, DTRXDDL, NOTICE) << "Rx TRXD msg with future FN " << currTime + << " vs last " << state->last_dl_time_rcv[tn] + << ", " << delta - 1 << " FN lost"; + state->ctrs.tx_trxd_fn_skipped += delta - 1; + dispatch_trx_rate_ctr_change(state, chan); + } + if (delta > 0) + state->last_dl_time_rcv[tn] = currTime; + } else { /* Initial check, simply store state */ + state->first_dl_fn_rcv[tn] = true; + state->last_dl_time_rcv[tn] = currTime; + } + BitVector newBurst(burstLen); BitVector::iterator itr = newBurst.begin(); uint8_t *bufferItr = dl->soft_bits; while (itr < newBurst.end()) *itr++ = *bufferItr++; - GSM::Time currTime = GSM::Time(fn, dl->common.tn); - addRadioVector(chan, newBurst, dl->tx_att, currTime); return true; diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h index 7ce5fa2..52748c1 100644 --- a/Transceiver52M/Transceiver.h +++ b/Transceiver52M/Transceiver.h @@ -86,6 +86,10 @@ /* counters */ struct trx_counters ctrs; + + /* Used to keep track of lost and out of order frames */ + bool first_dl_fn_rcv[8]; + GSM::Time last_dl_time_rcv[8]; }; /** The Transceiver class, responsible for physical layer of basestation */ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 Gerrit-Change-Number: 19205 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 15:24:51 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Thu, 9 Jul 2020 15:24:51 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_mme: make sure mcc/mnc are zero padded In-Reply-To: References: Message-ID: srs_andre has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19204 ) Change subject: amarisoft_mme: make sure mcc/mnc are zero padded ...................................................................... Patch Set 1: > Patch Set 1: > > did you know that there are 2-digit and 3-digit MNCs? So 001-01 is different from 001-001, this is why treating either of the two values as integers is always leading to confusign bugs. > > The SIM card contains an explicit field that encodes the MNC length, as otherwise the UE would not know where the MCC/MNC prefix of the IMSI ends. True. We don't have the notion of length notion of the MNC, other than the value you put in the config. I guess the only way to make sure we don't confuse 001 with 01 in MNC is to make sure the the leading zeros in the default.conf or resources.conf don't get stripped away. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I80a84e01ec9530c285634452d7c18c17bdd595ce Gerrit-Change-Number: 19204 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: srs_andre Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 09 Jul 2020 15:24:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 16:27:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 16:27:13 +0000 Subject: Change in osmo-trx[master]: Introduce rate counters to detect issues in received Dl bursts from TRXD In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 to look at the new patch set (#2). Change subject: Introduce rate counters to detect issues in received Dl bursts from TRXD ...................................................................... Introduce rate counters to detect issues in received Dl bursts from TRXD This ones together with rate counters already available in lower layers allows to understand better the source of the problem with stalled tx bursts. Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 --- M CommonLibs/osmo_signal.h M CommonLibs/trx_rate_ctr.cpp M CommonLibs/trx_rate_ctr.h M CommonLibs/trx_vty.c M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h 6 files changed, 73 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/05/19205/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 Gerrit-Change-Number: 19205 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 16:27:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 16:27:14 +0000 Subject: Change in osmo-trx[master]: Transceiver: Fix race condition obtaining Dl burst from Upper layer References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/19206 ) Change subject: Transceiver: Fix race condition obtaining Dl burst from Upper layer ...................................................................... Transceiver: Fix race condition obtaining Dl burst from Upper layer The queue was being accessed sequentially obtaining and releasing the mutual exclusion zone twice. First in getStaleBurst() dropping all FN filler(mChans, true); bool stale_bursts_changed; + TN = nowTime.TN(); + for (size_t i = 0; i < mChans; i ++) { state = &mStates[i]; stale_bursts_changed = false; + zeros[i] = state->chanType[TN] == NONE; + + Mutex *mtx = mTxPriorityQueues[i].getMutex(); + mtx->lock(); while ((burst = mTxPriorityQueues[i].getStaleBurst(nowTime))) { LOGCHAN(i, DTRXDDL, NOTICE) << "dumping STALE burst in TRX->SDR interface (" @@ -445,15 +451,6 @@ delete burst; } - if (stale_bursts_changed) - dispatch_trx_rate_ctr_change(state, i); - - TN = nowTime.TN(); - modFN = nowTime.FN() % state->fillerModulus[TN]; - - bursts[i] = state->fillerTable[modFN][TN]; - zeros[i] = state->chanType[TN] == NONE; - if ((burst = mTxPriorityQueues[i].getCurrentBurst(nowTime))) { bursts[i] = burst->getVector(); @@ -463,9 +460,16 @@ burst->setVector(NULL); filler[i] = false; } - delete burst; + } else { + modFN = nowTime.FN() % state->fillerModulus[TN]; + bursts[i] = state->fillerTable[modFN][TN]; } + + mtx->unlock(); + + if (stale_bursts_changed) + dispatch_trx_rate_ctr_change(state, i); } mRadioInterface->driveTransmitRadio(bursts, zeros); diff --git a/Transceiver52M/radioVector.cpp b/Transceiver52M/radioVector.cpp index ad40a11..68e42c5 100644 --- a/Transceiver52M/radioVector.cpp +++ b/Transceiver52M/radioVector.cpp @@ -120,38 +120,26 @@ radioVector* VectorQueue::getStaleBurst(const GSM::Time& targTime) { - mLock.lock(); - if ((mQ.size()==0)) { - mLock.unlock(); + if ((mQ.size()==0)) return NULL; - } if (mQ.top()->getTime() < targTime) { radioVector* retVal = mQ.top(); mQ.pop(); - mLock.unlock(); return retVal; } - mLock.unlock(); - return NULL; } radioVector* VectorQueue::getCurrentBurst(const GSM::Time& targTime) { - mLock.lock(); - if ((mQ.size()==0)) { - mLock.unlock(); + if ((mQ.size()==0)) return NULL; - } if (mQ.top()->getTime() == targTime) { radioVector* retVal = mQ.top(); mQ.pop(); - mLock.unlock(); return retVal; } - mLock.unlock(); - return NULL; } diff --git a/Transceiver52M/radioVector.h b/Transceiver52M/radioVector.h index 0a14a4d..84e3987 100644 --- a/Transceiver52M/radioVector.h +++ b/Transceiver52M/radioVector.h @@ -65,6 +65,7 @@ GSM::Time nextTime() const; radioVector* getStaleBurst(const GSM::Time& targTime); radioVector* getCurrentBurst(const GSM::Time& targTime); + Mutex *getMutex() const { return &mLock; }; }; #endif /* RADIOVECTOR_H */ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If1fd8d7fc5f21ee2894192ef1ac2a3cdda6bbb98 Gerrit-Change-Number: 19206 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 16:27:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 16:27:15 +0000 Subject: Change in osmo-trx[master]: Add rate counter for missing Txbursts when scheduled towards the radi... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/19207 ) Change subject: Add rate counter for missing Txbursts when scheduled towards the radioInterface ...................................................................... Add rate counter for missing Txbursts when scheduled towards the radioInterface Related: OS#4487 Change-Id: Ibb2c492b3c67cbab11fbb936ae3a090fb5756aa8 --- M CommonLibs/osmo_signal.h M CommonLibs/trx_rate_ctr.cpp M CommonLibs/trx_rate_ctr.h M CommonLibs/trx_vty.c M Transceiver52M/Transceiver.cpp 5 files changed, 20 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/07/19207/1 diff --git a/CommonLibs/osmo_signal.h b/CommonLibs/osmo_signal.h index 5cd90c6..13646a1 100644 --- a/CommonLibs/osmo_signal.h +++ b/CommonLibs/osmo_signal.h @@ -60,7 +60,8 @@ /* signal cb for signal */ struct trx_counters { size_t chan; - unsigned int tx_stale_bursts; /* Amount of Tx bursts dropped to to arriving too late from TRXD */ + unsigned int tx_stale_bursts; + unsigned int tx_unavailable_bursts; unsigned int tx_trxd_fn_repeated; unsigned int tx_trxd_fn_outoforder; unsigned int tx_trxd_fn_skipped; diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp index c74602a..ea65ac9 100644 --- a/CommonLibs/trx_rate_ctr.cpp +++ b/CommonLibs/trx_rate_ctr.cpp @@ -103,6 +103,7 @@ { TRX_CTR_DEV_TX_DROP_EV, "tx_drop_events" }, { TRX_CTR_DEV_TX_DROP_SMPL, "tx_drop_samples" }, { TRX_CTR_TRX_TX_STALE_BURSTS, "tx_stale_bursts" }, + { TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS, "tx_unavailable_bursts" }, { TRX_CTR_TRX_TRXD_FN_REPEATED, "tx_trxd_fn_repeated" }, { TRX_CTR_TRX_TRXD_FN_OUTOFORDER, "tx_trxd_fn_outoforder" }, { TRX_CTR_TRX_TRXD_FN_SKIPPED, "tx_trxd_fn_skipped" }, @@ -117,6 +118,7 @@ [TRX_CTR_DEV_TX_DROP_EV] = { "device:tx_drop_events", "Number of times Tx samples were dropped by HW" }, [TRX_CTR_DEV_TX_DROP_SMPL] = { "device:tx_drop_samples", "Number of Tx samples dropped by HW" }, [TRX_CTR_TRX_TX_STALE_BURSTS] = { "trx:tx_stale_bursts", "Number of Tx burts dropped by TRX due to arriving too late" }, + [TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS] = { "trx:tx_unavailable_bursts","Number of Tx burts unavailable (not enqueued) at the time they should be transmitted" }, [TRX_CTR_TRX_TRXD_FN_REPEATED] = { "trx:tx_trxd_fn_repeated", "Number of Tx burts received from TRXD with repeated FN" }, [TRX_CTR_TRX_TRXD_FN_OUTOFORDER] = { "trx:tx_trxd_fn_outoforder","Number of Tx burts received from TRXD with a past FN" }, [TRX_CTR_TRX_TRXD_FN_SKIPPED] = { "trx:tx_trxd_fn_skipped", "Number of Tx burts potentially skipped due to FN jumps" }, @@ -172,6 +174,8 @@ LOGCHAN(chan, DMAIN, INFO) << "rate_ctr update"; ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TX_STALE_BURSTS]; rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_stale_bursts - ctr->current); + ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS]; + rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_unavailable_bursts - ctr->current); ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TRXD_FN_REPEATED]; rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_trxd_fn_repeated - ctr->current); ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TRXD_FN_OUTOFORDER]; diff --git a/CommonLibs/trx_rate_ctr.h b/CommonLibs/trx_rate_ctr.h index cef3c21..c4c05ef 100644 --- a/CommonLibs/trx_rate_ctr.h +++ b/CommonLibs/trx_rate_ctr.h @@ -11,6 +11,7 @@ TRX_CTR_DEV_TX_DROP_EV, TRX_CTR_DEV_TX_DROP_SMPL, TRX_CTR_TRX_TX_STALE_BURSTS, + TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS, TRX_CTR_TRX_TRXD_FN_REPEATED, TRX_CTR_TRX_TRXD_FN_OUTOFORDER, TRX_CTR_TRX_TRXD_FN_SKIPPED, diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index 941a435..e37ecaf 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -390,7 +390,7 @@ return -1; } -#define THRESHOLD_ARGS "(rx_overruns|tx_underruns|rx_drop_events|rx_drop_samples|tx_drop_events|tx_drop_samples|tx_stale_bursts|tx_trxd_fn_repeated|tx_trxd_fn_outoforder|tx_trxd_fn_skipped)" +#define THRESHOLD_ARGS "(rx_overruns|tx_underruns|rx_drop_events|rx_drop_samples|tx_drop_events|tx_drop_samples|tx_stale_bursts|tx_unavailable_bursts|tx_trxd_fn_repeated|tx_trxd_fn_outoforder|tx_trxd_fn_skipped)" #define THRESHOLD_STR_VAL(s) "Set threshold value for rate_ctr device:" OSMO_STRINGIFY_VAL(s) "\n" #define THRESHOLD_STRS \ THRESHOLD_STR_VAL(rx_overruns) \ @@ -400,6 +400,7 @@ THRESHOLD_STR_VAL(tx_drop_events) \ THRESHOLD_STR_VAL(tx_drop_samples) \ THRESHOLD_STR_VAL(tx_stale_bursts) \ + THRESHOLD_STR_VAL(tx_unavailable_bursts) \ THRESHOLD_STR_VAL(tx_trxd_fn_repeated) \ THRESHOLD_STR_VAL(tx_trxd_fn_outoforder) \ THRESHOLD_STR_VAL(tx_trxd_fn_skipped) \ diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index ac2d142..dc2f1b8 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -429,13 +429,14 @@ std::vector bursts(mChans); std::vector zeros(mChans); std::vector filler(mChans, true); - bool stale_bursts_changed; + bool ratectr_changed; TN = nowTime.TN(); for (size_t i = 0; i < mChans; i ++) { state = &mStates[i]; - stale_bursts_changed = false; + ratectr_changed = false; + zeros[i] = state->chanType[TN] == NONE; Mutex *mtx = mTxPriorityQueues[i].getMutex(); @@ -445,7 +446,7 @@ LOGCHAN(i, DTRXDDL, NOTICE) << "dumping STALE burst in TRX->SDR interface (" << burst->getTime() <<" vs " << nowTime << "), retrans=" << state->mRetrans; state->ctrs.tx_stale_bursts++; - stale_bursts_changed = true; + ratectr_changed = true; if (state->mRetrans) updateFillerTable(i, burst); delete burst; @@ -464,11 +465,17 @@ } else { modFN = nowTime.FN() % state->fillerModulus[TN]; bursts[i] = state->fillerTable[modFN][TN]; + if (state->chanType[TN] != NONE) { + LOGCHAN(i, DTRXDDL, NOTICE) << "No Tx burst available for " << nowTime + << ", retrans=" << state->mRetrans; + state->ctrs.tx_unavailable_bursts++; + ratectr_changed = true; + } } mtx->unlock(); - if (stale_bursts_changed) + if (ratectr_changed) dispatch_trx_rate_ctr_change(state, i); } -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibb2c492b3c67cbab11fbb936ae3a090fb5756aa8 Gerrit-Change-Number: 19207 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 19:20:58 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jul 2020 19:20:58 +0000 Subject: Change in osmo-trx[master]: Introduce rate counters to detect issues in received Dl bursts from TRXD In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19205 ) Change subject: Introduce rate counters to detect issues in received Dl bursts from TRXD ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/19205/1/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/19205/1/Transceiver52M/Transceiver.cpp at 1072 PS1, Line 1072: some FN was lost in the middle Isn't it expected and normal? Imagine you have a TCH/H timeslot with only one sub-channel active. Same applies to SDCCH4 and SDCCH8 on TRX#N > 0 (where you don't need to send dummy bursts). -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 Gerrit-Change-Number: 19205 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 09 Jul 2020 19:20:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 19:50:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 9 Jul 2020 19:50:31 +0000 Subject: Change in osmo-trx[master]: Introduce rate counters to detect issues in received Dl bursts from TRXD In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19205 ) Change subject: Introduce rate counters to detect issues in received Dl bursts from TRXD ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/19205/1/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/19205/1/Transceiver52M/Transceiver.cpp at 1072 PS1, Line 1072: some FN was lost in the middle > Isn't it expected and normal? Imagine you have a TCH/H timeslot with only one sub-channel active. [?] I did some test with a PDCH and it was not triggering, so I expected the same for TCH/H and alike. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 Gerrit-Change-Number: 19205 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 09 Jul 2020 19:50:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 20:14:06 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jul 2020 20:14:06 +0000 Subject: Change in osmo-trx[master]: Introduce rate counters to detect issues in received Dl bursts from TRXD In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19205 ) Change subject: Introduce rate counters to detect issues in received Dl bursts from TRXD ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/19205/1/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/19205/1/Transceiver52M/Transceiver.cpp at 1072 PS1, Line 1072: some FN was lost in the middle > I did some test with a PDCH and it was not triggering, so I expected the same for TCH/H and alike. PDCH on Downlink is gapless, i.e. you always get monotonic-increasing frame numbers... -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 Gerrit-Change-Number: 19205 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 20:14:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 20:30:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 20:30:11 +0000 Subject: Change in osmo-e1d[master]: add missing call to logging_vty_add_cmds() during startup References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19208 ) Change subject: add missing call to logging_vty_add_cmds() during startup ...................................................................... add missing call to logging_vty_add_cmds() during startup Otherwise, the usual logging related VTY commands are absent. Change-Id: I07038dfb204301bb1696ca312b2ec29671b86ae5 --- M src/osmo-e1d.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/08/19208/1 diff --git a/src/osmo-e1d.c b/src/osmo-e1d.c index 647b039..10d7a5e 100644 --- a/src/osmo-e1d.c +++ b/src/osmo-e1d.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -173,6 +174,7 @@ INIT_LLIST_HEAD(&e1d->interfaces); vty_init(&vty_info); + logging_vty_add_cmds(); e1d_vty_init(e1d); handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I07038dfb204301bb1696ca312b2ec29671b86ae5 Gerrit-Change-Number: 19208 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 20:54:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 20:54:27 +0000 Subject: Change in osmo-e1d[master]: usb.c: Fix error introducing Tx underflows References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19209 ) Change subject: usb.c: Fix error introducing Tx underflows ...................................................................... usb.c: Fix error introducing Tx underflows In Change-Id I7d4d4ab39cb3e7e6a7eb8e738a367122eb3fbee2 I inroduced a bug that would cause e1_usb_xfer_out() to return four bytes too little, which in turn causes E1 Tx underflows to happen in the device firmware. Change-Id: I71675d4de781421286f0d1febedfdb1f7b523c38 --- M src/usb.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/09/19209/1 diff --git a/src/usb.c b/src/usb.c index e8cd212..7a5dce2 100644 --- a/src/usb.c +++ b/src/usb.c @@ -135,7 +135,7 @@ memset(buf, 0xff, 4); - return e1_line_mux_out(line, buf+4, fts); + return e1_line_mux_out(line, buf+4, fts) + 4; } static int -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I71675d4de781421286f0d1febedfdb1f7b523c38 Gerrit-Change-Number: 19209 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 20:54:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 20:54:50 +0000 Subject: Change in osmo-e1d[master]: migrate to proper allocated USB Product ID In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/19199 to look at the new patch set (#2). Change subject: migrate to proper allocated USB Product ID ...................................................................... migrate to proper allocated USB Product ID The 0xe1e1 was a neat hack in the early days, but now 0x6145 has been allocated within the Openmoko USB VendorID. The current device firmware already uses the new ProductID, let's change it here, too. Change-Id: Iea6087ce02c931c796d9c9cae89cdf5b5e0b28c5 --- M src/usb.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/99/19199/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Iea6087ce02c931c796d9c9cae89cdf5b5e0b28c5 Gerrit-Change-Number: 19199 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 20:54:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 20:54:56 +0000 Subject: Change in osmo-e1d[master]: migrate to proper allocated USB Product ID In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19199 ) Change subject: migrate to proper allocated USB Product ID ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Iea6087ce02c931c796d9c9cae89cdf5b5e0b28c5 Gerrit-Change-Number: 19199 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 09 Jul 2020 20:54:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 20:54:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 20:54:59 +0000 Subject: Change in osmo-e1d[master]: add missing call to logging_vty_add_cmds() during startup In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19208 ) Change subject: add missing call to logging_vty_add_cmds() during startup ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I07038dfb204301bb1696ca312b2ec29671b86ae5 Gerrit-Change-Number: 19208 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 09 Jul 2020 20:54:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 20:55:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 20:55:06 +0000 Subject: Change in osmo-e1d[master]: usb.c: Fix error introducing Tx underflows In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19209 ) Change subject: usb.c: Fix error introducing Tx underflows ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I71675d4de781421286f0d1febedfdb1f7b523c38 Gerrit-Change-Number: 19209 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 09 Jul 2020 20:55:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 20:56:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 20:56:54 +0000 Subject: Change in osmo-e1d[master]: migrate to proper allocated USB Product ID In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19199 ) Change subject: migrate to proper allocated USB Product ID ...................................................................... migrate to proper allocated USB Product ID The 0xe1e1 was a neat hack in the early days, but now 0x6145 has been allocated within the Openmoko USB VendorID. The current device firmware already uses the new ProductID, let's change it here, too. Change-Id: Iea6087ce02c931c796d9c9cae89cdf5b5e0b28c5 --- M src/usb.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/usb.c b/src/usb.c index 578bc34..e8cd212 100644 --- a/src/usb.c +++ b/src/usb.c @@ -39,7 +39,7 @@ #define USB_VID 0x1d50 -#define USB_PID 0xe1e1 +#define USB_PID 0x6145 libusb_context *g_usb = NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Iea6087ce02c931c796d9c9cae89cdf5b5e0b28c5 Gerrit-Change-Number: 19199 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 20:57:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 20:57:01 +0000 Subject: Change in osmo-e1d[master]: add missing call to logging_vty_add_cmds() during startup In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19208 ) Change subject: add missing call to logging_vty_add_cmds() during startup ...................................................................... add missing call to logging_vty_add_cmds() during startup Otherwise, the usual logging related VTY commands are absent. Change-Id: I07038dfb204301bb1696ca312b2ec29671b86ae5 --- M src/osmo-e1d.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-e1d.c b/src/osmo-e1d.c index 647b039..10d7a5e 100644 --- a/src/osmo-e1d.c +++ b/src/osmo-e1d.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -173,6 +174,7 @@ INIT_LLIST_HEAD(&e1d->interfaces); vty_init(&vty_info); + logging_vty_add_cmds(); e1d_vty_init(e1d); handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I07038dfb204301bb1696ca312b2ec29671b86ae5 Gerrit-Change-Number: 19208 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 20:57:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 9 Jul 2020 20:57:07 +0000 Subject: Change in osmo-e1d[master]: usb.c: Fix error introducing Tx underflows In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19209 ) Change subject: usb.c: Fix error introducing Tx underflows ...................................................................... usb.c: Fix error introducing Tx underflows In Change-Id I7d4d4ab39cb3e7e6a7eb8e738a367122eb3fbee2 I inroduced a bug that would cause e1_usb_xfer_out() to return four bytes too little, which in turn causes E1 Tx underflows to happen in the device firmware. Change-Id: I71675d4de781421286f0d1febedfdb1f7b523c38 --- M src/usb.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/usb.c b/src/usb.c index e8cd212..7a5dce2 100644 --- a/src/usb.c +++ b/src/usb.c @@ -135,7 +135,7 @@ memset(buf, 0xff, 4); - return e1_line_mux_out(line, buf+4, fts); + return e1_line_mux_out(line, buf+4, fts) + 4; } static int -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I71675d4de781421286f0d1febedfdb1f7b523c38 Gerrit-Change-Number: 19209 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 21:19:06 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jul 2020 21:19:06 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: check TDMA frame order, drop out of order bursts In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19201 ) Change subject: trxcon/scheduler: check TDMA frame order, drop out of order bursts ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I873c8555ea2ca190b1689227bb0fdcba87188772 Gerrit-Change-Number: 19201 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 09 Jul 2020 21:19:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 9 21:21:41 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 9 Jul 2020 21:21:41 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: check TDMA frame order, drop out of order bursts In-Reply-To: References: Message-ID: Hello neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/19201 to look at the new patch set (#4). Change subject: trxcon/scheduler: check TDMA frame order, drop out of order bursts ...................................................................... trxcon/scheduler: check TDMA frame order, drop out of order bursts When running together with fake_trx.py (mostly used back-end), it is currently possible that Downlink bursts are received in a wrong order if more than one transceiver is configured (multi-trx mode). This is how it looks like: DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=629 rssi=-86 toa=0 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=629 ts=3 bid=1 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=630 rssi=-86 toa=0 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=630 ts=3 bid=2 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=631 rssi=-86 toa=0 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=631 ts=3 bid=3 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=633 (!) rssi=-86 toa=0 DSCHD NOTICE sched_trx.c:663 Substituting (!) lost TDMA frame 632 on TCH/F DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=632 ts=3 bid=0 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=633 ts=3 bid=1 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=632 (!) rssi=-86 toa=0 DTRXD NOTICE sched_trx.c:640 Too many (>104) contiguous TDMA frames elapsed (2715647) since the last processed fn=633 (current fn=632) so here a burst with TDMA fn=633 was received earlier than a burst with TDMA fn=632. The burst loss detection logic considered the latter one as lost, and substituted it with a dummy burst. When finally the out-of-order burst with TDMA fn=632 was received, we got the large number of allegedly elapsed frames: ((632 + 2715648) - 633) % 2715648 == 2715647 Given that late bursts get substituted, the best thing we can do is to reject them and log an error. Passing them to the logical channel handler (again) might lead to undefined behaviour. Change-Id: I873c8555ea2ca190b1689227bb0fdcba87188772 Related: OS#4658, OS#4546 --- M src/host/trxcon/sched_trx.c 1 file changed, 26 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/01/19201/4 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I873c8555ea2ca190b1689227bb0fdcba87188772 Gerrit-Change-Number: 19201 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Jul 10 01:33:28 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 10 Jul 2020 01:33:28 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5f07c572adab1_604c2af35b5685f0422587@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/xUbuntu_18.10/i586 Package network:osmocom:nightly/open5gs failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: nction-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/nrf/src at nrf@@nrf at sta/sbi-path.c.o' -MF 'src/nrf/src at nrf@@nrf at sta/sbi-path.c.o.d' -o 'src/nrf/src at nrf@@nrf at sta/sbi-path.c.o' -c ../src/nrf/sbi-path.c [ 98s] [2172/2412] cc -Isrc/nrf/src at nrf@@open5gs-nrfd at exe -Isrc/nrf -I../src/nrf -Isrc -I../src -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -pthread '-DDEFAULT_CONFIG_FILENAME="/etc/open5gs/nrf.yaml"' -MD -MQ 'src/nrf/src at nrf@@open5gs-nrfd at exe/.._main.c.o' -MF 'src/nrf/src at nrf@@open5gs-nrfd at exe/.._main.c.o.d' -o 'src/nrf/src at nrf@@open5gs-nrfd at exe/.._main.c.o' -c ../src/main.c [ 98s] [2173/2412] rm -f src/mme/libmme.a && gcc-ar csrD src/mme/libmme.a 'src/mme/src at mme@@mme at sta/mme-init.c.o' 'src/mme/src at mme@@mme at sta/mme-event.c.o' 'src/mme/src at mme@@mme at sta/mme-timer.c.o' 'src/mme/src at mme@@mme at sta/mme-context.c.o' 'src/mme/src at mme@@mme at sta/s1ap-sm.c.o' 'src/mme/src at mme@@mme at sta/s1ap-build.c.o' 'src/mme/src at mme@@mme at sta/s1ap-handler.c.o' 'src/mme/src at mme@@mme at sta/s1ap-sctp.c.o' 'src/mme/src at mme@@mme at sta/s1ap-path.c.o' 'src/mme/src at mme@@mme at sta/sgsap-sm.c.o' 'src/mme/src at mme@@mme at sta/sgsap-build.c.o' 'src/mme/src at mme@@mme at sta/sgsap-handler.c.o' 'src/mme/src at mme@@mme at sta/sgsap-conv.c.o' 'src/mme/src at mme@@mme at sta/sgsap-sctp.c.o' 'src/mme/src at mme@@mme at sta/sgsap-path.c.o' 'src/mme/src at mme@@mme at sta/mme-fd-path.c.o' 'src/mme/src at mme@@mme at sta/mme-s6a-handler.c.o' 'src/mme/src at mme@@mme at sta/nas-security.c.o' 'src/mme/src at mme@@mme at sta/nas-path.c.o' 'src/mme/src at mme@@mme at sta/emm-sm.c.o' 'src/mme/src at mme@@mme at sta/emm-handler.c.o' 'src/mme/src at mme@@mme at sta/emm-build.c.o' 'src/mme/src at mme@@mme at sta/esm-sm.c.o' 'src/mme/src at mme@@mme at sta/esm-handler.c.o' 'src/mme/src at mme@@mme at sta/esm-build.c.o' 'src/mme/src at mme@@mme at sta/mme-gtp-path.c.o' 'src/mme/src at mme@@mme at sta/mme-s11-build.c.o' 'src/mme/src at mme@@mme at sta/mme-s11-handler.c.o' 'src/mme/src at mme@@mme at sta/mme-sm.c.o' 'src/mme/src at mme@@mme at sta/mme-path.c.o' 'src/mme/src at mme@@mme at sta/sbc-handler.c.o' [ 98s] [2174/2412] cc -Isrc/nrf/src at nrf@@nrf at sta -Isrc/nrf -I../src/nrf -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/nrf/src at nrf@@nrf at sta/nrf-sm.c.o' -MF 'src/nrf/src at nrf@@nrf at sta/nrf-sm.c.o.d' -o 'src/nrf/src at nrf@@nrf at sta/nrf-sm.c.o' -c ../src/nrf/nrf-sm.c [ 98s] [2175/2412] cc -Isrc/pcrf/src at pcrf@@pcrf at sta -Isrc/pcrf -I../src/pcrf -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/diameter/rx -I../lib/diameter/rx -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/diameter/gx -I../lib/diameter/gx -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/pcrf/src at pcrf@@pcrf at sta/pcrf-rx-path.c.o' -MF 'src/pcrf/src at pcrf@@pcrf at sta/pcrf-rx-path.c.o.d' -o 'src/pcrf/src at pcrf@@pcrf at sta/pcrf-rx-path.c.o' -c ../src/pcrf/pcrf-rx-path.c [ 98s] [2176/2412] cc -Isrc/udr/src at udr@@udr at sta -Isrc/udr -I../src/udr -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udr/src at udr@@udr at sta/event.c.o' -MF 'src/udr/src at udr@@udr at sta/event.c.o.d' -o 'src/udr/src at udr@@udr at sta/event.c.o' -c ../src/udr/event.c [ 98s] [2177/2412] cc -Isrc/pcrf/src at pcrf@@pcrf at sta -Isrc/pcrf -I../src/pcrf -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/diameter/rx -I../lib/diameter/rx -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/diameter/gx -I../lib/diameter/gx -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/pcrf/src at pcrf@@pcrf at sta/pcrf-context.c.o' -MF 'src/pcrf/src at pcrf@@pcrf at sta/pcrf-context.c.o.d' -o 'src/pcrf/src at pcrf@@pcrf at sta/pcrf-context.c.o' -c ../src/pcrf/pcrf-context.c [ 98s] [2178/2412] cc -Isrc/pgw/src at pgw@@pgw at sta -Isrc/pgw -I../src/pgw -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/diameter/gx -I../lib/diameter/gx -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/pgw/src at pgw@@pgw at sta/pgw-fd-path.c.o' -MF 'src/pgw/src at pgw@@pgw at sta/pgw-fd-path.c.o.d' -o 'src/pgw/src at pgw@@pgw at sta/pgw-fd-path.c.o' -c ../src/pgw/pgw-fd-path.c [ 98s] [2179/2412] cc -Isrc/pgw/src at pgw@@pgw at sta -Isrc/pgw -I../src/pgw -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/diameter/gx -I../lib/diameter/gx -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/pgw/src at pgw@@pgw at sta/pgw-context.c.o' -MF 'src/pgw/src at pgw@@pgw at sta/pgw-context.c.o.d' -o 'src/pgw/src at pgw@@pgw at sta/pgw-context.c.o' -c ../src/pgw/pgw-context.c [ 98s] [2180/2412] cc -Isrc/udr/src at udr@@udr at sta -Isrc/udr -I../src/udr -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udr/src at udr@@udr at sta/nf-sm.c.o' -MF 'src/udr/src at udr@@udr at sta/nf-sm.c.o.d' -o 'src/udr/src at udr@@udr at sta/nf-sm.c.o' -c ../src/udr/nf-sm.c [ 98s] [2181/2412] cc -Isrc/pgw/src at pgw@@pgw at sta -Isrc/pgw -I../src/pgw -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/diameter/gx -I../lib/diameter/gx -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/pgw/src at pgw@@pgw at sta/pgw-ipfw.c.o' -MF 'src/pgw/src at pgw@@pgw at sta/pgw-ipfw.c.o.d' -o 'src/pgw/src at pgw@@pgw at sta/pgw-ipfw.c.o' -c ../src/pgw/pgw-ipfw.c [ 98s] [2182/2412] cc -Isrc/pcrf/src at pcrf@@pcrf at sta -Isrc/pcrf -I../src/pcrf -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/diameter/rx -I../lib/diameter/rx -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/diameter/gx -I../lib/diameter/gx -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/pcrf/src at pcrf@@pcrf at sta/pcrf-gx-path.c.o' -MF 'src/pcrf/src at pcrf@@pcrf at sta/pcrf-gx-path.c.o.d' -o 'src/pcrf/src at pcrf@@pcrf at sta/pcrf-gx-path.c.o' -c ../src/pcrf/pcrf-gx-path.c [ 98s] ninja: build stopped: subcommand failed. [ 98s] dh_auto_build: cd obj-i686-linux-gnu && LC_ALL=C.UTF-8 ninja -j16 -v returned exit code 1 [ 98s] make: *** [debian/rules:11: binary] Error 1 [ 98s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 98s] ### VM INTERACTION START ### [ 102s] [ 96.305981] sysrq: SysRq : Power Off [ 102s] [ 96.312185] reboot: Power down [ 102s] ### VM INTERACTION END ### [ 102s] [ 102s] goat11 failed "build open5gs_1.3.0.20200710.dsc" at Fri Jul 10 01:33:17 UTC 2020. [ 102s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 10 01:33:45 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 10 Jul 2020 01:33:45 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5f07c592af971_604c2af35b5685f042263c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/open5gs failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 130s] Build dir: /usr/src/packages/BUILD/obj-x86_64-linux-gnu [ 130s] Build type: native build [ 130s] [ 130s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 130s] [ 130s] A full log can be found at /usr/src/packages/BUILD/obj-x86_64-linux-gnu/meson-logs/meson-log.txt [ 130s] cd obj-x86_64-linux-gnu && tail -v -n \+0 meson-logs/meson-log.txt [ 130s] ==> meson-logs/meson-log.txt <== [ 130s] Build started at 2020-07-10T01:33:35.841734 [ 130s] Main binary: /usr/bin/python3 [ 130s] Python system: Linux [ 130s] The Meson build system [ 130s] Version: 0.45.1 [ 130s] Source dir: /usr/src/packages/BUILD [ 130s] Build dir: /usr/src/packages/BUILD/obj-x86_64-linux-gnu [ 130s] Build type: native build [ 130s] [ 130s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 130s] dh_auto_configure: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 130s] debian/rules:11: recipe for target 'binary' failed [ 130s] make: *** [binary] Error 2 [ 130s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 130s] ### VM INTERACTION START ### [ 133s] [ 123.410758] sysrq: SysRq : Power Off [ 133s] [ 123.417519] reboot: Power down [ 133s] ### VM INTERACTION END ### [ 133s] [ 133s] lamb59 failed "build open5gs_1.3.0.20200710.dsc" at Fri Jul 10 01:33:39 UTC 2020. [ 133s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 10 01:36:19 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 10 Jul 2020 01:36:19 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f07c62575414_604c2af35b5685f042497e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/xUbuntu_18.04/i586 Package network:osmocom:nightly/open5gs failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 257s] Build dir: /usr/src/packages/BUILD/obj-i686-linux-gnu [ 257s] Build type: native build [ 257s] [ 257s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 257s] [ 257s] A full log can be found at /usr/src/packages/BUILD/obj-i686-linux-gnu/meson-logs/meson-log.txt [ 257s] cd obj-i686-linux-gnu && tail -v -n \+0 meson-logs/meson-log.txt [ 257s] ==> meson-logs/meson-log.txt <== [ 257s] Build started at 2020-07-10T01:36:10.954098 [ 257s] Main binary: /usr/bin/python3 [ 257s] Python system: Linux [ 257s] The Meson build system [ 257s] Version: 0.45.1 [ 257s] Source dir: /usr/src/packages/BUILD [ 257s] Build dir: /usr/src/packages/BUILD/obj-i686-linux-gnu [ 257s] Build type: native build [ 257s] [ 257s] meson.build:18:0: ERROR: Function does not take keyword arguments. [ 257s] dh_auto_configure: cd obj-i686-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/i386-linux-gnu --libexecdir=lib/i386-linux-gnu returned exit code 1 [ 257s] debian/rules:11: recipe for target 'binary' failed [ 257s] make: *** [binary] Error 2 [ 257s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 257s] ### VM INTERACTION START ### [ 260s] [ 248.612551] sysrq: SysRq : Power Off [ 260s] [ 248.639906] reboot: Power down [ 260s] ### VM INTERACTION END ### [ 260s] [ 260s] lamb03 failed "build open5gs_1.3.0.20200710.dsc" at Fri Jul 10 01:36:14 UTC 2020. [ 260s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 10 01:36:37 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 10 Jul 2020 01:36:37 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_10/i586 In-Reply-To: References: Message-ID: <5f07c6459a8ba_604c2af35b5685f0425015@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_10/i586 Package network:osmocom:nightly/open5gs failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 248s] ^~~~~~~~~~~ [ 248s] ../src/udr/nnrf-handler.c:77:17: note: in expansion of macro ?ogs_warn? [ 248s] ogs_warn("[%s] Forced to %d seconds", [ 248s] ^~~~~~~~ [ 248s] ../src/udr/nnrf-handler.c:78:44: note: in expansion of macro ?ogs_time_sec? [ 248s] subscription->id, (int)ogs_time_sec(VALIDITY_MINIMUM)); [ 248s] ^~~~~~~~~~~~ [ 248s] ../src/udr/nnrf-handler.c:78:57: note: in expansion of macro ?VALIDITY_MINIMUM? [ 248s] subscription->id, (int)ogs_time_sec(VALIDITY_MINIMUM)); [ 248s] ^~~~~~~~~~~~~~~~ [ 248s] cc1: some warnings being treated as errors [ 248s] [2185/2412] cc -o src/nrf/open5gs-nrfd 'src/nrf/f570ec2@@open5gs-nrfd at exe/app.c.o' 'src/nrf/f570ec2@@open5gs-nrfd at exe/.._main.c.o' -Wl,--no-undefined -Wl,--as-needed -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -Wl,--start-group src/nrf/libnrf.a lib/ipfw/libogsipfw.so.1.3.0 lib/app/libogsapp.so.1.3.0 lib/core/libogscore.so.1.3.0 lib/dbi/libogsdbi.so.1.3.0 lib/crypt/libogscrypt.so.1.3.0 lib/sbi/libogssbi.so.1.3.0 lib/sbi/openapi/libogssbi-openapi.so.1.3.0 /usr/lib/i386-linux-gnu/libyaml.so /usr/lib/gcc/i686-linux-gnu/8/../../../i386-linux-gnu/libmongoc-1.0.so /usr/lib/gcc/i686-linux-gnu/8/../../../i386-linux-gnu/libbson-1.0.so -lgnutls /usr/lib/i386-linux-gnu/libmicrohttpd.so /usr/lib/i386-linux-gnu/libcurl.so -lgnutls -Wl,--end-group -pthread '-Wl,-rpath,$ORIGIN/:$ORIGIN/../../lib/ipfw:$ORIGIN/../../lib/app:$ORIGIN/../../lib/core:$ORIGIN/../../lib/dbi:$ORIGIN/../../lib/crypt:$ORIGIN/../../lib/sbi:$ORIGIN/../../lib/sbi/openapi' -Wl,-rpath-link,/usr/src/packages/BUILD/obj-i686-linux-gnu/src/nrf:/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/ipfw:/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/app:/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/core:/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/dbi:/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/crypt:/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/sbi:/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/sbi/openapi [ 248s] [2186/2412] cc -Isrc/udr/e340f29@@udr at sta -Isrc/udr -I../src/udr -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udr/e340f29@@udr at sta/nf-sm.c.o' -MF 'src/udr/e340f29@@udr at sta/nf-sm.c.o.d' -o 'src/udr/e340f29@@udr at sta/nf-sm.c.o' -c ../src/udr/nf-sm.c [ 248s] [2187/2412] cc -Isrc/pcrf/9bf4e44@@pcrf at sta -Isrc/pcrf -I../src/pcrf -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/diameter/rx -I../lib/diameter/rx -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/diameter/gx -I../lib/diameter/gx -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/pcrf/9bf4e44@@pcrf at sta/pcrf-gx-path.c.o' -MF 'src/pcrf/9bf4e44@@pcrf at sta/pcrf-gx-path.c.o.d' -o 'src/pcrf/9bf4e44@@pcrf at sta/pcrf-gx-path.c.o' -c ../src/pcrf/pcrf-gx-path.c [ 248s] [2188/2412] cc -Isrc/udr/e340f29@@udr at sta -Isrc/udr -I../src/udr -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udr/e340f29@@udr at sta/sbi-path.c.o' -MF 'src/udr/e340f29@@udr at sta/sbi-path.c.o.d' -o 'src/udr/e340f29@@udr at sta/sbi-path.c.o' -c ../src/udr/sbi-path.c [ 248s] [2189/2412] cc -Isrc/udm/3eca12a@@udm at sta -Isrc/udm -I../src/udm -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udm/3eca12a@@udm at sta/context.c.o' -MF 'src/udm/3eca12a@@udm at sta/context.c.o.d' -o 'src/udm/3eca12a@@udm at sta/context.c.o' -c ../src/udm/context.c [ 248s] [2190/2412] cc -Isrc/udr/e340f29@@udr at sta -Isrc/udr -I../src/udr -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udr/e340f29@@udr at sta/nudr-handler.c.o' -MF 'src/udr/e340f29@@udr at sta/nudr-handler.c.o.d' -o 'src/udr/e340f29@@udr at sta/nudr-handler.c.o' -c ../src/udr/nudr-handler.c [ 248s] [2191/2412] cc -Isrc/udr/e340f29@@udr at sta -Isrc/udr -I../src/udr -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udr/e340f29@@udr at sta/udr-sm.c.o' -MF 'src/udr/e340f29@@udr at sta/udr-sm.c.o.d' -o 'src/udr/e340f29@@udr at sta/udr-sm.c.o' -c ../src/udr/udr-sm.c [ 248s] ninja: build stopped: subcommand failed. [ 248s] dh_auto_build: cd obj-i686-linux-gnu && LC_ALL=C.UTF-8 ninja -j8 -v returned exit code 1 [ 248s] make: *** [debian/rules:11: binary] Error 1 [ 248s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 248s] ### VM INTERACTION START ### [ 252s] [ 239.896587] sysrq: SysRq : Power Off [ 252s] [ 239.900547] reboot: Power down [ 252s] ### VM INTERACTION END ### [ 252s] [ 252s] lamb26 failed "build open5gs_1.3.0.20200710.dsc" at Fri Jul 10 01:36:21 UTC 2020. [ 252s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 10 03:52:54 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 10 Jul 2020 03:52:54 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f07e62474139_604c2af35b5685f04382bd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Testing/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 121s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 121s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 121s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 121s] | | [ 121s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 121s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 121s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 121s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 121s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 121s] 2425 | MHD_start_daemon (unsigned int flags, [ 121s] | ^~~~~~~~~~~~~~~~ [ 122s] cc1: all warnings being treated as errors [ 122s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 122s] make[3]: *** Waiting for unfinished jobs.... [ 122s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 122s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 122s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 122s] make[1]: *** [Makefile:166: all] Error 2 [ 122s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 122s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 122s] make: *** [debian/rules:9: build] Error 25 [ 122s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 122s] ### VM INTERACTION START ### [ 125s] [ 113.294731] sysrq: SysRq : Power Off [ 125s] [ 113.302472] reboot: Power down [ 125s] ### VM INTERACTION END ### [ 125s] [ 125s] lamb61 failed "build ulfius_2.5.2-4.1.dsc" at Fri Jul 10 03:52:42 UTC 2020. [ 125s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 10 03:53:45 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 10 Jul 2020 03:53:45 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f07e65f799ae_604c2af35b5685f04384a6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Testing/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 146s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 146s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 146s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 146s] | | [ 146s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 146s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 146s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 146s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 146s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 146s] 2425 | MHD_start_daemon (unsigned int flags, [ 146s] | ^~~~~~~~~~~~~~~~ [ 146s] cc1: all warnings being treated as errors [ 146s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 146s] make[3]: *** Waiting for unfinished jobs.... [ 146s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 146s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 146s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 146s] make[1]: *** [Makefile:166: all] Error 2 [ 146s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 146s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 146s] make: *** [debian/rules:9: build] Error 25 [ 146s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 146s] ### VM INTERACTION START ### [ 149s] [ 136.539266] sysrq: SysRq : Power Off [ 149s] [ 136.545829] reboot: Power down [ 149s] ### VM INTERACTION END ### [ 149s] [ 149s] lamb56 failed "build ulfius_2.5.2-4.1.dsc" at Fri Jul 10 03:53:40 UTC 2020. [ 149s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Jul 10 07:26:50 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jul 2020 07:26:50 +0000 Subject: Change in osmo-trx[master]: Transceiver: Fix race condition obtaining Dl burst from Upper layer In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19206 ) Change subject: Transceiver: Fix race condition obtaining Dl burst from Upper layer ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/19206/1/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/19206/1/Transceiver52M/Transceiver.cpp at a466 PS1, Line 466: Please stop mixing the logic changes with unrelated whitespace changes based on your preferences. Thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If1fd8d7fc5f21ee2894192ef1ac2a3cdda6bbb98 Gerrit-Change-Number: 19206 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 10 Jul 2020 07:26:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 08:50:27 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 10 Jul 2020 08:50:27 +0000 Subject: Change in osmo-bsc[master]: RR Release Cell selection IE: fix presence bit for repeated EARFCNs References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19210 ) Change subject: RR Release Cell selection IE: fix presence bit for repeated EARFCNs ...................................................................... RR Release Cell selection IE: fix presence bit for repeated EARFCNs 3GPP 44.018 10.5.2.1e defines the EARFCNs encoded in the 'Cell selection indicator after release of all TCH and SDCCH IE' as follows: ::= [...] | 011 { 1 > } ** 0 So after a 3-bit discriminator of '3' there can be multiple E-UTRAN Descriptions, and each of them starts with a '1' bit to indicate that another item follows. Before this patch, osmo-bsc only encoded the first '1' bit, and failed to repeat this before each following E-UTRAN Description. Fix that by moving the '1' encoding into the loop. Related: SYS#4871 SYS#4872 Change-Id: I59e427e4ebb1c6af99b27a15c40fed82457ac8ab --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/10/19210/1 diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index f47c31f..635b8a2 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -255,7 +255,6 @@ /* E-UTRAN Description */ bitvec_set_uint(&bv, 3, 3); - bitvec_set_bit(&bv, 1); for (i = 0; i < MAX_EARFCN_LIST; i++) { const struct osmo_earfcn_si2q *e = &bts->si_common.si2quater_neigh_list; @@ -266,6 +265,7 @@ LOGP(DRR, LOGL_NOTICE, "%s: Not enough room to store EARFCN %u in the " "Cell Selection Indicator IE\n", gsm_bts_name(bts), e->arfcn[i]); } else { + bitvec_set_bit(&bv, 1); bitvec_set_uint(&bv, e->arfcn[i], 16); /* No "Measurement Bandwidth" */ bitvec_set_bit(&bv, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I59e427e4ebb1c6af99b27a15c40fed82457ac8ab Gerrit-Change-Number: 19210 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 09:20:42 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jul 2020 09:20:42 +0000 Subject: Change in osmo-bsc[master]: RR Release Cell selection IE: fix presence bit for repeated EARFCNs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19210 ) Change subject: RR Release Cell selection IE: fix presence bit for repeated EARFCNs ...................................................................... Patch Set 1: Code-Review+2 We need a test case ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I59e427e4ebb1c6af99b27a15c40fed82457ac8ab Gerrit-Change-Number: 19210 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 10 Jul 2020 09:20:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 09:27:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 09:27:15 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: check TDMA frame order, drop out of order bursts In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19201 ) Change subject: trxcon/scheduler: check TDMA frame order, drop out of order bursts ...................................................................... Patch Set 4: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmocom-bb/+/19201/4/src/host/trxcon/sched_trx.c File src/host/trxcon/sched_trx.c: https://gerrit.osmocom.org/c/osmocom-bb/+/19201/4/src/host/trxcon/sched_trx.c at 646 PS4, Line 646: if (elapsed < 0) { It's a bit weird having this if here and then the other 2 conditional blocks checking for related stuff being chained together below through if else. https://gerrit.osmocom.org/c/osmocom-bb/+/19201/4/src/host/trxcon/sched_trx.c at 650 PS4, Line 650: "processed fn=%u (see OS#4658) => dropping\n", I'd say there's no need to ask the user to look at a ticket everytime, simply putting it in the code whenever the user wants to investigate further is enough imho. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I873c8555ea2ca190b1689227bb0fdcba87188772 Gerrit-Change-Number: 19201 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 09:27:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 09:29:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 09:29:45 +0000 Subject: Change in osmo-trx[master]: Transceiver: Fix race condition obtaining Dl burst from Upper layer In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19206 ) Change subject: Transceiver: Fix race condition obtaining Dl burst from Upper layer ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/19206/1/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/19206/1/Transceiver52M/Transceiver.cpp at a466 PS1, Line 466: > Please stop mixing the logic changes with unrelated whitespace changes based on your preferences. [?] I was reworking/refactoring the entire function as you can see, so with the new code blocks added it makes more sense to me to remove this space to make code easier to look at. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If1fd8d7fc5f21ee2894192ef1ac2a3cdda6bbb98 Gerrit-Change-Number: 19206 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 09:29:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 09:38:18 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 09:38:18 +0000 Subject: Change in osmo-trx[master]: Introduce rate counters to detect issues in received Dl bursts from TRXD In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19205 ) Change subject: Introduce rate counters to detect issues in received Dl bursts from TRXD ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/19205/1/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/19205/1/Transceiver52M/Transceiver.cpp at 1072 PS1, Line 1072: some FN was lost in the middle > PDCH on Downlink is gapless, i.e. you always get monotonic-increasing frame numbers... AFAIU we also have NOPE/IDLE indications in TRXDv1 in DL, am I correct? Then AFAIU we should also get packets for each FN+TN too. Maybe simply only doing these checks if TRXDv1 is enabled is enough? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 Gerrit-Change-Number: 19205 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 09:38:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 10:01:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jul 2020 10:01:40 +0000 Subject: Change in osmo-trx[master]: Transceiver: Fix race condition obtaining Dl burst from Upper layer In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19206 ) Change subject: Transceiver: Fix race condition obtaining Dl burst from Upper layer ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/19206/1/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/19206/1/Transceiver52M/Transceiver.cpp at a466 PS1, Line 466: > I was reworking/refactoring the entire function as you can see, so with the new code blocks added it [?] What's wrong with this space? What problem this particular line solves? This line is not related to your refactoring changes, and it's harder to read such mixed changes. Following this logic, everything in this file is related to your reworking/refactoring, so why don't you drop the other empty lines then (e.g. line#459)? Moreover, I think the opposite: this empty line makes the code easier to read, so it makes sense to you, but does not to me. I don't want to block your work, but it's getting a trend that. Some day we may see this line re-introduced again because somebody else has different coding style preferences, and that would be a mess. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If1fd8d7fc5f21ee2894192ef1ac2a3cdda6bbb98 Gerrit-Change-Number: 19206 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 10:01:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Jul 10 10:01:47 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 10 Jul 2020 10:01:47 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_10/armv7l In-Reply-To: References: Message-ID: <5f083ca912254_604c2af35b5685f050664b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_10/armv7l Package network:osmocom:nightly/open5gs failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 493s] #define VALIDITY_MINIMUM (3600 * OGS_USEC_PER_SEC) /* 3600 seconds */ [ 493s] ^ [ 493s] ../lib/core/ogs-log.h:45:8: note: in definition of macro ?ogs_log_message? [ 493s] 0, __VA_ARGS__) [ 493s] ^~~~~~~~~~~ [ 493s] ../src/udr/nnrf-handler.c:77:17: note: in expansion of macro ?ogs_warn? [ 493s] ogs_warn("[%s] Forced to %d seconds", [ 493s] ^~~~~~~~ [ 493s] ../src/udr/nnrf-handler.c:78:44: note: in expansion of macro ?ogs_time_sec? [ 493s] subscription->id, (int)ogs_time_sec(VALIDITY_MINIMUM)); [ 493s] ^~~~~~~~~~~~ [ 493s] ../src/udr/nnrf-handler.c:78:57: note: in expansion of macro ?VALIDITY_MINIMUM? [ 493s] subscription->id, (int)ogs_time_sec(VALIDITY_MINIMUM)); [ 493s] ^~~~~~~~~~~~~~~~ [ 493s] cc1: some warnings being treated as errors [ 493s] [2193/2412] cc -Isrc/udr/e340f29@@udr at sta -Isrc/udr -I../src/udr -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -I/usr/include/p11-kit-1 -I/usr/include/arm-linux-gnueabihf -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udr/e340f29@@udr at sta/udr-sm.c.o' -MF 'src/udr/e340f29@@udr at sta/udr-sm.c.o.d' -o 'src/udr/e340f29@@udr at sta/udr-sm.c.o' -c ../src/udr/udr-sm.c [ 493s] [2194/2412] cc -Isrc/udr/e340f29@@udr at sta -Isrc/udr -I../src/udr -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -I/usr/include/p11-kit-1 -I/usr/include/arm-linux-gnueabihf -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udr/e340f29@@udr at sta/nf-sm.c.o' -MF 'src/udr/e340f29@@udr at sta/nf-sm.c.o.d' -o 'src/udr/e340f29@@udr at sta/nf-sm.c.o' -c ../src/udr/nf-sm.c [ 494s] [2195/2412] cc -Isrc/udr/e340f29@@udr at sta -Isrc/udr -I../src/udr -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -I/usr/include/p11-kit-1 -I/usr/include/arm-linux-gnueabihf -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udr/e340f29@@udr at sta/nudr-handler.c.o' -MF 'src/udr/e340f29@@udr at sta/nudr-handler.c.o.d' -o 'src/udr/e340f29@@udr at sta/nudr-handler.c.o' -c ../src/udr/nudr-handler.c [ 494s] ninja: build stopped: subcommand failed. [ 494s] dh_auto_build: cd obj-arm-linux-gnueabihf && LC_ALL=C.UTF-8 ninja -j6 -v returned exit code 1 [ 494s] make: *** [debian/rules:11: binary] Error 1 [ 494s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 494s] ### VM INTERACTION START ### [ 497s] [ 472.794180] sysrq: SysRq : Power Off [ 497s] [ 472.820267] reboot: Power down [ 497s] ### VM INTERACTION END ### [ 497s] [ 497s] obs-arm-5 failed "build open5gs_1.3.0.20200710.dsc" at Fri Jul 10 10:01:31 UTC 2020. [ 497s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Jul 10 10:05:06 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jul 2020 10:05:06 +0000 Subject: Change in osmo-trx[master]: Introduce rate counters to detect issues in received Dl bursts from TRXD In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19205 ) Change subject: Introduce rate counters to detect issues in received Dl bursts from TRXD ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/19205/1/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/19205/1/Transceiver52M/Transceiver.cpp at 1072 PS1, Line 1072: some FN was lost in the middle > AFAIU we also have NOPE/IDLE indications in TRXDv1 in DL, am I correct? Then AFAIU we should also ge [?] Nope, we don't have them on Tx path... because it does not make any sense. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 Gerrit-Change-Number: 19205 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 10:05:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 10:12:32 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jul 2020 10:12:32 +0000 Subject: Change in osmo-ggsn[master]: gtp: queue_test: Fix printf gcc warn under ARM In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/19173 ) Change subject: gtp: queue_test: Fix printf gcc warn under ARM ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ggsn/+/19173/1/tests/gtp/queue_test.c File tests/gtp/queue_test.c: https://gerrit.osmocom.org/c/osmo-ggsn/+/19173/1/tests/gtp/queue_test.c at 31 PS1, Line 31: printf("%d\t%d\t%d\t%d\t%d\t%d\t%u\t%" PRIuPTR "\n", So what are we printing here? An integer that is stored in as a pointer? > but argument 9 has type 'unsigned int' '%u' would work here then? -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/19173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie9530cdd191386ca3f6c336684f81c4582c4d962 Gerrit-Change-Number: 19173 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 10:12:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 10:20:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 10:20:35 +0000 Subject: Change in osmo-trx[master]: Introduce rate counters to detect issues in received Dl bursts from TRXD In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19205 ) Change subject: Introduce rate counters to detect issues in received Dl bursts from TRXD ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/19205/1/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/19205/1/Transceiver52M/Transceiver.cpp at 1072 PS1, Line 1072: some FN was lost in the middle > Nope, we don't have them on Tx path... because it does not make any sense. Ah indeed, I looked in a wrong way at the data structures when writing my last comment, sorry for that. So it may make sense to limit this specific counter to TRX0 then (because we need to send dummy bursts on all TS of TRX0 AFAIU). I'd like to still keep this counter since together with the others provides valuable information even if it's only for a subset of trx/ts (as in bursts dropped at bts-trx or UDP level). -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 Gerrit-Change-Number: 19205 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 10:20:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 10:24:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 10:24:20 +0000 Subject: Change in osmo-ggsn[master]: gtp: queue_test: Fix printf gcc warn under ARM In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/19173 ) Change subject: gtp: queue_test: Fix printf gcc warn under ARM ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ggsn/+/19173/1/tests/gtp/queue_test.c File tests/gtp/queue_test.c: https://gerrit.osmocom.org/c/osmo-ggsn/+/19173/1/tests/gtp/queue_test.c at 31 PS1, Line 31: printf("%d\t%d\t%d\t%d\t%d\t%d\t%u\t%" PRIuPTR "\n", > So what are we printing here? An integer that is stored in as a pointer? [?] Yes, the problem is that since pointer type length is arch-dependent, the filling of 0 in representation of %p would break expected output (eg 0x0034 vs 0x000000034). %u would work on some architectures (ARM 32 bit), and wouldn't on some others. That's why I'm using the standard uintptr_t and is printf representation. On my system: /usr/include/inttypes.h 45:# define __PRIPTR_PREFIX "l" 163:# define PRIuPTR __PRIPTR_PREFIX "u" -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/19173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie9530cdd191386ca3f6c336684f81c4582c4d962 Gerrit-Change-Number: 19173 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 10:24:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 10:28:58 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jul 2020 10:28:58 +0000 Subject: Change in osmo-trx[master]: Introduce rate counters to detect issues in received Dl bursts from TRXD In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19205 ) Change subject: Introduce rate counters to detect issues in received Dl bursts from TRXD ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/19205/1/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/19205/1/Transceiver52M/Transceiver.cpp at 1072 PS1, Line 1072: some FN was lost in the middle > Ah indeed, I looked in a wrong way at the data structures when writing my last comment, sorry for th [?] ACK, makes sense for C0. But keep in mind that osmo-trx can do dummy burst filling itself (optional feature), so the L1 does not have to send dummy bursts to us. In that case your counter would show false-positive results. Then you would need to check if it's C0, and if dummy burst filling is disabled. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 Gerrit-Change-Number: 19205 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 10:28:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Jul 10 10:30:22 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 10 Jul 2020 10:30:22 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5f08435517fca_604c2af35b5685f0532558@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Raspbian_10/armv7l Package network:osmocom:nightly/open5gs failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 744s] from ../src/udr/sbi-path.h:23, [ 744s] from ../src/udr/nnrf-handler.c:20: [ 744s] ../src/udr/nnrf-handler.c:70:32: error: integer overflow in expression of type ?long int? results in ?-694967296? [-Werror=overflow] [ 744s] #define VALIDITY_MINIMUM (3600 * OGS_USEC_PER_SEC) /* 3600 seconds */ [ 744s] ^ [ 744s] ../lib/core/ogs-log.h:45:8: note: in definition of macro ?ogs_log_message? [ 744s] 0, __VA_ARGS__) [ 744s] ^~~~~~~~~~~ [ 744s] ../src/udr/nnrf-handler.c:77:17: note: in expansion of macro ?ogs_warn? [ 744s] ogs_warn("[%s] Forced to %d seconds", [ 744s] ^~~~~~~~ [ 744s] ../src/udr/nnrf-handler.c:78:44: note: in expansion of macro ?ogs_time_sec? [ 744s] subscription->id, (int)ogs_time_sec(VALIDITY_MINIMUM)); [ 744s] ^~~~~~~~~~~~ [ 744s] ../src/udr/nnrf-handler.c:78:57: note: in expansion of macro ?VALIDITY_MINIMUM? [ 744s] subscription->id, (int)ogs_time_sec(VALIDITY_MINIMUM)); [ 744s] ^~~~~~~~~~~~~~~~ [ 744s] cc1: some warnings being treated as errors [ 744s] ninja: build stopped: subcommand failed. [ 744s] dh_auto_build: cd obj-arm-linux-gnueabihf && LC_ALL=C.UTF-8 ninja -j6 -v returned exit code 1 [ 744s] make: *** [debian/rules:11: binary] Error 1 [ 744s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 744s] ### VM INTERACTION START ### [ 747s] [ 679.179017] sysrq: SysRq : Power Off [ 747s] [ 679.197113] reboot: Power down [ 748s] ### VM INTERACTION END ### [ 748s] [ 748s] obs-arm-6 failed "build open5gs_1.3.0.20200710.dsc" at Fri Jul 10 10:30:11 UTC 2020. [ 748s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Jul 10 10:32:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jul 2020 10:32:20 +0000 Subject: Change in osmo-ggsn[master]: gtp: queue_test: Fix printf gcc warn under ARM In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/19173 ) Change subject: gtp: queue_test: Fix printf gcc warn under ARM ...................................................................... Patch Set 1: Code-Review+1 Oh, ok. Ideally we should avoid storing integers in pointers... -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/19173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie9530cdd191386ca3f6c336684f81c4582c4d962 Gerrit-Change-Number: 19173 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 10:32:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 10:54:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 10:54:20 +0000 Subject: Change in osmo-ggsn[master]: gtp: queue_test: Fix printf gcc warn under ARM In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/19173 ) Change subject: gtp: queue_test: Fix printf gcc warn under ARM ...................................................................... Patch Set 1: Code-Review+2 > Patch Set 1: Code-Review+1 > > Oh, ok. Ideally we should avoid storing integers in pointers... It's only used for printing, and precisely intptr_t is used to avoid issues when doing so :) +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/19173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie9530cdd191386ca3f6c336684f81c4582c4d962 Gerrit-Change-Number: 19173 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 10:54:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 10:54:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 10:54:24 +0000 Subject: Change in osmo-ggsn[master]: gtp: queue_test: Fix printf gcc warn under ARM In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/19173 ) Change subject: gtp: queue_test: Fix printf gcc warn under ARM ...................................................................... gtp: queue_test: Fix printf gcc warn under ARM queue_test.c:39:3: warning: format '%ld' expects argument of type 'long int', but argument 9 has type 'unsigned int' [-Wformat=] Change-Id: Ie9530cdd191386ca3f6c336684f81c4582c4d962 --- M tests/gtp/queue_test.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/tests/gtp/queue_test.c b/tests/gtp/queue_test.c index bcc6d15..11b653d 100644 --- a/tests/gtp/queue_test.c +++ b/tests/gtp/queue_test.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include @@ -27,7 +28,7 @@ OSMO_ASSERT(memcmp(&qmsg_zero, &queue->qmsga[n], sizeof(qmsg_zero)) == 0); continue; } - printf("%d\t%d\t%d\t%d\t%d\t%d\t%u\t%ld\n", + printf("%d\t%d\t%d\t%d\t%d\t%d\t%u\t%" PRIuPTR "\n", n, queue->qmsga[n].seq, queue->qmsga[n].next, @@ -35,7 +36,7 @@ (int)queue->qmsga[n].timeout, queue->qmsga[n].retrans, queue->qmsga[n].type, - ((uintptr_t)queue->qmsga[n].cbp & 0xFFFFFFFF) + (uintptr_t)queue->qmsga[n].cbp ); } printf("======================================================\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/19173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie9530cdd191386ca3f6c336684f81c4582c4d962 Gerrit-Change-Number: 19173 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 13:26:07 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 10 Jul 2020 13:26:07 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: use define constant to define max number of E1 subslots In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19118 ) Change subject: mgcp_endp: use define constant to define max number of E1 subslots ...................................................................... Patch Set 4: (3 comments) (ensure messages are sent) https://gerrit.osmocom.org/c/osmo-mgw/+/19118/2/src/libosmo-mgcp/mgcp_endp.c File src/libosmo-mgcp/mgcp_endp.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19118/2/src/libosmo-mgcp/mgcp_endp.c at 527 PS2, Line 527: const int8_t interlock_tab[MGCP_ENDP_E1_SUBSLOTS][16] = > s/16/MGCP_ENDP_E1_SUBSLOTS + 1 [?] 16 is wrong. When counting out the length of the row I see its only 15. However, using MGCP_ENDP_E1_SUBSLOTS there would be wrong either because it is by coincidence and does not really relate to the number of possible subslot combinations. https://gerrit.osmocom.org/c/osmo-mgw/+/19118/4/src/libosmo-mgcp/mgcp_endp.c File src/libosmo-mgcp/mgcp_endp.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19118/4/src/libosmo-mgcp/mgcp_endp.c at 527 PS4, Line 527: 15 > Now you fixed it from 16 to 15, but I meant rather use the MGCP_ENDP_E1_SUBSLOTS constant here? [?] 16 was wrong, its a 15x15 array. This bug was unrelated. However, the 16 I fixed to 15 is still unrelated to MGCP_ENDP_E1_SUBSLOTS https://gerrit.osmocom.org/c/osmo-mgw/+/19118/4/src/libosmo-mgcp/mgcp_endp.c at 528 PS4, Line 528: { { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, -1 }, > Looking at it now, the alignment you use here is pretty weird. Simply move the first { up. I have fixed it in a separate patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If7cb74e486946aff09e22abf8a8885bf0693f34e Gerrit-Change-Number: 19118 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 13:26:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 13:27:19 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 10 Jul 2020 13:27:19 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: use define constant to define max number of E1 subslots In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19118 ) Change subject: mgcp_endp: use define constant to define max number of E1 subslots ...................................................................... Patch Set 4: (1 comment) (ensure messages are sent) https://gerrit.osmocom.org/c/osmo-mgw/+/19118/4/src/libosmo-mgcp/mgcp_endp.c File src/libosmo-mgcp/mgcp_endp.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19118/4/src/libosmo-mgcp/mgcp_endp.c at 527 PS4, Line 527: 15 > 16 was wrong, its a 15x15 array. This bug was unrelated. [?] MGCP_ENDP_E1_SUBSLOTS defines the number of rows. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If7cb74e486946aff09e22abf8a8885bf0693f34e Gerrit-Change-Number: 19118 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 13:27:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 13:29:09 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 10 Jul 2020 13:29:09 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: remove double check In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19119 ) Change subject: mgcp_trunk: remove double check ...................................................................... Patch Set 5: (1 comment) (ensure messages are sent) https://gerrit.osmocom.org/c/osmo-mgw/+/19119/2/src/libosmo-mgcp/mgcp_trunk.c File src/libosmo-mgcp/mgcp_trunk.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19119/2/src/libosmo-mgcp/mgcp_trunk.c at 164 PS2, Line 164: return mgcp_trunk_by_num(cfg, MGCP_TRUNK_E1, trunk_nr); > It looks to me like now mgcp_trunk_by_name() no longer works for epname that contain the virtual tru [?] I think everything is ok here, also the TTCN3 tests pass fine. Do I miss anything? If the virtual trunk is requested and the virtual trunk prefix is contained it should if in line 158 should become true, then we return the virtual trunk. If the trunk is an E1, if in line 163 will become true and we return the E1 trunk. The check below in line 174 if for legacy requests without trunk prefix. If non of the above applies it is the last chance to get a trunk. However, I would strongly argue to remove this part. Osmo-msc and osmo-bsc do the requests properly for a long time now. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I91fb8cf6e3b077ba8f18fdbcd071275c6fd7cacd Gerrit-Change-Number: 19119 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 13:29:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 13:44:51 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 13:44:51 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: use define constant to define max number of E1 subslots In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19118 ) Change subject: mgcp_endp: use define constant to define max number of E1 subslots ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/19118/2/src/libosmo-mgcp/mgcp_endp.c File src/libosmo-mgcp/mgcp_endp.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19118/2/src/libosmo-mgcp/mgcp_endp.c at 527 PS2, Line 527: const int8_t interlock_tab[MGCP_ENDP_E1_SUBSLOTS][16] = > 16 is wrong. When counting out the length of the row I see its only 15. [?] Then if the number only relates to the length of the array, please simply drop the size and let the compiler calculate it, can't you? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If7cb74e486946aff09e22abf8a8885bf0693f34e Gerrit-Change-Number: 19118 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 13:44:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 15:25:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 15:25:15 +0000 Subject: Change in osmo-trx[master]: trx_rate_ctr: Fix wrong mutex being locked, sometimes causing locdown... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/19211 ) Change subject: trx_rate_ctr: Fix wrong mutex being locked, sometimes causing locdown at shutdown time ...................................................................... trx_rate_ctr: Fix wrong mutex being locked, sometimes causing locdown at shutdown time Fixes: 92ba59dacffe79f4c987154bc63c6eacd8c3605f Change-Id: I49bea4b0ae469794b5c80ee8fa4f275914a5194c --- M CommonLibs/trx_rate_ctr.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/11/19211/1 diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp index 76aff7d..6391a38 100644 --- a/CommonLibs/trx_rate_ctr.cpp +++ b/CommonLibs/trx_rate_ctr.cpp @@ -159,7 +159,7 @@ size_t chan; struct rate_ctr *ctr; LOGC(DMAIN, NOTICE) << "Main thread is updating Transceiver counters"; - dev_rate_ctr_mutex.lock(); + trx_rate_ctr_mutex.lock(); for (chan = 0; chan < chan_len; chan++) { if (trx_ctrs_pending[chan].chan == PENDING_CHAN_NONE) continue; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I49bea4b0ae469794b5c80ee8fa4f275914a5194c Gerrit-Change-Number: 19211 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 15:29:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 15:29:10 +0000 Subject: Change in osmo-trx[master]: Introduce rate counters to detect issues in received Dl bursts from TRXD In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 to look at the new patch set (#3). Change subject: Introduce rate counters to detect issues in received Dl bursts from TRXD ...................................................................... Introduce rate counters to detect issues in received Dl bursts from TRXD This ones together with rate counters already available in lower layers allows to understand better the source of the problem with stalled tx bursts. Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 --- M CommonLibs/osmo_signal.h M CommonLibs/trx_rate_ctr.cpp M CommonLibs/trx_rate_ctr.h M CommonLibs/trx_vty.c M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h 6 files changed, 80 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/05/19205/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 Gerrit-Change-Number: 19205 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 15:29:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 15:29:10 +0000 Subject: Change in osmo-trx[master]: Transceiver: Fix race condition obtaining Dl burst from Upper layer In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/19206 to look at the new patch set (#2). Change subject: Transceiver: Fix race condition obtaining Dl burst from Upper layer ...................................................................... Transceiver: Fix race condition obtaining Dl burst from Upper layer The queue was being accessed sequentially obtaining and releasing the mutual exclusion zone twice. First in getStaleBurst() dropping all FN Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 15:32:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 15:32:10 +0000 Subject: Change in osmo-trx[master]: trx_rate_ctr: Fix locking wrong mutex In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-trx/+/19211 ) Change subject: trx_rate_ctr: Fix locking wrong mutex ...................................................................... trx_rate_ctr: Fix locking wrong mutex It was notcied due to sometimes causing deadlock at shutdown time. Fixes: 92ba59dacffe79f4c987154bc63c6eacd8c3605f Change-Id: I49bea4b0ae469794b5c80ee8fa4f275914a5194c --- M CommonLibs/trx_rate_ctr.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/11/19211/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I49bea4b0ae469794b5c80ee8fa4f275914a5194c Gerrit-Change-Number: 19211 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 15:32:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 15:32:10 +0000 Subject: Change in osmo-trx[master]: Introduce rate counters to detect issues in received Dl bursts from TRXD In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 to look at the new patch set (#4). Change subject: Introduce rate counters to detect issues in received Dl bursts from TRXD ...................................................................... Introduce rate counters to detect issues in received Dl bursts from TRXD This ones together with rate counters already available in lower layers allows to understand better the source of the problem with stalled tx bursts. Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 --- M CommonLibs/osmo_signal.h M CommonLibs/trx_rate_ctr.cpp M CommonLibs/trx_rate_ctr.h M CommonLibs/trx_vty.c M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h 6 files changed, 80 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/05/19205/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 Gerrit-Change-Number: 19205 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 15:32:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 15:32:10 +0000 Subject: Change in osmo-trx[master]: Transceiver: Fix race condition obtaining Dl burst from Upper layer In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/19206 to look at the new patch set (#3). Change subject: Transceiver: Fix race condition obtaining Dl burst from Upper layer ...................................................................... Transceiver: Fix race condition obtaining Dl burst from Upper layer The queue was being accessed sequentially obtaining and releasing the mutual exclusion zone twice. First in getStaleBurst() dropping all FN Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 15:32:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 15:32:10 +0000 Subject: Change in osmo-trx[master]: Add rate counter for missing Txbursts when scheduled towards the radi... In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/19207 to look at the new patch set (#3). Change subject: Add rate counter for missing Txbursts when scheduled towards the radioInterface ...................................................................... Add rate counter for missing Txbursts when scheduled towards the radioInterface Related: OS#4487 Change-Id: Ibb2c492b3c67cbab11fbb936ae3a090fb5756aa8 --- M CommonLibs/osmo_signal.h M CommonLibs/trx_rate_ctr.cpp M CommonLibs/trx_rate_ctr.h M CommonLibs/trx_vty.c M Transceiver52M/Transceiver.cpp 5 files changed, 20 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/07/19207/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibb2c492b3c67cbab11fbb936ae3a090fb5756aa8 Gerrit-Change-Number: 19207 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 15:32:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 15:32:46 +0000 Subject: Change in osmo-trx[master]: trx_rate_ctr: Fix locking wrong mutex In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19211 ) Change subject: trx_rate_ctr: Fix locking wrong mutex ...................................................................... Patch Set 2: Code-Review+2 Fast-tracking this one since the fix is obvious and the bug is really annoying. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I49bea4b0ae469794b5c80ee8fa4f275914a5194c Gerrit-Change-Number: 19211 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 10 Jul 2020 15:32:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 15:53:35 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jul 2020 15:53:35 +0000 Subject: Change in osmo-pcu[master]: encoding: Encode TA as unsigned and check validty against GSM48_TA_IN... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19176 ) Change subject: encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I82b13561d0fe5ebafb5c3a8b9a501045c29809bc Gerrit-Change-Number: 19176 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-CC: neels Gerrit-Comment-Date: Fri, 10 Jul 2020 15:53:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 15:55:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jul 2020 15:55:09 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Store TLLI promptly on newly created TLLI in rcv_resource_r... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19197 ) Change subject: pdch.cpp: Store TLLI promptly on newly created TLLI in rcv_resource_request ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I20ce4eb94ecf85ce2835275d0056d9ecd1b558c3 Gerrit-Change-Number: 19197 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Fri, 10 Jul 2020 15:55:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 16:23:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jul 2020 16:23:40 +0000 Subject: Change in osmo-trx[master]: trx_rate_ctr: Fix locking wrong mutex In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19211 ) Change subject: trx_rate_ctr: Fix locking wrong mutex ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I49bea4b0ae469794b5c80ee8fa4f275914a5194c Gerrit-Change-Number: 19211 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 16:23:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 16:30:02 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jul 2020 16:30:02 +0000 Subject: Change in osmo-trx[master]: Introduce rate counters to detect issues in received Dl bursts from TRXD In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19205 ) Change subject: Introduce rate counters to detect issues in received Dl bursts from TRXD ...................................................................... Patch Set 4: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/19205/4/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/19205/4/Transceiver52M/Transceiver.cpp at 57 PS4, Line 57: In this file 2 spaces are generally used for spacing... -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 Gerrit-Change-Number: 19205 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 16:30:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 16:44:23 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jul 2020 16:44:23 +0000 Subject: Change in osmo-trx[master]: Transceiver: Fix race condition obtaining Dl burst from Upper layer In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19206 ) Change subject: Transceiver: Fix race condition obtaining Dl burst from Upper layer ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/19206/3/Transceiver52M/radioVector.cpp File Transceiver52M/radioVector.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/19206/3/Transceiver52M/radioVector.cpp at 121 PS3, Line 121: getStaleBurst Might be worth to add a comment stating that these functions expect the lock/mutex to be acquired and released by the caller. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If1fd8d7fc5f21ee2894192ef1ac2a3cdda6bbb98 Gerrit-Change-Number: 19206 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 16:44:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 16:50:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 16:50:14 +0000 Subject: Change in osmo-trx[master]: Introduce rate counters to detect issues in received Dl bursts from TRXD In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19205 ) Change subject: Introduce rate counters to detect issues in received Dl bursts from TRXD ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/19205/4/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/19205/4/Transceiver52M/Transceiver.cpp at 57 PS4, Line 57: > In this file 2 spaces are generally used for spacing... Which is really annoying and makes blocks really difficult to read (really, I already had several issues due to that), so I'm introducing regular spacing in new functions :) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 Gerrit-Change-Number: 19205 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 16:50:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 16:51:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 16:51:16 +0000 Subject: Change in osmo-trx[master]: Transceiver: Fix race condition obtaining Dl burst from Upper layer In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19206 ) Change subject: Transceiver: Fix race condition obtaining Dl burst from Upper layer ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/19206/3/Transceiver52M/radioVector.cpp File Transceiver52M/radioVector.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/19206/3/Transceiver52M/radioVector.cpp at 121 PS3, Line 121: getStaleBurst > Might be worth to add a comment stating that these functions expect the lock/mutex to be acquired an [?] I thought about that, but tbh they are only used in one place and I doubt they'll ever be used anywhere else, so no real need, specially because the class only has those 2-3 functions. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If1fd8d7fc5f21ee2894192ef1ac2a3cdda6bbb98 Gerrit-Change-Number: 19206 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 16:51:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 16:52:48 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jul 2020 16:52:48 +0000 Subject: Change in osmo-trx[master]: Add rate counter for missing Txbursts when scheduled towards the radi... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19207 ) Change subject: Add rate counter for missing Txbursts when scheduled towards the radioInterface ...................................................................... Patch Set 3: (1 comment) Could you please add a detailed description to the commit message how can this happen? I am not getting this just looking at the code. https://gerrit.osmocom.org/c/osmo-trx/+/19207/3/CommonLibs/trx_rate_ctr.h File CommonLibs/trx_rate_ctr.h: https://gerrit.osmocom.org/c/osmo-trx/+/19207/3/CommonLibs/trx_rate_ctr.h at 14 PS3, Line 14: TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS So it's basically overrun? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibb2c492b3c67cbab11fbb936ae3a090fb5756aa8 Gerrit-Change-Number: 19207 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 10 Jul 2020 16:52:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 16:54:34 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jul 2020 16:54:34 +0000 Subject: Change in osmo-trx[master]: Introduce rate counters to detect issues in received Dl bursts from TRXD In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19205 ) Change subject: Introduce rate counters to detect issues in received Dl bursts from TRXD ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/19205/4/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/19205/4/Transceiver52M/Transceiver.cpp at 57 PS4, Line 57: > Which is really annoying and makes blocks really difficult to read (really, I already had several is [?] Mixed spacing is even more annoying, making the coding style inconsistent. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 Gerrit-Change-Number: 19205 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 16:54:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 16:56:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 16:56:23 +0000 Subject: Change in osmo-trx[master]: Add rate counter for missing Txbursts when scheduled towards the radi... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19207 ) Change subject: Add rate counter for missing Txbursts when scheduled towards the radioInterface ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/19207/3/CommonLibs/trx_rate_ctr.h File CommonLibs/trx_rate_ctr.h: https://gerrit.osmocom.org/c/osmo-trx/+/19207/3/CommonLibs/trx_rate_ctr.h at 14 PS3, Line 14: TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS > So it's basically overrun? AFAIU, Actually an underrun, since it's the reader finding nothing. An overrun would be the writer filling the queue. But anyway, it really depends o how you look at it, and as you see they are confusing terms. Morever we already use the term in lower layers, so I prefer keeping other terminology to easily differentiate. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibb2c492b3c67cbab11fbb936ae3a090fb5756aa8 Gerrit-Change-Number: 19207 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 10 Jul 2020 16:56:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 16:59:17 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 10 Jul 2020 16:59:17 +0000 Subject: Change in osmo-trx[master]: Introduce rate counters to detect issues in received Dl bursts from TRXD In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19205 ) Change subject: Introduce rate counters to detect issues in received Dl bursts from TRXD ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/19205/4/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/19205/4/Transceiver52M/Transceiver.cpp at 57 PS4, Line 57: > Mixed spacing is even more annoying, making the coding style inconsistent. As long as it's not mixing different spacing in the same function I'm fine with it, given it helps with understanding better and introducing less bugs. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 Gerrit-Change-Number: 19205 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 10 Jul 2020 16:59:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 19:42:59 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jul 2020 19:42:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_SystemInformation: add dec_SystemInformationSafe() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19212 ) Change subject: library/GSM_SystemInformation: add dec_SystemInformationSafe() ...................................................................... library/GSM_SystemInformation: add dec_SystemInformationSafe() Some types of System Information (mostly the Rest Octets) are not fully implemented, so calling the generic dec_SystemInformation() may result in a DTE. Let's add dec_SystemInformationSafeBT() with "prototype(backtrack)", so it would return a non-zero integer if decoding fails. Let's add a wrapper dec_SystemInformationSafe() that would additionally check the RR Protocol Discriminator. Change-Id: Id4d73e0f3347e1d4c4c77aec75b767311d662292 Related: OS#4662 --- M bts/BTS_Tests.ttcn M library/GSM_SystemInformation.ttcn 2 files changed, 32 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/12/19212/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 587e14a..923205f 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3534,7 +3534,6 @@ repeat; } [] L1CTL.receive(tr_L1CTL_DATA_IND(t_RslChanNr_PCH_AGCH(0), ?)) -> value l1_dl { - /* somehow dec_SystemInformation will try to decode even non-RR as SI */ var GsmRrMessage rr := dec_GsmRrMessage(l1_dl.payload.data_ind.payload); if (not match(rr, tr_IMM_ASS(42, ?, 5, ?, ?))) { /* FIXME: Why are we seeing paging requests on PCH/AGCH? */ @@ -3936,15 +3935,12 @@ T.start; alt { [] pt.receive(tr_L1CTL_DATA_IND(t_RslChanNr_BCCH(0), ?)) -> value l1_dl { - /* somehow dec_SystemInformation will try to decode even non-RR as SI */ - if (not (l1_dl.payload.data_ind.payload[1] == '06'O)) { - log("Ignoring non-RR SI ", l1_dl); + var SystemInformationFn sig := { frame_number := l1_dl.dl_info.frame_nr }; + if (dec_SystemInformationSafe(l1_dl.payload.data_ind.payload, sig.si) != 0) { + log("Ignoring non-RR or invalid SI ", l1_dl); repeat; } - var SystemInformationFn sig := { - frame_number := l1_dl.dl_info.frame_nr, - si := dec_SystemInformation(l1_dl.payload.data_ind.payload) - } + var integer tc := f_gsm_compute_tc(sig.frame_number); log("SI received at TC=", tc, ": ", sig.si); /* append to the per-TC bucket */ @@ -5227,17 +5223,13 @@ runs on test_CT return SystemInformation { var L1ctlDlMessage l1_dl; var SystemInformation si; + var integer rc; timer T := 5.0; T.start; alt { [] pt.receive(tr_L1CTL_DATA_IND(t_RslChanNr_BCCH(0), ?)) -> value l1_dl { - /* somehow dec_SystemInformation will try to decode even non-RR as SI */ - if (not (l1_dl.payload.data_ind.payload[1] == '06'O)) { - log("Ignoring non-RR SI ", l1_dl); - repeat; - } - si := dec_SystemInformation(l1_dl.payload.data_ind.payload) - if (si.header.message_type != si_type) { + rc := dec_SystemInformationSafe(l1_dl.payload.data_ind.payload, sig.si); + if (rc != 0 or si.header.message_type != si_type) { repeat; } } diff --git a/library/GSM_SystemInformation.ttcn b/library/GSM_SystemInformation.ttcn index 3c3d96c..9113583 100644 --- a/library/GSM_SystemInformation.ttcn +++ b/library/GSM_SystemInformation.ttcn @@ -264,4 +264,29 @@ } } + external function dec_SystemInformationSafeBT(in octetstring stream, out SystemInformation si) + return integer /* Decoding result: successful (0) or unsuccessful (1) */ + with { extension "prototype(backtrack) decode(RAW)" }; + + /* Some types of System Information (mostly the Rest Octets) are not fully implemented, + * so calling the generic dec_SystemInformation() may result in a DTE. This function + * additionally checks RR Protocol Discriminator, and should be used in the most cases. */ + function dec_SystemInformationSafe(in octetstring stream, out SystemInformation si) + return integer { + /* Try to decode a given octetstring as System Information */ + if (dec_SystemInformationSafeBT(stream, si) != 0) { + log("Failed to decode (RR) System Information: ", stream); + return 1; + } + + /* Check the protocol discriminator (we expect RR messages) */ + if (si.header.rr_protocol_discriminator != bit2int('0110'B)) { + log("Protocol discriminator is not RR (!= '0110'B): ", + si.header.rr_protocol_discriminator); + return 1; + } + + return 0; + } + } with { encode "RAW"; variant "FIELDORDER(msb)" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id4d73e0f3347e1d4c4c77aec75b767311d662292 Gerrit-Change-Number: 19212 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 19:45:25 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 10 Jul 2020 19:45:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_SystemInformation: add dec_SystemInformationSafe() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19212 to look at the new patch set (#2). Change subject: library/GSM_SystemInformation: add dec_SystemInformationSafe() ...................................................................... library/GSM_SystemInformation: add dec_SystemInformationSafe() Some types of System Information (mostly the Rest Octets) are not fully implemented, so calling the generic dec_SystemInformation() may result in a DTE. Let's add dec_SystemInformationSafeBT() with "prototype(backtrack)", so it would return a non-zero integer if decoding fails. Let's add a wrapper dec_SystemInformationSafe() that would additionally check the RR Protocol Discriminator. Change-Id: Id4d73e0f3347e1d4c4c77aec75b767311d662292 Related: OS#4662 --- M bts/BTS_Tests.ttcn M library/GSM_SystemInformation.ttcn 2 files changed, 32 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/12/19212/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id4d73e0f3347e1d4c4c77aec75b767311d662292 Gerrit-Change-Number: 19212 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 10 23:02:14 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 10 Jul 2020 23:02:14 +0000 Subject: Change in osmo-msc[master]: Clear Command: set cause value to "Call Control" References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/19213 ) Change subject: Clear Command: set cause value to "Call Control" ...................................................................... Clear Command: set cause value to "Call Control" So far, by failing to initialize the cause value, we always send a Clear Command cause == 0, which actually means "Radio Interface Message Failure". This is seen in all my logged network traces of osmo-msc lab testing. "Call Control" seems to be the only cause value that remotely fits a normal release procedure, even if it was not voice call related. Related: OS#4664 Change-Id: I1347ed72ae7d7ea73a557b866e764819c5ef8c42 --- M src/libmsc/msc_a.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/13/19213/1 diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index 76c0f01..0645c54 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -779,6 +779,9 @@ struct ran_msg msg = { .msg_type = RAN_MSG_CLEAR_COMMAND, .clear_command = { + /* "Call Control" is the only cause code listed in 3GPP TS 48.008 3.2.1.21 CLEAR COMMAND + * that qualifies for a normal release situation. (OS#4664) */ + .gsm0808_cause = GSM0808_CAUSE_CALL_CONTROL, .csfb_ind = (vsub && vsub->sgs_fsm->state == SGS_UE_ST_ASSOCIATED), }, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1347ed72ae7d7ea73a557b866e764819c5ef8c42 Gerrit-Change-Number: 19213 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 01:52:36 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 11 Jul 2020 01:52:36 +0000 Subject: Change in osmo-bsc[master]: RR Channel Release: pass Cause code from BSSMAP Clear to the BTS References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19214 ) Change subject: RR Channel Release: pass Cause code from BSSMAP Clear to the BTS ...................................................................... RR Channel Release: pass Cause code from BSSMAP Clear to the BTS In lchan.release, add 'cause_rr', and set RR Channel Release message's cause value to lchan.release.cause_rr. In lchan_release(), do not set lchan.release.rsl_error_cause to the RR cause value, these are unrelated. Store in new lchan.release.cause_rr instead. The rsl_error_cause is apparently only used for logging, except for one place in lchan_fsm_wait_activ_ack() that compares it to RSL_ERR_RCH_ALR_ACTV_ALLOC, so there should not be a functional difference by this fix. Propagate the BSSMAP Clear Command cause to the RR Channel Release: Add struct gscon_clear_cmd_data as event data for GSCON_EV_A_CLEAR_CMD -- so far it sent the is_csfb flag, add the gsm0808_cause; invoking the event happens in bssmap_handle_clear_cmd(). Adjust event handling in gscon_fsm_allstate(); there, pass the cause to gscon_release_lchans(). In gscon_release_lchans(), pass the cause to gscon_release_lchan(), and then lchan_release(), which sets the new lchan.release.cause_rr to the passed cause value. As soon as the lchan FSM enters the proper state, it calls gsm48_send_rr_release(). There, set the cause value in the encoded message to lchan.release.cause_rr. Interworking with osmo-msc: so far, osmo-msc fails to set the Clear Command cause code for normal release, it just passes 0 which amounts to GSM0808_CAUSE_RADIO_INTERFACE_MESSAGE_FAILURE. Before this patch, osmo-bsc always sent GSM48_RR_CAUSE_NORMAL in the RR Channel Release, and after this patch it will receive 0 == GSM0808_CAUSE_RADIO_INTERFACE_MESSAGE_FAILURE from osmo-msc and more accurately translate that to GSM48_RR_CAUSE_PROT_ERROR_UNSPC. This means in practice that we will now see an error cause in RR Channel Release instead of GSM48_RR_CAUSE_NORMAL when working with osmo-msc. For changing osmo-msc to send GSM0808_CAUSE_CALL_CONTROL instead (which translates to GSM48_RR_CAUSE_NORMAL), see OS#4664 and change-id I1347ed72ae7d7ea73a557b866e764819c5ef8c42 (osmo-msc). A test for this is in Ie6c99f28b610a67f2d59ec00b3541940e882251b (osmo-ttcn3-hacks). Related: SYS#4872 Change-Id: I734cc55c501d61bbdadee81a223b26f9df57f959 --- M include/osmocom/bsc/bsc_subscr_conn_fsm.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c 7 files changed, 65 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/14/19214/1 diff --git a/include/osmocom/bsc/bsc_subscr_conn_fsm.h b/include/osmocom/bsc/bsc_subscr_conn_fsm.h index 5475272..1a827d9 100644 --- a/include/osmocom/bsc/bsc_subscr_conn_fsm.h +++ b/include/osmocom/bsc/bsc_subscr_conn_fsm.h @@ -1,4 +1,6 @@ #pragma once +#include +#include #include enum gscon_fsm_event { @@ -40,6 +42,11 @@ GSCON_EV_FORGET_MGW_ENDPOINT, }; +struct gscon_clear_cmd_data { + enum gsm0808_cause cause_0808; + bool is_csfb; +}; + struct gsm_subscriber_connection; struct gsm_network; struct msgb; @@ -71,7 +78,7 @@ struct assignment_request *req); void gscon_change_primary_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *new_lchan); -void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_rr_release); +void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_rr_release, enum gsm48_rr_cause cause_rr); void gscon_lchan_releasing(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan); void gscon_forget_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan); diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 0f5fc54..a2e4e2f 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -572,6 +572,7 @@ * flag, so that the lchan will gracefully release at the next sensible junction. */ bool requested; bool do_rr_release; + enum gsm48_rr_cause rr_cause; /* There is an RSL error cause of value 0, so we need a separate flag. */ bool in_error; @@ -1897,4 +1898,6 @@ bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx); +enum gsm48_rr_cause bsc_gsm48_rr_cause_from_gsm0808_cause(enum gsm0808_cause c); + #endif /* _GSM_DATA_H */ diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 1d30246..0ed6715 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -182,14 +182,14 @@ lchan_release(lchan, do_rr_release, err, cause_rr); } -void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_rr_release) +void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_rr_release, enum gsm48_rr_cause cause_rr) { if (conn->ho.fi) handover_end(conn, HO_RESULT_CONN_RELEASE); assignment_reset(conn); - gscon_release_lchan(conn, conn->lchan, do_rr_release, false, 0); + gscon_release_lchan(conn, conn->lchan, do_rr_release, false, cause_rr); } static void handle_bssap_n_connect(struct osmo_fsm_inst *fi, struct osmo_scu_prim *scu_prim) @@ -746,17 +746,20 @@ static void gscon_fsm_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_subscriber_connection *conn = fi->priv; + const struct gscon_clear_cmd_data *ccd; /* Regular allstate event processing */ switch (event) { case GSCON_EV_A_CLEAR_CMD: + OSMO_ASSERT(data); + ccd = data; if (conn->lchan) - conn->lchan->release.is_csfb = *(bool *)data; + conn->lchan->release.is_csfb = ccd->is_csfb; /* MSC tells us to cleanly shut down */ if (conn->fi->state != ST_CLEARING) osmo_fsm_inst_state_chg(fi, ST_CLEARING, 60, 999); LOGPFSML(fi, LOGL_DEBUG, "Releasing all lchans (if any) after BSSMAP Clear Command\n"); - gscon_release_lchans(conn, true); + gscon_release_lchans(conn, true, bsc_gsm48_rr_cause_from_gsm0808_cause(ccd->cause_0808)); /* FIXME: Release all terestrial resources in ST_CLEARING */ /* According to 3GPP 48.008 3.1.9.1. "The BSS need not wait for the radio channel * release to be completed or for the guard timer to expire before returning the @@ -833,7 +836,9 @@ } LOGPFSML(fi, LOGL_DEBUG, "Releasing all lchans (if any) because this conn is terminating\n"); - gscon_release_lchans(conn, true); + /* when things go smoothly, the lchan should have been released before FSM instance termination. So if this is + * necessary it's probably "abnormal". */ + gscon_release_lchans(conn, true, GSM48_RR_CAUSE_ABNORMAL_UNSPEC); /* drop pending messages */ gscon_dtap_queue_flush(conn, 0); diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index b5a4284..212ced0 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -302,7 +302,7 @@ gh->msg_type = GSM48_MT_RR_CHAN_REL; cause = msgb_put(msg, 1); - cause[0] = GSM48_RR_CAUSE_NORMAL; + cause[0] = lchan->release.rr_cause; if (lchan->release.is_csfb) { uint8_t buf[CELL_SEL_IND_AFTER_REL_MAX_BYTES]; diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index f790b90..860e236 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -1840,3 +1840,30 @@ return result; } + +/* This may be specific to RR Channel Release, and the mappings were chosen by pure naive guessing without a proper + * specification available. */ +enum gsm48_rr_cause bsc_gsm48_rr_cause_from_gsm0808_cause(enum gsm0808_cause c) +{ + switch (c) { + case GSM0808_CAUSE_PREEMPTION: + return GSM48_RR_CAUSE_PREMPTIVE_REL; + case GSM0808_CAUSE_RADIO_INTERFACE_MESSAGE_FAILURE: + case GSM0808_CAUSE_INVALID_MESSAGE_CONTENTS: + case GSM0808_CAUSE_INFORMATION_ELEMENT_OR_FIELD_MISSING: + case GSM0808_CAUSE_INCORRECT_VALUE: + case GSM0808_CAUSE_UNKNOWN_MESSAGE_TYPE: + case GSM0808_CAUSE_UNKNOWN_INFORMATION_ELEMENT: + return GSM48_RR_CAUSE_PROT_ERROR_UNSPC; + case GSM0808_CAUSE_CALL_CONTROL: + case GSM0808_CAUSE_HANDOVER_SUCCESSFUL: + case GSM0808_CAUSE_BETTER_CELL: + case GSM0808_CAUSE_DIRECTED_RETRY: + case GSM0808_CAUSE_REDUCE_LOAD_IN_SERVING_CELL: + case GSM0808_CAUSE_RELOCATION_TRIGGERED: + case GSM0808_CAUSE_ALT_CHAN_CONFIG_REQUESTED: + return GSM48_RR_CAUSE_NORMAL; + default: + return GSM48_RR_CAUSE_ABNORMAL_UNSPEC; + } +} diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index a1bf857..fbda1ac 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -402,6 +402,8 @@ .meas_rep_last_seen_nr = 255, .last_error = lchan->last_error, + + .release.rr_cause = GSM48_RR_CAUSE_NORMAL, }; } @@ -1369,8 +1371,8 @@ struct osmo_fsm_inst *fi = lchan->fi; lchan->release.in_error = err; - lchan->release.rsl_error_cause = cause_rr; lchan->release.do_rr_release = do_rr_release; + lchan->release.rr_cause = cause_rr; /* States waiting for events will notice the desire to release when done waiting, so it is enough * to mark for release. */ diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 2deb7f4..1cacfe9 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -453,15 +453,23 @@ struct msgb *msg, unsigned int length) { struct tlv_parsed tp; - bool is_csfb = false; + struct gscon_clear_cmd_data ccd = { + .is_csfb = false, + }; tlv_parse(&tp, gsm0808_att_tlvdef(), msg->l4h + 1, length - 1, 0, 0); - /* FIXME: Check for mandatory cause IE, and use that in RR RELEASE cause! */ - if (TLVP_PRESENT(&tp, GSM0808_IE_CSFB_INDICATION)) - is_csfb = true; + ccd.cause_0808 = gsm0808_get_cause(&tp); + if (ccd.cause_0808 < 0) { + LOGPFSML(conn->fi, LOGL_ERROR, "Clear Command: Mandatory Cause IE not present.\n"); + /* Clear anyway, but without a proper cause. */ + ccd.cause_0808 = GSM0808_CAUSE_RADIO_INTERFACE_MESSAGE_FAILURE; + } - osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CLEAR_CMD, &is_csfb); + if (TLVP_PRESENT(&tp, GSM0808_IE_CSFB_INDICATION)) + ccd.is_csfb = true; + + osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CLEAR_CMD, &ccd); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I734cc55c501d61bbdadee81a223b26f9df57f959 Gerrit-Change-Number: 19214 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 01:52:37 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 11 Jul 2020 01:52:37 +0000 Subject: Change in osmo-bsc[master]: propagate RSL error cause codes to RR Channel Release cause References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19215 ) Change subject: propagate RSL error cause codes to RR Channel Release cause ...................................................................... propagate RSL error cause codes to RR Channel Release cause In various places that receive an error cause from RSL and place it in lchan.release.rsl_error_cause, translate it to an RR cause and place that in the recently added lchan.release.rr_cause. Hence the RR Channel Release message now reflects more specific error causes when the reason for the error was received in an RSL message's cause value. Change-Id: I46eb12c91a8c08162b43dd22c7ba825ef3bbc6ac --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/lchan_fsm.c 4 files changed, 34 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/15/19215/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index a2e4e2f..74e41df 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1899,5 +1899,6 @@ bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx); enum gsm48_rr_cause bsc_gsm48_rr_cause_from_gsm0808_cause(enum gsm0808_cause c); +enum gsm48_rr_cause bsc_gsm48_rr_cause_from_rsl_cause(uint8_t c); #endif /* _GSM_DATA_H */ diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 0ed6715..72f2474 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -783,6 +783,8 @@ if (conn->lchan) { conn->lchan->release.in_error = true; conn->lchan->release.rsl_error_cause = data ? *(uint8_t*)data : RSL_ERR_IE_ERROR; + conn->lchan->release.rr_cause = + bsc_gsm48_rr_cause_from_rsl_cause(conn->lchan->release.rsl_error_cause); } gscon_bssmap_clear(conn, GSM0808_CAUSE_RADIO_INTERFACE_FAILURE); break; diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 860e236..a4f6b7f 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -1867,3 +1867,29 @@ return GSM48_RR_CAUSE_ABNORMAL_UNSPEC; } } + +/* Map RSL_ERR_* cause codes to gsm48_rr_cause codes. + * The mappings were chosen by naive guessing without a proper specification available. */ +enum gsm48_rr_cause bsc_gsm48_rr_cause_from_rsl_cause(uint8_t c) +{ + switch (c) { + case RSL_ERR_NORMAL_UNSPEC: + return GSM48_RR_CAUSE_NORMAL; + case RSL_ERR_MAND_IE_ERROR: + return GSM48_RR_CAUSE_INVALID_MAND_INF; + case RSL_ERR_OPT_IE_ERROR: + return GSM48_RR_CAUSE_COND_IE_ERROR; + case RSL_ERR_INVALID_MESSAGE: + case RSL_ERR_MSG_DISCR: + case RSL_ERR_MSG_TYPE: + case RSL_ERR_MSG_SEQ: + case RSL_ERR_IE_ERROR: + case RSL_ERR_IE_NONEXIST: + case RSL_ERR_IE_LENGTH: + case RSL_ERR_IE_CONTENT: + case RSL_ERR_PROTO: + return GSM48_RR_CAUSE_PROT_ERROR_UNSPC; + default: + return GSM48_RR_CAUSE_ABNORMAL_UNSPEC; + } +} diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index fbda1ac..14c1942 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -681,6 +681,7 @@ if (data) { uint32_t next_state; lchan->release.rsl_error_cause = *(uint8_t*)data; + lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(lchan->release.rsl_error_cause); lchan->release.in_error = true; if (lchan->release.rsl_error_cause != RSL_ERR_RCH_ALR_ACTV_ALLOC) next_state = LCHAN_ST_BORKEN; @@ -693,6 +694,7 @@ rsl_err_name(lchan->release.rsl_error_cause), lchan->release.rsl_error_cause); } else { lchan->release.rsl_error_cause = RSL_ERR_IE_NONEXIST; + lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(lchan->release.rsl_error_cause); lchan->release.in_error = true; lchan_fail_to(LCHAN_ST_BORKEN, "Chan Activ NACK without cause IE"); } @@ -1109,6 +1111,7 @@ osmo_stat_item_dec(lchan->ts->trx->bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); lchan->release.in_error = true; lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING; + lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(lchan->release.rsl_error_cause); lchan_fsm_state_chg(LCHAN_ST_WAIT_RF_RELEASE_ACK); return; @@ -1125,6 +1128,7 @@ osmo_stat_item_dec(lchan->ts->trx->bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); lchan->release.in_error = true; lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING; + lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(lchan->release.rsl_error_cause); lchan_fsm_state_chg(LCHAN_ST_WAIT_AFTER_ERROR); /* TODO: we used to do this only for sysmobts: int do_free = is_sysmobts_v2(ts->trx->bts); @@ -1353,6 +1357,7 @@ default: lchan->release.in_error = true; lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING; + lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(lchan->release.rsl_error_cause); lchan_fail("Timeout"); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I46eb12c91a8c08162b43dd22c7ba825ef3bbc6ac Gerrit-Change-Number: 19215 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 01:53:02 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 11 Jul 2020 01:53:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test RR Channel Release EARFCNs References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 ) Change subject: bsc: test RR Channel Release EARFCNs ...................................................................... bsc: test RR Channel Release EARFCNs Add a DCHAN and release to recently added SI2quater tests (because these tests already configure various amounts of EARFCNs in osmo-bsc). Verify that the RR Channel Release for CSFB contains all configured EARFCNs. In GSM_RR_Types.ttcn, add coding for "Cell selection indicator after release of all TCH and SDCCH IE". In f_expect_chan_rel(), add optional arg csfb_expect_cells, and, if present, decode the RR Channel Release message's L3 part, and in turn the Cell Selection Indicator Value contained. Match against csfb_expect_cells. In f_tc_si2quater_n_earfcns(), also compose a list of EARFCNs as found in the RR Channel Release, and pass to f_expect_chan_rel(). Depends: I59e427e4ebb1c6af99b27a15c40fed82457ac8ab (osmo-bsc) Change-Id: I882c5e1f70bcc4833fc837a95c900ce291919cc5 --- M bsc/BSC_Tests.ttcn M library/GSM_RR_Types.ttcn 2 files changed, 162 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/19216/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index cc7346f..10947b0 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1441,13 +1441,15 @@ boolean expect_rr_chan_rel := true, boolean expect_rll_rel_req := true, boolean handle_rll_rel := true, - boolean is_csfb := false + boolean is_csfb := false, + template CellSelectionIndicatorValue csfb_expect_cells := omit ) runs on test_CT { var RslLinkId main_dcch := valueof(ts_RslLinkID_DCCH(0)); var boolean got_deact_sacch := false; var boolean got_rr_chan_rel := false; var boolean got_rll_rel_req := false; + var ASP_RSL_Unitdata ud; log("f_expect_chan_rel() expecting: expect_deact_sacch=", expect_deact_sacch, " expect_rr_chan_rel=", expect_rr_chan_rel, " expect_rll_rel_req=", expect_rll_rel_req); alt { @@ -1455,8 +1457,27 @@ got_deact_sacch := true; repeat; } - [is_csfb] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE_CSFB))) { + [is_csfb] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE_CSFB))) -> value ud { got_rr_chan_rel := true; + + if (ispresent(csfb_expect_cells)) { + var RSL_IE_Body l3_ie; + if (f_rsl_find_ie(ud.rsl, RSL_IE_L3_INFO, l3_ie) == false) { + setverdict(fail, "cannot find L3"); + mtc.stop; + } + var PDU_ML3_NW_MS l3 := dec_PDU_ML3_NW_MS(l3_ie.l3_info.payload); + var CellSelectionIndicatorValue cells := dec_CellSelectionIndicatorValue( + l3.msgs.rrm.channelRelease.cellSelectionIndicator.cellSelectionIndicatorValue); + + log("GOT RR CHANNEL RELEASE CSFB CELLS: ", cells); + if (match(cells, csfb_expect_cells)) { + setverdict(pass); + } else { + log("EXPECTED CSFB CELLS: ", csfb_expect_cells); + setverdict(fail, "Received CSFB cells list on RR Channel Release does not match expectations"); + } + } repeat; } [not is_csfb] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE))) { @@ -1735,7 +1756,8 @@ } } -function f_test_si2quater(integer total_earfcns, template SystemInformationConfig expect_si) runs on test_CT { +function f_test_si2quater(integer total_earfcns, template SystemInformationConfig expect_si, + template CellSelectionIndicatorValue expect_cells := omit) runs on test_CT { f_init(0); @@ -1747,6 +1769,30 @@ f_init_bts_and_check_sysinfo(0, expect_si := expect_si); + f_init(1); + + if (ispresent(expect_cells)) { + /* Also check that RR Channel Release contains these EARFCNs. + * (copied code from TC_chan_rel_hard_clear_csfb) */ + var BSSAP_N_DATA_ind rx_di; + var DchanTuple dt; + + dt := f_est_dchan('23'O, 23, '00010203040506'O); + + /* Instruct BSC to clear channel */ + var BssmapCause cause := 0; + BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_ClearCommandCSFB(cause))); + + /* expect Clear Complete from BSC on A */ + BSSAP.receive(tr_BSSAP_DATA_ind(dt.sccp_conn_id, tr_BSSMAP_ClearComplete)) { + /* release the SCCP connection */ + BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); + } + + f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false, is_csfb := true, + csfb_expect_cells := expect_cells); + } + for (var integer i := 1; i < total_earfcns; i := i + 1) { f_bts_0_cfg(BSCVTY, {"si2quater neighbor-list del earfcn " & int2str(f_test_si2quater_earfcn_by_idx(i))}); } @@ -1770,11 +1816,24 @@ return si2quater; } +private function f_tr_rr_chan_rel_earfcns(integer count) return template CellSelectionIndicatorValue +{ + var template CellSelectionIndicatorValue_EUTRAN_Descriptions cells := {}; + + for (var integer i := 0; i < count; i := i + 1) { + var integer earfcn := f_test_si2quater_earfcn_by_idx(i); + cells[i] := tr_CellSelectionIndicatorValue_EUTRAN_Description(earfcn, meas_bw_presence := '0'B, meas_bw := omit); + } + + return tr_CellSelectionIndicatorValue_EUTRAN(cells); +} + private function f_tc_si2quater_n_earfcns(integer n) runs on test_CT { var template SystemInformationConfig sic := SystemInformationConfig_default; sic.si2quater := f_tr_si2quater_earfcns(n); - f_test_si2quater(n, sic); + var template CellSelectionIndicatorValue cells := f_tr_rr_chan_rel_earfcns(n); + f_test_si2quater(n, sic, cells); } testcase TC_si2quater_2_earfcns() runs on test_CT { diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index 4b460b1..faa0429 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -1070,4 +1070,103 @@ ext_ra := ext_ra }; + + type record CellSelectionIndicatorValue { + BIT3 discr, + CellSelectionIndicatorValueEnum value_list, + BIT1 value_list_term ('0'B) + } with { + variant (value_list) "CROSSTAG( + gsm, discr='000'B; + utran_fdd, discr='001'B; + utran_tdd, discr='010'B; + eutran, discr='011'B; + )" + }; + + type union CellSelectionIndicatorValueEnum { + CellSelectionIndicatorValue_GSM_Descriptions gsm, + CellSelectionIndicatorValue_UTRAN_Descriptions utran_fdd, + CellSelectionIndicatorValue_UTRAN_Descriptions utran_tdd, + CellSelectionIndicatorValue_EUTRAN_Descriptions eutran + } with { variant "" }; + + type record of CellSelectionIndicatorValue_GSM_Description CellSelectionIndicatorValue_GSM_Descriptions; + type record CellSelectionIndicatorValue_GSM_Description { + BIT1 item_ind ('1'B), + BIT1 band_indicator, + uint10_t arfcn, + uint6_t bsic + } with { + variant "PRESENCE(item_ind = '1'B)" + }; + + type record of CellSelectionIndicatorValue_UTRAN_Description CellSelectionIndicatorValue_UTRAN_Descriptions; + type record CellSelectionIndicatorValue_UTRAN_Description { + BIT1 item_ind ('1'B), + BIT1 bandwidth_presence, + uint3_t bandwidth optional, + uint14_t arfcn, + BIT1 cell_info_presence, + UTRAN_CellInfo cell_info optional + } with { + variant "PRESENCE(item_ind = '1'B)" + variant (bandwidth) "PRESENCE(bandwidth_presence = '1'B)" + variant (cell_info) "PRESENCE(cell_info_presence = '1'B)" + }; + type record UTRAN_CellInfo { + BIT1 indic0, + uint5_t nr_of_cells, + // TODO: define cell_information_field + octetstring cell_information_field + } with { variant "" }; + + type record of CellSelectionIndicatorValue_EUTRAN_Description CellSelectionIndicatorValue_EUTRAN_Descriptions; + type record CellSelectionIndicatorValue_EUTRAN_Description { + BIT1 item_ind ('1'B), + uint16_t earfcn, + BIT1 meas_bw_presence, + uint3_t meas_bw optional, + BIT1 not_allowed_cells_presence, + // define not_allowed_cells + octetstring not_allowed_cells optional, + BIT1 target_pcid_presence, + uint9_t target_pcid optional + } with { + variant "PRESENCE(item_ind = '1'B)" + variant (meas_bw) "PRESENCE(meas_bw_presence = '1'B)" + variant (not_allowed_cells) "PRESENCE(not_allowed_cells_presence = '1'B)" + variant (target_pcid) "PRESENCE(target_pcid_presence = '1'B)" + }; + + template CellSelectionIndicatorValue tr_CellSelectionIndicatorValue_EUTRAN( + template CellSelectionIndicatorValue_EUTRAN_Descriptions cells := {}) + := { + discr := '011'B, + value_list := { + eutran := cells + }, + value_list_term := '0'B + }; + + template CellSelectionIndicatorValue_EUTRAN_Description tr_CellSelectionIndicatorValue_EUTRAN_Description( + template (present) uint16_t earfcn, + template (present) BIT1 meas_bw_presence := ?, + template uint3_t meas_bw := *) + := { + item_ind := '1'B, + earfcn := earfcn, + meas_bw_presence := ?, + meas_bw := meas_bw, + not_allowed_cells_presence := '0'B, + not_allowed_cells := omit, + target_pcid_presence := '0'B, + target_pcid := omit + }; + + external function enc_CellSelectionIndicatorValue(in CellSelectionIndicatorValue ro) return octetstring + with { extension "prototype(convert) encode(RAW)" }; + external function dec_CellSelectionIndicatorValue(in octetstring stream) return CellSelectionIndicatorValue + with { extension "prototype(convert) decode(RAW)" }; + } with { encode "RAW" ; variant "FIELDORDER(msb)" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I882c5e1f70bcc4833fc837a95c900ce291919cc5 Gerrit-Change-Number: 19216 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 01:53:02 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 11 Jul 2020 01:53:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test RR Channel Release cause codes from Clear Command cause codes References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217 ) Change subject: bsc: test RR Channel Release cause codes from Clear Command cause codes ...................................................................... bsc: test RR Channel Release cause codes from Clear Command cause codes Invoke Clear Command with various Cause codes and verify that the RR Channel Release reflects them. Depends: I734cc55c501d61bbdadee81a223b26f9df57f959 (osmo-bsc) Change-Id: Ie6c99f28b610a67f2d59ec00b3541940e882251b --- M bsc/BSC_Tests.ttcn M library/GSM_RR_Types.ttcn 2 files changed, 89 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/19217/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 10947b0..3b47612 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1442,7 +1442,8 @@ boolean expect_rll_rel_req := true, boolean handle_rll_rel := true, boolean is_csfb := false, - template CellSelectionIndicatorValue csfb_expect_cells := omit + template CellSelectionIndicatorValue csfb_expect_cells := omit, + template RR_Cause expect_rr_cause := ? ) runs on test_CT { var RslLinkId main_dcch := valueof(ts_RslLinkID_DCCH(0)); @@ -1450,6 +1451,9 @@ var boolean got_rr_chan_rel := false; var boolean got_rll_rel_req := false; var ASP_RSL_Unitdata ud; + var RSL_IE_Body l3_ie; + var PDU_ML3_NW_MS l3; + var RR_Cause got_cause; log("f_expect_chan_rel() expecting: expect_deact_sacch=", expect_deact_sacch, " expect_rr_chan_rel=", expect_rr_chan_rel, " expect_rll_rel_req=", expect_rll_rel_req); alt { @@ -1460,13 +1464,13 @@ [is_csfb] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE_CSFB))) -> value ud { got_rr_chan_rel := true; + if (f_rsl_find_ie(ud.rsl, RSL_IE_L3_INFO, l3_ie) == false) { + setverdict(fail, "cannot find L3"); + mtc.stop; + } + l3 := dec_PDU_ML3_NW_MS(l3_ie.l3_info.payload); + if (ispresent(csfb_expect_cells)) { - var RSL_IE_Body l3_ie; - if (f_rsl_find_ie(ud.rsl, RSL_IE_L3_INFO, l3_ie) == false) { - setverdict(fail, "cannot find L3"); - mtc.stop; - } - var PDU_ML3_NW_MS l3 := dec_PDU_ML3_NW_MS(l3_ie.l3_info.payload); var CellSelectionIndicatorValue cells := dec_CellSelectionIndicatorValue( l3.msgs.rrm.channelRelease.cellSelectionIndicator.cellSelectionIndicatorValue); @@ -1478,10 +1482,38 @@ setverdict(fail, "Received CSFB cells list on RR Channel Release does not match expectations"); } } + + if (ispresent(expect_rr_cause)) { + int2enum(oct2int(l3.msgs.rrm.channelRelease.rRCause.valuePart), got_cause); + log("GOT CAUSE CODE: ", l3.msgs.rrm.channelRelease.rRCause.valuePart, " = ", got_cause); + if (match(got_cause, expect_rr_cause)) { + setverdict(pass); + } else { + log("EXPECTED CAUSE CODE: ", expect_rr_cause); + setverdict(fail, "Received RR Channel Release Cause code does not match expectations"); + } + } repeat; } - [not is_csfb] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE))) { + [not is_csfb] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE))) -> value ud { got_rr_chan_rel := true; + + if (ispresent(expect_rr_cause)) { + if (f_rsl_find_ie(ud.rsl, RSL_IE_L3_INFO, l3_ie) == false) { + setverdict(fail, "cannot find L3"); + mtc.stop; + } + l3 := dec_PDU_ML3_NW_MS(l3_ie.l3_info.payload); + + int2enum(oct2int(l3.msgs.rrm.channelRelease.rRCause.valuePart), got_cause); + log("GOT CAUSE CODE: ", l3.msgs.rrm.channelRelease.rRCause.valuePart, " = ", got_cause); + if (match(got_cause, expect_rr_cause)) { + setverdict(pass); + } else { + log("EXPECTED CAUSE CODE: ", expect_rr_cause); + setverdict(fail, "Received RR Channel Release Cause code does not match expectations"); + } + } repeat; } [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_REL_REQ(rsl_chan_nr, ?))) { @@ -1631,6 +1663,34 @@ setverdict(pass); } +private function f_tc_chan_rel_rr_cause(myBSSMAP_Cause clear_cmd_cause, template RR_Cause expect_rr_cause) +runs on test_CT +{ + var DchanTuple dt; + + dt := f_est_dchan('23'O, 23, '00010203040506'O); + var BssmapCause cause := 0; + BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_ClearCommand(enum2int(clear_cmd_cause)))); + BSSAP.receive(tr_BSSAP_DATA_ind(dt.sccp_conn_id, tr_BSSMAP_ClearComplete)) { + BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); + } + + f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false, expect_rr_cause := expect_rr_cause); + setverdict(pass); +} + +/* Test that Clear Command cause codes affect the RR Channel Release cause code */ +testcase TC_chan_rel_rr_cause() runs on test_CT { + f_init(1); + + f_tc_chan_rel_rr_cause(GSM0808_CAUSE_CALL_CONTROL, GSM48_RR_CAUSE_NORMAL); + f_tc_chan_rel_rr_cause(GSM0808_CAUSE_HANDOVER_SUCCESSFUL, GSM48_RR_CAUSE_NORMAL); + f_tc_chan_rel_rr_cause(GSM0808_CAUSE_PREEMPTION, GSM48_RR_CAUSE_PREMPTIVE_REL); + f_tc_chan_rel_rr_cause(GSM0808_CAUSE_RADIO_INTERFACE_MESSAGE_FAILURE, GSM48_RR_CAUSE_PROT_ERROR_UNSPC); + f_tc_chan_rel_rr_cause(GSM0808_CAUSE_RADIO_INTERFACE_FAILURE, GSM48_RR_CAUSE_ABNORMAL_UNSPEC); + f_tc_chan_rel_rr_cause(GSM0808_CAUSE_EQUIPMENT_FAILURE, GSM48_RR_CAUSE_ABNORMAL_UNSPEC); +} + /* Test behavior if RSL EST IND for non-active channel */ testcase TC_rll_est_ind_inact_lchan() runs on test_CT { timer T := 2.0; @@ -5906,6 +5966,7 @@ execute( TC_chan_rel_hard_rlsd_ms_dead() ); execute( TC_chan_rel_a_reset() ); execute( TC_chan_rel_sccp_tiar_timeout() ); + execute( TC_chan_rel_rr_cause() ); execute( TC_outbound_connect() ); diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index faa0429..1d585cf 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -113,6 +113,26 @@ INTERSYS_TO_EUTRAN_HO_CMD ('01100110'B) } with { variant "FIELDLENGTH(8)" }; + type enumerated RR_Cause { + GSM48_RR_CAUSE_NORMAL ('00'O), + GSM48_RR_CAUSE_ABNORMAL_UNSPEC ('01'O), + GSM48_RR_CAUSE_ABNORMAL_UNACCT ('02'O), + GSM48_RR_CAUSE_ABNORMAL_TIMER ('03'O), + GSM48_RR_CAUSE_ABNORMAL_NOACT ('04'O), + GSM48_RR_CAUSE_PREMPTIVE_REL ('05'O), + GSM48_RR_CAUSE_HNDOVER_IMP ('08'O), + GSM48_RR_CAUSE_CHAN_MODE_UNACCT ('09'O), + GSM48_RR_CAUSE_FREQ_NOT_IMPL ('0a'O), + GSM48_RR_CAUSE_CALL_CLEARED ('41'O), + GSM48_RR_CAUSE_SEMANT_INCORR ('5f'O), + GSM48_RR_CAUSE_INVALID_MAND_INF ('60'O), + GSM48_RR_CAUSE_MSG_TYPE_N ('61'O), + GSM48_RR_CAUSE_MSG_TYPE_N_COMPAT('62'O), + GSM48_RR_CAUSE_COND_IE_ERROR ('64'O), + GSM48_RR_CAUSE_NO_CELL_ALLOC_A ('65'O), + GSM48_RR_CAUSE_PROT_ERROR_UNSPC ('6f'O) + } with { variant "FIELDLENGTH(8)" }; + type octetstring RestOctets with { variant "PADDING(yes), PADDING_PATTERN('00101011'B)" }; type hexstring GsmBcdString with { variant "HEXORDER(low)" }; type GsmBcdString BcdMccMnc with { variant "FIELDLENGTH(6)" }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie6c99f28b610a67f2d59ec00b3541940e882251b Gerrit-Change-Number: 19217 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 01:53:33 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 11 Jul 2020 01:53:33 +0000 Subject: Change in osmo-mgw[master]: add osmo-mgw --vty-ref-xml: dump VTY ref XML to stdout In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18926 ) Change subject: add osmo-mgw --vty-ref-xml: dump VTY ref XML to stdout ...................................................................... add osmo-mgw --vty-ref-xml: dump VTY ref XML to stdout Add only a long option to not clutter the cmdline namespace. To add a long option without a short letter is slightly complex: use the 'flag' and 'val' mechanism as in 'man 3 getopt' to write an option index to long_option. Depends: Ic74bbdb6dc5ea05f03c791cc70184861e39cd492 (libosmocore) Change-Id: Ia988ea1c3f5169bdb4d21f2f05933665711cfcbf --- M src/osmo-mgw/mgw_main.c 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-mgw/mgw_main.c b/src/osmo-mgw/mgw_main.c index 99e2499..6ca1800 100644 --- a/src/osmo-mgw/mgw_main.c +++ b/src/osmo-mgw/mgw_main.c @@ -98,18 +98,21 @@ printf(" -s --disable-color\n"); printf(" -D --daemonize Fork the process into a background daemon\n"); printf(" -V --version Print the version number\n"); + printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n"); } static void handle_options(int argc, char **argv) { while (1) { int option_index = 0, c; + static int long_option = 0; static struct option long_options[] = { {"help", 0, 0, 'h'}, {"config-file", 1, 0, 'c'}, {"daemonize", 0, 0, 'D'}, {"version", 0, 0, 'V'}, {"disable-color", 0, 0, 's'}, + {"vty-ref-xml", 0, &long_option, 1}, {0, 0, 0, 0}, }; @@ -123,6 +126,15 @@ print_help(); exit(0); break; + case 0: + switch (long_option) { + case 1: + vty_dump_xml_ref(stdout); + exit(0); + default: + fprintf(stderr, "error parsing cmdline options\n"); + exit(2); + } case 'c': config_file = talloc_strdup(tall_bsc_ctx, optarg); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia988ea1c3f5169bdb4d21f2f05933665711cfcbf Gerrit-Change-Number: 18926 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 01:59:07 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 11 Jul 2020 01:59:07 +0000 Subject: Change in osmo-hlr[master]: manual: describe subscriber import by SQL In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/19052 ) Change subject: manual: describe subscriber import by SQL ...................................................................... Patch Set 1: (1 comment) > Patch Set 1: > > (2 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/19052/1/doc/manuals/chapters/subscribers.adoc File doc/manuals/chapters/subscribers.adoc: https://gerrit.osmocom.org/c/osmo-hlr/+/19052/1/doc/manuals/chapters/subscribers.adoc at 160 PS1, Line 160: id > So I guess you can simply omit this field, and sqlite will pick a unique value for you? but below commands need to cross reference to the subscriber id. another consideration is that the import must not create duplicates (I think it's safe from the unique constraint on MSISDN and IMSI). anyway, there might be some SQL magic that gets the last added subscriber id and allows using that, but i'm not aware. maybe you can add such technique? (in another patch?) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/19052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3246e6d5364215a71c33b5aca876deab7b6cfd70 Gerrit-Change-Number: 19052 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 11 Jul 2020 01:59:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 02:02:46 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 11 Jul 2020 02:02:46 +0000 Subject: Change in osmo-mgw[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18927 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... Patch Set 3: Code-Review+2 combining +1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I526af21134087e2b43b9ada59c93f636ae242e24 Gerrit-Change-Number: 18927 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 11 Jul 2020 02:02:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 02:02:50 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 11 Jul 2020 02:02:50 +0000 Subject: Change in osmo-mgw[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18927 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... manuals: generate vty reference xml at build time Move 'doc' subdir further down to "make sure" the osmo-mgw binary is built before the docs. Remove mgw_vty_reference.xml from the source tree. In manuals/Makefile.am use the new BUILT_REFERENCE_XML feature recently added to osmo-gsm-manuals, and add a build target to generate the XML using the new osmo-mgw --vty-ref-xml cmdline switch. Depends: I613d692328050a036d05b49a436ab495fc2087ba (osmo-gsm-manuals) Change-Id: I526af21134087e2b43b9ada59c93f636ae242e24 --- M Makefile.am M doc/manuals/Makefile.am D doc/manuals/vty/mgw_vty_reference.xml 3 files changed, 6 insertions(+), 1,678 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/Makefile.am b/Makefile.am index 1255210..ae063da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,10 +9,10 @@ $(NULL) SUBDIRS = \ - doc \ include \ src \ tests \ + doc \ contrib \ $(NULL) diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am index a82f95d..7242015 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -13,6 +13,11 @@ VTY_REFERENCE = osmomgw-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc + BUILT_REFERENCE_XML = $(builddir)/vty/mgw_vty_reference.xml + $(builddir)/vty/mgw_vty_reference.xml: $(top_builddir)/src/osmo-mgw/osmo-mgw + mkdir -p $(builddir)/vty + $(top_builddir)/src/osmo-mgw/osmo-mgw --vty-ref-xml > $@ + OSMO_REPOSITORY = osmo-mgw include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc endif diff --git a/doc/manuals/vty/mgw_vty_reference.xml b/doc/manuals/vty/mgw_vty_reference.xml deleted file mode 100644 index 047a2ad..0000000 --- a/doc/manuals/vty/mgw_vty_reference.xml +++ /dev/null @@ -1,1677 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - - config-mgcp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-mgcp-trunk - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I526af21134087e2b43b9ada59c93f636ae242e24 Gerrit-Change-Number: 18927 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 02:13:56 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 11 Jul 2020 02:13:56 +0000 Subject: Change in osmo-msc[master]: add full SDP codec information to the MNCC socket In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15953 ) Change subject: add full SDP codec information to the MNCC socket ...................................................................... Patch Set 6: (7 comments) https://gerrit.osmocom.org/c/osmo-msc/+/15953/6//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/15953/6//COMMIT_MSG at 39 PS6, Line 39: mnccc_release_sent > ccc? ;) heh we should invent that, a hacker's call control interface for congresses https://gerrit.osmocom.org/c/osmo-msc/+/15953/6/src/libmsc/cc_sdp.c File src/libmsc/cc_sdp.c: https://gerrit.osmocom.org/c/osmo-msc/+/15953/6/src/libmsc/cc_sdp.c at 10 PS6, Line 10: /* In order of preference. TODO: make configurable */ > Are we adding regression here? Wasn't it already configurable before? i should check that indeed. I think the preference passed from the BSS still matters most, but I should take another look https://gerrit.osmocom.org/c/osmo-msc/+/15953/6/src/libmsc/cc_sdp.c at 11 PS6, Line 11: static const enum gsm48_bcap_speech_ver mobile_codecs[] = { > Not sure if it really makes sense having this static here. right, doesn't https://gerrit.osmocom.org/c/osmo-msc/+/15953/6/src/libmsc/cc_sdp.c at 27 PS6, Line 27: static const enum gsm48_bcap_speech_ver utran_codecs[] = { neither https://gerrit.osmocom.org/c/osmo-msc/+/15953/6/src/libmsc/codec_sdp_cc_t9n.c File src/libmsc/codec_sdp_cc_t9n.c: https://gerrit.osmocom.org/c/osmo-msc/+/15953/6/src/libmsc/codec_sdp_cc_t9n.c at 170 PS6, Line 170: const struct codec_mapping *codec_mapping_by_gsm0808_speech_codec_type(enum gsm0808_speech_codec_type sct, uint16_t cfg) > either fix the TODO or mark cfg as unused for the compiler. how? https://gerrit.osmocom.org/c/osmo-msc/+/15953/6/src/libmsc/sdp_msg.c File src/libmsc/sdp_msg.c: https://gerrit.osmocom.org/c/osmo-msc/+/15953/6/src/libmsc/sdp_msg.c at 558 PS6, Line 558: if (codec->rate != 8000) > Next time, please split this kind of stuff into separate commits for easier review. will split, missed this one https://gerrit.osmocom.org/c/osmo-msc/+/15953/6/tests/msc_vlr/msc_vlr_test_call.err File tests/msc_vlr/msc_vlr_test_call.err: https://gerrit.osmocom.org/c/osmo-msc/+/15953/6/tests/msc_vlr/msc_vlr_test_call.err at 429 PS6, Line 429: > This empty line in stderr (libosmocore log) looks susp?cious. [?] will check -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8c3b2de53ffae4ec3a66b9dabf308c290a2c999f Gerrit-Change-Number: 15953 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 11 Jul 2020 02:13:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 06:11:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 11 Jul 2020 06:11:45 +0000 Subject: Change in osmo-msc[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/18925 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/18925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib872e7979c5b5a9da1347a3f326307844cf76536 Gerrit-Change-Number: 18925 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 11 Jul 2020 06:11:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 06:22:32 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 11 Jul 2020 06:22:32 +0000 Subject: Change in osmo-msc[master]: Clear Command: set cause value to "Call Control" In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19213 ) Change subject: Clear Command: set cause value to "Call Control" ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-msc/+/19213/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/19213/1//COMMIT_MSG at 13 PS1, Line 13: "Call Control" seems to be the only cause value Please add the spec. references, thanks! https://gerrit.osmocom.org/c/osmo-msc/+/19213/1/src/libmsc/msc_a.c File src/libmsc/msc_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/19213/1/src/libmsc/msc_a.c at 784 PS1, Line 784: GSM0808_CAUSE_CALL_CONTROL So even if it's a connection for USSD or SMS, we still send "call control"? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1347ed72ae7d7ea73a557b866e764819c5ef8c42 Gerrit-Change-Number: 19213 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 11 Jul 2020 06:22:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 06:42:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 11 Jul 2020 06:42:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test RR Channel Release EARFCNs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 ) Change subject: bsc: test RR Channel Release EARFCNs ...................................................................... Patch Set 1: (8 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/bsc/BSC_Tests.ttcn at 1472 PS1, Line 1472: ws https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/bsc/BSC_Tests.ttcn at 1794 PS1, Line 1794: ws https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn File library/GSM_RR_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn at 1074 PS1, Line 1074: CellSelectionIndicatorValue It makes sense to shorten names a bit, e.g. CellSelIndValue. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn at 1087 PS1, Line 1087: CellSelectionIndicatorValueEnum Not sure if this type is going to be used outside, so let's make it 'private'. Same applies to other potentially 'private' types. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn at 1109 PS1, Line 1109: arfcn uarfcn? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn at 1131 PS1, Line 1131: define not_allowed_cells See GSM_RestOctets.EUTRAN_RepeatedNotAllowedCells (incomplete implementation). https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn at 1134 PS1, Line 1134: target_pcid Can we use GSM_RestOctets.EUTRAN_PCID2TAMaps here? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn at 1154 PS1, Line 1154: meas_bw_presence Unused argument. I don't think it's even needed. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I882c5e1f70bcc4833fc837a95c900ce291919cc5 Gerrit-Change-Number: 19216 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 11 Jul 2020 06:42:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 08:33:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 11 Jul 2020 08:33:28 +0000 Subject: Change in osmo-e1d[master]: Detect truncated reads on SOCK_SEQPACKET sockets References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19218 ) Change subject: Detect truncated reads on SOCK_SEQPACKET sockets ...................................................................... Detect truncated reads on SOCK_SEQPACKET sockets Related: OS#4663 Change-Id: Ie143d3d56a68fda97cb9f5107a27f9beb043a2a4 --- M src/intf_line.c 1 file changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/18/19218/1 diff --git a/src/intf_line.c b/src/intf_line.c index ce30b4f..fe9edbb 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -26,6 +26,9 @@ #include #include #include +#include +#include + #include #include @@ -179,8 +182,14 @@ while (oo < len) { /* Pending message ? */ if (!ts->tx_len) { - rv = read(ts->fd, ts->tx_buf, sizeof(ts->tx_buf)); + rv = recv(ts->fd, ts->tx_buf, sizeof(ts->tx_buf), MSG_TRUNC); if (rv > 0) { + if (rv > sizeof(ts->tx_buf)) { + LOGPTS(ts, DXFR, LOGL_ERROR, "Truncated message: Client tried to " + "send %d bytes but our buffer is limited to %lu\n", + rv, sizeof(ts->tx_buf)); + rv = sizeof(ts->tx_buf); + } LOGPTS(ts, DXFR, LOGL_DEBUG, "TX Message: %d [ %s]\n", rv, osmo_hexdump(ts->tx_buf, rv)); ts->tx_len = rv; @@ -242,7 +251,12 @@ switch (ts->mode) { case E1_TS_MODE_RAW: - l = read(ts->fd, buf_ts, fts); + l = recv(ts->fd, buf_ts, fts, MSG_TRUNC); + if (l > fts) { + LOGPTS(ts, DXFR, LOGL_ERROR, "Truncated message: Client tried to " + "send %d bytes but our buffer is limited to %d\n", l, fts); + l = fts; + } break; case E1_TS_MODE_HDLCFCS: l = _e1_tx_hdlcfs(ts, buf_ts, fts); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ie143d3d56a68fda97cb9f5107a27f9beb043a2a4 Gerrit-Change-Number: 19218 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 08:51:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 11 Jul 2020 08:51:46 +0000 Subject: Change in osmo-e1d[master]: print E1DP Mode as string, not in numeric format References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19219 ) Change subject: print E1DP Mode as string, not in numeric format ...................................................................... print E1DP Mode as string, not in numeric format Change-Id: I4d221a45bdd5d85b3ab6eaa35d67683b50bea21f --- M src/ctl.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/19/19219/1 diff --git a/src/ctl.c b/src/ctl.c index 0fb42de..163024a 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -111,7 +111,7 @@ { int ret, sd[2]; - LOGPTS(ts, DE1D, LOGL_INFO, "Starting in mode %u\n", mode); + LOGPTS(ts, DE1D, LOGL_INFO, "Starting in mode %s\n", get_value_string(osmo_e1dp_ts_mode_names, mode)); ret = socketpair(AF_UNIX, SOCK_SEQPACKET, 0, sd); if (ret < 0) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I4d221a45bdd5d85b3ab6eaa35d67683b50bea21f Gerrit-Change-Number: 19219 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 08:51:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 11 Jul 2020 08:51:47 +0000 Subject: Change in osmo-e1d[master]: Use SOCK_STREAM sockets for E1_TS_MODE_RAW References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19220 ) Change subject: Use SOCK_STREAM sockets for E1_TS_MODE_RAW ...................................................................... Use SOCK_STREAM sockets for E1_TS_MODE_RAW SEQPACKET is great for preserving message boundaries on signaling channels that use HDLC. However, its semantics, particularly regarding truncation, are sub-optimal for RAW slots containing raw user bitstreams (typically TRAU frames or PCM audio data). So let's use SOCK_STREAM for RAW and keep SEQPACKET for HDLCFCS. Closes: OS#4663 Change-Id: I1767ceaa5d2a008db0009b8027667a71c0fdc0f1 --- M src/ctl.c 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/20/19220/1 diff --git a/src/ctl.c b/src/ctl.c index 163024a..aff6ce2 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -110,10 +111,22 @@ _e1d_ts_start(struct e1_ts *ts, enum e1_ts_mode mode) { int ret, sd[2]; + int sock_type; LOGPTS(ts, DE1D, LOGL_INFO, "Starting in mode %s\n", get_value_string(osmo_e1dp_ts_mode_names, mode)); - ret = socketpair(AF_UNIX, SOCK_SEQPACKET, 0, sd); + switch (mode) { + case E1_TS_MODE_HDLCFCS: + sock_type = SOCK_SEQPACKET; + break; + case E1_TS_MODE_RAW: + sock_type = SOCK_STREAM; + break; + default: + return -EINVAL; + } + + ret = socketpair(AF_UNIX, sock_type, 0, sd); if (ret < 0) return ret; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I1767ceaa5d2a008db0009b8027667a71c0fdc0f1 Gerrit-Change-Number: 19220 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 09:51:49 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sat, 11 Jul 2020 09:51:49 +0000 Subject: Change in osmo-e1d[master]: print E1DP Mode as string, not in numeric format In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19219 ) Change subject: print E1DP Mode as string, not in numeric format ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I4d221a45bdd5d85b3ab6eaa35d67683b50bea21f Gerrit-Change-Number: 19219 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sat, 11 Jul 2020 09:51:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 09:53:06 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sat, 11 Jul 2020 09:53:06 +0000 Subject: Change in osmo-e1d[master]: Detect truncated reads on SOCK_SEQPACKET sockets In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19218 ) Change subject: Detect truncated reads on SOCK_SEQPACKET sockets ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ie143d3d56a68fda97cb9f5107a27f9beb043a2a4 Gerrit-Change-Number: 19218 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sat, 11 Jul 2020 09:53:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 09:54:08 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sat, 11 Jul 2020 09:54:08 +0000 Subject: Change in osmo-e1d[master]: Use SOCK_STREAM sockets for E1_TS_MODE_RAW In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19220 ) Change subject: Use SOCK_STREAM sockets for E1_TS_MODE_RAW ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I1767ceaa5d2a008db0009b8027667a71c0fdc0f1 Gerrit-Change-Number: 19220 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sat, 11 Jul 2020 09:54:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 13:56:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 11 Jul 2020 13:56:05 +0000 Subject: Change in osmo-e1d[master]: print E1DP Mode as string, not in numeric format In-Reply-To: References: Message-ID: Hello tnt, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/19219 to look at the new patch set (#2). Change subject: print E1DP Mode as string, not in numeric format ...................................................................... print E1DP Mode as string, not in numeric format Change-Id: I4d221a45bdd5d85b3ab6eaa35d67683b50bea21f --- M src/ctl.c M src/e1d.h M src/vty.c 3 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/19/19219/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I4d221a45bdd5d85b3ab6eaa35d67683b50bea21f Gerrit-Change-Number: 19219 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 11 13:56:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 11 Jul 2020 13:56:05 +0000 Subject: Change in osmo-e1d[master]: Use SOCK_STREAM sockets for E1_TS_MODE_RAW In-Reply-To: References: Message-ID: Hello tnt, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/19220 to look at the new patch set (#2). Change subject: Use SOCK_STREAM sockets for E1_TS_MODE_RAW ...................................................................... Use SOCK_STREAM sockets for E1_TS_MODE_RAW SEQPACKET is great for preserving message boundaries on signaling channels that use HDLC. However, its semantics, particularly regarding truncation, are sub-optimal for RAW slots containing raw user bitstreams (typically TRAU frames or PCM audio data). So let's use SOCK_STREAM for RAW and keep SEQPACKET for HDLCFCS. Closes: OS#4663 Change-Id: I1767ceaa5d2a008db0009b8027667a71c0fdc0f1 --- M src/ctl.c M src/intf_line.c 2 files changed, 15 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/20/19220/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I1767ceaa5d2a008db0009b8027667a71c0fdc0f1 Gerrit-Change-Number: 19220 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Jul 11 15:19:46 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jul 2020 15:19:46 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f09d8a25854e_633d2acac9ae85f82927da@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 76s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 76s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 76s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 76s] | | [ 76s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 76s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 76s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 76s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 76s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 76s] 2425 | MHD_start_daemon (unsigned int flags, [ 76s] | ^~~~~~~~~~~~~~~~ [ 76s] cc1: all warnings being treated as errors [ 76s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 76s] make[3]: *** Waiting for unfinished jobs.... [ 76s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 76s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 76s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 76s] make[1]: *** [Makefile:166: all] Error 2 [ 76s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 76s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 76s] make: *** [debian/rules:9: build] Error 25 [ 76s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 76s] ### VM INTERACTION START ### [ 80s] [ 69.001917] sysrq: SysRq : Power Off [ 80s] [ 69.004233] reboot: Power down [ 80s] ### VM INTERACTION END ### [ 80s] [ 80s] wildcard2 failed "build ulfius_2.5.2-4.1.dsc" at Sat Jul 11 15:19:43 UTC 2020. [ 80s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 11 15:20:54 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jul 2020 15:20:54 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f09d8e0254e2_633d2acac9ae85f8293211@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Testing/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 117s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 117s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 117s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 117s] | | [ 117s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 117s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 117s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 117s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 117s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 117s] 2425 | MHD_start_daemon (unsigned int flags, [ 117s] | ^~~~~~~~~~~~~~~~ [ 117s] cc1: all warnings being treated as errors [ 117s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 117s] make[3]: *** Waiting for unfinished jobs.... [ 117s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 117s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 117s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 117s] make[1]: *** [Makefile:166: all] Error 2 [ 117s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 117s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 117s] make: *** [debian/rules:9: build] Error 25 [ 117s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 117s] ### VM INTERACTION START ### [ 120s] [ 109.354775] sysrq: SysRq : Power Off [ 120s] [ 109.360444] reboot: Power down [ 120s] ### VM INTERACTION END ### [ 120s] [ 120s] lamb05 failed "build ulfius_2.5.2-4.1.dsc" at Sat Jul 11 15:20:45 UTC 2020. [ 120s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 11 15:21:11 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jul 2020 15:21:11 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f09d8f9e4ab4_633d2acac9ae85f82933ca@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Testing/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 90s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 90s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 90s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 90s] | | [ 90s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 90s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 90s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 90s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 90s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 90s] 2425 | MHD_start_daemon (unsigned int flags, [ 90s] | ^~~~~~~~~~~~~~~~ [ 91s] cc1: all warnings being treated as errors [ 91s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 91s] make[3]: *** Waiting for unfinished jobs.... [ 91s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 91s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 91s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 91s] make[1]: *** [Makefile:166: all] Error 2 [ 91s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 91s] dh_auto_build: error: cd build && make -j16 "INSTALL=install --strip-program=true" returned exit code 2 [ 91s] make: *** [debian/rules:9: build] Error 25 [ 91s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 91s] ### VM INTERACTION START ### [ 94s] [ 84.731383] sysrq: SysRq : Power Off [ 94s] [ 84.740527] reboot: Power down [ 94s] ### VM INTERACTION END ### [ 94s] [ 94s] sheep81 failed "build ulfius_2.5.2-4.1.dsc" at Sat Jul 11 15:21:09 UTC 2020. [ 94s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 11 15:22:03 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jul 2020 15:22:03 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f09d9383a3a5_633d2acac9ae85f82934fe@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 123s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 123s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 123s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 123s] | | [ 123s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 123s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 123s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 123s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 123s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 123s] 2425 | MHD_start_daemon (unsigned int flags, [ 123s] | ^~~~~~~~~~~~~~~~ [ 124s] cc1: all warnings being treated as errors [ 124s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 124s] make[3]: *** Waiting for unfinished jobs.... [ 124s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 124s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 124s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 124s] make[1]: *** [Makefile:166: all] Error 2 [ 124s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 124s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 124s] make: *** [debian/rules:9: build] Error 25 [ 124s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 124s] ### VM INTERACTION START ### [ 127s] [ 114.717243] sysrq: SysRq : Power Off [ 127s] [ 114.722557] reboot: Power down [ 127s] ### VM INTERACTION END ### [ 127s] [ 127s] lamb57 failed "build ulfius_2.5.2-4.1.dsc" at Sat Jul 11 15:21:51 UTC 2020. [ 127s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Jul 11 18:32:25 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sat, 11 Jul 2020 18:32:25 +0000 Subject: Change in osmo-e1d[master]: Use SOCK_STREAM sockets for E1_TS_MODE_RAW In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19220 ) Change subject: Use SOCK_STREAM sockets for E1_TS_MODE_RAW ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I1767ceaa5d2a008db0009b8027667a71c0fdc0f1 Gerrit-Change-Number: 19220 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sat, 11 Jul 2020 18:32:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Jul 11 21:49:13 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jul 2020 21:49:13 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0a33e2c79b1_633d2acac9ae85f832212e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 109s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 109s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 109s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 109s] | | [ 109s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 109s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 109s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 109s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 109s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 109s] 2425 | MHD_start_daemon (unsigned int flags, [ 109s] | ^~~~~~~~~~~~~~~~ [ 109s] cc1: all warnings being treated as errors [ 109s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 109s] make[3]: *** Waiting for unfinished jobs.... [ 109s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 109s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 109s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 109s] make[1]: *** [Makefile:166: all] Error 2 [ 109s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 109s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 109s] make: *** [debian/rules:9: build] Error 25 [ 109s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 109s] ### VM INTERACTION START ### [ 112s] [ 96.108589] sysrq: SysRq : Power Off [ 112s] [ 96.112547] reboot: Power down [ 112s] ### VM INTERACTION END ### [ 112s] [ 112s] cloud123 failed "build ulfius_2.5.2-4.1.dsc" at Sat Jul 11 21:49:01 UTC 2020. [ 112s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 11 21:49:30 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Jul 2020 21:49:30 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0a33fdd3b54_633d2acac9ae85f832231e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 121s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 121s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 121s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 121s] | | [ 121s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 121s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 121s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 121s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 121s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 121s] 2425 | MHD_start_daemon (unsigned int flags, [ 121s] | ^~~~~~~~~~~~~~~~ [ 121s] cc1: all warnings being treated as errors [ 121s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 121s] make[3]: *** Waiting for unfinished jobs.... [ 121s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 121s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 121s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 121s] make[1]: *** [Makefile:166: all] Error 2 [ 121s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 121s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 121s] make: *** [debian/rules:9: build] Error 25 [ 121s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 121s] ### VM INTERACTION START ### [ 124s] [ 112.135936] sysrq: SysRq : Power Off [ 124s] [ 112.142999] reboot: Power down [ 124s] ### VM INTERACTION END ### [ 124s] [ 124s] lamb51 failed "build ulfius_2.5.2-4.1.dsc" at Sat Jul 11 21:49:17 UTC 2020. [ 124s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Jul 11 23:01:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 11 Jul 2020 23:01:37 +0000 Subject: Change in osmo-trx[master]: trx_rate_ctr: Fix locking wrong mutex In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19211 ) Change subject: trx_rate_ctr: Fix locking wrong mutex ...................................................................... trx_rate_ctr: Fix locking wrong mutex It was notcied due to sometimes causing deadlock at shutdown time. Fixes: 92ba59dacffe79f4c987154bc63c6eacd8c3605f Change-Id: I49bea4b0ae469794b5c80ee8fa4f275914a5194c --- M CommonLibs/trx_rate_ctr.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp index 76aff7d..6391a38 100644 --- a/CommonLibs/trx_rate_ctr.cpp +++ b/CommonLibs/trx_rate_ctr.cpp @@ -159,7 +159,7 @@ size_t chan; struct rate_ctr *ctr; LOGC(DMAIN, NOTICE) << "Main thread is updating Transceiver counters"; - dev_rate_ctr_mutex.lock(); + trx_rate_ctr_mutex.lock(); for (chan = 0; chan < chan_len; chan++) { if (trx_ctrs_pending[chan].chan == PENDING_CHAN_NONE) continue; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I49bea4b0ae469794b5c80ee8fa4f275914a5194c Gerrit-Change-Number: 19211 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 08:56:05 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jul 2020 08:56:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-stop.sh: compress capture files with gzip References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19221 ) Change subject: ttcn3-tcpdump-stop.sh: compress capture files with gzip ...................................................................... ttcn3-tcpdump-stop.sh: compress capture files with gzip Since we have enabled the GSMTAP logging, test case capture files now contain a lot of textual information that can be efficiently compressed with gzip. That would make the "Build artifacts" consume much less space on Jenkins. Change-Id: Ibdf5312bb9ff802d7ce7d00c690facdd79839782 --- M ttcn3-tcpdump-stop.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/21/19221/1 diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh index 30d331d..ac192ca 100755 --- a/ttcn3-tcpdump-stop.sh +++ b/ttcn3-tcpdump-stop.sh @@ -48,3 +48,5 @@ kill_rm_pidfile "$PIDFILE_PCAP" kill_rm_pidfile "$PIDFILE_NETCAT" + +gzip "$TTCN3_PCAP_PATH/$TESTCASE.pcap" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibdf5312bb9ff802d7ce7d00c690facdd79839782 Gerrit-Change-Number: 19221 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 08:58:21 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jul 2020 08:58:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-stop.sh: compress capture files with gzip In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19221 to look at the new patch set (#2). Change subject: ttcn3-tcpdump-stop.sh: compress capture files with gzip ...................................................................... ttcn3-tcpdump-stop.sh: compress capture files with gzip Since we have enabled the GSMTAP logging, test case capture files now contain a lot of textual information that can be efficiently compressed with gzip. That would make the "Build artifacts" take much less space on Jenkins. Change-Id: Ibdf5312bb9ff802d7ce7d00c690facdd79839782 --- M ttcn3-tcpdump-stop.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/21/19221/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibdf5312bb9ff802d7ce7d00c690facdd79839782 Gerrit-Change-Number: 19221 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:20:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 12:20:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-stop.sh: compress capture files with gzip In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19221 ) Change subject: ttcn3-tcpdump-stop.sh: compress capture files with gzip ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibdf5312bb9ff802d7ce7d00c690facdd79839782 Gerrit-Change-Number: 19221 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 12 Jul 2020 12:20:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:20:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 12:20:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-stop.sh: compress capture files with gzip In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19221 ) Change subject: ttcn3-tcpdump-stop.sh: compress capture files with gzip ...................................................................... ttcn3-tcpdump-stop.sh: compress capture files with gzip Since we have enabled the GSMTAP logging, test case capture files now contain a lot of textual information that can be efficiently compressed with gzip. That would make the "Build artifacts" take much less space on Jenkins. Change-Id: Ibdf5312bb9ff802d7ce7d00c690facdd79839782 --- M ttcn3-tcpdump-stop.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh index 30d331d..ac192ca 100755 --- a/ttcn3-tcpdump-stop.sh +++ b/ttcn3-tcpdump-stop.sh @@ -48,3 +48,5 @@ kill_rm_pidfile "$PIDFILE_PCAP" kill_rm_pidfile "$PIDFILE_NETCAT" + +gzip "$TTCN3_PCAP_PATH/$TESTCASE.pcap" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibdf5312bb9ff802d7ce7d00c690facdd79839782 Gerrit-Change-Number: 19221 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:21:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 12:21:24 +0000 Subject: Change in osmo-e1d[master]: Detect truncated reads on SOCK_SEQPACKET sockets In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19218 ) Change subject: Detect truncated reads on SOCK_SEQPACKET sockets ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ie143d3d56a68fda97cb9f5107a27f9beb043a2a4 Gerrit-Change-Number: 19218 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jul 2020 12:21:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:21:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 12:21:46 +0000 Subject: Change in osmo-e1d[master]: print E1DP Mode as string, not in numeric format In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19219 ) Change subject: print E1DP Mode as string, not in numeric format ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I4d221a45bdd5d85b3ab6eaa35d67683b50bea21f Gerrit-Change-Number: 19219 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jul 2020 12:21:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:22:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 12:22:15 +0000 Subject: Change in osmo-e1d[master]: Use SOCK_STREAM sockets for E1_TS_MODE_RAW In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19220 ) Change subject: Use SOCK_STREAM sockets for E1_TS_MODE_RAW ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I1767ceaa5d2a008db0009b8027667a71c0fdc0f1 Gerrit-Change-Number: 19220 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jul 2020 12:22:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:22:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 12:22:21 +0000 Subject: Change in osmo-e1d[master]: Detect truncated reads on SOCK_SEQPACKET sockets In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19218 ) Change subject: Detect truncated reads on SOCK_SEQPACKET sockets ...................................................................... Detect truncated reads on SOCK_SEQPACKET sockets Related: OS#4663 Change-Id: Ie143d3d56a68fda97cb9f5107a27f9beb043a2a4 --- M src/intf_line.c 1 file changed, 16 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/intf_line.c b/src/intf_line.c index ce30b4f..fe9edbb 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -26,6 +26,9 @@ #include #include #include +#include +#include + #include #include @@ -179,8 +182,14 @@ while (oo < len) { /* Pending message ? */ if (!ts->tx_len) { - rv = read(ts->fd, ts->tx_buf, sizeof(ts->tx_buf)); + rv = recv(ts->fd, ts->tx_buf, sizeof(ts->tx_buf), MSG_TRUNC); if (rv > 0) { + if (rv > sizeof(ts->tx_buf)) { + LOGPTS(ts, DXFR, LOGL_ERROR, "Truncated message: Client tried to " + "send %d bytes but our buffer is limited to %lu\n", + rv, sizeof(ts->tx_buf)); + rv = sizeof(ts->tx_buf); + } LOGPTS(ts, DXFR, LOGL_DEBUG, "TX Message: %d [ %s]\n", rv, osmo_hexdump(ts->tx_buf, rv)); ts->tx_len = rv; @@ -242,7 +251,12 @@ switch (ts->mode) { case E1_TS_MODE_RAW: - l = read(ts->fd, buf_ts, fts); + l = recv(ts->fd, buf_ts, fts, MSG_TRUNC); + if (l > fts) { + LOGPTS(ts, DXFR, LOGL_ERROR, "Truncated message: Client tried to " + "send %d bytes but our buffer is limited to %d\n", l, fts); + l = fts; + } break; case E1_TS_MODE_HDLCFCS: l = _e1_tx_hdlcfs(ts, buf_ts, fts); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ie143d3d56a68fda97cb9f5107a27f9beb043a2a4 Gerrit-Change-Number: 19218 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:22:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 12:22:21 +0000 Subject: Change in osmo-e1d[master]: print E1DP Mode as string, not in numeric format In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19219 ) Change subject: print E1DP Mode as string, not in numeric format ...................................................................... print E1DP Mode as string, not in numeric format Change-Id: I4d221a45bdd5d85b3ab6eaa35d67683b50bea21f --- M src/ctl.c M src/e1d.h M src/vty.c 3 files changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/ctl.c b/src/ctl.c index 0fb42de..ee5066f 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -111,7 +111,7 @@ { int ret, sd[2]; - LOGPTS(ts, DE1D, LOGL_INFO, "Starting in mode %u\n", mode); + LOGPTS(ts, DE1D, LOGL_INFO, "Starting in mode %s\n", get_value_string(e1_ts_mode_names, mode)); ret = socketpair(AF_UNIX, SOCK_SEQPACKET, 0, sd); if (ret < 0) diff --git a/src/e1d.h b/src/e1d.h index 64e8f45..f556e8f 100644 --- a/src/e1d.h +++ b/src/e1d.h @@ -33,6 +33,7 @@ E1_TS_MODE_RAW, E1_TS_MODE_HDLCFCS, }; +extern const struct value_string e1_ts_mode_names[]; struct e1_ts { struct e1_line *line; diff --git a/src/vty.c b/src/vty.c index cc0df21..5e3f37c 100644 --- a/src/vty.c +++ b/src/vty.c @@ -86,7 +86,7 @@ return uc.pid; } -static const struct value_string e1_ts_mode_names[] = { +const struct value_string e1_ts_mode_names[] = { { E1_TS_MODE_OFF, "OFF" }, { E1_TS_MODE_RAW, "RAW" }, { E1_TS_MODE_HDLCFCS, "HDLC-FCS" }, -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I4d221a45bdd5d85b3ab6eaa35d67683b50bea21f Gerrit-Change-Number: 19219 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:22:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 12:22:21 +0000 Subject: Change in osmo-e1d[master]: Use SOCK_STREAM sockets for E1_TS_MODE_RAW In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19220 ) Change subject: Use SOCK_STREAM sockets for E1_TS_MODE_RAW ...................................................................... Use SOCK_STREAM sockets for E1_TS_MODE_RAW SEQPACKET is great for preserving message boundaries on signaling channels that use HDLC. However, its semantics, particularly regarding truncation, are sub-optimal for RAW slots containing raw user bitstreams (typically TRAU frames or PCM audio data). So let's use SOCK_STREAM for RAW and keep SEQPACKET for HDLCFCS. Closes: OS#4663 Change-Id: I1767ceaa5d2a008db0009b8027667a71c0fdc0f1 --- M src/ctl.c M src/intf_line.c 2 files changed, 15 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/ctl.c b/src/ctl.c index ee5066f..482366f 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -110,10 +111,22 @@ _e1d_ts_start(struct e1_ts *ts, enum e1_ts_mode mode) { int ret, sd[2]; + int sock_type; LOGPTS(ts, DE1D, LOGL_INFO, "Starting in mode %s\n", get_value_string(e1_ts_mode_names, mode)); - ret = socketpair(AF_UNIX, SOCK_SEQPACKET, 0, sd); + switch (mode) { + case E1_TS_MODE_HDLCFCS: + sock_type = SOCK_SEQPACKET; + break; + case E1_TS_MODE_RAW: + sock_type = SOCK_STREAM; + break; + default: + return -EINVAL; + } + + ret = socketpair(AF_UNIX, sock_type, 0, sd); if (ret < 0) return ret; diff --git a/src/intf_line.c b/src/intf_line.c index fe9edbb..5994805 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -251,12 +251,7 @@ switch (ts->mode) { case E1_TS_MODE_RAW: - l = recv(ts->fd, buf_ts, fts, MSG_TRUNC); - if (l > fts) { - LOGPTS(ts, DXFR, LOGL_ERROR, "Truncated message: Client tried to " - "send %d bytes but our buffer is limited to %d\n", l, fts); - l = fts; - } + l = read(ts->fd, buf_ts, fts); break; case E1_TS_MODE_HDLCFCS: l = _e1_tx_hdlcfs(ts, buf_ts, fts); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I1767ceaa5d2a008db0009b8027667a71c0fdc0f1 Gerrit-Change-Number: 19220 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:30:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 12:30:06 +0000 Subject: Change in osmo-msc[master]: Clear Command: set cause value to "Call Control" In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19213 ) Change subject: Clear Command: set cause value to "Call Control" ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1347ed72ae7d7ea73a557b866e764819c5ef8c42 Gerrit-Change-Number: 19213 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Sun, 12 Jul 2020 12:30:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:30:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 12:30:22 +0000 Subject: Change in osmo-msc[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/18925 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/18925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib872e7979c5b5a9da1347a3f326307844cf76536 Gerrit-Change-Number: 18925 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 12 Jul 2020 12:30:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:30:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 12:30:28 +0000 Subject: Change in osmo-msc[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/18925 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... manuals: generate vty reference xml at build time Move 'doc' subdir further down to "make sure" the osmo-msc binary is built before the docs. Remove msc_vty_reference.xml from the source tree. In manuals/Makefile.am use the new BUILT_REFERENCE_XML feature recently added to osmo-gsm-manuals, and add a build target to generate the XML using the new osmo-msc --vty-ref-xml cmdline switch. Depends: I613d692328050a036d05b49a436ab495fc2087ba (osmo-gsm-manuals) Change-Id: Ib872e7979c5b5a9da1347a3f326307844cf76536 --- M Makefile.am M doc/manuals/Makefile.am D doc/manuals/vty/msc_vty_reference.xml 3 files changed, 6 insertions(+), 3,255 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/Makefile.am b/Makefile.am index bfc3b6c..759f396 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,9 +9,9 @@ $(NULL) SUBDIRS = \ - doc \ include \ src \ + doc \ contrib \ tests \ $(NULL) diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am index 3b50d4e..14d142d 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -14,6 +14,11 @@ VTY_REFERENCE = osmomsc-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc + BUILT_REFERENCE_XML = $(builddir)/vty/msc_vty_reference.xml + $(builddir)/vty/msc_vty_reference.xml: $(top_builddir)/src/osmo-msc/osmo-msc + mkdir -p $(builddir)/vty + $(top_builddir)/src/osmo-msc/osmo-msc --vty-ref-xml > $@ + OSMO_REPOSITORY = osmo-msc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc endif diff --git a/doc/manuals/vty/msc_vty_reference.xml b/doc/manuals/vty/msc_vty_reference.xml deleted file mode 100644 index 3939c08..0000000 --- a/doc/manuals/vty/msc_vty_reference.xml +++ /dev/null @@ -1,3254 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - - config-ctrl - - - - - - - - - config-cs7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-as - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-asp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr-gt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-net - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-msc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-mncc-int - - - - - - - - - - - - - - - - - - - - config-smpp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-smpp-esme - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-hlr - - - - - - - - - - - - - - - - - - - - - config-sgs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/18925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib872e7979c5b5a9da1347a3f326307844cf76536 Gerrit-Change-Number: 18925 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:32:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 12:32:42 +0000 Subject: Change in osmo-bsc[master]: RR Channel Release: pass Cause code from BSSMAP Clear to the BTS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19214 ) Change subject: RR Channel Release: pass Cause code from BSSMAP Clear to the BTS ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I734cc55c501d61bbdadee81a223b26f9df57f959 Gerrit-Change-Number: 19214 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 12 Jul 2020 12:32:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:33:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 12:33:37 +0000 Subject: Change in osmo-bsc[master]: propagate RSL error cause codes to RR Channel Release cause In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19215 ) Change subject: propagate RSL error cause codes to RR Channel Release cause ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I46eb12c91a8c08162b43dd22c7ba825ef3bbc6ac Gerrit-Change-Number: 19215 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 12 Jul 2020 12:33:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:34:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 12:34:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_SystemInformation: add dec_SystemInformationSafe() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19212 ) Change subject: library/GSM_SystemInformation: add dec_SystemInformationSafe() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id4d73e0f3347e1d4c4c77aec75b767311d662292 Gerrit-Change-Number: 19212 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 12 Jul 2020 12:34:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:34:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 12:34:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_SystemInformation: add dec_SystemInformationSafe() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19212 ) Change subject: library/GSM_SystemInformation: add dec_SystemInformationSafe() ...................................................................... library/GSM_SystemInformation: add dec_SystemInformationSafe() Some types of System Information (mostly the Rest Octets) are not fully implemented, so calling the generic dec_SystemInformation() may result in a DTE. Let's add dec_SystemInformationSafeBT() with "prototype(backtrack)", so it would return a non-zero integer if decoding fails. Let's add a wrapper dec_SystemInformationSafe() that would additionally check the RR Protocol Discriminator. Change-Id: Id4d73e0f3347e1d4c4c77aec75b767311d662292 Related: OS#4662 --- M bts/BTS_Tests.ttcn M library/GSM_SystemInformation.ttcn 2 files changed, 32 insertions(+), 15 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 587e14a..47f8a29 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3534,7 +3534,6 @@ repeat; } [] L1CTL.receive(tr_L1CTL_DATA_IND(t_RslChanNr_PCH_AGCH(0), ?)) -> value l1_dl { - /* somehow dec_SystemInformation will try to decode even non-RR as SI */ var GsmRrMessage rr := dec_GsmRrMessage(l1_dl.payload.data_ind.payload); if (not match(rr, tr_IMM_ASS(42, ?, 5, ?, ?))) { /* FIXME: Why are we seeing paging requests on PCH/AGCH? */ @@ -3936,15 +3935,12 @@ T.start; alt { [] pt.receive(tr_L1CTL_DATA_IND(t_RslChanNr_BCCH(0), ?)) -> value l1_dl { - /* somehow dec_SystemInformation will try to decode even non-RR as SI */ - if (not (l1_dl.payload.data_ind.payload[1] == '06'O)) { - log("Ignoring non-RR SI ", l1_dl); + var SystemInformationFn sig := { frame_number := l1_dl.dl_info.frame_nr }; + if (dec_SystemInformationSafe(l1_dl.payload.data_ind.payload, sig.si) != 0) { + log("Ignoring non-RR or invalid SI ", l1_dl); repeat; } - var SystemInformationFn sig := { - frame_number := l1_dl.dl_info.frame_nr, - si := dec_SystemInformation(l1_dl.payload.data_ind.payload) - } + var integer tc := f_gsm_compute_tc(sig.frame_number); log("SI received at TC=", tc, ": ", sig.si); /* append to the per-TC bucket */ @@ -5227,17 +5223,13 @@ runs on test_CT return SystemInformation { var L1ctlDlMessage l1_dl; var SystemInformation si; + var integer rc; timer T := 5.0; T.start; alt { [] pt.receive(tr_L1CTL_DATA_IND(t_RslChanNr_BCCH(0), ?)) -> value l1_dl { - /* somehow dec_SystemInformation will try to decode even non-RR as SI */ - if (not (l1_dl.payload.data_ind.payload[1] == '06'O)) { - log("Ignoring non-RR SI ", l1_dl); - repeat; - } - si := dec_SystemInformation(l1_dl.payload.data_ind.payload) - if (si.header.message_type != si_type) { + rc := dec_SystemInformationSafe(l1_dl.payload.data_ind.payload, si); + if (rc != 0 or si.header.message_type != si_type) { repeat; } } diff --git a/library/GSM_SystemInformation.ttcn b/library/GSM_SystemInformation.ttcn index 3c3d96c..9113583 100644 --- a/library/GSM_SystemInformation.ttcn +++ b/library/GSM_SystemInformation.ttcn @@ -264,4 +264,29 @@ } } + external function dec_SystemInformationSafeBT(in octetstring stream, out SystemInformation si) + return integer /* Decoding result: successful (0) or unsuccessful (1) */ + with { extension "prototype(backtrack) decode(RAW)" }; + + /* Some types of System Information (mostly the Rest Octets) are not fully implemented, + * so calling the generic dec_SystemInformation() may result in a DTE. This function + * additionally checks RR Protocol Discriminator, and should be used in the most cases. */ + function dec_SystemInformationSafe(in octetstring stream, out SystemInformation si) + return integer { + /* Try to decode a given octetstring as System Information */ + if (dec_SystemInformationSafeBT(stream, si) != 0) { + log("Failed to decode (RR) System Information: ", stream); + return 1; + } + + /* Check the protocol discriminator (we expect RR messages) */ + if (si.header.rr_protocol_discriminator != bit2int('0110'B)) { + log("Protocol discriminator is not RR (!= '0110'B): ", + si.header.rr_protocol_discriminator); + return 1; + } + + return 0; + } + } with { encode "RAW"; variant "FIELDORDER(msb)" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id4d73e0f3347e1d4c4c77aec75b767311d662292 Gerrit-Change-Number: 19212 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:35:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jul 2020 12:35:30 +0000 Subject: Change in osmo-hlr[master]: manual: describe subscriber import by SQL In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/19052 ) Change subject: manual: describe subscriber import by SQL ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/19052/1/doc/manuals/chapters/subscribers.adoc File doc/manuals/chapters/subscribers.adoc: https://gerrit.osmocom.org/c/osmo-hlr/+/19052/1/doc/manuals/chapters/subscribers.adoc at 160 PS1, Line 160: INSERT > Error: near "subscriber": syntax error INSERT INTO, not just INSERT. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/19052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3246e6d5364215a71c33b5aca876deab7b6cfd70 Gerrit-Change-Number: 19052 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 12 Jul 2020 12:35:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:35:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 12:35:51 +0000 Subject: Change in osmo-trx[master]: Transceiver: Fix race condition obtaining Dl burst from Upper layer In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19206 ) Change subject: Transceiver: Fix race condition obtaining Dl burst from Upper layer ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If1fd8d7fc5f21ee2894192ef1ac2a3cdda6bbb98 Gerrit-Change-Number: 19206 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 12 Jul 2020 12:35:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:37:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 12:37:11 +0000 Subject: Change in osmo-trx[master]: Add rate counter for missing Txbursts when scheduled towards the radi... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19207 ) Change subject: Add rate counter for missing Txbursts when scheduled towards the radioInterface ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibb2c492b3c67cbab11fbb936ae3a090fb5756aa8 Gerrit-Change-Number: 19207 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Sun, 12 Jul 2020 12:37:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:52:41 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jul 2020 12:52:41 +0000 Subject: Change in osmo-hlr[master]: manual: describe subscriber import by SQL In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/19052 ) Change subject: manual: describe subscriber import by SQL ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/19052/1/doc/manuals/chapters/subscribers.adoc File doc/manuals/chapters/subscribers.adoc: https://gerrit.osmocom.org/c/osmo-hlr/+/19052/1/doc/manuals/chapters/subscribers.adoc at 160 PS1, Line 160: id > anyway, there might be some SQL magic that gets the last added subscriber id and allows using Yeah, SQLite offets last_insert_rowid(). You can use it in nested queries: INSERT INTO auc_2g (subscriber_id, algo_id_2g, ki) VALUES((select last_insert_rowid()), 1, '0123456789abcdef0123456789abcdef'); -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/19052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3246e6d5364215a71c33b5aca876deab7b6cfd70 Gerrit-Change-Number: 19052 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 12 Jul 2020 12:52:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:54:06 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jul 2020 12:54:06 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: inherit trx list API from TRXList References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19222 ) Change subject: trx_toolkit/burst_fwd.py: inherit trx list API from TRXList ...................................................................... trx_toolkit/burst_fwd.py: inherit trx list API from TRXList Change-Id: I1c589888991add435d88517094c7b4a7db93cbae --- M src/target/trx_toolkit/burst_fwd.py M src/target/trx_toolkit/trx_list.py 2 files changed, 5 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/22/19222/1 diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index 9fb308f..574c97e 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -25,7 +25,9 @@ import logging as log -class BurstForwarder: +from trx_list import TRXList + +class BurstForwarder(TRXList): """ Performs burst forwarding between transceivers. BurstForwarder distributes bursts between the list of given @@ -44,27 +46,6 @@ """ - def __init__(self, trx_list = None): - # List of Transceiver instances - 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: - log.error("TRX is already in the list") - return - - self.trx_list.append(trx) - - def del_trx(self, trx): - if trx not in self.trx_list: - log.error("TRX is not in the list") - return - - self.trx_list.remove(trx) - def forward_msg(self, src_trx, rx_msg): # Originating Transceiver may use frequency hopping, # so let's precalculate its Tx frequency in advance diff --git a/src/target/trx_toolkit/trx_list.py b/src/target/trx_toolkit/trx_list.py index 8b4013d..4f9eff2 100644 --- a/src/target/trx_toolkit/trx_list.py +++ b/src/target/trx_toolkit/trx_list.py @@ -31,8 +31,8 @@ """ - def __init__(self): - self.trx_list = [] + def __init__(self, trx_list = None): + self.trx_list = trx_list or [] def __getitem__(self, i): return self.trx_list[i] -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1c589888991add435d88517094c7b4a7db93cbae Gerrit-Change-Number: 19222 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:54:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jul 2020 12:54:07 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: avoid using TRXList.__getitem__() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19223 ) Change subject: trx_toolkit/fake_trx.py: avoid using TRXList.__getitem__() ...................................................................... trx_toolkit/fake_trx.py: avoid using TRXList.__getitem__() Running with cProfile shows that there are quite a lot calls: 469896 0.254 0.000 0.254 0.000 trx_list.py:37(__getitem__) Let's better avoid using it in performance critical parts. Change-Id: I2bbc0a2af8218af0b9a02d8e16d4216cf602892a --- M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/trx_list.py 2 files changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/23/19223/1 diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 4a49fa3..82eb5b7 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -411,7 +411,7 @@ self.append_child_trx(addr, port, idx, name) # Burst forwarding between transceivers - self.burst_fwd = BurstForwarder(self.trx_list) + self.burst_fwd = BurstForwarder(self.trx_list.trx_list) log.info("Init complete") @@ -444,7 +444,7 @@ def run(self): # Compose list of to be monitored sockets sock_list = [] - for trx in self.trx_list: + for trx in self.trx_list.trx_list: sock_list.append(trx.ctrl_if.sock) sock_list.append(trx.data_if.sock) @@ -454,7 +454,7 @@ r_event, _, _ = select.select(sock_list, [], []) # Iterate over all transceivers - for trx in self.trx_list: + for trx in self.trx_list.trx_list: # DATA interface if trx.data_if.sock in r_event: msg = trx.recv_data_msg() diff --git a/src/target/trx_toolkit/trx_list.py b/src/target/trx_toolkit/trx_list.py index 4f9eff2..3206d74 100644 --- a/src/target/trx_toolkit/trx_list.py +++ b/src/target/trx_toolkit/trx_list.py @@ -34,6 +34,7 @@ def __init__(self, trx_list = None): self.trx_list = trx_list or [] + # NOTE: do not use this in performance critical parts def __getitem__(self, i): return self.trx_list[i] -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2bbc0a2af8218af0b9a02d8e16d4216cf602892a Gerrit-Change-Number: 19223 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:54:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jul 2020 12:54:07 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: move Rx burst handling to Transceiver References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19224 ) Change subject: trx_toolkit/fake_trx.py: move Rx burst handling to Transceiver ...................................................................... trx_toolkit/fake_trx.py: move Rx burst handling to Transceiver Change-Id: Ic1f44bfb21ac3173e9530a0a9966cd5e64b8bd48 --- M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/transceiver.py 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/24/19224/1 diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 82eb5b7..27c2b88 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -252,8 +252,7 @@ if src_trx.ta != 0: msg.toa256 -= src_trx.ta * 256 - # TODO: make legacy mode configurable (via argv?) - self.data_if.send_msg(msg, legacy = True) + Transceiver.handle_data_msg(self, msg) # Simulation specific CTRL command handler def ctrl_cmd_handler(self, request): diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 655d4f6..474834d 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -276,3 +276,7 @@ return None return msg + + def handle_data_msg(self, msg): + # TODO: make legacy mode configurable (via argv?) + self.data_if.send_msg(msg, legacy = True) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic1f44bfb21ac3173e9530a0a9966cd5e64b8bd48 Gerrit-Change-Number: 19224 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:54:08 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jul 2020 12:54:08 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: fix TDMA clock counter wrapping References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19225 ) Change subject: trx_toolkit/clck_gen.py: fix TDMA clock counter wrapping ...................................................................... trx_toolkit/clck_gen.py: fix TDMA clock counter wrapping Change-Id: I157447c7610402f6d62d2b74c9f04fcaa0bc1724 --- M src/target/trx_toolkit/clck_gen.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/25/19225/1 diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index 0219bb4..1b92cef 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -92,8 +92,8 @@ self.send_clck_ind() def send_clck_ind(self): - # Keep clock cycle - if self.clck_src % GSM_HYPERFRAME >= 0: + # Keep the clock cycle + if self.clck_src >= GSM_HYPERFRAME: self.clck_src %= GSM_HYPERFRAME # We don't need to send so often -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I157447c7610402f6d62d2b74c9f04fcaa0bc1724 Gerrit-Change-Number: 19225 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:54:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jul 2020 12:54:09 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: call send_clck_ind() on every TDMA frame References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19226 ) Change subject: trx_toolkit/clck_gen.py: call send_clck_ind() on every TDMA frame ...................................................................... trx_toolkit/clck_gen.py: call send_clck_ind() on every TDMA frame Change-Id: I6d53e5266fa3b1f2eb55822d1c14975789b202ed --- M src/target/trx_toolkit/clck_gen.py 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/26/19226/1 diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index 1b92cef..62b6b1d 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -53,7 +53,6 @@ # Calculate counter time self.ctr_interval = self.GSM_FRAME_US - self.LO_DELAY_US self.ctr_interval /= self.SEC_DELAY_US - self.ctr_interval *= self.ind_period @property def running(self): @@ -109,7 +108,7 @@ log.debug(payload.rstrip("\0")) # Increase frame count - self.clck_src += self.ind_period + self.clck_src += 1 # Just a wrapper for independent usage class Application(ApplicationBase): -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6d53e5266fa3b1f2eb55822d1c14975789b202ed Gerrit-Change-Number: 19226 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:54:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jul 2020 12:54:09 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: support optional clock handler References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19227 ) Change subject: trx_toolkit/clck_gen.py: support optional clock handler ...................................................................... trx_toolkit/clck_gen.py: support optional clock handler Change-Id: I85b2182d9835ed035cf370e45ea039ac6a7e8405 --- M src/target/trx_toolkit/clck_gen.py 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/27/19227/1 diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index 62b6b1d..f95180d 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -54,6 +54,9 @@ self.ctr_interval = self.GSM_FRAME_US - self.LO_DELAY_US self.ctr_interval /= self.SEC_DELAY_US + # (Optional) clock consumer + self.clck_handler = None + @property def running(self): if self._thread is None: @@ -107,6 +110,9 @@ # Debug print log.debug(payload.rstrip("\0")) + if self.clck_handler is not None: + self.clck_handler(self.clck_src) + # Increase frame count self.clck_src += 1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I85b2182d9835ed035cf370e45ea039ac6a7e8405 Gerrit-Change-Number: 19227 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 12:54:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jul 2020 12:54:09 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/transceiver.py: implement the transmit burst queue References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19228 ) Change subject: trx_toolkit/transceiver.py: implement the transmit burst queue ...................................................................... trx_toolkit/transceiver.py: implement the transmit burst queue In order to reflect the UL/DL delay caused by the premature burst scheduling (a.k.a. 'fn-advance') in a virtual environment, the Transceiver implementation now queues all to be transmitted bursts, so they remain in the queue until the appropriate time of transmission. The API user is supposed to call recv_data_msg() in order to obtain a L12TRX message on the TRXD (data) inteface, so it gets queued by this function. Then, to ensure the timeous transmission, the user of this implementation needs to call clck_tick() on each TDMA frame. Both functions are thread-safe (queue mutex). In a multi-trx configuration, the use of queue additionally ensures proper burst aggregation on multiple TRXD connections, so all L12TRX messages are guaranteed to be sent in the right order, i.e. with monolithically-increasing TDMA frame numbers. Of course, this change increases the overall CPU usage, given that each transceiver gets its own queue, and we need to serve them all on every TDMA frame. According to my measurements, when running test cases from ttcn3-bts-test, the average load is ~50% higher than what it used to be. Still not significantly high, though. Change-Id: Ie66ef9667dc8d156ad578ce324941a816c07c105 Related: OS#4658, OS#4546 --- M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/transceiver.py 2 files changed, 74 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/28/19228/1 diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 27c2b88..b487a93 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -388,6 +388,8 @@ # Init shared clock generator self.clck_gen = CLCKGen([]) + # This method will be called on each TDMA frame + self.clck_gen.clck_handler = self.clck_handler # Power measurement emulation # Noise: -120 .. -105 @@ -456,14 +458,18 @@ for trx in self.trx_list.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) + trx.recv_data_msg() # CTRL interface if trx.ctrl_if.sock in r_event: trx.ctrl_if.handle_rx() + # This method will be called by the clock thread + def clck_handler(self, fn): + # We assume that this list is immutable at run-time + for trx in self.trx_list.trx_list: + trx.clck_tick(self.burst_fwd, fn) + def shutdown(self): log.info("Shutting down...") diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 474834d..119f3e2 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -24,6 +24,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import logging as log +import threading from ctrl_if_trx import CTRLInterfaceTRX from data_if import DATAInterface @@ -123,6 +124,37 @@ Transceiver and all its timeslots, so using in for the BTS side does not make any sense (imagine BCCH hopping together with DCCH). + == The transmit burst queue + + According to 3GPP 45.002, the time difference between Uplink and + Downlink corresponds to three TDMA timeslot periods. However, + in general the L1 implementations (such as osmo-bts-trx and trxcon) + never schedule to be transmitted bursts for the current TDMA frame + immediately. Instead, they are being scheduled prematurely. + + The rationale is that both transceiver and the L1 implementation + are separete processes that are not perfectly synchronized in time. + Moreover, the transceiver needs some time to prepare a burst for + transmission. This is why the time difference between Uplink and + Downlink is actually much higher on practice (20 TDMA frame periods + by default, at the moment of writing this patch). + + In order to reflect that delay in a virtual environment, this + implementation, just like a normal transceiver (e.g. osmo-trx), + queues all to be transmitted (L12TRX) bursts, so hey remain in + the transmit queue until the appropriate time of transmission. + + The API user is supposed to call recv_data_msg() in order to obtain + a L12TRX message on the TRXD (data) inteface, so it gets queued by + this function. Then, to ensure the timeous transmission, the user + of this implementation needs to call clck_tick() on each TDMA + frame. Both functions are thread-safe (queue mutex). + + In a multi-trx configuration, the use of queue additionally ensures + proper burst aggregation on multiple TRXD connections, so all L12TRX + messages are guaranteed to be sent in the right order, i.e. with + monolithically-increasing TDMA frame numbers. + """ def __init__(self, bind_addr, remote_addr, base_port, name = None, @@ -178,6 +210,10 @@ # List of child transceivers self.child_trx_list = TRXList() + # Tx (L12TRX) burst queue and mutex + self._tx_queue_lock = threading.Lock() + self._tx_queue = [] + def __str__(self): desc = "%s:%d" % (self.remote_addr, self.base_port) if self.child_idx > 0: @@ -234,10 +270,12 @@ trx.running = True elif event == "POWEROFF": trx.running = False + trx.tx_queue_clear() trx.disable_fh() - # Reset frequency hopping parameters + # Reset frequency hopping parameters, clear the queue if event == "POWEROFF": + self.tx_queue_clear() self.disable_fh() # Trigger clock generator if required @@ -275,8 +313,34 @@ "configured => dropping..." % (self, msg.desc_hdr())) return None + # Enque the message, it will be sent later + self.tx_queue_append(msg) return msg def handle_data_msg(self, msg): # TODO: make legacy mode configurable (via argv?) self.data_if.send_msg(msg, legacy = True) + + def tx_queue_append(self, msg): + with self._tx_queue_lock: + self._tx_queue.append(msg) + + def tx_queue_clear(self): + with self._tx_queue_lock: + self._tx_queue.clear() + + def clck_tick(self, fwd, fn): + if not self.running: + return + + self._tx_queue_lock.acquire() + + for msg in self._tx_queue: + if msg.fn == fn: + fwd.forward_msg(self, msg) + elif msg.fn < fn: + log.warning("(%s) Stale TRXD message (fn=%u): %s" + % (self, fn, msg.desc_hdr())) + + self._tx_queue = [msg for msg in self._tx_queue if msg.fn > fn] + self._tx_queue_lock.release() -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie66ef9667dc8d156ad578ce324941a816c07c105 Gerrit-Change-Number: 19228 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 14:27:16 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jul 2020 14:27:16 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/transceiver.py: implement the transmit burst queue In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/19228 to look at the new patch set (#2). Change subject: trx_toolkit/transceiver.py: implement the transmit burst queue ...................................................................... trx_toolkit/transceiver.py: implement the transmit burst queue In order to reflect the UL/DL delay caused by the premature burst scheduling (a.k.a. 'fn-advance') in a virtual environment, the Transceiver implementation now queues all to be transmitted bursts, so they remain in the queue until the appropriate time of transmission. The API user is supposed to call recv_data_msg() in order to obtain a L12TRX message on the TRXD (data) inteface, so it gets queued by this function. Then, to ensure the timeous transmission, the user of this implementation needs to call clck_tick() on each TDMA frame. Both functions are thread-safe (queue mutex). In a multi-trx configuration, the use of queue additionally ensures proper burst aggregation on multiple TRXD connections, so all L12TRX messages are guaranteed to be sent in the right order, i.e. with monolithically-increasing TDMA frame numbers. Of course, this change increases the overall CPU usage, given that each transceiver gets its own queue, and we need to serve them all on every TDMA frame. According to my measurements, when running test cases from ttcn3-bts-test, the average load is ~50% higher than what it used to be. Still not significantly high, though. Change-Id: Ie66ef9667dc8d156ad578ce324941a816c07c105 Related: OS#4658, OS#4546 --- M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/transceiver.py 2 files changed, 75 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/28/19228/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie66ef9667dc8d156ad578ce324941a816c07c105 Gerrit-Change-Number: 19228 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 19:16:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 19:16:47 +0000 Subject: Change in osmo-e1d[master]: introduce concept of superchannel to data structures + CTL References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19229 ) Change subject: introduce concept of superchannel to data structures + CTL ...................................................................... introduce concept of superchannel to data structures + CTL We treat the superchannel as an extra, separate timeslot. Initially I thought of simply re-using TS1, but keeping the superchannel separate ensures that it doesn't inherit any state (like half-sent HDLC frames) from another timeslot when we switch between the modes at runtime. Change-Id: I0aacf251e155de2bb6ad03ffc4181067b22f1c90 --- M include/osmocom/e1d/proto.h M src/ctl.c M src/e1d.h M src/intf_line.c 4 files changed, 30 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/29/19229/1 diff --git a/include/osmocom/e1d/proto.h b/include/osmocom/e1d/proto.h index 56064b8..6711332 100644 --- a/include/osmocom/e1d/proto.h +++ b/include/osmocom/e1d/proto.h @@ -71,6 +71,7 @@ #define E1DP_MAGIC 0x00e1 #define E1DP_MAX_LEN 4096 +#define E1DP_TS_SUPERCHAN 0xfe #define E1DP_INVALID 0xff #define E1DP_DEFAULT_SOCKET "/tmp/osmo-e1d.ctl" diff --git a/src/ctl.c b/src/ctl.c index 482366f..5322ab4 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -68,7 +68,12 @@ static struct e1_ts * _e1d_get_ts(struct e1_line *line, uint8_t ts) { - return (ts < 32) ? &line->ts[ts] : NULL; + if (ts < 32) + return &line->ts[ts]; + else if (ts == E1DP_TS_SUPERCHAN) + return &line->superchan; + else + return NULL; } static void diff --git a/src/e1d.h b/src/e1d.h index f556e8f..2b8e32b 100644 --- a/src/e1d.h +++ b/src/e1d.h @@ -55,15 +55,28 @@ int fd; }; +enum e1_line_mode { + /* 31 individual 64k timeslots, as used on 3GPP Abis, 3GPP A or ISDN */ + E1_LINE_MODE_CHANNELIZED, + /* 1 channel group spanning all 31 TS, as used e.g. when using Frame Relay + * or raw HDLC over channelized E1. */ + E1_LINE_MODE_SUPERCHANNEL, +}; + struct e1_line { struct llist_head list; struct e1_intf *intf; uint8_t id; + enum e1_line_mode mode; + void *drv_data; + /* timeslots for channelized mode */ struct e1_ts ts[32]; + /* superchannel */ + struct e1_ts superchan; }; enum e1_driver { diff --git a/src/intf_line.c b/src/intf_line.c index 5994805..75da211 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -90,6 +90,13 @@ talloc_free(intf); } +static void ts_init(struct e1_ts *ts, struct e1_line *line, int id) +{ + ts->line = line; + ts->id = id; + ts->fd = -1; +} + struct e1_line * e1_line_new(struct e1_intf *intf, void *drv_data) { @@ -100,12 +107,12 @@ line->intf = intf; line->drv_data = drv_data; + line->mode = E1_LINE_MODE_CHANNELIZED; for (int i=0; i<32; i++) { - line->ts[i].line = line; - line->ts[i].id = i; - line->ts[i].fd = -1; + ts_init(&line->ts[i], line, i); } + ts_init(&line->superchan, line, 255); INIT_LLIST_HEAD(&line->list); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I0aacf251e155de2bb6ad03ffc4181067b22f1c90 Gerrit-Change-Number: 19229 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 19:16:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 19:16:48 +0000 Subject: Change in osmo-e1d[master]: _e1_rx_hdlcfs: const-ify input buffer argument References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19230 ) Change subject: _e1_rx_hdlcfs: const-ify input buffer argument ...................................................................... _e1_rx_hdlcfs: const-ify input buffer argument Change-Id: If772487124e26bafea23b451536b3b556d4c088c --- M src/intf_line.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/30/19230/1 diff --git a/src/intf_line.c b/src/intf_line.c index 75da211..3b51026 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -149,7 +149,7 @@ // --------------------------------------------------------------------------- static int -_e1_rx_hdlcfs(struct e1_ts *ts, uint8_t *buf, int len) +_e1_rx_hdlcfs(struct e1_ts *ts, const uint8_t *buf, int len) { int rv, cl, oi; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: If772487124e26bafea23b451536b3b556d4c088c Gerrit-Change-Number: 19230 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 19:16:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 19:16:48 +0000 Subject: Change in osmo-e1d[master]: actually implement the superchannel mode References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19231 ) Change subject: actually implement the superchannel mode ...................................................................... actually implement the superchannel mode In superchannel mode, all 31 TS are grouped together. Change-Id: Id340b1925471f427deb6cda7eb54e80dfc71faec --- M src/intf_line.c 1 file changed, 162 insertions(+), 59 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/31/19231/1 diff --git a/src/intf_line.c b/src/intf_line.c index 3b51026..584bb99 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -33,6 +33,7 @@ #include #include +#include #include "e1d.h" #include "log.h" @@ -112,7 +113,7 @@ for (int i=0; i<32; i++) { ts_init(&line->ts[i], line, i); } - ts_init(&line->superchan, line, 255); + ts_init(&line->superchan, line, E1DP_TS_SUPERCHAN); INIT_LLIST_HEAD(&line->list); @@ -176,7 +177,7 @@ oi += cl; } - return 0; + return len; } static int @@ -232,6 +233,83 @@ return len; } +/* read from a timeslot-FD (direction application -> hardware) */ +static int +_e1_ts_read(struct e1_ts *ts, uint8_t *buf, size_t len) +{ + int l; + + switch (ts->mode) { + case E1_TS_MODE_RAW: + l = read(ts->fd, buf, len); + /* FIXME: handle underflow */ + break; + case E1_TS_MODE_HDLCFCS: + l = _e1_tx_hdlcfs(ts, buf, len); + break; + default: + OSMO_ASSERT(0); + break; + } + + if (l < 0 && errno != EAGAIN) { + LOGPTS(ts, DE1D, LOGL_ERROR, "dead socket during read: %s\n", + strerror(errno)); + e1_ts_stop(ts); + } else if (l < len) { + LOGPTS(ts, DE1D, LOGL_NOTICE, "TS read underflow: We had %zu bytes to read, " + "but socket returned only %d\n", len, l); + } + + return l; +} + +static void +_e1_line_mux_out_channelized(struct e1_line *line, uint8_t *buf, int fts) +{ + OSMO_ASSERT(line->mode == E1_LINE_MODE_CHANNELIZED); + + /* Scan timeslots */ + for (int tsn=1; tsn<32; tsn++) + { + struct e1_ts *ts = &line->ts[tsn]; + uint8_t buf_ts[fts]; + int l; + + if (ts->mode == E1_TS_MODE_OFF) + continue; + + l = _e1_ts_read(ts, buf_ts, sizeof(buf_ts)); + if (l <= 0) + continue; + + for (int i=0; isuperchan; + uint8_t sc_buf[31*fts]; + int l; + + OSMO_ASSERT(line->mode == E1_LINE_MODE_SUPERCHANNEL); + + if (ts->mode == E1_TS_MODE_OFF) + return; + + /* first pull all we need out of the source */ + l = _e1_ts_read(ts, sc_buf, sizeof(sc_buf)); + if (l <= 0) + return; + + /* then form E1 frames from it, sprinkling in some gaps for TS0 */ + for (int i = 0; i < fts; i++) + memcpy(buf + i*32 + 1, sc_buf + i*31, 31); +} + /*! generate (multiplex) output data for the specified e1_line * \param[in] line E1 line for which to genrate output data * \param[in] buf caller-allocated output buffer for multiplexed data @@ -246,42 +324,91 @@ tsz = 32 * fts; memset(buf, 0xff, tsz); - /* Scan timeslots */ + switch (line->mode) { + case E1_LINE_MODE_CHANNELIZED: + _e1_line_mux_out_channelized(line, buf, fts); + break; + case E1_LINE_MODE_SUPERCHANNEL: + _e1_line_mux_out_superchan(line, buf, fts); + break; + default: + OSMO_ASSERT(0); + } + + return tsz; +} + +/* write data to a timeslot (hardware -> application direction) */ +static int +_e1_ts_write(struct e1_ts *ts, const uint8_t *buf, size_t len) +{ + int rv; + + switch (ts->mode) { + case E1_TS_MODE_RAW: + rv = write(ts->fd, buf, len); + break; + case E1_TS_MODE_HDLCFCS: + rv = _e1_rx_hdlcfs(ts, buf, len); + break; + default: + OSMO_ASSERT(0); + break; + } + + if (rv < 0 && errno != EAGAIN) { + LOGPTS(ts, DE1D, LOGL_ERROR, "dead socket during write: %s\n", + strerror(errno)); + e1_ts_stop(ts); + } else if (rv < len) { + LOGPTS(ts, DE1D, LOGL_NOTICE, "TS write overflow: We had %zu bytes to send, " + "but write returned only %d\n", len, rv); + } + + return rv; +} + +static int +_e1_line_demux_in_superchan(struct e1_line *line, const uint8_t *buf, int ftr) +{ + struct e1_ts *ts = &line->superchan; + uint8_t sc_buf[ftr*31]; + + OSMO_ASSERT(line->mode == E1_LINE_MODE_SUPERCHANNEL); + + if (ts->mode == E1_TS_MODE_OFF) + return 0; + + /* first gather input data from multiple frames*/ + for (int i = 0; i < ftr; i++) + memcpy(sc_buf + (i*31), buf + (i*32) + 1, 31); + + /* then dispatch to appropriate action */ + _e1_ts_write(ts, sc_buf, ftr*31); + + return 0; +} + +static int +_e1_line_demux_in_channelized(struct e1_line *line, const uint8_t *buf, int ftr) +{ + OSMO_ASSERT(line->mode == E1_LINE_MODE_CHANNELIZED); + for (int tsn=1; tsn<32; tsn++) { struct e1_ts *ts = &line->ts[tsn]; - uint8_t buf_ts[fts]; - int l; + uint8_t buf_ts[ftr]; if (ts->mode == E1_TS_MODE_OFF) continue; - switch (ts->mode) { - case E1_TS_MODE_RAW: - l = read(ts->fd, buf_ts, fts); - break; - case E1_TS_MODE_HDLCFCS: - l = _e1_tx_hdlcfs(ts, buf_ts, fts); - break; - default: - OSMO_ASSERT(0); - continue; - } + for (int i=0; its[tsn]; - uint8_t buf_ts[ftr]; - int rv; - - if (ts->mode == E1_TS_MODE_OFF) - continue; - - for (int i=0; imode) { - case E1_TS_MODE_RAW: - rv = write(ts->fd, buf_ts, ftr); - break; - case E1_TS_MODE_HDLCFCS: - rv = _e1_rx_hdlcfs(ts, buf_ts, ftr); - break; - default: - OSMO_ASSERT(0); - continue; - } - if (rv < 0 && errno != EAGAIN) { - LOGPTS(ts, DE1D, LOGL_ERROR, "dead socket during write: %s\n", - strerror(errno)); - e1_ts_stop(ts); - } - + switch (line->mode) { + case E1_LINE_MODE_CHANNELIZED: + return _e1_line_demux_in_channelized(line, buf, ftr); + case E1_LINE_MODE_SUPERCHANNEL: + return _e1_line_demux_in_superchan(line, buf, ftr); + default: + OSMO_ASSERT(0); } - - return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id340b1925471f427deb6cda7eb54e80dfc71faec Gerrit-Change-Number: 19231 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 19:52:56 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jul 2020 19:52:56 +0000 Subject: Change in docker-playground[master]: make: use $(nproc) instead of hard-coded number of cores References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/19232 ) Change subject: make: use $(nproc) instead of hard-coded number of cores ...................................................................... make: use $(nproc) instead of hard-coded number of cores Change-Id: Ie93b81a8a9206c47c4e4d4834fc5c03d9bf4254c --- M gr-gsm-master/Dockerfile M osmo-bsc-master/Dockerfile M osmo-bts-master/Dockerfile M osmo-gerrit-libosmo/Dockerfile M osmo-ggsn-master/Dockerfile M osmo-hlr-master/Dockerfile M osmo-hnbgw-master/Dockerfile M osmo-mgw-master/Dockerfile M osmo-msc-master/Dockerfile M osmo-nitb-master/Dockerfile M osmo-pcu-master/Dockerfile M osmo-remsim-master/Dockerfile M osmo-sgsn-master/Dockerfile M osmo-sip-master/Dockerfile M osmo-stp-master/Dockerfile M osmo-uecups-master/Dockerfile M osmocom-bb-host-master/Dockerfile 17 files changed, 29 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/32/19232/1 diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile index 03cf427..a756b88 100644 --- a/gr-gsm-master/Dockerfile +++ b/gr-gsm-master/Dockerfile @@ -57,7 +57,7 @@ --disable-doxygen \ --disable-pcsc \ --prefix=/usr \ - && make -j5 \ + && make "-j$(nproc)" \ && make install \ && make distclean @@ -74,7 +74,7 @@ -Wno-dev \ -DENABLE_GRCC=OFF \ ../ \ - && make -j5 \ + && make "-j$(nproc)" \ && make install \ && cd ../ \ && rm -rf build/ diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile index 57b4b04..6cfaebd 100644 --- a/osmo-bsc-master/Dockerfile +++ b/osmo-bsc-master/Dockerfile @@ -61,7 +61,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ - make -j8 install + make "-j$(nproc)" install VOLUME /data diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile index 98b0bb0..6e208c6 100644 --- a/osmo-bts-master/Dockerfile +++ b/osmo-bts-master/Dockerfile @@ -62,7 +62,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure --enable-trx && \ - make -j8 install + make "-j$(nproc)" install VOLUME /data diff --git a/osmo-gerrit-libosmo/Dockerfile b/osmo-gerrit-libosmo/Dockerfile index 5442703..1b98c9f 100644 --- a/osmo-gerrit-libosmo/Dockerfile +++ b/osmo-gerrit-libosmo/Dockerfile @@ -48,7 +48,7 @@ git fetch && git checkout -f -B master origin/master && \ autoreconf -fi && \ ./configure && \ - make -j8 && \ + make "-j$(nproc)" && \ sudo make install && \ make clean && \ sudo ldconfig @@ -59,7 +59,7 @@ git fetch && git checkout -f -B master origin/master && \ autoreconf -fi && \ ./configure && \ - make -j1 && \ + make "-j$(nproc)" && \ sudo make install && \ make clean && \ sudo ldconfig @@ -70,7 +70,7 @@ git fetch && git checkout -f -B master origin/master && \ autoreconf -fi && \ ./configure && \ - make -j8 && \ + make "-j$(nproc)" && \ sudo make install && \ make clean && \ sudo ldconfig @@ -82,7 +82,7 @@ git fetch && git checkout -f -B master origin/master && \ autoreconf -fi && \ ./configure && \ - make -j8 && \ + make "-j$(nproc)" && \ sudo make install && \ make clean && \ sudo ldconfig @@ -92,7 +92,7 @@ git fetch && git checkout -f -B master origin/master && \ autoreconf -fi && \ ./configure && \ - make -j8 && \ + make "-j$(nproc)" && \ sudo make install && \ make clean && \ sudo ldconfig @@ -102,7 +102,7 @@ git fetch && git checkout -f -B master origin/master && \ autoreconf -fi && \ ./configure && \ - make -j8 && \ + make "-j$(nproc)" && \ sudo make install && \ make clean && \ sudo ldconfig @@ -112,7 +112,7 @@ git fetch && git checkout -f -B master origin/master && \ autoreconf -fi && \ ./configure && \ - make -j8 && \ + make "-j$(nproc)" && \ sudo make install && \ make clean && \ sudo ldconfig @@ -122,7 +122,7 @@ git fetch && git checkout -f -B master origin/master && \ autoreconf -fi && \ ./configure && \ - make -j8 && \ + make "-j$(nproc)" && \ sudo make install && \ make clean && \ sudo ldconfig @@ -132,11 +132,11 @@ git fetch && git checkout -f -B master origin/master && \ autoreconf -fi && \ ./configure && \ - make -j8 && \ + make "-j$(nproc)" && \ sudo make install && \ make clean && \ sudo ldconfig # example command which builds a single osmo-* application at 'docker run' time in tmpfs -CMD /bin/sh -c 'cd /tmpfs && git clone --reference /build/openbsc git://git.osmocom.org/openbsc.git && cd openbsc && git checkout -f -B master origin/master && cd openbsc && autoreconf -fi && ./configure --enable-nat --enable-osmo-bsc --enable-smpp --enable-vty-tests --enable-external-tests && make -j8 check' +CMD /bin/sh -c 'cd /tmpfs && git clone --reference /build/openbsc git://git.osmocom.org/openbsc.git && cd openbsc && git checkout -f -B master origin/master && cd openbsc && autoreconf -fi && ./configure --enable-nat --enable-osmo-bsc --enable-smpp --enable-vty-tests --enable-external-tests && make "-j$(nproc)" check' diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile index 81444d8..17ea3c9 100644 --- a/osmo-ggsn-master/Dockerfile +++ b/osmo-ggsn-master/Dockerfile @@ -50,7 +50,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ - make -j8 install && \ + make "-j$(nproc)" install && \ ldconfig VOLUME /data diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile index d4727cc..1595c11 100644 --- a/osmo-hlr-master/Dockerfile +++ b/osmo-hlr-master/Dockerfile @@ -56,7 +56,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ - make -j8 install && \ + make "-j$(nproc)" install && \ ldconfig VOLUME /data diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile index 951b95b..215b562 100644 --- a/osmo-hnbgw-master/Dockerfile +++ b/osmo-hnbgw-master/Dockerfile @@ -35,7 +35,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ - make -j8 install && \ + make "-j$(nproc)" install && \ ldconfig VOLUME /data diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile index 773c2a5..c07697e 100644 --- a/osmo-mgw-master/Dockerfile +++ b/osmo-mgw-master/Dockerfile @@ -56,7 +56,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ - make -j8 install && \ + make "-j$(nproc)" install && \ ldconfig VOLUME /data diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile index 366e77c..15b59f0 100644 --- a/osmo-msc-master/Dockerfile +++ b/osmo-msc-master/Dockerfile @@ -70,7 +70,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure --enable-smpp --enable-iu && \ - make -j8 install + make "-j$(nproc)" install VOLUME /data diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile index 0dad7fa..cd463fe 100644 --- a/osmo-nitb-master/Dockerfile +++ b/osmo-nitb-master/Dockerfile @@ -36,7 +36,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure --enable-nat --enable-osmo-bsc --enable-smpp && \ - make -j8 install && \ + make "-j$(nproc)" install && \ ldconfig VOLUME /data diff --git a/osmo-pcu-master/Dockerfile b/osmo-pcu-master/Dockerfile index e8ce5d8..8306837 100644 --- a/osmo-pcu-master/Dockerfile +++ b/osmo-pcu-master/Dockerfile @@ -52,7 +52,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ - make -j8 install + make "-j$(nproc)" install VOLUME /data diff --git a/osmo-remsim-master/Dockerfile b/osmo-remsim-master/Dockerfile index bed7f47..2653ac2 100644 --- a/osmo-remsim-master/Dockerfile +++ b/osmo-remsim-master/Dockerfile @@ -28,7 +28,7 @@ # build virtualsmartcard RUN git clone https://github.com/frankmorgner/vsmartcard.git -RUN cd vsmartcard/virtualsmartcard && autoreconf -fi && ./configure && make -j8 install +RUN cd vsmartcard/virtualsmartcard && autoreconf -fi && ./configure && make "-j$(nproc)" install ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" @@ -91,7 +91,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ - make -j8 install && \ + make "-j$(nproc)" install && \ ldconfig VOLUME /data diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile index 1121712..d3b2518 100644 --- a/osmo-sgsn-master/Dockerfile +++ b/osmo-sgsn-master/Dockerfile @@ -68,7 +68,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure --enable-iu && \ - make -j8 install && \ + make "-j$(nproc)" install && \ ldconfig VOLUME /data diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile index b15a2c9..1f40ff0 100644 --- a/osmo-sip-master/Dockerfile +++ b/osmo-sip-master/Dockerfile @@ -60,7 +60,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure --enable-smpp --enable-iu && \ - make -j8 install + make "-j$(nproc)" install VOLUME /data diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile index 6396b32..26ec494 100644 --- a/osmo-stp-master/Dockerfile +++ b/osmo-stp-master/Dockerfile @@ -50,7 +50,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ - make -j8 install && \ + make "-j$(nproc)" install && \ install examples/.libs/sccp_demo_user /usr/local/bin/ && \ ldconfig diff --git a/osmo-uecups-master/Dockerfile b/osmo-uecups-master/Dockerfile index 9684d08..777797f 100644 --- a/osmo-uecups-master/Dockerfile +++ b/osmo-uecups-master/Dockerfile @@ -35,7 +35,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ - make -j8 install + make "-j$(nproc)" install VOLUME /data diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile index 1d79f06..4a41085 100644 --- a/osmocom-bb-host-master/Dockerfile +++ b/osmocom-bb-host-master/Dockerfile @@ -33,12 +33,12 @@ RUN cd osmocom-bb/src/host/trxcon && \ autoreconf -fi && \ ./configure && \ - make -j8 install + make "-j$(nproc)" install RUN cd osmocom-bb/src/host/virt_phy && \ autoreconf -fi && \ ./configure && \ - make -j8 install + make "-j$(nproc)" install RUN mkdir -p /data/unix -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie93b81a8a9206c47c4e4d4834fc5c03d9bf4254c Gerrit-Change-Number: 19232 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 21:47:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 21:47:21 +0000 Subject: Change in osmo-e1d[master]: Fix HDLC-FCS transmit side References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19233 ) Change subject: Fix HDLC-FCS transmit side ...................................................................... Fix HDLC-FCS transmit side If we are not able to read more packets from the user application, the recv/read call will return 0 and set errno = EAGAIN. In this situation we cannot bail out but still ask the HDLC code to generate output (sequences of flag octets). If we fail to do that, we will transmit all-ones pattern instaed of all-flag octets. Change-Id: Id3bc76f1956138dcd9cb7b499f7251cd94af1329 --- M src/intf_line.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/33/19233/1 diff --git a/src/intf_line.c b/src/intf_line.c index 5994805..4c9c404 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -194,7 +194,7 @@ rv, osmo_hexdump(ts->tx_buf, rv)); ts->tx_len = rv; ts->tx_ofs = 0; - } else if (rv < 0) + } else if (rv < 0 && errno != EAGAIN) return rv; } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id3bc76f1956138dcd9cb7b499f7251cd94af1329 Gerrit-Change-Number: 19233 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 21:50:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 21:50:31 +0000 Subject: Change in osmo-e1d[master]: Fix HDLC-FCS transmit side In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19233 ) Change subject: Fix HDLC-FCS transmit side ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id3bc76f1956138dcd9cb7b499f7251cd94af1329 Gerrit-Change-Number: 19233 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 12 Jul 2020 21:50:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 21:50:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 21:50:35 +0000 Subject: Change in osmo-e1d[master]: Fix HDLC-FCS transmit side In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19233 ) Change subject: Fix HDLC-FCS transmit side ...................................................................... Fix HDLC-FCS transmit side If we are not able to read more packets from the user application, the recv/read call will return 0 and set errno = EAGAIN. In this situation we cannot bail out but still ask the HDLC code to generate output (sequences of flag octets). If we fail to do that, we will transmit all-ones pattern instaed of all-flag octets. Change-Id: Id3bc76f1956138dcd9cb7b499f7251cd94af1329 --- M src/intf_line.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/intf_line.c b/src/intf_line.c index 5994805..4c9c404 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -194,7 +194,7 @@ rv, osmo_hexdump(ts->tx_buf, rv)); ts->tx_len = rv; ts->tx_ofs = 0; - } else if (rv < 0) + } else if (rv < 0 && errno != EAGAIN) return rv; } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id3bc76f1956138dcd9cb7b499f7251cd94af1329 Gerrit-Change-Number: 19233 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 21:51:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 12 Jul 2020 21:51:28 +0000 Subject: Change in osmo-e1d[master]: actually implement the superchannel mode In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19231 ) Change subject: actually implement the superchannel mode ...................................................................... Patch Set 2: Code-Review-1 let's not merge this until there is code to actually set the line->mode to SUPERCHANNEL via the CTL protocol. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id340b1925471f427deb6cda7eb54e80dfc71faec Gerrit-Change-Number: 19231 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sun, 12 Jul 2020 21:51:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 22:11:28 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jul 2020 22:11:28 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: check TDMA frame order, drop out of order bursts In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/19201 to look at the new patch set (#5). Change subject: trxcon/scheduler: check TDMA frame order, drop out of order bursts ...................................................................... trxcon/scheduler: check TDMA frame order, drop out of order bursts When running together with fake_trx.py (mostly used back-end), it is currently possible that Downlink bursts are received in a wrong order if more than one transceiver is configured (multi-trx mode). This is how it looks like: DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=629 rssi=-86 toa=0 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=629 ts=3 bid=1 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=630 rssi=-86 toa=0 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=630 ts=3 bid=2 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=631 rssi=-86 toa=0 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=631 ts=3 bid=3 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=633 (!) rssi=-86 toa=0 DSCHD NOTICE sched_trx.c:663 Substituting (!) lost TDMA frame 632 on TCH/F DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=632 ts=3 bid=0 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=633 ts=3 bid=1 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=632 (!) rssi=-86 toa=0 DTRXD NOTICE sched_trx.c:640 Too many (>104) contiguous TDMA frames elapsed (2715647) since the last processed fn=633 (current fn=632) so here a burst with TDMA fn=633 was received earlier than a burst with TDMA fn=632. The burst loss detection logic considered the latter one as lost, and substituted it with a dummy burst. When finally the out-of-order burst with TDMA fn=632 was received, we got the large number of allegedly elapsed frames: ((632 + 2715648) - 633) % 2715648 == 2715647 Given that late bursts get substituted, the best thing we can do is to reject them and log an error. Passing them to the logical channel handler (again) might lead to undefined behaviour. Change-Id: I873c8555ea2ca190b1689227bb0fdcba87188772 Related: OS#4658, OS#4546 --- M src/host/trxcon/sched_trx.c 1 file changed, 26 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/01/19201/5 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I873c8555ea2ca190b1689227bb0fdcba87188772 Gerrit-Change-Number: 19201 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 22:11:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jul 2020 22:11:29 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: reduce default Uplink burst scheduling advance References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19234 ) Change subject: trxcon/scheduler: reduce default Uplink burst scheduling advance ...................................................................... trxcon/scheduler: reduce default Uplink burst scheduling advance In general, premature scheduling of to be transmitted bursts inevitably increases the time delay between Uplink and Downlink. The more we advance TDMA frame number, the greater gets this delay. 20 TDMA frames is definitely more than a regular transceiver needs to pre-process a burst before transmission. Change-Id: Ia9b142b59d95f2cd7b2394596cf72c0bcd36d711 Related: OS#4487 --- M src/host/trxcon/trxcon.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/34/19234/1 diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index dfce2b8..8efa6a7 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -160,7 +160,7 @@ printf(" -b --trx-bind TRX bind IP address (default 0.0.0.0)\n"); printf(" -i --trx-remote TRX remote IP address (default 127.0.0.1)\n"); printf(" -p --trx-port Base port of TRX instance (default 6700)\n"); - printf(" -f --trx-advance Scheduler clock advance (default 20)\n"); + printf(" -f --trx-advance Uplink burst scheduling advance (default 3)\n"); printf(" -s --socket Listening socket for layer23 (default /tmp/osmocom_l2)\n"); printf(" -g --gsmtap-ip The destination IP used for GSMTAP (disabled by default)\n"); printf(" -D --daemonize Run as daemon\n"); @@ -233,7 +233,7 @@ app_data.trx_remote_ip = "127.0.0.1"; app_data.trx_bind_ip = "0.0.0.0"; app_data.trx_base_port = 6700; - app_data.trx_fn_advance = 20; + app_data.trx_fn_advance = 3; app_data.debug_mask = NULL; app_data.gsmtap_ip = NULL; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia9b142b59d95f2cd7b2394596cf72c0bcd36d711 Gerrit-Change-Number: 19234 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 22:36:49 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jul 2020 22:36:49 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19159 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib27704dcba3979d69e44065c472b1452eaa11a7a Gerrit-Change-Number: 19159 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 12 Jul 2020 22:36:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 22:37:34 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jul 2020 22:37:34 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: add osmo-bsc-fh.cfg with hopping parameters In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19160 ) Change subject: ttcn3-bts-test: add osmo-bsc-fh.cfg with hopping parameters ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7822c3581fccba3277a63577e740e7486307635d Gerrit-Change-Number: 19160 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 12 Jul 2020 22:37:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 22:55:08 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jul 2020 22:55:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fixup ttcn3-tcpdump-stop.sh: add --force flag to gzip References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19235 ) Change subject: fixup ttcn3-tcpdump-stop.sh: add --force flag to gzip ...................................................................... fixup ttcn3-tcpdump-stop.sh: add --force flag to gzip When a directory path for the "build artifacts" is not specified, '/tmp' would be used by default. When running the same text case more than once, gzip will be asking for confirmation whether to overwrite the existing capture file. Let's do this by default. Change-Id: I357f3d9c5dc5963f4b709166bb659f3f66a721b8 --- M ttcn3-tcpdump-stop.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/19235/1 diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh index ac192ca..b2a3a3e 100755 --- a/ttcn3-tcpdump-stop.sh +++ b/ttcn3-tcpdump-stop.sh @@ -49,4 +49,4 @@ kill_rm_pidfile "$PIDFILE_PCAP" kill_rm_pidfile "$PIDFILE_NETCAT" -gzip "$TTCN3_PCAP_PATH/$TESTCASE.pcap" +gzip -f "$TTCN3_PCAP_PATH/$TESTCASE.pcap" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I357f3d9c5dc5963f4b709166bb659f3f66a721b8 Gerrit-Change-Number: 19235 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 12 22:55:31 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 12 Jul 2020 22:55:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fixup ttcn3-tcpdump-stop.sh: add flag '--force' to gzip In-Reply-To: References: Message-ID: fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19235 ) Change subject: fixup ttcn3-tcpdump-stop.sh: add flag '--force' to gzip ...................................................................... fixup ttcn3-tcpdump-stop.sh: add flag '--force' to gzip When a directory path for the "build artifacts" is not specified, '/tmp' would be used by default. When running the same text case more than once, gzip will be asking for confirmation whether to overwrite the existing capture file. Let's do this by default. Change-Id: I357f3d9c5dc5963f4b709166bb659f3f66a721b8 --- M ttcn3-tcpdump-stop.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/19235/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I357f3d9c5dc5963f4b709166bb659f3f66a721b8 Gerrit-Change-Number: 19235 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Jul 13 04:02:02 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 13 Jul 2020 04:02:02 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f0bdccb901bb_633d2acac9ae85f8415718@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Testing/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 68s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 68s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 68s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 68s] | | [ 68s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 68s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 68s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 68s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 68s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 68s] 2425 | MHD_start_daemon (unsigned int flags, [ 68s] | ^~~~~~~~~~~~~~~~ [ 68s] cc1: all warnings being treated as errors [ 68s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 68s] make[3]: *** Waiting for unfinished jobs.... [ 69s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 69s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 69s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 69s] make[1]: *** [Makefile:166: all] Error 2 [ 69s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 69s] dh_auto_build: error: cd build && make -j16 "INSTALL=install --strip-program=true" returned exit code 2 [ 69s] make: *** [debian/rules:9: build] Error 25 [ 69s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 69s] ### VM INTERACTION START ### [ 72s] [ 63.492342] sysrq: SysRq : Power Off [ 72s] [ 63.498849] reboot: Power down [ 72s] ### VM INTERACTION END ### [ 72s] [ 72s] goat05 failed "build ulfius_2.5.2-4.1.dsc" at Mon Jul 13 04:01:58 UTC 2020. [ 72s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jul 13 04:03:10 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 13 Jul 2020 04:03:10 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f0bdd0686fd7_633d2acac9ae85f8415883@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Testing/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 115s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 115s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 115s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 115s] | | [ 115s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 115s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 115s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 115s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 115s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 115s] 2425 | MHD_start_daemon (unsigned int flags, [ 115s] | ^~~~~~~~~~~~~~~~ [ 116s] cc1: all warnings being treated as errors [ 116s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 116s] make[3]: *** Waiting for unfinished jobs.... [ 116s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 116s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 116s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 116s] make[1]: *** [Makefile:166: all] Error 2 [ 116s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 116s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 116s] make: *** [debian/rules:9: build] Error 25 [ 116s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 116s] ### VM INTERACTION START ### [ 119s] [ 108.153015] sysrq: SysRq : Power Off [ 119s] [ 108.160318] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] lamb10 failed "build ulfius_2.5.2-4.1.dsc" at Mon Jul 13 04:03:02 UTC 2020. [ 119s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:30:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 08:30:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test RR Channel Release cause codes from Clear Command cause codes In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217 ) Change subject: bsc: test RR Channel Release cause codes from Clear Command cause codes ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie6c99f28b610a67f2d59ec00b3541940e882251b Gerrit-Change-Number: 19217 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 13 Jul 2020 08:30:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:36:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 08:36:30 +0000 Subject: Change in osmo-bsc[master]: RR Channel Release: pass Cause code from BSSMAP Clear to the BTS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19214 ) Change subject: RR Channel Release: pass Cause code from BSSMAP Clear to the BTS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I734cc55c501d61bbdadee81a223b26f9df57f959 Gerrit-Change-Number: 19214 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:36:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:37:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 08:37:23 +0000 Subject: Change in osmo-bsc[master]: propagate RSL error cause codes to RR Channel Release cause In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19215 ) Change subject: propagate RSL error cause codes to RR Channel Release cause ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I46eb12c91a8c08162b43dd22c7ba825ef3bbc6ac Gerrit-Change-Number: 19215 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:37:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:38:48 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 08:38:48 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: inherit trx list API from TRXList In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19222 ) Change subject: trx_toolkit/burst_fwd.py: inherit trx list API from TRXList ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1c589888991add435d88517094c7b4a7db93cbae Gerrit-Change-Number: 19222 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:38:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:40:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 08:40:13 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: avoid using TRXList.__getitem__() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19223 ) Change subject: trx_toolkit/fake_trx.py: avoid using TRXList.__getitem__() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2bbc0a2af8218af0b9a02d8e16d4216cf602892a Gerrit-Change-Number: 19223 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:40:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:41:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 08:41:44 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: move Rx burst handling to Transceiver In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19224 ) Change subject: trx_toolkit/fake_trx.py: move Rx burst handling to Transceiver ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic1f44bfb21ac3173e9530a0a9966cd5e64b8bd48 Gerrit-Change-Number: 19224 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:41:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:43:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 08:43:20 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: fix TDMA clock counter wrapping In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19225 ) Change subject: trx_toolkit/clck_gen.py: fix TDMA clock counter wrapping ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmocom-bb/+/19225/1/src/target/trx_toolkit/clck_gen.py File src/target/trx_toolkit/clck_gen.py: https://gerrit.osmocom.org/c/osmocom-bb/+/19225/1/src/target/trx_toolkit/clck_gen.py at 96 PS1, Line 96: if self.clck_src >= GSM_HYPERFRAME: You can simply do self.clck_src %= GSM_HYPERFRAME unconditionally and get rid of the if branch. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I157447c7610402f6d62d2b74c9f04fcaa0bc1724 Gerrit-Change-Number: 19225 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:43:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:45:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:45:30 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: check TDMA frame order, drop out of order bursts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19201 ) Change subject: trxcon/scheduler: check TDMA frame order, drop out of order bursts ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I873c8555ea2ca190b1689227bb0fdcba87188772 Gerrit-Change-Number: 19201 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:45:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:45:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 08:45:36 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: call send_clck_ind() on every TDMA frame In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19226 ) Change subject: trx_toolkit/clck_gen.py: call send_clck_ind() on every TDMA frame ...................................................................... Patch Set 1: I don't see the relation between the commit description and the code changes. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6d53e5266fa3b1f2eb55822d1c14975789b202ed Gerrit-Change-Number: 19226 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:45:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:46:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 08:46:14 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: support optional clock handler In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19227 ) Change subject: trx_toolkit/clck_gen.py: support optional clock handler ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I85b2182d9835ed035cf370e45ea039ac6a7e8405 Gerrit-Change-Number: 19227 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:46:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:47:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:47:57 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: reduce default Uplink burst scheduling advance In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19234 ) Change subject: trxcon/scheduler: reduce default Uplink burst scheduling advance ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia9b142b59d95f2cd7b2394596cf72c0bcd36d711 Gerrit-Change-Number: 19234 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 13 Jul 2020 08:47:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:48:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:48:01 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: check TDMA frame order, drop out of order bursts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19201 ) Change subject: trxcon/scheduler: check TDMA frame order, drop out of order bursts ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I873c8555ea2ca190b1689227bb0fdcba87188772 Gerrit-Change-Number: 19201 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:48:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:48:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:48:05 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: check TDMA frame order, drop out of order bursts In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19201 ) Change subject: trxcon/scheduler: check TDMA frame order, drop out of order bursts ...................................................................... trxcon/scheduler: check TDMA frame order, drop out of order bursts When running together with fake_trx.py (mostly used back-end), it is currently possible that Downlink bursts are received in a wrong order if more than one transceiver is configured (multi-trx mode). This is how it looks like: DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=629 rssi=-86 toa=0 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=629 ts=3 bid=1 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=630 rssi=-86 toa=0 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=630 ts=3 bid=2 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=631 rssi=-86 toa=0 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=631 ts=3 bid=3 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=633 (!) rssi=-86 toa=0 DSCHD NOTICE sched_trx.c:663 Substituting (!) lost TDMA frame 632 on TCH/F DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=632 ts=3 bid=0 DSCHD DEBUG sched_lchan_tchf.c:60 Traffic received on TCH/F: fn=633 ts=3 bid=1 DTRXD DEBUG trx_if.c:612 RX burst tn=3 fn=632 (!) rssi=-86 toa=0 DTRXD NOTICE sched_trx.c:640 Too many (>104) contiguous TDMA frames elapsed (2715647) since the last processed fn=633 (current fn=632) so here a burst with TDMA fn=633 was received earlier than a burst with TDMA fn=632. The burst loss detection logic considered the latter one as lost, and substituted it with a dummy burst. When finally the out-of-order burst with TDMA fn=632 was received, we got the large number of allegedly elapsed frames: ((632 + 2715648) - 633) % 2715648 == 2715647 Given that late bursts get substituted, the best thing we can do is to reject them and log an error. Passing them to the logical channel handler (again) might lead to undefined behaviour. Change-Id: I873c8555ea2ca190b1689227bb0fdcba87188772 Related: OS#4658, OS#4546 --- M src/host/trxcon/sched_trx.c 1 file changed, 26 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index 9195b33..0025e0c 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -625,7 +625,7 @@ { const struct trx_multiframe *mf; const struct trx_frame *fp; - unsigned int elapsed, i; + int elapsed, i; /* Wait until at least one TDMA frame is processed */ if (lchan->tdma.num_proc == 0) @@ -634,10 +634,28 @@ /* Short alias for the current multiframe */ mf = lchan->ts->mf_layout; - /* How many frames elapsed since the last one? */ - elapsed = GSM_TDMA_FN_SUB(fn, lchan->tdma.last_proc); + /* Calculate how many frames elapsed since the last received one. + * The algorithm is based on GSM::FNDelta() from osmo-trx. */ + elapsed = fn - lchan->tdma.last_proc; + if (elapsed >= GSM_TDMA_HYPERFRAME / 2) + elapsed -= GSM_TDMA_HYPERFRAME; + else if (elapsed < -GSM_TDMA_HYPERFRAME / 2) + elapsed += GSM_TDMA_HYPERFRAME; + + /* Check TDMA frame order (wrong order is possible with fake_trx.py, see OS#4658) */ + if (elapsed < 0) { + /* This burst has already been substituted by a dummy burst (all bits set to zero), + * so better drop it. Otherwise we risk to get undefined behavior in handler(). */ + LOGP(DSCHD, LOGL_ERROR, "(%s) Rx burst with fn=%u older than the last " + "processed fn=%u (see OS#4658) => dropping\n", + trx_lchan_desc[lchan->type].name, + fn, lchan->tdma.last_proc); + return -EALREADY; + } + + /* Check how many frames we (potentially) need to compensate */ if (elapsed > mf->period) { - LOGP(DSCHD, LOGL_NOTICE, "Too many (>%u) contiguous TDMA frames elapsed (%u) " + LOGP(DSCHD, LOGL_NOTICE, "Too many (>%u) contiguous TDMA frames elapsed (%d) " "since the last processed fn=%u (current %u)\n", mf->period, elapsed, lchan->tdma.last_proc, fn); return -EIO; @@ -687,6 +705,7 @@ trx_lchan_rx_func *handler; enum trx_lchan_type chan; uint8_t offset, bid; + int rc; /* Check whether required timeslot is allocated and configured */ ts = trx->ts_list[tn]; @@ -720,7 +739,9 @@ return 0; /* Compensate lost TDMA frames (if any) */ - subst_frame_loss(lchan, handler, fn); + rc = subst_frame_loss(lchan, handler, fn); + if (rc == -EALREADY) + return rc; /* Perform A5/X decryption if required */ if (lchan->a5.algo) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I873c8555ea2ca190b1689227bb0fdcba87188772 Gerrit-Change-Number: 19201 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:48:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:48:06 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: reduce default Uplink burst scheduling advance In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19234 ) Change subject: trxcon/scheduler: reduce default Uplink burst scheduling advance ...................................................................... trxcon/scheduler: reduce default Uplink burst scheduling advance In general, premature scheduling of to be transmitted bursts inevitably increases the time delay between Uplink and Downlink. The more we advance TDMA frame number, the greater gets this delay. 20 TDMA frames is definitely more than a regular transceiver needs to pre-process a burst before transmission. Change-Id: Ia9b142b59d95f2cd7b2394596cf72c0bcd36d711 Related: OS#4487 --- M src/host/trxcon/trxcon.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index dfce2b8..8efa6a7 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -160,7 +160,7 @@ printf(" -b --trx-bind TRX bind IP address (default 0.0.0.0)\n"); printf(" -i --trx-remote TRX remote IP address (default 127.0.0.1)\n"); printf(" -p --trx-port Base port of TRX instance (default 6700)\n"); - printf(" -f --trx-advance Scheduler clock advance (default 20)\n"); + printf(" -f --trx-advance Uplink burst scheduling advance (default 3)\n"); printf(" -s --socket Listening socket for layer23 (default /tmp/osmocom_l2)\n"); printf(" -g --gsmtap-ip The destination IP used for GSMTAP (disabled by default)\n"); printf(" -D --daemonize Run as daemon\n"); @@ -233,7 +233,7 @@ app_data.trx_remote_ip = "127.0.0.1"; app_data.trx_bind_ip = "0.0.0.0"; app_data.trx_base_port = 6700; - app_data.trx_fn_advance = 20; + app_data.trx_fn_advance = 3; app_data.debug_mask = NULL; app_data.gsmtap_ip = NULL; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia9b142b59d95f2cd7b2394596cf72c0bcd36d711 Gerrit-Change-Number: 19234 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:48:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:48:43 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19159 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib27704dcba3979d69e44065c472b1452eaa11a7a Gerrit-Change-Number: 19159 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:48:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:48:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:48:54 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: add osmo-bsc-fh.cfg with hopping parameters In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19160 ) Change subject: ttcn3-bts-test: add osmo-bsc-fh.cfg with hopping parameters ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7822c3581fccba3277a63577e740e7486307635d Gerrit-Change-Number: 19160 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 13 Jul 2020 08:48:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:49:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:49:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fixup ttcn3-tcpdump-stop.sh: add flag '--force' to gzip In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19235 ) Change subject: fixup ttcn3-tcpdump-stop.sh: add flag '--force' to gzip ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I357f3d9c5dc5963f4b709166bb659f3f66a721b8 Gerrit-Change-Number: 19235 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 13 Jul 2020 08:49:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:49:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:49:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fixup ttcn3-tcpdump-stop.sh: add flag '--force' to gzip In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19235 ) Change subject: fixup ttcn3-tcpdump-stop.sh: add flag '--force' to gzip ...................................................................... fixup ttcn3-tcpdump-stop.sh: add flag '--force' to gzip When a directory path for the "build artifacts" is not specified, '/tmp' would be used by default. When running the same text case more than once, gzip will be asking for confirmation whether to overwrite the existing capture file. Let's do this by default. Change-Id: I357f3d9c5dc5963f4b709166bb659f3f66a721b8 --- M ttcn3-tcpdump-stop.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh index ac192ca..b2a3a3e 100755 --- a/ttcn3-tcpdump-stop.sh +++ b/ttcn3-tcpdump-stop.sh @@ -49,4 +49,4 @@ kill_rm_pidfile "$PIDFILE_PCAP" kill_rm_pidfile "$PIDFILE_NETCAT" -gzip "$TTCN3_PCAP_PATH/$TESTCASE.pcap" +gzip -f "$TTCN3_PCAP_PATH/$TESTCASE.pcap" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I357f3d9c5dc5963f4b709166bb659f3f66a721b8 Gerrit-Change-Number: 19235 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:49:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:49:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test RR Channel Release cause codes from Clear Command cause codes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217 ) Change subject: bsc: test RR Channel Release cause codes from Clear Command cause codes ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie6c99f28b610a67f2d59ec00b3541940e882251b Gerrit-Change-Number: 19217 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:49:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:50:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:50:07 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: inherit trx list API from TRXList In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19222 ) Change subject: trx_toolkit/burst_fwd.py: inherit trx list API from TRXList ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1c589888991add435d88517094c7b4a7db93cbae Gerrit-Change-Number: 19222 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:50:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:50:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:50:47 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: avoid using TRXList.__getitem__() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19223 ) Change subject: trx_toolkit/fake_trx.py: avoid using TRXList.__getitem__() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2bbc0a2af8218af0b9a02d8e16d4216cf602892a Gerrit-Change-Number: 19223 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:50:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:51:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:51:00 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: move Rx burst handling to Transceiver In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19224 ) Change subject: trx_toolkit/fake_trx.py: move Rx burst handling to Transceiver ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic1f44bfb21ac3173e9530a0a9966cd5e64b8bd48 Gerrit-Change-Number: 19224 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:51:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:51:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:51:19 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: inherit trx list API from TRXList In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19222 ) Change subject: trx_toolkit/burst_fwd.py: inherit trx list API from TRXList ...................................................................... trx_toolkit/burst_fwd.py: inherit trx list API from TRXList Change-Id: I1c589888991add435d88517094c7b4a7db93cbae --- M src/target/trx_toolkit/burst_fwd.py M src/target/trx_toolkit/trx_list.py 2 files changed, 5 insertions(+), 24 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index 9fb308f..574c97e 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -25,7 +25,9 @@ import logging as log -class BurstForwarder: +from trx_list import TRXList + +class BurstForwarder(TRXList): """ Performs burst forwarding between transceivers. BurstForwarder distributes bursts between the list of given @@ -44,27 +46,6 @@ """ - def __init__(self, trx_list = None): - # List of Transceiver instances - 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: - log.error("TRX is already in the list") - return - - self.trx_list.append(trx) - - def del_trx(self, trx): - if trx not in self.trx_list: - log.error("TRX is not in the list") - return - - self.trx_list.remove(trx) - def forward_msg(self, src_trx, rx_msg): # Originating Transceiver may use frequency hopping, # so let's precalculate its Tx frequency in advance diff --git a/src/target/trx_toolkit/trx_list.py b/src/target/trx_toolkit/trx_list.py index 8b4013d..4f9eff2 100644 --- a/src/target/trx_toolkit/trx_list.py +++ b/src/target/trx_toolkit/trx_list.py @@ -31,8 +31,8 @@ """ - def __init__(self): - self.trx_list = [] + def __init__(self, trx_list = None): + self.trx_list = trx_list or [] def __getitem__(self, i): return self.trx_list[i] -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1c589888991add435d88517094c7b4a7db93cbae Gerrit-Change-Number: 19222 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:51:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:51:19 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: avoid using TRXList.__getitem__() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19223 ) Change subject: trx_toolkit/fake_trx.py: avoid using TRXList.__getitem__() ...................................................................... trx_toolkit/fake_trx.py: avoid using TRXList.__getitem__() Running with cProfile shows that there are quite a lot calls: 469896 0.254 0.000 0.254 0.000 trx_list.py:37(__getitem__) Let's better avoid using it in performance critical parts. Change-Id: I2bbc0a2af8218af0b9a02d8e16d4216cf602892a --- M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/trx_list.py 2 files changed, 4 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 4a49fa3..82eb5b7 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -411,7 +411,7 @@ self.append_child_trx(addr, port, idx, name) # Burst forwarding between transceivers - self.burst_fwd = BurstForwarder(self.trx_list) + self.burst_fwd = BurstForwarder(self.trx_list.trx_list) log.info("Init complete") @@ -444,7 +444,7 @@ def run(self): # Compose list of to be monitored sockets sock_list = [] - for trx in self.trx_list: + for trx in self.trx_list.trx_list: sock_list.append(trx.ctrl_if.sock) sock_list.append(trx.data_if.sock) @@ -454,7 +454,7 @@ r_event, _, _ = select.select(sock_list, [], []) # Iterate over all transceivers - for trx in self.trx_list: + for trx in self.trx_list.trx_list: # DATA interface if trx.data_if.sock in r_event: msg = trx.recv_data_msg() diff --git a/src/target/trx_toolkit/trx_list.py b/src/target/trx_toolkit/trx_list.py index 4f9eff2..3206d74 100644 --- a/src/target/trx_toolkit/trx_list.py +++ b/src/target/trx_toolkit/trx_list.py @@ -34,6 +34,7 @@ def __init__(self, trx_list = None): self.trx_list = trx_list or [] + # NOTE: do not use this in performance critical parts def __getitem__(self, i): return self.trx_list[i] -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2bbc0a2af8218af0b9a02d8e16d4216cf602892a Gerrit-Change-Number: 19223 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:51:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:51:19 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: move Rx burst handling to Transceiver In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19224 ) Change subject: trx_toolkit/fake_trx.py: move Rx burst handling to Transceiver ...................................................................... trx_toolkit/fake_trx.py: move Rx burst handling to Transceiver Change-Id: Ic1f44bfb21ac3173e9530a0a9966cd5e64b8bd48 --- M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/transceiver.py 2 files changed, 5 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 82eb5b7..27c2b88 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -252,8 +252,7 @@ if src_trx.ta != 0: msg.toa256 -= src_trx.ta * 256 - # TODO: make legacy mode configurable (via argv?) - self.data_if.send_msg(msg, legacy = True) + Transceiver.handle_data_msg(self, msg) # Simulation specific CTRL command handler def ctrl_cmd_handler(self, request): diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 655d4f6..474834d 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -276,3 +276,7 @@ return None return msg + + def handle_data_msg(self, msg): + # TODO: make legacy mode configurable (via argv?) + self.data_if.send_msg(msg, legacy = True) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic1f44bfb21ac3173e9530a0a9966cd5e64b8bd48 Gerrit-Change-Number: 19224 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:52:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:52:09 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: call send_clck_ind() on every TDMA frame In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19226 ) Change subject: trx_toolkit/clck_gen.py: call send_clck_ind() on every TDMA frame ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6d53e5266fa3b1f2eb55822d1c14975789b202ed Gerrit-Change-Number: 19226 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:52:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:52:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:52:38 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: call send_clck_ind() on every TDMA frame In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19226 ) Change subject: trx_toolkit/clck_gen.py: call send_clck_ind() on every TDMA frame ...................................................................... Patch Set 1: > Patch Set 1: > > I don't see the relation between the commit description and the code changes. the timer interval multiplier is removed in the first hunk, causing the code to be executed every frame. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6d53e5266fa3b1f2eb55822d1c14975789b202ed Gerrit-Change-Number: 19226 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:52:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:52:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:52:51 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: support optional clock handler In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19227 ) Change subject: trx_toolkit/clck_gen.py: support optional clock handler ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I85b2182d9835ed035cf370e45ea039ac6a7e8405 Gerrit-Change-Number: 19227 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:52:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:53:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:53:41 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/transceiver.py: implement the transmit burst queue In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19228 ) Change subject: trx_toolkit/transceiver.py: implement the transmit burst queue ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie66ef9667dc8d156ad578ce324941a816c07c105 Gerrit-Change-Number: 19228 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 13 Jul 2020 08:53:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:54:09 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 08:54:09 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/transceiver.py: implement the transmit burst queue In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19228 ) Change subject: trx_toolkit/transceiver.py: implement the transmit burst queue ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/c/osmocom-bb/+/19228/2/src/target/trx_toolkit/transceiver.py File src/target/trx_toolkit/transceiver.py: https://gerrit.osmocom.org/c/osmocom-bb/+/19228/2/src/target/trx_toolkit/transceiver.py at 277 PS2, Line 277: if event == "POWEROFF": Aren't yo repeating the same above in POWEROFF? https://gerrit.osmocom.org/c/osmocom-bb/+/19228/2/src/target/trx_toolkit/transceiver.py at 326 PS2, Line 326: self._tx_queue.append(msg) If you sort them here when adding them, then during clk_tick you only need to check for the few first ones, or only the first element. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie66ef9667dc8d156ad578ce324941a816c07c105 Gerrit-Change-Number: 19228 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:54:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:54:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:54:31 +0000 Subject: Change in osmo-bts[master]: common: Avoid changing OPSTATE to Enabled upon RSL up In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19156 ) Change subject: common: Avoid changing OPSTATE to Enabled upon RSL up ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iefb5c4e1097233b5c31e4d621c544d51516af678 Gerrit-Change-Number: 19156 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 13 Jul 2020 08:54:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:54:54 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 13 Jul 2020 08:54:54 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: call send_clck_ind() on every TDMA frame In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19226 ) Change subject: trx_toolkit/clck_gen.py: call send_clck_ind() on every TDMA frame ...................................................................... Patch Set 1: > Patch Set 1: > > > Patch Set 1: > > > > I don't see the relation between the commit description and the code changes. > > the timer interval multiplier is removed in the first hunk, causing the code to be executed every frame. Yep, exactly. In the current code (before this patch) we call send_clck_ind() only once per 102 frames. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6d53e5266fa3b1f2eb55822d1c14975789b202ed Gerrit-Change-Number: 19226 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:54:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:55:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 08:55:03 +0000 Subject: Change in osmo-e1d[master]: _e1_rx_hdlcfs: const-ify input buffer argument In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19230 ) Change subject: _e1_rx_hdlcfs: const-ify input buffer argument ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: If772487124e26bafea23b451536b3b556d4c088c Gerrit-Change-Number: 19230 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:55:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:55:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 08:55:30 +0000 Subject: Change in docker-playground[master]: make: use $(nproc) instead of hard-coded number of cores In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19232 ) Change subject: make: use $(nproc) instead of hard-coded number of cores ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie93b81a8a9206c47c4e4d4834fc5c03d9bf4254c Gerrit-Change-Number: 19232 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:55:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:56:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:56:20 +0000 Subject: Change in osmo-bts[master]: Move struct gsm_bts_trx: gsm_data.* & bts.* => bts_trx.* In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19124 ) Change subject: Move struct gsm_bts_trx: gsm_data.* & bts.* => bts_trx.* ...................................................................... Patch Set 3: Code-Review+1 still not convinced that this is really an improvement (rather than a, what Holger would have called "sideways development", i.e. something that uses time but doesn't move us ahead). Would be really interesting what others think about it. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iebaf5b221c48b571f45408af867ce6f9c0cd9f4a Gerrit-Change-Number: 19124 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 13 Jul 2020 08:56:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 08:58:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 13 Jul 2020 08:58:14 +0000 Subject: Change in docker-playground[master]: make: use $(nproc) instead of hard-coded number of cores In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19232 ) Change subject: make: use $(nproc) instead of hard-coded number of cores ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie93b81a8a9206c47c4e4d4834fc5c03d9bf4254c Gerrit-Change-Number: 19232 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 08:58:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 09:02:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 09:02:21 +0000 Subject: Change in osmo-bts[master]: Move struct gsm_bts_trx: gsm_data.* & bts.* => bts_trx.* In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19124 ) Change subject: Move struct gsm_bts_trx: gsm_data.* & bts.* => bts_trx.* ...................................................................... Patch Set 3: The current status makes no sense to me, with lots of functions in different places for no apparent good reason, and that's basically because we end up having a model ordered in a way which makes people put stuff in the first place they find. I'm trying to solve this by ordering a bit the data model files. We are adding more and more features to osmo-bts and this requires also cleaning up a bit in order to avoid messing around more and more over time. I cannot really understand how you can find the old situation desirable. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iebaf5b221c48b571f45408af867ce6f9c0cd9f4a Gerrit-Change-Number: 19124 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-CC: dexter Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 13 Jul 2020 09:02:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 10:52:33 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 13 Jul 2020 10:52:33 +0000 Subject: Change in osmo-bsc[master]: RR Release Cell selection IE: fix repeated EARFCNs encoding In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19210 ) Change subject: RR Release Cell selection IE: fix repeated EARFCNs encoding ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I59e427e4ebb1c6af99b27a15c40fed82457ac8ab Gerrit-Change-Number: 19210 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Mon, 13 Jul 2020 10:52:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 10:54:33 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 13 Jul 2020 10:54:33 +0000 Subject: Change in osmo-bsc[master]: RR Release Cell selection IE: fix repeated EARFCNs encoding In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19210 ) Change subject: RR Release Cell selection IE: fix repeated EARFCNs encoding ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/19210/2/src/osmo-bsc/gsm_04_08_rr.c File src/osmo-bsc/gsm_04_08_rr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/19210/2/src/osmo-bsc/gsm_04_08_rr.c at 264 PS2, Line 264: if (bitvec_tailroom_bits(&bv) < 20) { ah wait, this should also include the final 0, i.e. '< 21' -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I59e427e4ebb1c6af99b27a15c40fed82457ac8ab Gerrit-Change-Number: 19210 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Mon, 13 Jul 2020 10:54:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 11:04:42 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 13 Jul 2020 11:04:42 +0000 Subject: Change in osmo-bsc[master]: RR Release Cell selection IE: fix repeated EARFCNs encoding In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19210 to look at the new patch set (#3). Change subject: RR Release Cell selection IE: fix repeated EARFCNs encoding ...................................................................... RR Release Cell selection IE: fix repeated EARFCNs encoding 3GPP 44.018 10.5.2.1e defines the EARFCNs encoded in the 'Cell selection indicator after release of all TCH and SDCCH IE' as follows: ::= [...] | 011 { 1 > } ** 0 So after a 3-bit discriminator of '3' there can be multiple E-UTRAN Descriptions, and each of them starts with a '1' bit to indicate that another item follows. Finally there is a '0' bit to indicate the list end. Before this patch, osmo-bsc only encoded the first '1' bit, and failed to repeat this before each following E-UTRAN Description. Fix that by moving the '1' encoding into the loop. The final '0' was missing. Add it. With these changes, adjust the size calculation in CELL_SEL_IND_AFTER_REL_MAX_BITS to match. Also fix CELL_SEL_IND_AFTER_REL_MAX_BYTES by using OSMO_BYTES_FOR_BITS() instead of the inaccurate (n/8)+1. A test for this is in I882c5e1f70bcc4833fc837a95c900ce291919cc5 (osmo-ttcn3-hacks). Related: SYS#4871 SYS#4872 Change-Id: I59e427e4ebb1c6af99b27a15c40fed82457ac8ab --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/10/19210/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I59e427e4ebb1c6af99b27a15c40fed82457ac8ab Gerrit-Change-Number: 19210 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 11:07:07 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 13 Jul 2020 11:07:07 +0000 Subject: Change in osmo-hlr[master]: manual: describe subscriber import by SQL In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/19052 ) Change subject: manual: describe subscriber import by SQL ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/19052/1/doc/manuals/chapters/subscribers.adoc File doc/manuals/chapters/subscribers.adoc: https://gerrit.osmocom.org/c/osmo-hlr/+/19052/1/doc/manuals/chapters/subscribers.adoc at 160 PS1, Line 160: INSERT > > Error: near "subscriber": syntax error [?] "you tested this, right?" :P https://gerrit.osmocom.org/c/osmo-hlr/+/19052/1/doc/manuals/chapters/subscribers.adoc at 160 PS1, Line 160: id > > anyway, there might be some SQL magic that gets the last added subscriber id and allows using [?] and then? there is another 'INSERT INTO auc_3g' below, we must not insert the auc_2g's rowid there -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/19052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3246e6d5364215a71c33b5aca876deab7b6cfd70 Gerrit-Change-Number: 19052 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 11:07:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 11:16:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 11:16:14 +0000 Subject: Change in osmo-bsc[master]: RR Release Cell selection IE: fix repeated EARFCNs encoding In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19210 ) Change subject: RR Release Cell selection IE: fix repeated EARFCNs encoding ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I59e427e4ebb1c6af99b27a15c40fed82457ac8ab Gerrit-Change-Number: 19210 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 11:16:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 11:27:41 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 13 Jul 2020 11:27:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test RR Channel Release EARFCNs In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 ) Change subject: bsc: test RR Channel Release EARFCNs ...................................................................... Patch Set 1: (7 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/bsc/BSC_Tests.ttcn at 1825 PS1, Line 1825: cells[i] := tr_CellSelectionIndicatorValue_EUTRAN_Description(earfcn, meas_bw_presence := '0'B, meas_bw := omit); I am using meas_bw_presence here. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn File library/GSM_RR_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn at 1074 PS1, Line 1074: CellSelectionIndicatorValue > It makes sense to shorten names a bit, e.g. CellSelIndValue. yes, the names are getting awfully long, but there's also something to using the exact naming from the specs... looking around this file the style seems to be shortened names. so ok. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn at 1087 PS1, Line 1087: CellSelectionIndicatorValueEnum > Not sure if this type is going to be used outside, so let's make it 'private'. [?] I see only this one. But I wonder why keeping it private is worth spending thoughts on? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn at 1109 PS1, Line 1109: arfcn > uarfcn? in the spec this is called "FDD-ARFCN" and "TDD-ARFCN" -- i noticed that FDD and TDD are exactly the same structure, so i stripped the prefix and used this twice in the Enum above. It makes sense to add a 'u' but I try to use naming identical to the specs. What do you think? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn at 1131 PS1, Line 1131: define not_allowed_cells > See GSM_RestOctets.EUTRAN_RepeatedNotAllowedCells (incomplete implementation). indeed seems to be the same "PCID Group IE" coding https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn at 1134 PS1, Line 1134: target_pcid > Can we use GSM_RestOctets. [?] 44.018 says PCID to TA mapping : < PCID Group IE > vs TARGET_PCID : bit (9) so looks distinct to me...? let's just leave it until someone wants to use it? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn at 1154 PS1, Line 1154: meas_bw_presence > Unused argument. I don't think it's even needed. if i want to verify that the presence bit is encoded correctly, then I do need this argument. I am using it in this patch. Are you saying the presence bit is validated even when I am passing it as '?' -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I882c5e1f70bcc4833fc837a95c900ce291919cc5 Gerrit-Change-Number: 19216 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 13 Jul 2020 11:27:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 11:43:21 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 13 Jul 2020 11:43:21 +0000 Subject: Change in osmo-pcu[master]: WIP add IPv6 support for the PCU SOCKET References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19236 ) Change subject: WIP add IPv6 support for the PCU SOCKET ...................................................................... WIP add IPv6 support for the PCU SOCKET This is the "old" approach. Not for master. Change-Id: Iaa2113644fcb4e6ff38649ca7f3abb6469f33d48 --- M include/osmocom/pcu/pcuif_proto.h M src/gprs_bssgp_pcu.cpp M src/gprs_bssgp_pcu.h M src/pcu_l1_if.cpp M tests/emu/pcu_emu.cpp 5 files changed, 41 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/36/19236/1 diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index fd989a5..a6714ca 100644 --- a/include/osmocom/pcu/pcuif_proto.h +++ b/include/osmocom/pcu/pcuif_proto.h @@ -1,11 +1,12 @@ #ifndef _PCUIF_PROTO_H #define _PCUIF_PROTO_H +#include #include #define PCU_SOCK_DEFAULT "/tmp/pcu_bts" -#define PCU_IF_VERSION 0x09 +#define PCU_IF_VERSION 0x10 #define TXT_MAX_LEN 128 /* msg_type */ @@ -153,7 +154,11 @@ uint16_t nsvci[2]; uint16_t local_port[2]; uint16_t remote_port[2]; - uint32_t remote_ip[2]; + uint8_t adress_family; + union { + struct in_addr ipv4; + struct in6_addr ipv6; + } remote_ip[2]; } __attribute__ ((packed)); struct gsm_pcu_if_act_req { diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp index abcb106..d769333 100644 --- a/src/gprs_bssgp_pcu.cpp +++ b/src/gprs_bssgp_pcu.cpp @@ -882,13 +882,13 @@ } /* create BSSGP/NS layer instances */ +/* TODO: use a pointer for sgsn */ struct gprs_bssgp_pcu *gprs_bssgp_create_and_connect(struct gprs_rlcmac_bts *bts, - uint16_t local_port, uint32_t sgsn_ip, - uint16_t sgsn_port, uint16_t nsei, uint16_t nsvci, uint16_t bvci, + uint16_t local_port, struct osmo_sockaddr *sgsn, + uint16_t nsei, uint16_t nsvci, uint16_t bvci, uint16_t mcc, uint16_t mnc, bool mnc_3_digits, uint16_t lac, uint16_t rac, uint16_t cell_id) { - struct sockaddr_in dest; int rc; /* if already created... return the current address */ @@ -901,10 +901,9 @@ * issue a connect() on the socket, which prevents us to dynamically communicate * with any number of IP-SNS endpoints on the SGSN side */ if (!bts->gb_dialect_sns) { - bssgp_nsi->nsip.remote_port = sgsn_port; - bssgp_nsi->nsip.remote_ip = sgsn_ip; + bssgp_nsi->nsip.remote = *sgsn; } - bssgp_nsi->nsip.local_port = local_port; + bssgp_nsi->nsip.local.u.sin.sin_port = local_port; rc = gprs_ns_nsip_listen(bssgp_nsi); if (rc < 0) { LOGP(DBSSGP, LOGL_ERROR, "Failed to create socket\n"); @@ -912,14 +911,10 @@ return NULL; } - dest.sin_family = AF_INET; - dest.sin_port = htons(sgsn_port); - dest.sin_addr.s_addr = htonl(sgsn_ip); - if (bts->gb_dialect_sns) - the_pcu.nsvc = gprs_ns_nsip_connect_sns(bssgp_nsi, &dest, nsei, nsvci); + the_pcu.nsvc = gprs_ns_nsip_connect_sns(bssgp_nsi, sgsn, nsei, nsvci); else - the_pcu.nsvc = gprs_ns_nsip_connect(bssgp_nsi, &dest, nsei, nsvci); + the_pcu.nsvc = gprs_ns_nsip_connect(bssgp_nsi, sgsn, nsei, nsvci); if (!the_pcu.nsvc) { LOGP(DBSSGP, LOGL_ERROR, "Failed to create NSVCt\n"); gprs_ns_close(bssgp_nsi); diff --git a/src/gprs_bssgp_pcu.h b/src/gprs_bssgp_pcu.h index f98e719..9b40059 100644 --- a/src/gprs_bssgp_pcu.h +++ b/src/gprs_bssgp_pcu.h @@ -75,8 +75,7 @@ }; struct gprs_bssgp_pcu *gprs_bssgp_create_and_connect(struct gprs_rlcmac_bts *bts, - uint16_t local_port, - uint32_t sgsn_ip, uint16_t sgsn_port, uint16_t nsei, + uint16_t local_port, struct osmo_sockaddr *sgsn, uint16_t nsei, uint16_t nsvci, uint16_t bvci, uint16_t mcc, uint16_t mnc, bool mnc_3_digits, uint16_t lac, uint16_t rac, uint16_t cell_id); diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 883cb22..e0ff701 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -34,6 +34,8 @@ #include #include #include +#include +#include #include #include #include @@ -424,6 +426,8 @@ struct gprs_rlcmac_bts *bts = bts_main_data(); struct gprs_bssgp_pcu *pcu; struct gprs_rlcmac_pdch *pdch; + struct osmo_sockaddr saddr; + struct osmo_sockaddr_str addr; struct in_addr ia; int rc = 0; unsigned int trx, ts; @@ -502,11 +506,25 @@ LOGP(DL1IF, LOGL_DEBUG, " nsvci=%d\n", info_ind->nsvci[0]); LOGP(DL1IF, LOGL_DEBUG, " local_port=%d\n", info_ind->local_port[0]); LOGP(DL1IF, LOGL_DEBUG, " remote_port=%d\n", info_ind->remote_port[0]); - ia.s_addr = htonl(info_ind->remote_ip[0]); - LOGP(DL1IF, LOGL_DEBUG, " remote_ip=%s\n", inet_ntoa(ia)); + + switch (info_ind->adress_family) { + case IPPROTO_IPIP: + saddr.u.sin.sin_addr = info_ind->remote_ip[0].ipv4; + saddr.u.sin.sin_port = info_ind->remote_port[0]; + saddr.u.sin.sin_family = AF_INET; + break; + case IPPROTO_IPV6: + saddr.u.sin6.sin6_addr = info_ind->remote_ip[0].ipv6; + saddr.u.sin6.sin6_port = info_ind->remote_port[0]; + saddr.u.sin6.sin6_family = AF_INET6; + break; + } + osmo_sockaddr_str_from_sockaddr(&addr, &saddr.u.sas); + + LOGP(DL1IF, LOGL_DEBUG, " remote_ip=%s\n", addr.ip); pcu = gprs_bssgp_create_and_connect(bts, info_ind->local_port[0], - info_ind->remote_ip[0], info_ind->remote_port[0], + &saddr, info_ind->nsei, info_ind->nsvci[0], info_ind->bvci, info_ind->mcc, info_ind->mnc, info_ind->mnc_3_digits, info_ind->lac, info_ind->rac, info_ind->cell_id); diff --git a/tests/emu/pcu_emu.cpp b/tests/emu/pcu_emu.cpp index 7f99355..e8d8f05 100644 --- a/tests/emu/pcu_emu.cpp +++ b/tests/emu/pcu_emu.cpp @@ -93,8 +93,12 @@ uint32_t sgsn_ip, uint16_t sgsn_port) { struct gprs_bssgp_pcu *pcu; + struct osmo_sockaddr saddr; + saddr.u.sin.sin_family = AF_INET; + saddr.u.sin.sin_addr.s_addr = htonl(sgsn_ip); + saddr.u.sin.sin_port = htons(sgsn_port); - pcu = gprs_bssgp_create_and_connect(bts, 0, sgsn_ip, sgsn_port, + pcu = gprs_bssgp_create_and_connect(bts, 0, &saddr, 20, 20, 20, 901, 99, false, 1, 0, 0); pcu->on_unblock_ack = bvci_unblocked; pcu->on_dl_unit_data = bssgp_data; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iaa2113644fcb4e6ff38649ca7f3abb6469f33d48 Gerrit-Change-Number: 19236 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 13:44:55 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 13:44:55 +0000 Subject: Change in osmo-gsm-tester[master]: 4G: Add milenage support References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19237 ) Change subject: 4G: Add milenage support ...................................................................... 4G: Add milenage support Change-Id: I4c1fb9bfec9927f2bfa29e6b27959323838f59e5 --- M src/osmo_gsm_tester/core/schema.py M src/osmo_gsm_tester/obj/epc_amarisoft.py M src/osmo_gsm_tester/obj/epc_srs.py M src/osmo_gsm_tester/obj/ms.py M src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl M src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl M src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl M src/osmo_gsm_tester/templates/srsue.conf.tmpl M sysmocom/resources.conf.prod 9 files changed, 30 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/37/19237/1 diff --git a/src/osmo_gsm_tester/core/schema.py b/src/osmo_gsm_tester/core/schema.py index 9a346cd..72c2738 100644 --- a/src/osmo_gsm_tester/core/schema.py +++ b/src/osmo_gsm_tester/core/schema.py @@ -28,6 +28,7 @@ HWADDR_RE = re.compile('([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}') IMSI_RE = re.compile('[0-9]{6,15}') KI_RE = re.compile('[0-9a-fA-F]{32}') +OPC_RE = re.compile('[0-9a-fA-F]{32}') MSISDN_RE = re.compile('[0-9]{1,15}') def match_re(name, regex, val): @@ -60,6 +61,9 @@ def ki(val): return match_re('KI', KI_RE, val) +def opc(val): + return match_re('OPC', OPC_RE, val) + def msisdn(val): return match_re('MSISDN', MSISDN_RE, val) @@ -157,6 +161,7 @@ HWADDR = 'hwaddr' IMSI = 'imsi' KI = 'ki' +OPC = 'opc' MSISDN = 'msisdn' AUTH_ALGO = 'auth_algo' TIMES='times' @@ -180,6 +185,7 @@ HWADDR: hwaddr, IMSI: imsi, KI: ki, + OPC: opc, MSISDN: msisdn, AUTH_ALGO: auth_algo, TIMES: times, diff --git a/src/osmo_gsm_tester/obj/epc_amarisoft.py b/src/osmo_gsm_tester/obj/epc_amarisoft.py index 40216f7..3e91b5c 100644 --- a/src/osmo_gsm_tester/obj/epc_amarisoft.py +++ b/src/osmo_gsm_tester/obj/epc_amarisoft.py @@ -177,8 +177,11 @@ if algo_str != util.OSMO_AUTH_ALGO_NONE and not modem.ki(): raise log.Error("Auth algo %r selected but no KI specified" % algo_str) + if algo_str == 'milenage' and not modem.opc(): + raise log.Error("Auth algo milenage selected but no OPC specified") + subscriber_id = len(self.subscriber_list) # list index - self.subscriber_list.append({'id': subscriber_id, 'imsi': modem.imsi(), 'msisdn': msisdn, 'auth_algo': algo_str, 'ki': modem.ki(), 'opc': None, 'apn_ipaddr': modem.apn_ipaddr()}) + self.subscriber_list.append({'id': subscriber_id, 'imsi': modem.imsi(), 'msisdn': msisdn, 'auth_algo': algo_str, 'ki': modem.ki(), 'opc': modem.opc(), 'apn_ipaddr': modem.apn_ipaddr()}) self.log('Add subscriber', msisdn=msisdn, imsi=modem.imsi(), subscriber_id=subscriber_id, algo_str=algo_str) diff --git a/src/osmo_gsm_tester/obj/epc_srs.py b/src/osmo_gsm_tester/obj/epc_srs.py index 9c4b004..ee0ad33 100644 --- a/src/osmo_gsm_tester/obj/epc_srs.py +++ b/src/osmo_gsm_tester/obj/epc_srs.py @@ -190,8 +190,14 @@ if algo_str != util.OSMO_AUTH_ALGO_NONE and not modem.ki(): raise log.Error("Auth algo %r selected but no KI specified" % algo_str) + if algo_str == 'milenage': + if not modem.opc(): + raise log.Error("Auth algo milenage selected but no OPC specified") + # srsepc's used_db uses token 'mil' for milenage: + algo_str = 'mil' + subscriber_id = len(self.subscriber_list) # list index - self.subscriber_list.append({'id': subscriber_id, 'imsi': modem.imsi(), 'msisdn': msisdn, 'auth_algo': algo_str, 'ki': modem.ki(), 'opc': None, 'apn_ipaddr': modem.apn_ipaddr()}) + self.subscriber_list.append({'id': subscriber_id, 'imsi': modem.imsi(), 'msisdn': msisdn, 'auth_algo': algo_str, 'ki': modem.ki(), 'opc': modem.opc(), 'apn_ipaddr': modem.apn_ipaddr()}) self.log('Add subscriber', msisdn=msisdn, imsi=modem.imsi(), subscriber_id=subscriber_id, algo_str=algo_str) diff --git a/src/osmo_gsm_tester/obj/ms.py b/src/osmo_gsm_tester/obj/ms.py index b39d3ee..3e75719 100644 --- a/src/osmo_gsm_tester/obj/ms.py +++ b/src/osmo_gsm_tester/obj/ms.py @@ -28,6 +28,7 @@ 'path': schema.STR, 'imsi': schema.IMSI, 'ki': schema.KI, + 'opc': schema.OPC, 'auth_algo': schema.AUTH_ALGO, 'apn_ipaddr': schema.IPV4, 'ciphers[]': schema.CIPHER, @@ -100,6 +101,9 @@ def ki(self): return self._conf.get('ki') + def opc(self): + return self._conf.get('opc', None) + def apn_ipaddr(self): return self._conf.get('apn_ipaddr', 'dynamic') diff --git a/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl index 5fcc74a..9564e39 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl @@ -154,10 +154,11 @@ amf: 0x9001, /* Authentication Management Field */ sqn: "000000000000", /* Sequence Number */ K: "${sub.ki}", /* Anritsu Test USIM */ + opc: "${sub.opc}", /* if true, allow several UEs to have the same IMSI (useful with test SIM cards). They are distinguished with their IMEI. default = false. */ - multi_sim: true, + multi_sim: false, }, %endfor /* Add new entries for each IMSI/K */ diff --git a/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl index 720c0ba..263c191 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl @@ -48,8 +48,10 @@ ue_category: 4, /* USIM data */ + sim_algo: "${sub.auth_algo}", /* USIM authentication algorithm: xor, milenage or tuak */ imsi: "${ue.imsi}", K: "${ue.ki}", + opc: "${ue.opc}", /* If enabled, will try to use external SIM card using libpcsclite */ //external_sim: true, diff --git a/src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl b/src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl index 5b970bf..250b261 100644 --- a/src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl +++ b/src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl @@ -20,5 +20,5 @@ #ue2,mil,001010123456780,00112233445566778899aabbccddeeff,opc,63bfa50ee6523365ff14c1f45f88737d,8000,000000001234,7,dynamic #ue1,xor,001010123456789,00112233445566778899aabbccddeeff,opc,63bfa50ee6523365ff14c1f45f88737d,9001,000000001255,7,dynamic %for sub in epc.hss.subscribers: -ogt${sub.id},${sub.auth_algo},${sub.imsi},${sub.ki},opc,63bfa50ee6523365ff14c1f45f88737d,8000,000000001234,${sub.qci},${sub.apn_ipaddr} +ogt${sub.id},${sub.auth_algo},${sub.imsi},${sub.ki},opc,${sub.opc},8000,000000001234,${sub.qci},${sub.apn_ipaddr} %endfor diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl b/src/osmo_gsm_tester/templates/srsue.conf.tmpl index a75be23..6d97589 100644 --- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl @@ -126,7 +126,7 @@ [usim] mode = soft algo = ${ue.auth_algo} -#opc = 63BFA50EE6523365FF14C1F45F88737D +opc = ${ue.opc} k = ${ue.ki} imsi = ${ue.imsi} imei = 353490069873319 diff --git a/sysmocom/resources.conf.prod b/sysmocom/resources.conf.prod index e6429a0..dc60734 100644 --- a/sysmocom/resources.conf.prod +++ b/sysmocom/resources.conf.prod @@ -260,7 +260,8 @@ rf_dev_args: auto imsi: '001010123456789' ki: '00112233445566778899aabbccddeeff' - auth_algo: 'xor' + opc: '63BFA50EE6523365FF14C1F45F88737D' + auth_algo: 'milenage' features: ['4g'] run_node: run_type: ssh @@ -274,6 +275,7 @@ rf_dev_args: driver=lime,serial=00090706024F0A22,rxant=LNAW,txant=BAND1 imsi: '001010123456789' ki: '00112233445566778899aabbccddeeff' + opc: '63BFA50EE6523365FF14C1F45F88737D' auth_algo: 'xor' features: ['4g'] run_node: -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4c1fb9bfec9927f2bfa29e6b27959323838f59e5 Gerrit-Change-Number: 19237 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 13:44:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 13:44:56 +0000 Subject: Change in osmo-gsm-tester[master]: contrib/jenkins-build-amarisoft.sh: Pass srsLTE.git branch explicitly References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19238 ) Change subject: contrib/jenkins-build-amarisoft.sh: Pass srsLTE.git branch explicitly ...................................................................... contrib/jenkins-build-amarisoft.sh: Pass srsLTE.git branch explicitly This allows easily changing the branch for local builds. Change-Id: I9765e1ebdd7488788be5f5c7259cf8b6e04e58f6 --- M contrib/jenkins-build-amarisoft.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/38/19238/1 diff --git a/contrib/jenkins-build-amarisoft.sh b/contrib/jenkins-build-amarisoft.sh index b07927c..c210c4c 100755 --- a/contrib/jenkins-build-amarisoft.sh +++ b/contrib/jenkins-build-amarisoft.sh @@ -15,10 +15,11 @@ name="srslte" git_url="${git_url:-https://github.com/srsLTE}" project_name_srslte="${project_name:-srsLTE}" + branch="master" . "$(dirname "$0")/jenkins-build-common.sh" #TODO: make sure libconfig, zeroMQ is installed - build_repo $project_name_srslte -DENABLE_UHD=False -DENABLE_BLADERF=False -DENABLE_SOAPYSDR=False -DENABLE_ZEROMQ=True + build_repo $project_name_srslte $branch -DENABLE_UHD=False -DENABLE_BLADERF=False -DENABLE_SOAPYSDR=False -DENABLE_ZEROMQ=True git_url="git at github.com:softwareradiosystems" project_name_zmq="amarisoft_dummy_trx" -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I9765e1ebdd7488788be5f5c7259cf8b6e04e58f6 Gerrit-Change-Number: 19238 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 16:48:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 16:48:32 +0000 Subject: Change in osmo-gsm-tester[master]: 4G: Add milenage support In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19237 to look at the new patch set (#3). Change subject: 4G: Add milenage support ...................................................................... 4G: Add milenage support Change-Id: I4c1fb9bfec9927f2bfa29e6b27959323838f59e5 --- M src/osmo_gsm_tester/core/schema.py M src/osmo_gsm_tester/obj/epc_amarisoft.py M src/osmo_gsm_tester/obj/epc_srs.py M src/osmo_gsm_tester/obj/ms.py M src/osmo_gsm_tester/obj/ms_amarisoft.py M src/osmo_gsm_tester/obj/ms_srs.py M src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl M src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl M src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl M src/osmo_gsm_tester/templates/srsue.conf.tmpl M sysmocom/resources.conf.prod 11 files changed, 41 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/37/19237/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4c1fb9bfec9927f2bfa29e6b27959323838f59e5 Gerrit-Change-Number: 19237 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 16:48:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 16:48:33 +0000 Subject: Change in osmo-gsm-tester[master]: contrib/jenkins-build-amarisoft.sh: Allow generating trial without lteue References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19239 ) Change subject: contrib/jenkins-build-amarisoft.sh: Allow generating trial without lteue ...................................................................... contrib/jenkins-build-amarisoft.sh: Allow generating trial without lteue Some Amarisoft bundles may come without lteue in it. Allow the script to run if that's the case by setting an envvar. Change-Id: I363b44cd8aa48f80d24219b6bf5b3ebde580e3c3 --- M contrib/jenkins-build-amarisoft.sh 1 file changed, 14 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/39/19239/1 diff --git a/contrib/jenkins-build-amarisoft.sh b/contrib/jenkins-build-amarisoft.sh index c210c4c..fe106f1 100755 --- a/contrib/jenkins-build-amarisoft.sh +++ b/contrib/jenkins-build-amarisoft.sh @@ -4,6 +4,7 @@ amarisoft_tgz="$1" BUILD_AMARISOFT_TRX_ZMQ="${BUILD_AMARISOFT_TRX_ZMQ:-1}" +HAVE_AMARISOFT_LTEUE="${HAVE_AMARISOFT_LTEUE:-1}" if [ ! -f "$amarisoft_tgz" ]; then echo "Amarisoft tgz doesn't exist: $amarisoft_tgz" @@ -57,18 +58,20 @@ md5sum "$tar" > "${this}.md5" # Create amarisoftue inst: -rm -rf inst-amarisoftue && mkdir inst-amarisoftue || exit 1 -tar --strip-components=1 -zxf inst-tmp/*/lteue-linux*.tar.gz -C inst-amarisoftue/ -if [ "x${BUILD_AMARISOFT_TRX_ZMQ}" = "x1" ]; then - cp ${base}/${project_name_srslte}/build/lib/src/phy/rf/libsrslte_rf.so inst-amarisoftue/ - cp ${base}/${project_name_zmq}/build/libtrx_zmq-linux-2018-10-18.so inst-amarisoftue/trx_zmq.so - patchelf --set-rpath '$ORIGIN/' inst-amarisoftue/trx_zmq.so +if [ "x${HAVE_AMARISOFT_LTEUE}" = "x1" ]; then + rm -rf inst-amarisoftue && mkdir inst-amarisoftue || exit 1 + tar --strip-components=1 -zxf inst-tmp/*/lteue-linux*.tar.gz -C inst-amarisoftue/ + if [ "x${BUILD_AMARISOFT_TRX_ZMQ}" = "x1" ]; then + cp ${base}/${project_name_srslte}/build/lib/src/phy/rf/libsrslte_rf.so inst-amarisoftue/ + cp ${base}/${project_name_zmq}/build/libtrx_zmq-linux-2018-10-18.so inst-amarisoftue/trx_zmq.so + patchelf --set-rpath '$ORIGIN/' inst-amarisoftue/trx_zmq.so + fi + cp ${base}/inst-tmp/trx_uhd-linux*/trx_uhd.so inst-amarisoftue/ + this="amarisoftue.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}" + tar="${this}.tgz" + tar -czf "$tar" -C inst-amarisoftue/ . + md5sum "$tar" > "${this}.md5" fi -cp ${base}/inst-tmp/trx_uhd-linux*/trx_uhd.so inst-amarisoftue/ -this="amarisoftue.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}" -tar="${this}.tgz" -tar -czf "$tar" -C inst-amarisoftue/ . -md5sum "$tar" > "${this}.md5" # Create amarisoftepc inst: rm -rf inst-amarisoftepc && mkdir inst-amarisoftepc || exit 1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I363b44cd8aa48f80d24219b6bf5b3ebde580e3c3 Gerrit-Change-Number: 19239 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 16:48:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 16:48:34 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_ltemme_ifup.sh: use ip cmd instead of ifconfig References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19240 ) Change subject: amarisoft_ltemme_ifup.sh: use ip cmd instead of ifconfig ...................................................................... amarisoft_ltemme_ifup.sh: use ip cmd instead of ifconfig ifconfig is deprecated and not available in newer distros. Change-Id: I93e4b7f3c9bee2563c0e01a1ff7e832e5098cf1f --- M utils/bin/osmo-gsm-tester_amarisoft_ltemme_ifup.sh 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/40/19240/1 diff --git a/utils/bin/osmo-gsm-tester_amarisoft_ltemme_ifup.sh b/utils/bin/osmo-gsm-tester_amarisoft_ltemme_ifup.sh index d502123..d992002 100755 --- a/utils/bin/osmo-gsm-tester_amarisoft_ltemme_ifup.sh +++ b/utils/bin/osmo-gsm-tester_amarisoft_ltemme_ifup.sh @@ -9,8 +9,10 @@ mask="$8" # Mask echo "*** Configuring $type APN[$index] '$apn' on ${ifname}, $ifaddr/$mask, ${addr1}..${addr2}" if [ "$type" = "ipv4" ] ; then - ifconfig ${ifname} ${ifaddr}/${mask} up + ip addr add ${ifaddr}/${mask} dev ${ifname} + ip link set ${ifname} up else - ifconfig ${ifname} inet6 add ${addr1}/${mask} up + ip -6 addr add ${addr1}/${mask} dev ${ifname} + ip -6 link set ${ifname} up fi echo "*** done configuring interface ${ifname}" -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I93e4b7f3c9bee2563c0e01a1ff7e832e5098cf1f Gerrit-Change-Number: 19240 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 17:24:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 17:24:31 +0000 Subject: Change in osmo-gsm-tester[master]: iperf3: Avoid creating empty log file References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19241 ) Change subject: iperf3: Avoid creating empty log file ...................................................................... iperf3: Avoid creating empty log file Since a while ago, we avoid by default using the --logfile param to log the json output to a different file, in order to stay compatible with older versions of iperf3. However, the local logfile was still being created, and was not overwritten with the remote file with content because there's none created remotely (due to reasons explained above). Change-Id: I218ec28dc65febc7bd083d6d15854319bf4f3daf --- M src/osmo_gsm_tester/obj/iperf3.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/41/19241/1 diff --git a/src/osmo_gsm_tester/obj/iperf3.py b/src/osmo_gsm_tester/obj/iperf3.py index d61dbb1..9e084aa 100644 --- a/src/osmo_gsm_tester/obj/iperf3.py +++ b/src/osmo_gsm_tester/obj/iperf3.py @@ -117,7 +117,7 @@ self.log('Starting iperf3-srv') self.log_copied = False self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name())) - self.log_file = self.run_dir.new_file(IPerf3Server.LOGFILE) + self.log_file = self.run_dir.new_child(IPerf3Server.LOGFILE) if self.runs_locally(): self.start_locally() else: @@ -258,7 +258,7 @@ self.log('Preparing iperf3-client connecting to %s:%d (proto=%s,time=%ds)' % (self.server.addr(), self.server.port(), self._proto, time_sec)) self.log_copied = False self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name())) - self.log_file = self.run_dir.new_file(IPerf3Client.LOGFILE) + self.log_file = self.run_dir.new_child(IPerf3Client.LOGFILE) popen_args = ('iperf3', '-c', self.server.addr(), '-p', str(self.server.port()), '-J', -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I218ec28dc65febc7bd083d6d15854319bf4f3daf Gerrit-Change-Number: 19241 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 17:24:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 17:24:31 +0000 Subject: Change in osmo-gsm-tester[master]: iperf3: server: Avoid copying logfile during cleanup if already copie... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19242 ) Change subject: iperf3: server: Avoid copying logfile during cleanup if already copied previously ...................................................................... iperf3: server: Avoid copying logfile during cleanup if already copied previously Change-Id: I44e28f326fd476d27eb021922d38e9ca913aec69 --- M src/osmo_gsm_tester/obj/iperf3.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/42/19242/1 diff --git a/src/osmo_gsm_tester/obj/iperf3.py b/src/osmo_gsm_tester/obj/iperf3.py index 9e084aa..252c55a 100644 --- a/src/osmo_gsm_tester/obj/iperf3.py +++ b/src/osmo_gsm_tester/obj/iperf3.py @@ -101,11 +101,12 @@ def cleanup(self): if self.process is None: return - if self.runs_locally() or not self.logfile_supported: + if self.runs_locally() or not self.logfile_supported or self.log_copied: return # copy back files (may not exist, for instance if there was an early error of process): try: self.rem_host.scpfrom('scp-back-log', self.remote_log_file, self.log_file) + self.log_copied = True except Exception as e: self.log(repr(e)) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I44e28f326fd476d27eb021922d38e9ca913aec69 Gerrit-Change-Number: 19242 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 17:28:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 17:28:37 +0000 Subject: Change in osmo-gsm-tester[master]: contrib/jenkins-build-amarisoft.sh: Pass srsLTE.git branch explicitly In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19238 ) Change subject: contrib/jenkins-build-amarisoft.sh: Pass srsLTE.git branch explicitly ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I9765e1ebdd7488788be5f5c7259cf8b6e04e58f6 Gerrit-Change-Number: 19238 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 17:28:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 17:28:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 17:28:42 +0000 Subject: Change in osmo-gsm-tester[master]: contrib/jenkins-build-amarisoft.sh: Allow generating trial without lteue In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19239 ) Change subject: contrib/jenkins-build-amarisoft.sh: Allow generating trial without lteue ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I363b44cd8aa48f80d24219b6bf5b3ebde580e3c3 Gerrit-Change-Number: 19239 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 17:28:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 17:28:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 17:28:49 +0000 Subject: Change in osmo-gsm-tester[master]: contrib/jenkins-build-amarisoft.sh: Pass srsLTE.git branch explicitly In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19238 ) Change subject: contrib/jenkins-build-amarisoft.sh: Pass srsLTE.git branch explicitly ...................................................................... contrib/jenkins-build-amarisoft.sh: Pass srsLTE.git branch explicitly This allows easily changing the branch for local builds. Change-Id: I9765e1ebdd7488788be5f5c7259cf8b6e04e58f6 --- M contrib/jenkins-build-amarisoft.sh 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/contrib/jenkins-build-amarisoft.sh b/contrib/jenkins-build-amarisoft.sh index b07927c..c210c4c 100755 --- a/contrib/jenkins-build-amarisoft.sh +++ b/contrib/jenkins-build-amarisoft.sh @@ -15,10 +15,11 @@ name="srslte" git_url="${git_url:-https://github.com/srsLTE}" project_name_srslte="${project_name:-srsLTE}" + branch="master" . "$(dirname "$0")/jenkins-build-common.sh" #TODO: make sure libconfig, zeroMQ is installed - build_repo $project_name_srslte -DENABLE_UHD=False -DENABLE_BLADERF=False -DENABLE_SOAPYSDR=False -DENABLE_ZEROMQ=True + build_repo $project_name_srslte $branch -DENABLE_UHD=False -DENABLE_BLADERF=False -DENABLE_SOAPYSDR=False -DENABLE_ZEROMQ=True git_url="git at github.com:softwareradiosystems" project_name_zmq="amarisoft_dummy_trx" -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I9765e1ebdd7488788be5f5c7259cf8b6e04e58f6 Gerrit-Change-Number: 19238 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 17:28:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 17:28:50 +0000 Subject: Change in osmo-gsm-tester[master]: contrib/jenkins-build-amarisoft.sh: Allow generating trial without lteue In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19239 ) Change subject: contrib/jenkins-build-amarisoft.sh: Allow generating trial without lteue ...................................................................... contrib/jenkins-build-amarisoft.sh: Allow generating trial without lteue Some Amarisoft bundles may come without lteue in it. Allow the script to run if that's the case by setting an envvar. Change-Id: I363b44cd8aa48f80d24219b6bf5b3ebde580e3c3 --- M contrib/jenkins-build-amarisoft.sh 1 file changed, 14 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/contrib/jenkins-build-amarisoft.sh b/contrib/jenkins-build-amarisoft.sh index c210c4c..fe106f1 100755 --- a/contrib/jenkins-build-amarisoft.sh +++ b/contrib/jenkins-build-amarisoft.sh @@ -4,6 +4,7 @@ amarisoft_tgz="$1" BUILD_AMARISOFT_TRX_ZMQ="${BUILD_AMARISOFT_TRX_ZMQ:-1}" +HAVE_AMARISOFT_LTEUE="${HAVE_AMARISOFT_LTEUE:-1}" if [ ! -f "$amarisoft_tgz" ]; then echo "Amarisoft tgz doesn't exist: $amarisoft_tgz" @@ -57,18 +58,20 @@ md5sum "$tar" > "${this}.md5" # Create amarisoftue inst: -rm -rf inst-amarisoftue && mkdir inst-amarisoftue || exit 1 -tar --strip-components=1 -zxf inst-tmp/*/lteue-linux*.tar.gz -C inst-amarisoftue/ -if [ "x${BUILD_AMARISOFT_TRX_ZMQ}" = "x1" ]; then - cp ${base}/${project_name_srslte}/build/lib/src/phy/rf/libsrslte_rf.so inst-amarisoftue/ - cp ${base}/${project_name_zmq}/build/libtrx_zmq-linux-2018-10-18.so inst-amarisoftue/trx_zmq.so - patchelf --set-rpath '$ORIGIN/' inst-amarisoftue/trx_zmq.so +if [ "x${HAVE_AMARISOFT_LTEUE}" = "x1" ]; then + rm -rf inst-amarisoftue && mkdir inst-amarisoftue || exit 1 + tar --strip-components=1 -zxf inst-tmp/*/lteue-linux*.tar.gz -C inst-amarisoftue/ + if [ "x${BUILD_AMARISOFT_TRX_ZMQ}" = "x1" ]; then + cp ${base}/${project_name_srslte}/build/lib/src/phy/rf/libsrslte_rf.so inst-amarisoftue/ + cp ${base}/${project_name_zmq}/build/libtrx_zmq-linux-2018-10-18.so inst-amarisoftue/trx_zmq.so + patchelf --set-rpath '$ORIGIN/' inst-amarisoftue/trx_zmq.so + fi + cp ${base}/inst-tmp/trx_uhd-linux*/trx_uhd.so inst-amarisoftue/ + this="amarisoftue.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}" + tar="${this}.tgz" + tar -czf "$tar" -C inst-amarisoftue/ . + md5sum "$tar" > "${this}.md5" fi -cp ${base}/inst-tmp/trx_uhd-linux*/trx_uhd.so inst-amarisoftue/ -this="amarisoftue.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}" -tar="${this}.tgz" -tar -czf "$tar" -C inst-amarisoftue/ . -md5sum "$tar" > "${this}.md5" # Create amarisoftepc inst: rm -rf inst-amarisoftepc && mkdir inst-amarisoftepc || exit 1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I363b44cd8aa48f80d24219b6bf5b3ebde580e3c3 Gerrit-Change-Number: 19239 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 19:21:34 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Mon, 13 Jul 2020 19:21:34 +0000 Subject: Change in osmo-gsm-tester[master]: 4G: Add milenage support In-Reply-To: References: Message-ID: srs_andre has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19237 ) Change subject: 4G: Add milenage support ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4c1fb9bfec9927f2bfa29e6b27959323838f59e5 Gerrit-Change-Number: 19237 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-Comment-Date: Mon, 13 Jul 2020 19:21:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 19:28:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 19:28:16 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_ltemme_ifup.sh: use ip cmd instead of ifconfig In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19240 ) Change subject: amarisoft_ltemme_ifup.sh: use ip cmd instead of ifconfig ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I93e4b7f3c9bee2563c0e01a1ff7e832e5098cf1f Gerrit-Change-Number: 19240 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 19:28:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 19:28:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 19:28:20 +0000 Subject: Change in osmo-gsm-tester[master]: iperf3: Avoid creating empty log file In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19241 ) Change subject: iperf3: Avoid creating empty log file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I218ec28dc65febc7bd083d6d15854319bf4f3daf Gerrit-Change-Number: 19241 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 19:28:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 19:28:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 19:28:24 +0000 Subject: Change in osmo-gsm-tester[master]: iperf3: server: Avoid copying logfile during cleanup if already copie... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19242 ) Change subject: iperf3: server: Avoid copying logfile during cleanup if already copied previously ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I44e28f326fd476d27eb021922d38e9ca913aec69 Gerrit-Change-Number: 19242 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 13 Jul 2020 19:28:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 19:28:26 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 19:28:26 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_ltemme_ifup.sh: use ip cmd instead of ifconfig In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19240 ) Change subject: amarisoft_ltemme_ifup.sh: use ip cmd instead of ifconfig ...................................................................... amarisoft_ltemme_ifup.sh: use ip cmd instead of ifconfig ifconfig is deprecated and not available in newer distros. Change-Id: I93e4b7f3c9bee2563c0e01a1ff7e832e5098cf1f --- M utils/bin/osmo-gsm-tester_amarisoft_ltemme_ifup.sh 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/utils/bin/osmo-gsm-tester_amarisoft_ltemme_ifup.sh b/utils/bin/osmo-gsm-tester_amarisoft_ltemme_ifup.sh index d502123..d992002 100755 --- a/utils/bin/osmo-gsm-tester_amarisoft_ltemme_ifup.sh +++ b/utils/bin/osmo-gsm-tester_amarisoft_ltemme_ifup.sh @@ -9,8 +9,10 @@ mask="$8" # Mask echo "*** Configuring $type APN[$index] '$apn' on ${ifname}, $ifaddr/$mask, ${addr1}..${addr2}" if [ "$type" = "ipv4" ] ; then - ifconfig ${ifname} ${ifaddr}/${mask} up + ip addr add ${ifaddr}/${mask} dev ${ifname} + ip link set ${ifname} up else - ifconfig ${ifname} inet6 add ${addr1}/${mask} up + ip -6 addr add ${addr1}/${mask} dev ${ifname} + ip -6 link set ${ifname} up fi echo "*** done configuring interface ${ifname}" -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I93e4b7f3c9bee2563c0e01a1ff7e832e5098cf1f Gerrit-Change-Number: 19240 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 19:28:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 19:28:27 +0000 Subject: Change in osmo-gsm-tester[master]: 4G: Add milenage support In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19237 ) Change subject: 4G: Add milenage support ...................................................................... 4G: Add milenage support Change-Id: I4c1fb9bfec9927f2bfa29e6b27959323838f59e5 --- M src/osmo_gsm_tester/core/schema.py M src/osmo_gsm_tester/obj/epc_amarisoft.py M src/osmo_gsm_tester/obj/epc_srs.py M src/osmo_gsm_tester/obj/ms.py M src/osmo_gsm_tester/obj/ms_amarisoft.py M src/osmo_gsm_tester/obj/ms_srs.py M src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl M src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl M src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl M src/osmo_gsm_tester/templates/srsue.conf.tmpl M sysmocom/resources.conf.prod 11 files changed, 41 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified srs_andre: Looks good to me, approved diff --git a/src/osmo_gsm_tester/core/schema.py b/src/osmo_gsm_tester/core/schema.py index 9a346cd..72c2738 100644 --- a/src/osmo_gsm_tester/core/schema.py +++ b/src/osmo_gsm_tester/core/schema.py @@ -28,6 +28,7 @@ HWADDR_RE = re.compile('([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}') IMSI_RE = re.compile('[0-9]{6,15}') KI_RE = re.compile('[0-9a-fA-F]{32}') +OPC_RE = re.compile('[0-9a-fA-F]{32}') MSISDN_RE = re.compile('[0-9]{1,15}') def match_re(name, regex, val): @@ -60,6 +61,9 @@ def ki(val): return match_re('KI', KI_RE, val) +def opc(val): + return match_re('OPC', OPC_RE, val) + def msisdn(val): return match_re('MSISDN', MSISDN_RE, val) @@ -157,6 +161,7 @@ HWADDR = 'hwaddr' IMSI = 'imsi' KI = 'ki' +OPC = 'opc' MSISDN = 'msisdn' AUTH_ALGO = 'auth_algo' TIMES='times' @@ -180,6 +185,7 @@ HWADDR: hwaddr, IMSI: imsi, KI: ki, + OPC: opc, MSISDN: msisdn, AUTH_ALGO: auth_algo, TIMES: times, diff --git a/src/osmo_gsm_tester/obj/epc_amarisoft.py b/src/osmo_gsm_tester/obj/epc_amarisoft.py index 40216f7..3e91b5c 100644 --- a/src/osmo_gsm_tester/obj/epc_amarisoft.py +++ b/src/osmo_gsm_tester/obj/epc_amarisoft.py @@ -177,8 +177,11 @@ if algo_str != util.OSMO_AUTH_ALGO_NONE and not modem.ki(): raise log.Error("Auth algo %r selected but no KI specified" % algo_str) + if algo_str == 'milenage' and not modem.opc(): + raise log.Error("Auth algo milenage selected but no OPC specified") + subscriber_id = len(self.subscriber_list) # list index - self.subscriber_list.append({'id': subscriber_id, 'imsi': modem.imsi(), 'msisdn': msisdn, 'auth_algo': algo_str, 'ki': modem.ki(), 'opc': None, 'apn_ipaddr': modem.apn_ipaddr()}) + self.subscriber_list.append({'id': subscriber_id, 'imsi': modem.imsi(), 'msisdn': msisdn, 'auth_algo': algo_str, 'ki': modem.ki(), 'opc': modem.opc(), 'apn_ipaddr': modem.apn_ipaddr()}) self.log('Add subscriber', msisdn=msisdn, imsi=modem.imsi(), subscriber_id=subscriber_id, algo_str=algo_str) diff --git a/src/osmo_gsm_tester/obj/epc_srs.py b/src/osmo_gsm_tester/obj/epc_srs.py index 9c4b004..44e06a5 100644 --- a/src/osmo_gsm_tester/obj/epc_srs.py +++ b/src/osmo_gsm_tester/obj/epc_srs.py @@ -190,8 +190,15 @@ if algo_str != util.OSMO_AUTH_ALGO_NONE and not modem.ki(): raise log.Error("Auth algo %r selected but no KI specified" % algo_str) + if algo_str == 'milenage': + if not modem.opc(): + raise log.Error("Auth algo milenage selected but no OPC specified") + # srsepc's used_db uses token 'mil' for milenage: + algo_str = 'mil' + + opc = (modem.opc() or '') subscriber_id = len(self.subscriber_list) # list index - self.subscriber_list.append({'id': subscriber_id, 'imsi': modem.imsi(), 'msisdn': msisdn, 'auth_algo': algo_str, 'ki': modem.ki(), 'opc': None, 'apn_ipaddr': modem.apn_ipaddr()}) + self.subscriber_list.append({'id': subscriber_id, 'imsi': modem.imsi(), 'msisdn': msisdn, 'auth_algo': algo_str, 'ki': modem.ki(), 'opc': opc, 'apn_ipaddr': modem.apn_ipaddr()}) self.log('Add subscriber', msisdn=msisdn, imsi=modem.imsi(), subscriber_id=subscriber_id, algo_str=algo_str) diff --git a/src/osmo_gsm_tester/obj/ms.py b/src/osmo_gsm_tester/obj/ms.py index b39d3ee..3e75719 100644 --- a/src/osmo_gsm_tester/obj/ms.py +++ b/src/osmo_gsm_tester/obj/ms.py @@ -28,6 +28,7 @@ 'path': schema.STR, 'imsi': schema.IMSI, 'ki': schema.KI, + 'opc': schema.OPC, 'auth_algo': schema.AUTH_ALGO, 'apn_ipaddr': schema.IPV4, 'ciphers[]': schema.CIPHER, @@ -100,6 +101,9 @@ def ki(self): return self._conf.get('ki') + def opc(self): + return self._conf.get('opc', None) + def apn_ipaddr(self): return self._conf.get('apn_ipaddr', 'dynamic') diff --git a/src/osmo_gsm_tester/obj/ms_amarisoft.py b/src/osmo_gsm_tester/obj/ms_amarisoft.py index 565786b..7af6283 100644 --- a/src/osmo_gsm_tester/obj/ms_amarisoft.py +++ b/src/osmo_gsm_tester/obj/ms_amarisoft.py @@ -231,7 +231,8 @@ config.overlay(values, dict(ue=self.testenv.suite().config().get('modem', {}))) config.overlay(values, dict(ue=self._conf)) config.overlay(values, dict(ue=dict(addr = self.addr(), - num_antennas = self.enb.num_ports()))) + num_antennas = self.enb.num_ports(), + opc = self.opc()))) logfile = self.log_file if self._run_node.is_local() else self.remote_log_file ifupfile = self.ifup_file if self._run_node.is_local() else self.remote_ifup_file diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py index 96623a2..124b113 100644 --- a/src/osmo_gsm_tester/obj/ms_srs.py +++ b/src/osmo_gsm_tester/obj/ms_srs.py @@ -246,7 +246,8 @@ values = dict(ue=config.get_defaults('srsue')) config.overlay(values, dict(ue=self.testenv.suite().config().get('modem', {}))) config.overlay(values, dict(ue=self._conf)) - config.overlay(values, dict(ue=dict(num_antennas = self.enb.num_ports()))) + config.overlay(values, dict(ue=dict(num_antennas = self.enb.num_ports(), + opc = self.opc()))) metricsfile = self.metrics_file if self._run_node.is_local() else self.remote_metrics_file logfile = self.log_file if self._run_node.is_local() else self.remote_log_file diff --git a/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl index 5fcc74a..fb3ec98 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl @@ -154,10 +154,13 @@ amf: 0x9001, /* Authentication Management Field */ sqn: "000000000000", /* Sequence Number */ K: "${sub.ki}", /* Anritsu Test USIM */ +% if sub.opc: + opc: "${sub.opc}", +% endif /* if true, allow several UEs to have the same IMSI (useful with test SIM cards). They are distinguished with their IMEI. default = false. */ - multi_sim: true, + multi_sim: false, }, %endfor /* Add new entries for each IMSI/K */ diff --git a/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl index 720c0ba..d6ba32d 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl @@ -48,8 +48,12 @@ ue_category: 4, /* USIM data */ + sim_algo: "${sub.auth_algo}", /* USIM authentication algorithm: xor, milenage or tuak */ imsi: "${ue.imsi}", K: "${ue.ki}", +% if ue.opc is not None: + opc: "${ue.opc}", +% endif /* If enabled, will try to use external SIM card using libpcsclite */ //external_sim: true, diff --git a/src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl b/src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl index 5b970bf..250b261 100644 --- a/src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl +++ b/src/osmo_gsm_tester/templates/srsepc_user_db.csv.tmpl @@ -20,5 +20,5 @@ #ue2,mil,001010123456780,00112233445566778899aabbccddeeff,opc,63bfa50ee6523365ff14c1f45f88737d,8000,000000001234,7,dynamic #ue1,xor,001010123456789,00112233445566778899aabbccddeeff,opc,63bfa50ee6523365ff14c1f45f88737d,9001,000000001255,7,dynamic %for sub in epc.hss.subscribers: -ogt${sub.id},${sub.auth_algo},${sub.imsi},${sub.ki},opc,63bfa50ee6523365ff14c1f45f88737d,8000,000000001234,${sub.qci},${sub.apn_ipaddr} +ogt${sub.id},${sub.auth_algo},${sub.imsi},${sub.ki},opc,${sub.opc},8000,000000001234,${sub.qci},${sub.apn_ipaddr} %endfor diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl b/src/osmo_gsm_tester/templates/srsue.conf.tmpl index a75be23..3a43f17 100644 --- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl @@ -126,7 +126,9 @@ [usim] mode = soft algo = ${ue.auth_algo} -#opc = 63BFA50EE6523365FF14C1F45F88737D +% if ue.opc is not None: +opc = ${ue.opc} +% endif k = ${ue.ki} imsi = ${ue.imsi} imei = 353490069873319 diff --git a/sysmocom/resources.conf.prod b/sysmocom/resources.conf.prod index e6429a0..dc60734 100644 --- a/sysmocom/resources.conf.prod +++ b/sysmocom/resources.conf.prod @@ -260,7 +260,8 @@ rf_dev_args: auto imsi: '001010123456789' ki: '00112233445566778899aabbccddeeff' - auth_algo: 'xor' + opc: '63BFA50EE6523365FF14C1F45F88737D' + auth_algo: 'milenage' features: ['4g'] run_node: run_type: ssh @@ -274,6 +275,7 @@ rf_dev_args: driver=lime,serial=00090706024F0A22,rxant=LNAW,txant=BAND1 imsi: '001010123456789' ki: '00112233445566778899aabbccddeeff' + opc: '63BFA50EE6523365FF14C1F45F88737D' auth_algo: 'xor' features: ['4g'] run_node: -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4c1fb9bfec9927f2bfa29e6b27959323838f59e5 Gerrit-Change-Number: 19237 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 19:28:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 19:28:28 +0000 Subject: Change in osmo-gsm-tester[master]: iperf3: Avoid creating empty log file In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19241 ) Change subject: iperf3: Avoid creating empty log file ...................................................................... iperf3: Avoid creating empty log file Since a while ago, we avoid by default using the --logfile param to log the json output to a different file, in order to stay compatible with older versions of iperf3. However, the local logfile was still being created, and was not overwritten with the remote file with content because there's none created remotely (due to reasons explained above). Change-Id: I218ec28dc65febc7bd083d6d15854319bf4f3daf --- M src/osmo_gsm_tester/obj/iperf3.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/obj/iperf3.py b/src/osmo_gsm_tester/obj/iperf3.py index d61dbb1..9e084aa 100644 --- a/src/osmo_gsm_tester/obj/iperf3.py +++ b/src/osmo_gsm_tester/obj/iperf3.py @@ -117,7 +117,7 @@ self.log('Starting iperf3-srv') self.log_copied = False self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name())) - self.log_file = self.run_dir.new_file(IPerf3Server.LOGFILE) + self.log_file = self.run_dir.new_child(IPerf3Server.LOGFILE) if self.runs_locally(): self.start_locally() else: @@ -258,7 +258,7 @@ self.log('Preparing iperf3-client connecting to %s:%d (proto=%s,time=%ds)' % (self.server.addr(), self.server.port(), self._proto, time_sec)) self.log_copied = False self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name())) - self.log_file = self.run_dir.new_file(IPerf3Client.LOGFILE) + self.log_file = self.run_dir.new_child(IPerf3Client.LOGFILE) popen_args = ('iperf3', '-c', self.server.addr(), '-p', str(self.server.port()), '-J', -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I218ec28dc65febc7bd083d6d15854319bf4f3daf Gerrit-Change-Number: 19241 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 13 19:28:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 13 Jul 2020 19:28:28 +0000 Subject: Change in osmo-gsm-tester[master]: iperf3: server: Avoid copying logfile during cleanup if already copie... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19242 ) Change subject: iperf3: server: Avoid copying logfile during cleanup if already copied previously ...................................................................... iperf3: server: Avoid copying logfile during cleanup if already copied previously Change-Id: I44e28f326fd476d27eb021922d38e9ca913aec69 --- M src/osmo_gsm_tester/obj/iperf3.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/obj/iperf3.py b/src/osmo_gsm_tester/obj/iperf3.py index 9e084aa..252c55a 100644 --- a/src/osmo_gsm_tester/obj/iperf3.py +++ b/src/osmo_gsm_tester/obj/iperf3.py @@ -101,11 +101,12 @@ def cleanup(self): if self.process is None: return - if self.runs_locally() or not self.logfile_supported: + if self.runs_locally() or not self.logfile_supported or self.log_copied: return # copy back files (may not exist, for instance if there was an early error of process): try: self.rem_host.scpfrom('scp-back-log', self.remote_log_file, self.log_file) + self.log_copied = True except Exception as e: self.log(repr(e)) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I44e28f326fd476d27eb021922d38e9ca913aec69 Gerrit-Change-Number: 19242 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Jul 14 03:07:50 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 14 Jul 2020 03:07:50 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0d21a0c5cba_32942b26effd85f424909b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 108s] /usr/src/packages/BUILD/src/ulfius.c: In function 'ulfius_run_mhd_daemon': [ 108s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 108s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 108s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 108s] | | [ 108s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 108s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 108s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 108s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 108s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 108s] 2425 | MHD_start_daemon (unsigned int flags, [ 108s] | ^~~~~~~~~~~~~~~~ [ 108s] cc1: all warnings being treated as errors [ 108s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 108s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 108s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 108s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 108s] make[1]: *** [Makefile:166: all] Error 2 [ 108s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 108s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 108s] make: *** [debian/rules:9: build] Error 25 [ 108s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 109s] ### VM INTERACTION START ### [ 112s] [ 95.229653] sysrq: SysRq : Power Off [ 112s] [ 95.234036] reboot: Power down [ 112s] ### VM INTERACTION END ### [ 112s] [ 112s] cloud130 failed "build ulfius_2.5.2-4.1.dsc" at Tue Jul 14 03:07:39 UTC 2020. [ 112s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jul 14 03:08:42 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 14 Jul 2020 03:08:42 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0d21bd93058_32942b26effd85f424921d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 107s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 107s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 107s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 107s] | | [ 107s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 107s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 107s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 107s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 107s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 107s] 2425 | MHD_start_daemon (unsigned int flags, [ 107s] | ^~~~~~~~~~~~~~~~ [ 107s] cc1: all warnings being treated as errors [ 107s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 107s] make[3]: *** Waiting for unfinished jobs.... [ 107s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 107s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 107s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 107s] make[1]: *** [Makefile:166: all] Error 2 [ 107s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 107s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 107s] make: *** [debian/rules:9: build] Error 25 [ 107s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 107s] ### VM INTERACTION START ### [ 110s] [ 94.881585] sysrq: SysRq : Power Off [ 110s] [ 94.885598] reboot: Power down [ 110s] ### VM INTERACTION END ### [ 110s] [ 110s] cloud125 failed "build ulfius_2.5.2-4.1.dsc" at Tue Jul 14 03:08:34 UTC 2020. [ 110s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Jul 14 08:37:33 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 14 Jul 2020 08:37:33 +0000 Subject: Change in osmo-bts[master]: measurement: replace u_int64_t with uint64_t In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18822 ) Change subject: measurement: replace u_int64_t with uint64_t ...................................................................... measurement: replace u_int64_t with uint64_t Be consistent and use everywhere uint64_t. Change-Id: Id6b5df7f5045901109fe1007a5ad54e2f95b95f8 --- M src/common/measurement.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: neels: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/common/measurement.c b/src/common/measurement.c index 3170e4a..17169ca 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -470,7 +470,7 @@ /* each measurement is an int32_t, so the squared difference value must fit in 32bits */ /* the sum of the squared values (each up to 32bit) can very easily exceed 32 bits */ - u_int64_t sq_diff_sum = 0; + uint64_t sq_diff_sum = 0; /* In case we do not have any measurement values collected there is no * computation possible. We just skip the whole computation here, the -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id6b5df7f5045901109fe1007a5ad54e2f95b95f8 Gerrit-Change-Number: 18822 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 08:55:46 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Tue, 14 Jul 2020 08:55:46 +0000 Subject: Change in osmo-e1d[master]: _e1_rx_hdlcfs: const-ify input buffer argument In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19230 ) Change subject: _e1_rx_hdlcfs: const-ify input buffer argument ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: If772487124e26bafea23b451536b3b556d4c088c Gerrit-Change-Number: 19230 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Tue, 14 Jul 2020 08:55:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 08:57:56 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Tue, 14 Jul 2020 08:57:56 +0000 Subject: Change in osmo-e1d[master]: introduce concept of superchannel to data structures + CTL In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19229 ) Change subject: introduce concept of superchannel to data structures + CTL ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-e1d/+/19229/2/src/intf_line.c File src/intf_line.c: https://gerrit.osmocom.org/c/osmo-e1d/+/19229/2/src/intf_line.c at 93 PS2, Line 93: static void ts_init(struct e1_ts *ts, struct e1_line *line, int id) style consistency static void _ts_init(...) { } (static have _ prefix and also type and function name on different lines). -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I0aacf251e155de2bb6ad03ffc4181067b22f1c90 Gerrit-Change-Number: 19229 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Tue, 14 Jul 2020 08:57:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:07:03 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 09:07:03 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: add configuration with frequency hopping parameters In-Reply-To: References: Message-ID: Hello laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/19160 to look at the new patch set (#3). Change subject: ttcn3-bts-test: add configuration with frequency hopping parameters ...................................................................... ttcn3-bts-test: add configuration with frequency hopping parameters The Physical channel configuration is the same as in the non-hopping configuration file. Hopping parameters are listed below the table. == Physical channel configuration (FDMA) == +-------+------------------+------------------+------------------+------------------+ | # / # | TRX#0 | TRX#1 | TRX#2 | TRX#3 | +-------+------------------+------------------+------------------+------------------+ | ARFCN | 871 | 873 | 875 | 877 | +-------+------------------+------------------+------------------+------------------+ == Physical channel configuration (TDMA) == +-------+------------------+------------------+------------------+------------------+ | # / # | TRX#0 | TRX#1 | TRX#2 | TRX#3 | +-------+------------------+------------------+------------------+------------------+ | TS0 | CCCH+SDCCH4 | TCH/F (a) | TCH/F (a) | TCH/F (a) | +-------+------------------+------------------+------------------+------------------+ | TS1 | TCH/F | SDCCH8+CBCH | SDCCH8+CBCH (b) | SDCCH8+CBCH (b) | +-------+------------------+------------------+------------------+------------------+ | TS2 | TCH/F (c) | TCH/H (c) | TCH/F (d) | TCH/H (d) | +-------+------------------+------------------+------------------+------------------+ | TS3 | TCH/F_PDCH (e) | TCH/F_PDCH (e) | TCH/F_PDCH (e) | TCH/F_PDCH (e) | +-------+------------------+------------------+------------------+------------------+ | TS4 | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | +-------+------------------+------------------+------------------+------------------+ | TS5 | TCH/H (f) | TCH/H (f) | TCH/H (f) | TCH/H (f) | +-------+------------------+------------------+------------------+------------------+ | TS6 | SDCCH8 (g) | PDCH (h) | PDCH (h) | SDCCH8 (g) | +-------+------------------+------------------+------------------+------------------+ | TS7 | PDCH (i) | PDCH (j) | PDCH (i) | PDCH (j) | +-------+------------------+------------------+------------------+------------------+ == Hopping configuration == a) HSN=0, MAIO=0,1,2 b) HSN=1, MAIO=3,5 c) HSN=2, MAIO=0,1 d) HSN=2, MAIO=2,3 e) HSN=3, MAIO=3,2,1,0 f) HSN=5, MAIO=0,1,2,3 g) HSN=6, MAIO=1,0 h) HSN=6, MAIO=1,0 i) HSN=0, MAIO=1,3 j) HSN=0, MAIO=0,2 Change-Id: I7822c3581fccba3277a63577e740e7486307635d Related: SYS#4868, OS#4546 --- A ttcn3-bts-test/fh/BTS_Tests.cfg A ttcn3-bts-test/fh/osmo-bsc.cfg 2 files changed, 539 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/60/19160/3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7822c3581fccba3277a63577e740e7486307635d Gerrit-Change-Number: 19160 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:11:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 09:11:50 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19159 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib27704dcba3979d69e44065c472b1452eaa11a7a Gerrit-Change-Number: 19159 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 09:11:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:12:19 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 14 Jul 2020 09:12:19 +0000 Subject: Change in osmo-pcu[master]: encoding: Encode TA as unsigned and check validty against GSM48_TA_IN... In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19176 ) Change subject: encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I82b13561d0fe5ebafb5c3a8b9a501045c29809bc Gerrit-Change-Number: 19176 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-CC: neels Gerrit-Comment-Date: Tue, 14 Jul 2020 09:12:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:14:02 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 09:14:02 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: add configuration with frequency hopping parameters In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19160 ) Change subject: ttcn3-bts-test: add configuration with frequency hopping parameters ...................................................................... Patch Set 3: So what's the idea here, run all tests using this config? That means expanding jenkins.sh right? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7822c3581fccba3277a63577e740e7486307635d Gerrit-Change-Number: 19160 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 09:14:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:14:47 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 09:14:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: add ts/tr templates for MaioHsn References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19243 ) Change subject: library/GSM_RR_Types: add ts/tr templates for MaioHsn ...................................................................... library/GSM_RR_Types: add ts/tr templates for MaioHsn Change-Id: I0c5581c3d95018d808907bd2bc5e8ddd0a730bea --- M library/GSM_RR_Types.ttcn 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/43/19243/1 diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index 4b460b1..d0d5d8e 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -186,6 +186,18 @@ uint6_t hsn } with { variant "" }; + /* It's more handy to pass HSN first, so the arguments' order is reversed. */ + template (value) MaioHsn ts_HsnMaio(template (value) uint6_t hsn, + template (value) uint6_t maio) := { + maio := maio, + hsn := hsn + }; + template MaioHsn tr_HsnMaio(template (present) uint6_t hsn, + template (present) uint6_t maio) := { + maio := maio, + hsn := hsn + }; + /* TS 24.008 10.5.1.1 */ type uint16_t CellIdentity; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0c5581c3d95018d808907bd2bc5e8ddd0a730bea Gerrit-Change-Number: 19243 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:14:48 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 09:14:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: introduce and use helper f_l1ctl_est_dchan() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19244 ) Change subject: BTS_Tests: introduce and use helper f_l1ctl_est_dchan() ...................................................................... BTS_Tests: introduce and use helper f_l1ctl_est_dchan() This is required for the upcoming test cases running on hopping channels. Dealing with module / hopping parameters in every test case is definitely not a good idea, so let's add a function. Change-Id: Ia4f078ebbb278246ee117f580ff93f301dc60f7c Related: SYS#4868, OS#4546 --- M bts/BTS_Tests.ttcn 1 file changed, 22 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/44/19244/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 47f8a29..f4631ce 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1149,7 +1149,7 @@ f_rsl_chan_act(g_pars.chan_mode, act_type := t_RSL_IE_ActType_HO_ASYNC); /* don't perform immediate assignment here, as we're testing non-IA case */ /* enable dedicated mode */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn)); + f_l1ctl_est_dchan(); /* Verify that no DL SACCH is being received */ f_sacch_missing(?); @@ -1167,7 +1167,7 @@ f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_ASYNC); /* don't perform immediate assignment here, as we're testing non-IA case */ /* enable dedicated mode */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn)); + f_l1ctl_est_dchan(); /* Verify that DL SACCH is being received */ f_sacch_present(si5); @@ -1205,7 +1205,7 @@ f_rsl_chan_act(g_pars.chan_mode, act_type := t_RSL_IE_ActType_HO_SYNC); /* don't perform immediate assignment here, as we're testing non-IA case */ /* enable dedicated mode */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn)); + f_l1ctl_est_dchan(); /* Verify that no DL SACCH is being received */ f_sacch_missing(?); @@ -1223,7 +1223,7 @@ f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_SYNC); /* don't perform immediate assignment here, as we're testing non-IA case */ /* enable dedicated mode */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn)); + f_l1ctl_est_dchan(); /* Verify that no DL SACCH is being received */ f_sacch_missing(?); @@ -1241,7 +1241,7 @@ f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_SYNC); /* don't perform immediate assignment here, as we're testing non-IA case */ /* enable dedicated mode */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn)); + f_l1ctl_est_dchan(); /* Verify that no DL SACCH is being received */ f_sacch_missing(?); @@ -1260,7 +1260,7 @@ f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_SYNC); /* don't perform immediate assignment here, as we're testing non-IA case */ /* enable dedicated mode */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn)); + f_l1ctl_est_dchan(); /* Verify that DL SACCH is being received */ f_sacch_present(si5); @@ -1626,7 +1626,7 @@ /* Switch the MS side (e.g. trxcon) to a dedicated channel without * waiting for Immediate Assignment and sending Access Burst */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn)); + f_l1ctl_est_dchan(); /* Send handover Access Burst */ fn := f_L1CTL_RACH(L1CTL, ho_ref, chan_nr := g_pars.chan_nr); @@ -1990,6 +1990,21 @@ return fn; } +/* Tune to a dedicated channel: L1CTL only */ +private function f_l1ctl_est_dchan() runs on ConnHdlr { + if (not ispresent(g_pars.maio_hsn)) { + L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, + 7 /* TODO: mp_tsc */, + mp_trx0_arfcn)); + } else { + L1CTL.send(ts_L1CTL_DM_EST_REQ_H1(g_pars.chan_nr, + 7 /* TODO: mp_tsc */, + g_pars.maio_hsn.hsn, + g_pars.maio_hsn.maio, + g_pars.ma)); + } +} + /* Establish dedicated channel: L1CTL + RSL side */ private function f_est_dchan(boolean encr_enable := false, RSL_IE_List more_ies := {}) runs on ConnHdlr { var GsmFrameNumber fn; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia4f078ebbb278246ee117f580ff93f301dc60f7c Gerrit-Change-Number: 19244 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:14:49 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 09:14:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: implement optional frequency hopping support References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19245 ) Change subject: BTS_Tests: implement optional frequency hopping support ...................................................................... BTS_Tests: implement optional frequency hopping support Change-Id: If0318fd320d4f112341465844555bf8d65b5f88f Depends: I7822c3581fccba3277a63577e740e7486307635d Related: SYS#4868, OS#4546 --- M bts/BTS_Tests.ttcn 1 file changed, 52 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/19245/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index f4631ce..46bb9d9 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -111,6 +111,10 @@ boolean mp_l1_supports_gprs := false; /* how many transceivers do we expect to connect */ integer mp_transceiver_num := 1; + /* frequency hopping status */ + boolean mp_freq_hop_enabled := false; + /* frequency hopping parameters */ + FreqHopConfig mp_fh_config; } type record of RslChannelNr ChannelNrs; @@ -510,6 +514,49 @@ private type function void_fn(charstring id) runs on ConnHdlr; +private type record length(8) of FreqHopGroups FreqHopConfig; + +private type record of FreqHopGroup FreqHopGroups; +private type record FreqHopGroup { + uint6_t hsn, + FreqHopGroupItems trx_maio +}; + +private type record of FreqHopGroupItem FreqHopGroupItems; +private type record FreqHopGroupItem { + uint8_t trx_nr, + uint6_t maio +}; + +private function f_resolve_fh_params(inout ConnHdlrPars pars, uint8_t trx_nr := 0) +runs on test_CT { + var FreqHopGroups groups := mp_fh_config[pars.chan_nr.tn]; + var integer i, j; + + for (i := 0; i < lengthof(groups); i := i + 1) { + var FreqHopGroup g := groups[i]; + for (j := 0; j < lengthof(g.trx_maio); j := j + 1) { + var FreqHopGroupItem gi := g.trx_maio[j]; + if (gi.trx_nr == trx_nr) { + pars.maio_hsn := valueof(ts_HsnMaio(g.hsn, gi.maio)); + pars.ma := { }; /* to be composed below */ + break; + } + } + + if (ispresent(pars.maio_hsn)) { + /* Compose the Mobile Allocation */ + for (j := 0; j < lengthof(g.trx_maio); j := j + 1) { + var FreqHopGroupItem gi := g.trx_maio[j]; + pars.ma := pars.ma & { l1ctl_ma_def[gi.trx_nr] }; + } + + log("Freq. hopping parameters: ", pars.maio_hsn, pars.ma); + break; /* We're done */ + } + } +} + /* create a new test component */ friend function f_start_handler(void_fn fn, ConnHdlrPars pars, boolean pcu_comp := false, @@ -535,6 +582,11 @@ map(vc_conn:BTS_TRXC, system:BTS_TRXC); } + /* Obtain frequency hopping parameters for a given timeslot */ + if (mp_freq_hop_enabled and mp_transceiver_num > 1) { + f_resolve_fh_params(pars); + } + vc_conn.start(f_handler_init(fn, id, pars)); return vc_conn; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If0318fd320d4f112341465844555bf8d65b5f88f Gerrit-Change-Number: 19245 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:19:38 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 14 Jul 2020 09:19:38 +0000 Subject: Change in osmo-trx[master]: Introduce rate counters to detect issues in received Dl bursts from TRXD In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19205 ) Change subject: Introduce rate counters to detect issues in received Dl bursts from TRXD ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 Gerrit-Change-Number: 19205 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 09:19:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:21:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 09:21:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: add ts/tr templates for MaioHsn In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19243 ) Change subject: library/GSM_RR_Types: add ts/tr templates for MaioHsn ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0c5581c3d95018d808907bd2bc5e8ddd0a730bea Gerrit-Change-Number: 19243 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 09:21:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:22:48 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 09:22:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: introduce and use helper f_l1ctl_est_dchan() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19244 ) Change subject: BTS_Tests: introduce and use helper f_l1ctl_est_dchan() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia4f078ebbb278246ee117f580ff93f301dc60f7c Gerrit-Change-Number: 19244 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 09:22:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:23:52 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 14 Jul 2020 09:23:52 +0000 Subject: Change in osmo-bts[master]: Move struct gsm_bts_trx: gsm_data.* & bts.* => bts_trx.* In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19124 ) Change subject: Move struct gsm_bts_trx: gsm_data.* & bts.* => bts_trx.* ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iebaf5b221c48b571f45408af867ce6f9c0cd9f4a Gerrit-Change-Number: 19124 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: dexter Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 14 Jul 2020 09:23:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:24:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 09:24:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: implement optional frequency hopping support In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19245 ) Change subject: BTS_Tests: implement optional frequency hopping support ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If0318fd320d4f112341465844555bf8d65b5f88f Gerrit-Change-Number: 19245 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 09:24:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:25:36 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 14 Jul 2020 09:25:36 +0000 Subject: Change in osmo-trx[master]: Add rate counter for missing Txbursts when scheduled towards the radi... In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19207 ) Change subject: Add rate counter for missing Txbursts when scheduled towards the radioInterface ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibb2c492b3c67cbab11fbb936ae3a090fb5756aa8 Gerrit-Change-Number: 19207 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 14 Jul 2020 09:25:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:42:40 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 14 Jul 2020 09:42:40 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Fix wrong annoying log line about non-scheduled ResourceReq... In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19196 ) Change subject: pdch.cpp: Fix wrong annoying log line about non-scheduled ResourceReq received ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4b4367126d6a16055cd2f45afc4a6b9c15a7c980 Gerrit-Change-Number: 19196 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 09:42:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:43:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 09:43:05 +0000 Subject: Change in osmo-trx[master]: Introduce rate counters to detect issues in received Dl bursts from TRXD In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19205 ) Change subject: Introduce rate counters to detect issues in received Dl bursts from TRXD ...................................................................... Introduce rate counters to detect issues in received Dl bursts from TRXD This ones together with rate counters already available in lower layers allows to understand better the source of the problem with stalled tx bursts. Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 --- M CommonLibs/osmo_signal.h M CommonLibs/trx_rate_ctr.cpp M CommonLibs/trx_rate_ctr.h M CommonLibs/trx_vty.c M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h 6 files changed, 80 insertions(+), 10 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/CommonLibs/osmo_signal.h b/CommonLibs/osmo_signal.h index de17b1d..5cd90c6 100644 --- a/CommonLibs/osmo_signal.h +++ b/CommonLibs/osmo_signal.h @@ -61,4 +61,7 @@ struct trx_counters { size_t chan; unsigned int tx_stale_bursts; /* Amount of Tx bursts dropped to to arriving too late from TRXD */ + unsigned int tx_trxd_fn_repeated; + unsigned int tx_trxd_fn_outoforder; + unsigned int tx_trxd_fn_skipped; }; diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp index 6391a38..8b2597d 100644 --- a/CommonLibs/trx_rate_ctr.cpp +++ b/CommonLibs/trx_rate_ctr.cpp @@ -103,6 +103,9 @@ { TRX_CTR_DEV_TX_DROP_EV, "tx_drop_events" }, { TRX_CTR_DEV_TX_DROP_SMPL, "tx_drop_samples" }, { TRX_CTR_TRX_TX_STALE_BURSTS, "tx_stale_bursts" }, + { TRX_CTR_TRX_TRXD_FN_REPEATED, "tx_trxd_fn_repeated" }, + { TRX_CTR_TRX_TRXD_FN_OUTOFORDER, "tx_trxd_fn_outoforder" }, + { TRX_CTR_TRX_TRXD_FN_SKIPPED, "tx_trxd_fn_skipped" }, { 0, NULL } }; @@ -114,6 +117,9 @@ [TRX_CTR_DEV_TX_DROP_EV] = { "device:tx_drop_events", "Number of times Tx samples were dropped by HW" }, [TRX_CTR_DEV_TX_DROP_SMPL] = { "device:tx_drop_samples", "Number of Tx samples dropped by HW" }, [TRX_CTR_TRX_TX_STALE_BURSTS] = { "trx:tx_stale_bursts", "Number of Tx burts dropped by TRX due to arriving too late" }, + [TRX_CTR_TRX_TRXD_FN_REPEATED] = { "trx:tx_trxd_fn_repeated", "Number of Tx burts received from TRXD with repeated FN" }, + [TRX_CTR_TRX_TRXD_FN_OUTOFORDER] = { "trx:tx_trxd_fn_outoforder","Number of Tx burts received from TRXD with a past FN" }, + [TRX_CTR_TRX_TRXD_FN_SKIPPED] = { "trx:tx_trxd_fn_skipped", "Number of Tx burts potentially skipped due to FN jumps" }, }; static const struct rate_ctr_group_desc trx_chan_ctr_group_desc = { @@ -166,6 +172,12 @@ LOGCHAN(chan, DMAIN, INFO) << "rate_ctr update"; ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TX_STALE_BURSTS]; rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_stale_bursts - ctr->current); + ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TRXD_FN_REPEATED]; + rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_trxd_fn_repeated - ctr->current); + ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TRXD_FN_OUTOFORDER]; + rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_trxd_fn_outoforder - ctr->current); + ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TRXD_FN_SKIPPED]; + rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_trxd_fn_skipped - ctr->current); /* Mark as done */ trx_ctrs_pending[chan].chan = PENDING_CHAN_NONE; } diff --git a/CommonLibs/trx_rate_ctr.h b/CommonLibs/trx_rate_ctr.h index 588ac2f..cef3c21 100644 --- a/CommonLibs/trx_rate_ctr.h +++ b/CommonLibs/trx_rate_ctr.h @@ -11,6 +11,9 @@ TRX_CTR_DEV_TX_DROP_EV, TRX_CTR_DEV_TX_DROP_SMPL, TRX_CTR_TRX_TX_STALE_BURSTS, + TRX_CTR_TRX_TRXD_FN_REPEATED, + TRX_CTR_TRX_TRXD_FN_OUTOFORDER, + TRX_CTR_TRX_TRXD_FN_SKIPPED, }; struct ctr_threshold { diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index f085d09..941a435 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -390,7 +390,7 @@ return -1; } -#define THRESHOLD_ARGS "(rx_overruns|tx_underruns|rx_drop_events|rx_drop_samples|tx_drop_events|tx_drop_samples|tx_stale_bursts)" +#define THRESHOLD_ARGS "(rx_overruns|tx_underruns|rx_drop_events|rx_drop_samples|tx_drop_events|tx_drop_samples|tx_stale_bursts|tx_trxd_fn_repeated|tx_trxd_fn_outoforder|tx_trxd_fn_skipped)" #define THRESHOLD_STR_VAL(s) "Set threshold value for rate_ctr device:" OSMO_STRINGIFY_VAL(s) "\n" #define THRESHOLD_STRS \ THRESHOLD_STR_VAL(rx_overruns) \ @@ -399,7 +399,11 @@ THRESHOLD_STR_VAL(rx_drop_samples) \ THRESHOLD_STR_VAL(tx_drop_events) \ THRESHOLD_STR_VAL(tx_drop_samples) \ - THRESHOLD_STR_VAL(tx_stale_bursts) + THRESHOLD_STR_VAL(tx_stale_bursts) \ + THRESHOLD_STR_VAL(tx_trxd_fn_repeated) \ + THRESHOLD_STR_VAL(tx_trxd_fn_outoforder) \ + THRESHOLD_STR_VAL(tx_trxd_fn_skipped) \ + "" #define INTV_ARGS "(per-second|per-minute|per-hour|per-day)" #define INTV_STR_VAL(s) "Threshold value sampled " OSMO_STRINGIFY_VAL(s) "\n" #define INTV_STRS \ diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 2ae5eda..d45a28b 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -52,6 +52,14 @@ /* Number of running values use in noise average */ #define NOISE_CNT 20 + +static void dispatch_trx_rate_ctr_change(TransceiverState *state, unsigned int chan) { + thread_enable_cancel(false); + state->ctrs.chan = chan; + osmo_signal_dispatch(SS_DEVICE, S_TRX_COUNTER_CHANGE, &state->ctrs); + thread_enable_cancel(true); +} + TransceiverState::TransceiverState() : mRetrans(false), mNoiseLev(0.0), mNoises(NOISE_CNT), mPower(0.0) { @@ -87,6 +95,8 @@ if ((sps != 1) && (sps != 4)) return false; + mFiller = filler; + for (size_t n = 0; n < 8; n++) { for (size_t i = 0; i < 102; i++) { switch (filler) { @@ -437,12 +447,8 @@ delete burst; } - if (stale_bursts_changed) { - thread_enable_cancel(false); - state->ctrs.chan = i; - osmo_signal_dispatch(SS_DEVICE, S_TRX_COUNTER_CHANGE, &state->ctrs); - thread_enable_cancel(true); - } + if (stale_bursts_changed) + dispatch_trx_rate_ctr_change(state, i); TN = nowTime.TN(); modFN = nowTime.FN() % state->fillerModulus[TN]; @@ -1001,6 +1007,7 @@ struct trxd_hdr_v01_dl *dl; char buffer[sizeof(*dl) + EDGE_BURST_NBITS]; uint32_t fn; + uint8_t tn; // check data socket msgLen = read(mDataSockets[chan], buffer, sizeof(buffer)); @@ -1029,6 +1036,7 @@ /* Convert TDMA FN to the host endianness */ fn = osmo_load32be(&dl->common.fn); + tn = dl->common.tn; /* Make sure we support the received header format */ switch (dl->common.version) { @@ -1044,14 +1052,49 @@ LOGCHAN(chan, DTRXDDL, DEBUG) << "Rx TRXD message (hdr_ver=" << unsigned(dl->common.version) << "): fn=" << fn << ", tn=" << unsigned(dl->common.tn) << ", burst_len=" << burstLen; + TransceiverState *state = &mStates[chan]; + GSM::Time currTime = GSM::Time(fn, tn); + + /* Verify proper FN order in DL stream */ + if (state->first_dl_fn_rcv[tn]) { + int32_t delta = GSM::FNDelta(currTime.FN(), state->last_dl_time_rcv[tn].FN()); + if (delta == 1) { + /* usual expected scenario, continue code flow */ + } else if (delta == 0) { + LOGCHAN(chan, DTRXDDL, NOTICE) << "Rx TRXD msg with repeated FN " << currTime; + state->ctrs.tx_trxd_fn_repeated++; + dispatch_trx_rate_ctr_change(state, chan); + return true; + } else if (delta < 0) { + LOGCHAN(chan, DTRXDDL, NOTICE) << "Rx TRXD msg with previous FN " << currTime + << " vs last " << state->last_dl_time_rcv[tn]; + state->ctrs.tx_trxd_fn_outoforder++; + dispatch_trx_rate_ctr_change(state, chan); + /* Allow adding radio vector below, since it gets sorted in the queue */ + } else if (chan == 0 && state->mFiller == FILLER_ZERO) { + /* delta > 1. Some FN was lost in the middle. We can only easily rely + * on consecutive FNs in TRX0 since it must transmit continuously in all + * setups. Also, osmo-trx supports optionally filling empty bursts on + * its own. In that case bts-trx is not obliged to submit all bursts. */ + LOGCHAN(chan, DTRXDDL, NOTICE) << "Rx TRXD msg with future FN " << currTime + << " vs last " << state->last_dl_time_rcv[tn] + << ", " << delta - 1 << " FN lost"; + state->ctrs.tx_trxd_fn_skipped += delta - 1; + dispatch_trx_rate_ctr_change(state, chan); + } + if (delta > 0) + state->last_dl_time_rcv[tn] = currTime; + } else { /* Initial check, simply store state */ + state->first_dl_fn_rcv[tn] = true; + state->last_dl_time_rcv[tn] = currTime; + } + BitVector newBurst(burstLen); BitVector::iterator itr = newBurst.begin(); uint8_t *bufferItr = dl->soft_bits; while (itr < newBurst.end()) *itr++ = *bufferItr++; - GSM::Time currTime = GSM::Time(fn, dl->common.tn); - addRadioVector(chan, newBurst, dl->tx_att, currTime); return true; diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h index 7ce5fa2..39298aa 100644 --- a/Transceiver52M/Transceiver.h +++ b/Transceiver52M/Transceiver.h @@ -63,6 +63,7 @@ /* The filler table */ signalVector *fillerTable[102][8]; int fillerModulus[8]; + FillerType mFiller; bool mRetrans; /* Most recent channel estimate of all timeslots */ @@ -86,6 +87,10 @@ /* counters */ struct trx_counters ctrs; + + /* Used to keep track of lost and out of order frames */ + bool first_dl_fn_rcv[8]; + GSM::Time last_dl_time_rcv[8]; }; /** The Transceiver class, responsible for physical layer of basestation */ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia34f7e7d780ad1e12f24638a07f05fe91f2afea5 Gerrit-Change-Number: 19205 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:43:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 09:43:07 +0000 Subject: Change in osmo-trx[master]: Transceiver: Fix race condition obtaining Dl burst from Upper layer In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19206 ) Change subject: Transceiver: Fix race condition obtaining Dl burst from Upper layer ...................................................................... Transceiver: Fix race condition obtaining Dl burst from Upper layer The queue was being accessed sequentially obtaining and releasing the mutual exclusion zone twice. First in getStaleBurst() dropping all FN filler(mChans, true); bool stale_bursts_changed; + TN = nowTime.TN(); + for (size_t i = 0; i < mChans; i ++) { state = &mStates[i]; stale_bursts_changed = false; + zeros[i] = state->chanType[TN] == NONE; + + Mutex *mtx = mTxPriorityQueues[i].getMutex(); + mtx->lock(); while ((burst = mTxPriorityQueues[i].getStaleBurst(nowTime))) { LOGCHAN(i, DTRXDDL, NOTICE) << "dumping STALE burst in TRX->SDR interface (" @@ -447,15 +453,6 @@ delete burst; } - if (stale_bursts_changed) - dispatch_trx_rate_ctr_change(state, i); - - TN = nowTime.TN(); - modFN = nowTime.FN() % state->fillerModulus[TN]; - - bursts[i] = state->fillerTable[modFN][TN]; - zeros[i] = state->chanType[TN] == NONE; - if ((burst = mTxPriorityQueues[i].getCurrentBurst(nowTime))) { bursts[i] = burst->getVector(); @@ -467,7 +464,15 @@ } delete burst; + } else { + modFN = nowTime.FN() % state->fillerModulus[TN]; + bursts[i] = state->fillerTable[modFN][TN]; } + + mtx->unlock(); + + if (stale_bursts_changed) + dispatch_trx_rate_ctr_change(state, i); } mRadioInterface->driveTransmitRadio(bursts, zeros); diff --git a/Transceiver52M/radioVector.cpp b/Transceiver52M/radioVector.cpp index ad40a11..68e42c5 100644 --- a/Transceiver52M/radioVector.cpp +++ b/Transceiver52M/radioVector.cpp @@ -120,38 +120,26 @@ radioVector* VectorQueue::getStaleBurst(const GSM::Time& targTime) { - mLock.lock(); - if ((mQ.size()==0)) { - mLock.unlock(); + if ((mQ.size()==0)) return NULL; - } if (mQ.top()->getTime() < targTime) { radioVector* retVal = mQ.top(); mQ.pop(); - mLock.unlock(); return retVal; } - mLock.unlock(); - return NULL; } radioVector* VectorQueue::getCurrentBurst(const GSM::Time& targTime) { - mLock.lock(); - if ((mQ.size()==0)) { - mLock.unlock(); + if ((mQ.size()==0)) return NULL; - } if (mQ.top()->getTime() == targTime) { radioVector* retVal = mQ.top(); mQ.pop(); - mLock.unlock(); return retVal; } - mLock.unlock(); - return NULL; } diff --git a/Transceiver52M/radioVector.h b/Transceiver52M/radioVector.h index 0a14a4d..84e3987 100644 --- a/Transceiver52M/radioVector.h +++ b/Transceiver52M/radioVector.h @@ -65,6 +65,7 @@ GSM::Time nextTime() const; radioVector* getStaleBurst(const GSM::Time& targTime); radioVector* getCurrentBurst(const GSM::Time& targTime); + Mutex *getMutex() const { return &mLock; }; }; #endif /* RADIOVECTOR_H */ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If1fd8d7fc5f21ee2894192ef1ac2a3cdda6bbb98 Gerrit-Change-Number: 19206 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:43:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 09:43:07 +0000 Subject: Change in osmo-trx[master]: Add rate counter for missing Txbursts when scheduled towards the radi... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19207 ) Change subject: Add rate counter for missing Txbursts when scheduled towards the radioInterface ...................................................................... Add rate counter for missing Txbursts when scheduled towards the radioInterface Related: OS#4487 Change-Id: Ibb2c492b3c67cbab11fbb936ae3a090fb5756aa8 --- M CommonLibs/osmo_signal.h M CommonLibs/trx_rate_ctr.cpp M CommonLibs/trx_rate_ctr.h M CommonLibs/trx_vty.c M Transceiver52M/Transceiver.cpp 5 files changed, 20 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/CommonLibs/osmo_signal.h b/CommonLibs/osmo_signal.h index 5cd90c6..13646a1 100644 --- a/CommonLibs/osmo_signal.h +++ b/CommonLibs/osmo_signal.h @@ -60,7 +60,8 @@ /* signal cb for signal */ struct trx_counters { size_t chan; - unsigned int tx_stale_bursts; /* Amount of Tx bursts dropped to to arriving too late from TRXD */ + unsigned int tx_stale_bursts; + unsigned int tx_unavailable_bursts; unsigned int tx_trxd_fn_repeated; unsigned int tx_trxd_fn_outoforder; unsigned int tx_trxd_fn_skipped; diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp index 8b2597d..e45aba8 100644 --- a/CommonLibs/trx_rate_ctr.cpp +++ b/CommonLibs/trx_rate_ctr.cpp @@ -103,6 +103,7 @@ { TRX_CTR_DEV_TX_DROP_EV, "tx_drop_events" }, { TRX_CTR_DEV_TX_DROP_SMPL, "tx_drop_samples" }, { TRX_CTR_TRX_TX_STALE_BURSTS, "tx_stale_bursts" }, + { TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS, "tx_unavailable_bursts" }, { TRX_CTR_TRX_TRXD_FN_REPEATED, "tx_trxd_fn_repeated" }, { TRX_CTR_TRX_TRXD_FN_OUTOFORDER, "tx_trxd_fn_outoforder" }, { TRX_CTR_TRX_TRXD_FN_SKIPPED, "tx_trxd_fn_skipped" }, @@ -117,6 +118,7 @@ [TRX_CTR_DEV_TX_DROP_EV] = { "device:tx_drop_events", "Number of times Tx samples were dropped by HW" }, [TRX_CTR_DEV_TX_DROP_SMPL] = { "device:tx_drop_samples", "Number of Tx samples dropped by HW" }, [TRX_CTR_TRX_TX_STALE_BURSTS] = { "trx:tx_stale_bursts", "Number of Tx burts dropped by TRX due to arriving too late" }, + [TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS] = { "trx:tx_unavailable_bursts","Number of Tx burts unavailable (not enqueued) at the time they should be transmitted" }, [TRX_CTR_TRX_TRXD_FN_REPEATED] = { "trx:tx_trxd_fn_repeated", "Number of Tx burts received from TRXD with repeated FN" }, [TRX_CTR_TRX_TRXD_FN_OUTOFORDER] = { "trx:tx_trxd_fn_outoforder","Number of Tx burts received from TRXD with a past FN" }, [TRX_CTR_TRX_TRXD_FN_SKIPPED] = { "trx:tx_trxd_fn_skipped", "Number of Tx burts potentially skipped due to FN jumps" }, @@ -172,6 +174,8 @@ LOGCHAN(chan, DMAIN, INFO) << "rate_ctr update"; ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TX_STALE_BURSTS]; rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_stale_bursts - ctr->current); + ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS]; + rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_unavailable_bursts - ctr->current); ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TRXD_FN_REPEATED]; rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_trxd_fn_repeated - ctr->current); ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TRXD_FN_OUTOFORDER]; diff --git a/CommonLibs/trx_rate_ctr.h b/CommonLibs/trx_rate_ctr.h index cef3c21..c4c05ef 100644 --- a/CommonLibs/trx_rate_ctr.h +++ b/CommonLibs/trx_rate_ctr.h @@ -11,6 +11,7 @@ TRX_CTR_DEV_TX_DROP_EV, TRX_CTR_DEV_TX_DROP_SMPL, TRX_CTR_TRX_TX_STALE_BURSTS, + TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS, TRX_CTR_TRX_TRXD_FN_REPEATED, TRX_CTR_TRX_TRXD_FN_OUTOFORDER, TRX_CTR_TRX_TRXD_FN_SKIPPED, diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index 941a435..e37ecaf 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -390,7 +390,7 @@ return -1; } -#define THRESHOLD_ARGS "(rx_overruns|tx_underruns|rx_drop_events|rx_drop_samples|tx_drop_events|tx_drop_samples|tx_stale_bursts|tx_trxd_fn_repeated|tx_trxd_fn_outoforder|tx_trxd_fn_skipped)" +#define THRESHOLD_ARGS "(rx_overruns|tx_underruns|rx_drop_events|rx_drop_samples|tx_drop_events|tx_drop_samples|tx_stale_bursts|tx_unavailable_bursts|tx_trxd_fn_repeated|tx_trxd_fn_outoforder|tx_trxd_fn_skipped)" #define THRESHOLD_STR_VAL(s) "Set threshold value for rate_ctr device:" OSMO_STRINGIFY_VAL(s) "\n" #define THRESHOLD_STRS \ THRESHOLD_STR_VAL(rx_overruns) \ @@ -400,6 +400,7 @@ THRESHOLD_STR_VAL(tx_drop_events) \ THRESHOLD_STR_VAL(tx_drop_samples) \ THRESHOLD_STR_VAL(tx_stale_bursts) \ + THRESHOLD_STR_VAL(tx_unavailable_bursts) \ THRESHOLD_STR_VAL(tx_trxd_fn_repeated) \ THRESHOLD_STR_VAL(tx_trxd_fn_outoforder) \ THRESHOLD_STR_VAL(tx_trxd_fn_skipped) \ diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 7aaf1d4..5e42178 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -431,13 +431,14 @@ std::vector bursts(mChans); std::vector zeros(mChans); std::vector filler(mChans, true); - bool stale_bursts_changed; + bool ratectr_changed; TN = nowTime.TN(); for (size_t i = 0; i < mChans; i ++) { state = &mStates[i]; - stale_bursts_changed = false; + ratectr_changed = false; + zeros[i] = state->chanType[TN] == NONE; Mutex *mtx = mTxPriorityQueues[i].getMutex(); @@ -447,7 +448,7 @@ LOGCHAN(i, DTRXDDL, NOTICE) << "dumping STALE burst in TRX->SDR interface (" << burst->getTime() <<" vs " << nowTime << "), retrans=" << state->mRetrans; state->ctrs.tx_stale_bursts++; - stale_bursts_changed = true; + ratectr_changed = true; if (state->mRetrans) updateFillerTable(i, burst); delete burst; @@ -467,11 +468,17 @@ } else { modFN = nowTime.FN() % state->fillerModulus[TN]; bursts[i] = state->fillerTable[modFN][TN]; + if (state->chanType[TN] != NONE) { + LOGCHAN(i, DTRXDDL, NOTICE) << "No Tx burst available for " << nowTime + << ", retrans=" << state->mRetrans; + state->ctrs.tx_unavailable_bursts++; + ratectr_changed = true; + } } mtx->unlock(); - if (stale_bursts_changed) + if (ratectr_changed) dispatch_trx_rate_ctr_change(state, i); } -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibb2c492b3c67cbab11fbb936ae3a090fb5756aa8 Gerrit-Change-Number: 19207 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:43:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 09:43:41 +0000 Subject: Change in osmo-pcu[master]: encoding: Encode TA as unsigned and check validty against GSM48_TA_IN... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19176 ) Change subject: encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID ...................................................................... encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID According to 3GPP TS 44.018 sec 10.5.2.40, Timing Advance value is 8 bit and range is 0-63 (0-219 on GSM400). Unsigned value (uint8_t) is used everywhere else, so avoid using a signed one here, and simply check for GSM48_TA_INVALID here, which we use everywhere else to initialize when the value is not known. Ideally we should check for value based on band, but it makes more sense to check that when receiving the data and storing in in set_ta(). Change-Id: I82b13561d0fe5ebafb5c3a8b9a501045c29809bc --- M src/encoding.cpp 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/encoding.cpp b/src/encoding.cpp index 89cc5f2..32358c3 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -142,9 +142,9 @@ } /* { 0 | 1 < TIMING_ADVANCE_VALUE : bit (6) > } */ -static inline void write_ta(bitvec *dest, unsigned& wp, int8_t ta) +static inline void write_ta(bitvec *dest, unsigned& wp, uint8_t ta) { - if (ta < 0) /* No TIMING_ADVANCE_VALUE: */ + if (ta >= GSM48_TA_INVALID) /* No TIMING_ADVANCE_VALUE: */ bitvec_write_field(dest, &wp, 0, 1); else { /* TIMING_ADVANCE_VALUE: */ bitvec_write_field(dest, &wp, 1, 1); @@ -174,7 +174,7 @@ < TIMING_ADVANCE_TIMESLOT_NUMBER : bit (3) > } */ static inline void write_ta_ie(bitvec *dest, unsigned& wp, - int8_t ta, int8_t tai, uint8_t ts) + uint8_t ta, int8_t tai, uint8_t ts) { write_ta(dest, wp, ta); if (write_tai(dest, wp, tai)) /* TIMING_ADVANCE_TIMESLOT_NUMBER: */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I82b13561d0fe5ebafb5c3a8b9a501045c29809bc Gerrit-Change-Number: 19176 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-CC: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:43:43 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 09:43:43 +0000 Subject: Change in osmo-pcu[master]: encoding.cpp: Fix missing spacing in function param In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19193 ) Change subject: encoding.cpp: Fix missing spacing in function param ...................................................................... encoding.cpp: Fix missing spacing in function param Change-Id: I4f30a0cea615d57cd7783a92ae782790c8075a6c --- M src/encoding.cpp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/encoding.cpp b/src/encoding.cpp index 32358c3..92944f0 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -580,7 +580,7 @@ bitvec_write_field(dest, &wp,0x0,1); // Message escape bitvec_write_field(dest, &wp, mcs_chan_code(tbf->current_cs()), 2); // CHANNEL_CODING_COMMAND bitvec_write_field(dest, &wp,0x1,1); // TLLI_BLOCK_CHANNEL_CODING - write_ta_ie(dest, wp,tbf->ta(), ta_idx, ta_ts); + write_ta_ie(dest, wp, tbf->ta(), ta_idx, ta_ts); } else { /* EPGRS */ bitvec_write_field(dest, &wp,0x1,1); // Message escape bitvec_write_field(dest, &wp,0x0,2); // EGPRS message contents @@ -594,7 +594,7 @@ bitvec_write_field(dest, &wp,0x0,1); // No ARAC RETRANSMISSION REQUEST bitvec_write_field(dest, &wp,0x1,1); // TLLI_BLOCK_CHANNEL_CODING bitvec_write_field(dest, &wp,0x0,1); // No BEP_PERIOD2 - write_ta_ie(dest, wp,tbf->ta(), ta_idx, ta_ts); + write_ta_ie(dest, wp, tbf->ta(), ta_idx, ta_ts); bitvec_write_field(dest, &wp,0x0,1); // No Packet Extended Timing Advance } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4f30a0cea615d57cd7783a92ae782790c8075a6c Gerrit-Change-Number: 19193 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:44:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 09:44:06 +0000 Subject: Change in osmo-bts[master]: Move struct gsm_bts_trx: gsm_data.* & bts.* => bts_trx.* In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19124 ) Change subject: Move struct gsm_bts_trx: gsm_data.* & bts.* => bts_trx.* ...................................................................... Move struct gsm_bts_trx: gsm_data.* & bts.* => bts_trx.* Move all struct gsm_bts_trx references from bulky gsm_data to its own file containing all related definitions and implementations. Also move a few functions clearly related to that object which were placed in bts.* Change-Id: Iebaf5b221c48b571f45408af867ce6f9c0cd9f4a --- M include/osmo-bts/Makefile.am M include/osmo-bts/bts.h A include/osmo-bts/bts_trx.h M include/osmo-bts/gsm_data.h M include/osmo-bts/phy_link.h M src/common/Makefile.am M src/common/abis.c M src/common/bts.c M src/common/bts_ctrl_lookup.c A src/common/bts_trx.c M src/common/gsm_data.c M src/common/sysinfo.c M src/common/tx_power.c 13 files changed, 283 insertions(+), 237 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/Makefile.am b/include/osmo-bts/Makefile.am index 310fce2..cdbaa4f 100644 --- a/include/osmo-bts/Makefile.am +++ b/include/osmo-bts/Makefile.am @@ -3,6 +3,7 @@ bts.h \ bts_model.h \ bts_shutdown_fsm.h \ + bts_trx.h \ gsm_data.h \ logging.h \ measurement.h \ diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index cb8787f..da321b0 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -3,6 +3,10 @@ #include #include +#include + + +struct gsm_bts_trx; enum bts_global_status { BTS_STATUS_RF_ACTIVE, @@ -318,12 +322,9 @@ struct gsm_bts *gsm_bts_num(struct gsm_network *net, int num); int bts_init(struct gsm_bts *bts); -int bts_trx_init(struct gsm_bts_trx *trx); void bts_shutdown(struct gsm_bts *bts, const char *reason); int bts_link_estab(struct gsm_bts *bts); -int trx_link_estab(struct gsm_bts_trx *trx); -int trx_set_available(struct gsm_bts_trx *trx, int avail); int bts_agch_enqueue(struct gsm_bts *bts, struct msgb *msg); struct msgb *bts_agch_dequeue(struct gsm_bts *bts); @@ -337,11 +338,8 @@ int lchan_init_lapdm(struct gsm_lchan *lchan); void load_timer_start(struct gsm_bts *bts); -uint8_t num_agch(struct gsm_bts_trx *trx, const char * arg); void bts_update_status(enum bts_global_status which, int on); -bool trx_ms_pwr_ctrl_is_osmo(struct gsm_bts_trx *trx); - struct gsm_time *get_time(struct gsm_bts *bts); int bts_main(int argc, char **argv); diff --git a/include/osmo-bts/bts_trx.h b/include/osmo-bts/bts_trx.h new file mode 100644 index 0000000..ae87528 --- /dev/null +++ b/include/osmo-bts/bts_trx.h @@ -0,0 +1,65 @@ +#pragma once + +#include + +/* One TRX in a BTS */ +struct gsm_bts_trx { + /* list header in bts->trx_list */ + struct llist_head list; + + struct gsm_bts *bts; + /* number of this TRX in the BTS */ + uint8_t nr; + /* human readable name / description */ + char *description; + /* how do we talk RSL with this TRX? */ + uint8_t rsl_tei; + struct e1inp_sign_link *rsl_link; + + /* Some BTS (specifically Ericsson RBS) have a per-TRX OML Link */ + struct e1inp_sign_link *oml_link; + + struct gsm_abis_mo mo; + struct tlv_parsed nm_attr; + struct { + struct gsm_abis_mo mo; + } bb_transc; + + uint16_t arfcn; + int nominal_power; /* in dBm */ + unsigned int max_power_red; /* in actual dB */ + uint8_t max_power_backoff_8psk; /* in actual dB OC-2G only */ + uint8_t c0_idle_power_red; /* in actual dB OC-2G only */ + + + struct trx_power_params power_params; + bool ms_pwr_ctl_soft; /* is power control loop done by osmocom software? */ + + struct { + void *l1h; + } role_bts; + + union { + struct { + unsigned int test_state; + uint8_t test_nr; + struct rxlev_stats rxlev_stat; + } ipaccess; + }; + struct gsm_bts_trx_ts ts[TRX_NR_TS]; +}; + + +struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts); +int bts_trx_init(struct gsm_bts_trx *trx); +struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num); +char *gsm_trx_name(const struct gsm_bts_trx *trx); +const char *gsm_trx_unit_id(struct gsm_bts_trx *trx); + +int trx_link_estab(struct gsm_bts_trx *trx); +int trx_set_available(struct gsm_bts_trx *trx, int avail); + +uint8_t num_agch(struct gsm_bts_trx *trx, const char * arg); +bool trx_ms_pwr_ctrl_is_osmo(struct gsm_bts_trx *trx); + +#define LOGPTRX(trx, ss, lvl, fmt, args...) LOGP(ss, lvl, "%s " fmt, gsm_trx_name(trx), ## args) diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 0bb7761..0402f11 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -43,7 +43,6 @@ #define GSM_BTS_AGCH_QUEUE_HIGH_LEVEL_DEFAULT 91 #define LOGPLCHAN(lchan, ss, lvl, fmt, args...) LOGP(ss, lvl, "%s " fmt, gsm_lchan_name(lchan), ## args) -#define LOGPTRX(trx, ss, lvl, fmt, args...) LOGP(ss, lvl, "%s " fmt, gsm_trx_name(trx), ## args) struct gsm_network { struct llist_head bts_list; @@ -339,53 +338,6 @@ struct gsm_lchan lchan[TS_MAX_LCHAN]; }; -/* One TRX in a BTS */ -struct gsm_bts_trx { - /* list header in bts->trx_list */ - struct llist_head list; - - struct gsm_bts *bts; - /* number of this TRX in the BTS */ - uint8_t nr; - /* human readable name / description */ - char *description; - /* how do we talk RSL with this TRX? */ - uint8_t rsl_tei; - struct e1inp_sign_link *rsl_link; - - /* Some BTS (specifically Ericsson RBS) have a per-TRX OML Link */ - struct e1inp_sign_link *oml_link; - - struct gsm_abis_mo mo; - struct tlv_parsed nm_attr; - struct { - struct gsm_abis_mo mo; - } bb_transc; - - uint16_t arfcn; - int nominal_power; /* in dBm */ - unsigned int max_power_red; /* in actual dB */ - uint8_t max_power_backoff_8psk; /* in actual dB OC-2G only */ - uint8_t c0_idle_power_red; /* in actual dB OC-2G only */ - - - struct trx_power_params power_params; - bool ms_pwr_ctl_soft; /* is power control loop done by osmocom software? */ - - struct { - void *l1h; - } role_bts; - - union { - struct { - unsigned int test_state; - uint8_t test_nr; - struct rxlev_stats rxlev_stat; - } ipaccess; - }; - struct gsm_bts_trx_ts ts[TRX_NR_TS]; -}; - #define GSM_LCHAN_SI(lchan, i) (void *)((lchan)->si.buf[i][0]) enum gprs_rlc_par { @@ -424,16 +376,12 @@ * OML connection will cause a special warning to be logged. */ #define OSMO_BTS_OML_CONN_EARLY_DISCONNECT 10 /* in seconds */ -struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts); -struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num); - extern const struct value_string gsm_pchant_names[13]; extern const struct value_string gsm_pchant_descs[13]; const char *gsm_pchan_name(enum gsm_phys_chan_config c); enum gsm_phys_chan_config gsm_pchan_parse(const char *name); const char *gsm_lchant_name(enum gsm_chan_t c); -char *gsm_trx_name(const struct gsm_bts_trx *trx); char *gsm_ts_name(const struct gsm_bts_trx_ts *ts); char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts); char *gsm_lchan_name_compute(const struct gsm_lchan *lchan); @@ -458,7 +406,6 @@ enum gsm_phys_chan_config ts_pchan(struct gsm_bts_trx_ts *ts); uint8_t ts_subslots(struct gsm_bts_trx_ts *ts); bool ts_is_tch(struct gsm_bts_trx_ts *ts); -const char *gsm_trx_unit_id(struct gsm_bts_trx *trx); int lchan2ecu_codec(const struct gsm_lchan *lchan); diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h index 2a53d91..ce4ea45 100644 --- a/include/osmo-bts/phy_link.h +++ b/include/osmo-bts/phy_link.h @@ -5,11 +5,12 @@ #include #include +#include #include #include "btsconfig.h" -struct gsm_bts_trx; + struct virt_um_inst; enum phy_link_type { diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 2fa5514..e3a72dc 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -14,6 +14,7 @@ abis.c \ oml.c \ bts.c \ + bts_trx.c \ rsl.c \ vty.c \ paging.c \ diff --git a/src/common/abis.c b/src/common/abis.c index ad6fddc..4c62e8f 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -49,6 +49,7 @@ #include #include #include +#include static struct gsm_bts *g_bts; diff --git a/src/common/bts.c b/src/common/bts.c index 2f6a700..983f61d 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -383,40 +383,6 @@ return rc; } -/* Initialize the TRX data structures, called before config - * file reading */ -int bts_trx_init(struct gsm_bts_trx *trx) -{ - /* initialize bts data structure */ - struct trx_power_params *tpp = &trx->power_params; - int rc, i; - - for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { - struct gsm_bts_trx_ts *ts = &trx->ts[i]; - int k; - - for (k = 0; k < ARRAY_SIZE(ts->lchan); k++) { - struct gsm_lchan *lchan = &ts->lchan[k]; - INIT_LLIST_HEAD(&lchan->dl_tch_queue); - } - } - /* Default values for the power adjustments */ - tpp->ramp.max_initial_pout_mdBm = to_mdB(0); - tpp->ramp.step_size_mdB = to_mdB(2); - tpp->ramp.step_interval_sec = 1; - - /* IF BTS model doesn't DSP/HW support MS Power Control Loop, enable osmo algo by default: */ - if (!bts_internal_flag_get(trx->bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP)) - trx->ms_pwr_ctl_soft = true; - - rc = bts_model_trx_init(trx); - if (rc < 0) { - llist_del(&trx->list); - return rc; - } - return 0; -} - /* main link is established, send status report */ int bts_link_estab(struct gsm_bts *bts) { @@ -451,55 +417,6 @@ return bts_model_oml_estab(bts); } -/* RSL link is established, send status report */ -int trx_link_estab(struct gsm_bts_trx *trx) -{ - struct e1inp_sign_link *link = trx->rsl_link; - uint8_t radio_state = link ? NM_OPSTATE_ENABLED : NM_OPSTATE_DISABLED; - int rc; - - LOGP(DSUM, LOGL_INFO, "RSL link (TRX %02x) state changed to %s, sending Status'.\n", - trx->nr, link ? "up" : "down"); - - oml_mo_state_chg(&trx->mo, radio_state, NM_AVSTATE_OK); - - if (link) - rc = rsl_tx_rf_res(trx); - else - rc = bts_model_trx_deact_rf(trx); - if (rc < 0) { - oml_tx_failure_event_rep(&trx->bb_transc.mo, NM_SEVER_MAJOR, OSMO_EVT_MAJ_RSL_FAIL, - link ? - "Failed to establish RSL link (%d)" : - "Failed to deactivate RF (%d)", rc); - } - - return 0; -} - -/* set the availability of the TRX (used by PHY driver) */ -int trx_set_available(struct gsm_bts_trx *trx, int avail) -{ - int tn; - - LOGP(DSUM, LOGL_INFO, "TRX(%d): Setting available = %d\n", - trx->nr, avail); - if (avail) { - int op_state = trx->rsl_link ? NM_OPSTATE_ENABLED : NM_OPSTATE_DISABLED; - oml_mo_state_chg(&trx->mo, op_state, NM_AVSTATE_OK); - oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OK); - for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) - oml_mo_state_chg(&trx->ts[tn].mo, op_state, NM_AVSTATE_OK); - } else { - oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); - oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_NOT_INSTALLED); - - for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) - oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); - } - return 0; -} - /* prepare the per-SAPI T200 arrays for a given lchan */ static int t200_by_lchan(int *t200_ms_dcch, int *t200_ms_acch, struct gsm_lchan *lchan) { @@ -899,11 +816,6 @@ return sup > 0; } -bool trx_ms_pwr_ctrl_is_osmo(struct gsm_bts_trx *trx) -{ - return trx->ms_pwr_ctl_soft; -} - struct gsm_time *get_time(struct gsm_bts *bts) { return &bts->gsm_time; diff --git a/src/common/bts_ctrl_lookup.c b/src/common/bts_ctrl_lookup.c index f0157e9..a3e3c8b 100644 --- a/src/common/bts_ctrl_lookup.c +++ b/src/common/bts_ctrl_lookup.c @@ -28,6 +28,7 @@ #include #include #include +#include extern vector ctrl_node_vec; diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c new file mode 100644 index 0000000..15640c6 --- /dev/null +++ b/src/common/bts_trx.c @@ -0,0 +1,205 @@ +/* (C) 2008-2010 by Harald Welte + * (C) 2020 by sysmocom - s.f.m.c. GmbH + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include +#include +#include + +struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts) +{ + struct gsm_bts_trx *trx = talloc_zero(bts, struct gsm_bts_trx); + int k; + + if (!trx) + return NULL; + + trx->bts = bts; + trx->nr = bts->num_trx++; + + gsm_mo_init(&trx->mo, bts, NM_OC_RADIO_CARRIER, + bts->nr, trx->nr, 0xff); + + gsm_mo_init(&trx->bb_transc.mo, bts, NM_OC_BASEB_TRANSC, + bts->nr, trx->nr, 0xff); + + for (k = 0; k < TRX_NR_TS; k++) { + struct gsm_bts_trx_ts *ts = &trx->ts[k]; + int l; + + ts->trx = trx; + ts->nr = k; + ts->pchan = GSM_PCHAN_NONE; + ts->dyn.pchan_is = GSM_PCHAN_NONE; + ts->dyn.pchan_want = GSM_PCHAN_NONE; + ts->tsc = -1; + + gsm_mo_init(&ts->mo, bts, NM_OC_CHANNEL, + bts->nr, trx->nr, ts->nr); + + for (l = 0; l < TS_MAX_LCHAN; l++) { + struct gsm_lchan *lchan; + char *name; + lchan = &ts->lchan[l]; + + lchan->ts = ts; + lchan->nr = l; + lchan->type = GSM_LCHAN_NONE; + + name = gsm_lchan_name_compute(lchan); + lchan->name = talloc_strdup(trx, name); + INIT_LLIST_HEAD(&lchan->sapi_cmds); + } + } + + if (trx->nr != 0) + trx->nominal_power = bts->c0->nominal_power; + + llist_add_tail(&trx->list, &bts->trx_list); + + return trx; +} + +/* Initialize the TRX data structures, called before config + * file reading */ +int bts_trx_init(struct gsm_bts_trx *trx) +{ + /* initialize bts data structure */ + struct trx_power_params *tpp = &trx->power_params; + int rc, i; + + for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + int k; + + for (k = 0; k < ARRAY_SIZE(ts->lchan); k++) { + struct gsm_lchan *lchan = &ts->lchan[k]; + INIT_LLIST_HEAD(&lchan->dl_tch_queue); + } + } + /* Default values for the power adjustments */ + tpp->ramp.max_initial_pout_mdBm = to_mdB(0); + tpp->ramp.step_size_mdB = to_mdB(2); + tpp->ramp.step_interval_sec = 1; + + /* IF BTS model doesn't DSP/HW support MS Power Control Loop, enable osmo algo by default: */ + if (!bts_internal_flag_get(trx->bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP)) + trx->ms_pwr_ctl_soft = true; + + rc = bts_model_trx_init(trx); + if (rc < 0) { + llist_del(&trx->list); + return rc; + } + return 0; +} + +struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num) +{ + struct gsm_bts_trx *trx; + + if (num >= bts->num_trx) + return NULL; + + llist_for_each_entry(trx, &bts->trx_list, list) { + if (trx->nr == num) + return trx; + } + + return NULL; +} + +static char ts2str[255]; + +char *gsm_trx_name(const struct gsm_bts_trx *trx) +{ + if (!trx) + snprintf(ts2str, sizeof(ts2str), "(trx=NULL)"); + else + snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d)", + trx->bts->nr, trx->nr); + + return ts2str; +} + +const char *gsm_trx_unit_id(struct gsm_bts_trx *trx) +{ + static char buf[23]; + + snprintf(buf, sizeof(buf), "%u/%u/%u", trx->bts->ip_access.site_id, + trx->bts->ip_access.bts_id, trx->nr); + return buf; +} + +/* RSL link is established, send status report */ +int trx_link_estab(struct gsm_bts_trx *trx) +{ + struct e1inp_sign_link *link = trx->rsl_link; + uint8_t radio_state = link ? NM_OPSTATE_ENABLED : NM_OPSTATE_DISABLED; + int rc; + + LOGP(DSUM, LOGL_INFO, "RSL link (TRX %02x) state changed to %s, sending Status'.\n", + trx->nr, link ? "up" : "down"); + + oml_mo_state_chg(&trx->mo, radio_state, NM_AVSTATE_OK); + + if (link) + rc = rsl_tx_rf_res(trx); + else + rc = bts_model_trx_deact_rf(trx); + if (rc < 0) { + oml_tx_failure_event_rep(&trx->bb_transc.mo, NM_SEVER_MAJOR, OSMO_EVT_MAJ_RSL_FAIL, + link ? + "Failed to establish RSL link (%d)" : + "Failed to deactivate RF (%d)", rc); + } + + return 0; +} + +/* set the availability of the TRX (used by PHY driver) */ +int trx_set_available(struct gsm_bts_trx *trx, int avail) +{ + int tn; + + LOGP(DSUM, LOGL_INFO, "TRX(%d): Setting available = %d\n", + trx->nr, avail); + if (avail) { + int op_state = trx->rsl_link ? NM_OPSTATE_ENABLED : NM_OPSTATE_DISABLED; + oml_mo_state_chg(&trx->mo, op_state, NM_AVSTATE_OK); + oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OK); + for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) + oml_mo_state_chg(&trx->ts[tn].mo, op_state, NM_AVSTATE_OK); + } else { + oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); + oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_NOT_INSTALLED); + + for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) + oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); + } + return 0; +} + + +bool trx_ms_pwr_ctrl_is_osmo(struct gsm_bts_trx *trx) +{ + return trx->ms_pwr_ctl_soft; +} diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c index c63793c..383a31d 100644 --- a/src/common/gsm_data.c +++ b/src/common/gsm_data.c @@ -37,6 +37,7 @@ #include #include +#include const struct value_string gsm_pchant_names[13] = { { GSM_PCHAN_NONE, "NONE" }, @@ -103,88 +104,8 @@ return get_value_string(lchan_s_names, s); } -struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts) -{ - struct gsm_bts_trx *trx = talloc_zero(bts, struct gsm_bts_trx); - int k; - - if (!trx) - return NULL; - - trx->bts = bts; - trx->nr = bts->num_trx++; - - gsm_mo_init(&trx->mo, bts, NM_OC_RADIO_CARRIER, - bts->nr, trx->nr, 0xff); - - gsm_mo_init(&trx->bb_transc.mo, bts, NM_OC_BASEB_TRANSC, - bts->nr, trx->nr, 0xff); - - for (k = 0; k < TRX_NR_TS; k++) { - struct gsm_bts_trx_ts *ts = &trx->ts[k]; - int l; - - ts->trx = trx; - ts->nr = k; - ts->pchan = GSM_PCHAN_NONE; - ts->dyn.pchan_is = GSM_PCHAN_NONE; - ts->dyn.pchan_want = GSM_PCHAN_NONE; - ts->tsc = -1; - - gsm_mo_init(&ts->mo, bts, NM_OC_CHANNEL, - bts->nr, trx->nr, ts->nr); - - for (l = 0; l < TS_MAX_LCHAN; l++) { - struct gsm_lchan *lchan; - char *name; - lchan = &ts->lchan[l]; - - lchan->ts = ts; - lchan->nr = l; - lchan->type = GSM_LCHAN_NONE; - - name = gsm_lchan_name_compute(lchan); - lchan->name = talloc_strdup(trx, name); - INIT_LLIST_HEAD(&lchan->sapi_cmds); - } - } - - if (trx->nr != 0) - trx->nominal_power = bts->c0->nominal_power; - - llist_add_tail(&trx->list, &bts->trx_list); - - return trx; -} - -struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num) -{ - struct gsm_bts_trx *trx; - - if (num >= bts->num_trx) - return NULL; - - llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->nr == num) - return trx; - } - - return NULL; -} - static char ts2str[255]; -char *gsm_trx_name(const struct gsm_bts_trx *trx) -{ - if (!trx) - snprintf(ts2str, sizeof(ts2str), "(trx=NULL)"); - else - snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d)", - trx->bts->nr, trx->nr); - - return ts2str; -} - char *gsm_ts_name(const struct gsm_bts_trx_ts *ts) { @@ -459,15 +380,6 @@ return pchan_is_tch(ts_pchan(ts)); } -const char *gsm_trx_unit_id(struct gsm_bts_trx *trx) -{ - static char buf[23]; - - snprintf(buf, sizeof(buf), "%u/%u/%u", trx->bts->ip_access.site_id, - trx->bts->ip_access.bts_id, trx->nr); - return buf; -} - const struct value_string lchan_ciph_state_names[] = { { LCHAN_CIPH_NONE, "NONE" }, { LCHAN_CIPH_RX_REQ, "RX_REQ" }, diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c index 4a86c4e..e35caeb 100644 --- a/src/common/sysinfo.c +++ b/src/common/sysinfo.c @@ -26,6 +26,7 @@ #include #include #include +#include /* properly increment SI2q index and return SI2q data for scheduling */ static inline uint8_t *get_si2q_inc_index(struct gsm_bts *bts) diff --git a/src/common/tx_power.c b/src/common/tx_power.c index 8292d9f..8f50b0f 100644 --- a/src/common/tx_power.c +++ b/src/common/tx_power.c @@ -29,6 +29,7 @@ #include #include #include +#include static int get_pa_drive_level_mdBm(const struct power_amp *pa, int desired_p_out_mdBm, unsigned int arfcn) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iebaf5b221c48b571f45408af867ce6f9c0cd9f4a Gerrit-Change-Number: 19124 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: dexter Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:44:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 09:44:07 +0000 Subject: Change in osmo-bts[master]: bts-trx: Don't set OPSTATE enabled during trx_init In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19155 ) Change subject: bts-trx: Don't set OPSTATE enabled during trx_init ...................................................................... bts-trx: Don't set OPSTATE enabled during trx_init At that time we schedule a POWERON command towards osmo-trx, so let the callback of RSP POWERON set the OPSTATE in l1if_poweronoff_cb rather than setting it without waiting for confirmation from osmo-trx. Change-Id: Ib36a073cae5e1522821a04d8806648562f4e0f5b --- M src/osmo-bts-trx/l1_if.c 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Hoernchen: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 4cdb108..f47fc05 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -406,9 +406,6 @@ if (trx == trx->bts->c0) lchan_init_lapdm(&trx->ts[0].lchan[CCCH_LCHAN]); - /* Set to Operational State: Enabled */ - oml_mo_state_chg(&trx->mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK); - /* Send OPSTART ack */ return oml_mo_opstart_ack(&trx->mo); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib36a073cae5e1522821a04d8806648562f4e0f5b Gerrit-Change-Number: 19155 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:44:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 09:44:08 +0000 Subject: Change in osmo-bts[master]: common: Avoid changing OPSTATE to Enabled upon RSL up In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19156 ) Change subject: common: Avoid changing OPSTATE to Enabled upon RSL up ...................................................................... common: Avoid changing OPSTATE to Enabled upon RSL up the RSL link has nothing to do regarding the state of the Radio Carrier, as in it being up is not enough to have a working (enabled) Radio Carrier. Change-Id: Iefb5c4e1097233b5c31e4d621c544d51516af678 --- M src/common/bts_trx.c 1 file changed, 2 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c index 15640c6..6318dbc 100644 --- a/src/common/bts_trx.c +++ b/src/common/bts_trx.c @@ -153,13 +153,10 @@ int trx_link_estab(struct gsm_bts_trx *trx) { struct e1inp_sign_link *link = trx->rsl_link; - uint8_t radio_state = link ? NM_OPSTATE_ENABLED : NM_OPSTATE_DISABLED; int rc; - LOGP(DSUM, LOGL_INFO, "RSL link (TRX %02x) state changed to %s, sending Status'.\n", - trx->nr, link ? "up" : "down"); - - oml_mo_state_chg(&trx->mo, radio_state, NM_AVSTATE_OK); + LOGPTRX(trx, DSUM, LOGL_INFO, "RSL link %s\n", + link ? "up" : "down"); if (link) rc = rsl_tx_rf_res(trx); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iefb5c4e1097233b5c31e4d621c544d51516af678 Gerrit-Change-Number: 19156 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:44:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 09:44:08 +0000 Subject: Change in osmo-bts[master]: bts-trx: Remove unused function l1if_provision_transceiver() In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19162 ) Change subject: bts-trx: Remove unused function l1if_provision_transceiver() ...................................................................... bts-trx: Remove unused function l1if_provision_transceiver() Change-Id: I509fdbc7883f227cef4b7e46cb68fa2418c63f97 --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h 2 files changed, 0 insertions(+), 25 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index f47fc05..a3bdf01 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -363,30 +363,6 @@ return 0; } -int l1if_provision_transceiver(struct gsm_bts *bts) -{ - struct gsm_bts_trx *trx; - uint8_t tn; - - llist_for_each_entry(trx, &bts->trx_list, list) { - struct phy_instance *pinst = trx_phy_instance(trx); - struct trx_l1h *l1h = pinst->u.osmotrx.hdl; - l1h->config.trxd_hdr_ver_req = 0; - l1h->config.trxd_hdr_ver_use = 0; - l1h->config.setformat_sent = 0; - l1h->config.arfcn_sent = 0; - l1h->config.tsc_sent = 0; - l1h->config.bsic_sent = 0; - l1h->config.rxgain_sent = 0; - l1h->config.maxdly_sent = 0; - l1h->config.maxdlynb_sent = 0; - for (tn = 0; tn < TRX_NR_TS; tn++) - l1h->config.slottype_sent[tn] = 0; - l1if_provision_transceiver_trx(l1h); - } - return 0; -} - /* * activation/configuration/deactivation of transceiver's TRX */ diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h index 7f60ca3..d2fdf06 100644 --- a/src/osmo-bts-trx/l1_if.h +++ b/src/osmo-bts-trx/l1_if.h @@ -120,7 +120,6 @@ struct trx_l1h *trx_l1h_alloc(void *tall_ctx, struct phy_instance *pinst); int l1if_provision_transceiver_trx(struct trx_l1h *l1h); -int l1if_provision_transceiver(struct gsm_bts *bts); int l1if_mph_time_ind(struct gsm_bts *bts, uint32_t fn); void l1if_trx_set_nominal_power(struct gsm_bts_trx *trx, int nominal_power); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I509fdbc7883f227cef4b7e46cb68fa2418c63f97 Gerrit-Change-Number: 19162 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:46:00 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 14 Jul 2020 09:46:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19177 ) Change subject: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic251339afb9caa23d9a4e7bdb135d42a36a203d5 Gerrit-Change-Number: 19177 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 09:46:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:48:22 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 14 Jul 2020 09:48:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RLCMAC: Improve support of Pkt Ul AckNack messages In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19192 ) Change subject: RLCMAC: Improve support of Pkt Ul AckNack messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8586248f435b1a70042ea25f633b75542bbc14aa Gerrit-Change-Number: 19192 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 09:48:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:49:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 09:49:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RLCMAC: Improve support of Pkt Ul AckNack messages In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19192 ) Change subject: RLCMAC: Improve support of Pkt Ul AckNack messages ...................................................................... RLCMAC: Improve support of Pkt Ul AckNack messages Change-Id: I8586248f435b1a70042ea25f633b75542bbc14aa --- M library/RLCMAC_CSN1_Templates.ttcn M library/RLCMAC_CSN1_Types.ttcn 2 files changed, 48 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/RLCMAC_CSN1_Templates.ttcn b/library/RLCMAC_CSN1_Templates.ttcn index 9f53c3f..0d7de99 100644 --- a/library/RLCMAC_CSN1_Templates.ttcn +++ b/library/RLCMAC_CSN1_Templates.ttcn @@ -217,15 +217,34 @@ multi_block_alloc := omit }; - template UlAckNackGprs tr_UlAckNackGprs(template GprsTlli tlli := *) := { + template AckNackDescription tr_AckNackDescription(template BIT1 final_ack := ?) := { + final_ack := final_ack, + starting_seq_nr := ?, + receive_block_bitmap := ? + }; + + template UlAckNackGprsAdditionsRel99 tr_UlAckNackGprsAdditionsRel99(template boolean tbf_est := ?) := { + ext_pkt_ta_present := ?, + ext_pkt_ta := *, + tbf_est := tbf_est + }; + + template UlAckNackGprs tr_UlAckNackGprs(template GprsTlli tlli := *, + template AckNackDescription acknack_desc := ?, + template UlAckNackGprsAdditionsRel99 rel99 := *) := { ch_coding_cmd := ?, - ack_nack_desc := ?, + ack_nack_desc := acknack_desc, cont_res_tlli_present := ?, cont_res_tlli := tlli, pkt_ta_present := ?, pkt_ta := *, pwr_ctrl_present := ?, - pwr_ctrl := * + pwr_ctrl := *, + extension_bits_present := ?, + extension_bits := *, + not_used := '0'B, + rel99_present := ?, + rel99 := rel99 }; template UlAckNackEgprs tr_UlAckNackEgprs(template GprsTlli tlli := *) := { diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index ee02a8a..20c2d81 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -416,6 +416,15 @@ variant (repeated_pageinfo) "PRESENCE(repeated_pageinfo_present = '1'B)" }; + /* 12.26 Extension Bits IE */ + type record ExtensionBits { + uint6_t extension_length, + bitstring spare_bits + } with { + variant (extension_length) "LENGTHTO(spare_bits) - 1" + variant (extension_length) "UNIT(bits)" + }; + /* 11.2.28 Uplink Ack/Nack */ type enumerated ChCodingCommand { CH_CODING_CS1 ('00'B), @@ -423,6 +432,15 @@ CH_CODING_CS3 ('10'B), CH_CODING_CS4 ('11'B) } with { variant "FIELDLENGTH(2)" }; + type record UlAckNackGprsAdditionsRel99 { + BIT1 ext_pkt_ta_present, + BIT2 ext_pkt_ta optional, + boolean tbf_est + /* TODO: Rel5 ,... */ + } with { + variant (ext_pkt_ta) "PRESENCE(ext_pkt_ta_present = '1'B)" + variant (tbf_est) "FIELDLENGTH(1)" + }; type record UlAckNackGprs { ChCodingCommand ch_coding_cmd, AckNackDescription ack_nack_desc, @@ -431,12 +449,18 @@ BIT1 pkt_ta_present, PacketTimingAdvance pkt_ta optional, BIT1 pwr_ctrl_present, - PowerControlParameters pwr_ctrl optional - /* TODO: Extension Bits, Rel5 ,... */ + PowerControlParameters pwr_ctrl optional, + BIT1 extension_bits_present, + ExtensionBits extension_bits optional, + BIT1 not_used ('0'B), + BIT1 rel99_present, + UlAckNackGprsAdditionsRel99 rel99 optional } with { variant (cont_res_tlli) "PRESENCE(cont_res_tlli_present = '1'B)" variant (pkt_ta) "PRESENCE(pkt_ta_present = '1'B)" variant (pwr_ctrl) "PRESENCE(pwr_ctrl_present = '1'B)" + variant (extension_bits) "PRESENCE(extension_bits_present = '1'B)" + variant (rel99) "PRESENCE(rel99_present = '1'B)" variant (cont_res_tlli) "BYTEORDER(first)" }; type record UlAckNackEgprs { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8586248f435b1a70042ea25f633b75542bbc14aa Gerrit-Change-Number: 19192 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:49:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 09:49:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19177 ) Change subject: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req ...................................................................... pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req Related: OS#4657 Change-Id: Ic251339afb9caa23d9a4e7bdb135d42a36a203d5 --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 68 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 6018b7b..bba2c97 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -647,13 +647,14 @@ } } -function f_rx_rlcmac_dl_block_exp_ack_nack(out RlcmacDlBlock dl_block, out uint32_t poll_fn) +function f_rx_rlcmac_dl_block_exp_ack_nack(out RlcmacDlBlock dl_block, out uint32_t poll_fn, + template RlcmacDlBlock acknack_tmpl := (tr_RLCMAC_UL_ACK_NACK_GPRS(ul_tfi := ?), + tr_RLCMAC_UL_ACK_NACK_EGPRS(ul_tfi := ?))) runs on MS_BTS_IFACE_CT { var uint32_t dl_fn; f_rx_rlcmac_dl_block(dl_block, dl_fn); - if (match(dl_block, tr_RLCMAC_UL_ACK_NACK_GPRS(ul_tfi := ?)) or - match(dl_block, tr_RLCMAC_UL_ACK_NACK_EGPRS(ul_tfi := ?))) { + if (match(dl_block, acknack_tmpl)) { poll_fn := f_rrbp_ack_fn(dl_fn, dl_block.ctrl.mac_hdr.rrbp); return; } diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 10a9275..42f3f2b 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -1592,6 +1592,70 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Test scenario where MS wants to request a new TBF once the current one is + * ending, by means of sending a Packet Resource Request on ul slot provided by + * last Pkt Ul ACK's RRBP. + * See 3GPP TS 44.060 sec 9.3.2.4.2 "Non-extended uplink TBF mode" */ +testcase TC_ul_tbf_reestablish_with_pkt_resource_req() runs on RAW_PCU_Test_CT { + var CodingScheme exp_cs_mcs := CS_1; + var RlcmacDlBlock dl_block; + var octetstring data := f_rnd_octstring(10); + var uint32_t sched_fn; + var uint32_t dl_fn; + var template RlcmacDlBlock acknack_tmpl; + var GprsMS ms; + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename()); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign('FFFFFFFF'O, ms.tlli); + + /* Establish an Uplink TBF */ + f_ms_establish_ul_tbf(ms); + + /* Send one UL block (with TLLI since we are in One-Phase Access + contention resoultion) and make sure it is ACKED fine */ + f_ms_tx_ul_data_block_multi(ms, 1, with_tlli := true); + + /* UL block should be received in SGSN */ + BSSGP[0].receive(tr_BSSGP_UL_UD(ms.tlli, mp_gb_cfg.cell_id)); + + acknack_tmpl := tr_RLCMAC_UL_ACK_NACK_GPRS(ms.ul_tbf.tfi, + tr_UlAckNackGprs(ms.tlli, + tr_AckNackDescription(final_ack := '1'B), + tr_UlAckNackGprsAdditionsRel99(tbf_est := true))) + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn, acknack_tmpl); + + /* TODO: verify TBF_EST and FinalACK are both '1' above */ + + /* Send PACKET RESOURCE REQUEST to request a new UL TBF */ + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(valueof(ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, omit))), sched_fn); + f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS); + /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + + /* Send one UL block (without TLLI since we are in Second-Phase Access) + and make sure it is ACKED fine */ + f_ms_tx_ul_data_block_multi(ms, 1, with_tlli := false); /* TODO: send using cs_mcs */ + + /* UL block should be received in SGSN */ + BSSGP[0].receive(tr_BSSGP_UL_UD(ms.tlli, mp_gb_cfg.cell_id)); + + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn, acknack_tmpl); + /* ACK the ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + + f_shutdown(__BFILE__, __LINE__, final := true); +} + private function f_pkt_paging_match_imsi(in PacketPagingReq req, hexstring imsi) runs on RAW_PCU_Test_CT { var MobileIdentityLV_Paging mi_lv := req.repeated_pageinfo.cs.mobile_identity; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic251339afb9caa23d9a4e7bdb135d42a36a203d5 Gerrit-Change-Number: 19177 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 09:56:54 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 09:56:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test RR Channel Release EARFCNs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 ) Change subject: bsc: test RR Channel Release EARFCNs ...................................................................... Patch Set 1: (5 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn File library/GSM_RR_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn at 1074 PS1, Line 1074: CellSelectionIndicatorValue > looking around this file the style seems to be shortened names. so ok. Yeah, please keep them short. > but there's also something to using the exact naming from the specs... Better add the spec. references in comments. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn at 1087 PS1, Line 1087: CellSelectionIndicatorValueEnum > I see only this one. [?] Well, for sure it's not really important. But still improves readability. If it's private, I know that I can change it in any way and there are no potentially broken dependencies. This also speeds up rebuilding the test suite. Without 'private', if you change this definition, TITAN would rebuild all modules that implicitly import it, even if they don't actually use it. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn at 1109 PS1, Line 1109: arfcn > in the spec this is called "FDD-ARFCN" and "TDD-ARFCN" -- i noticed that FDD and TDD are exactly the [?] Not critical, we can leave it as is. In the end, it's still ARFCN regardless of the network generation it relates to. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn at 1134 PS1, Line 1134: target_pcid > 44.018 says [?] Ok, sorry for confusion. Indeed it seems to be a different IE. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn at 1159 PS1, Line 1159: meas_bw_presence := ?, The problem is that this field is unconditionally set to '?', so your template parameter does not affect it. You don't really need this argument because you can explicitly pass 'meas_bw := omit' if it is expected to be absent. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I882c5e1f70bcc4833fc837a95c900ce291919cc5 Gerrit-Change-Number: 19216 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 14 Jul 2020 09:56:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:18:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 10:18:46 +0000 Subject: Change in libosmo-abis[master]: ipaccess.c: Drop repeated ipaccess_keepalive_fsm_cleanup in write err... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19246 ) Change subject: ipaccess.c: Drop repeated ipaccess_keepalive_fsm_cleanup in write error path ...................................................................... ipaccess.c: Drop repeated ipaccess_keepalive_fsm_cleanup in write error path The function is already being called by ipaccess_drop(). Change-Id: I00d0557fe81861d4b913a4c76e4b56f93e656103 --- M src/input/ipaccess.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/46/19246/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 96828eb..28191b7 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -486,7 +486,6 @@ msgb_free(msg); return ret; err: - ipaccess_keepalive_fsm_cleanup(e1i_ts); ipaccess_drop(bfd, line); msgb_free(msg); return ret; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I00d0557fe81861d4b913a4c76e4b56f93e656103 Gerrit-Change-Number: 19246 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:22:54 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 10:22:54 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: fix TDMA clock counter wrapping In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/19225 to look at the new patch set (#2). Change subject: trx_toolkit/clck_gen.py: fix TDMA clock counter wrapping ...................................................................... trx_toolkit/clck_gen.py: fix TDMA clock counter wrapping Change-Id: I157447c7610402f6d62d2b74c9f04fcaa0bc1724 --- M src/target/trx_toolkit/clck_gen.py 1 file changed, 2 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/25/19225/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I157447c7610402f6d62d2b74c9f04fcaa0bc1724 Gerrit-Change-Number: 19225 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:22:54 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 10:22:54 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: support optional clock handler In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/19227 to look at the new patch set (#2). Change subject: trx_toolkit/clck_gen.py: support optional clock handler ...................................................................... trx_toolkit/clck_gen.py: support optional clock handler Change-Id: I85b2182d9835ed035cf370e45ea039ac6a7e8405 --- M src/target/trx_toolkit/clck_gen.py 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/27/19227/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I85b2182d9835ed035cf370e45ea039ac6a7e8405 Gerrit-Change-Number: 19227 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:32:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 10:32:38 +0000 Subject: Change in libosmo-abis[master]: ipaccess.c: Drop repeated ipaccess_keepalive_fsm_cleanup in write err... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19246 ) Change subject: ipaccess.c: Drop repeated ipaccess_keepalive_fsm_cleanup in write error path ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I00d0557fe81861d4b913a4c76e4b56f93e656103 Gerrit-Change-Number: 19246 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 14 Jul 2020 10:32:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:32:50 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 10:32:50 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/transceiver.py: implement the transmit burst queue In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19228 ) Change subject: trx_toolkit/transceiver.py: implement the transmit burst queue ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/osmocom-bb/+/19228/2/src/target/trx_toolkit/transceiver.py File src/target/trx_toolkit/transceiver.py: https://gerrit.osmocom.org/c/osmocom-bb/+/19228/2/src/target/trx_toolkit/transceiver.py at 277 PS2, Line 277: if event == "POWEROFF": > Aren't yo repeating the same above in POWEROFF? Above is for the child Transceiver instances (additional transceivers in a multi-trx setup), this call is for the current (parent) transceiver. https://gerrit.osmocom.org/c/osmocom-bb/+/19228/2/src/target/trx_toolkit/transceiver.py at 326 PS2, Line 326: self._tx_queue.append(msg) > If you sort them here when adding them, then during clk_tick you only need to check for the few firs [?] I was thinking about that, but then decided against this approach. Doing sorted insertion is probably more expensive than doing a full list iteration in self.clck_tick(). Python seems to have a sorted queue implementation, but it does not work with anything else than numbers (while we basically need to sort DATAMSG objects). Sigh. At least for now, we can merge it as is and then optimize further. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie66ef9667dc8d156ad578ce324941a816c07c105 Gerrit-Change-Number: 19228 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 10:32:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:33:12 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 10:33:12 +0000 Subject: Change in pysim[master]: utils.py: Add helper method to encode ePDG Identifier In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/18977 ) Change subject: utils.py: Add helper method to encode ePDG Identifier ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/18977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I864bda5505e9061391a727add294a6e90c50f9ef Gerrit-Change-Number: 18977 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 14 Jul 2020 10:33:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:33:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 10:33:14 +0000 Subject: Change in pysim[master]: utils.py: Add helper method to encode ePDG Identifier In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/18977 ) Change subject: utils.py: Add helper method to encode ePDG Identifier ...................................................................... utils.py: Add helper method to encode ePDG Identifier This method encodes ePDG Id so it can be stored to EF.ePDGId or EF.ePDGIdEm. See 3GPP TS 31.102 version 13.4.0 Release 13, section 4.2.102 and 4.2.104. Resulting hex string is made of tag value + length + address type + address. tag value for home ePDG identifier is 80 address type: 0x00 (FQDN), 0x01 (IPv4), 0x02 (IPv6), other (Reserved) ePDG FQDN example: epdg.mnc001.mcc001.3gppnetwork.org Note: Only FQDN format is supported for now Change-Id: I864bda5505e9061391a727add294a6e90c50f9ef --- M pySim/utils.py 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/utils.py b/pySim/utils.py index 79a1c1b..ac82774 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -476,6 +476,24 @@ return s +def enc_epdgid(epdg_addr, addr_type='00'): + """ + Encode ePDG Id so it can be stored to EF.ePDGId or EF.ePDGIdEm. + See 3GPP TS 31.102 version 13.4.0 Release 13, section 4.2.102 and 4.2.104. + + Default values: + - addr_type: 00 - FQDN format of ePDG Address + """ + + s = "" + + # TODO: Encoding of IPv4 and IPv6 address + if addr_type == '00': + hex_str = s2h(epdg_addr) + s += '80' + ('%02x' % ((len(hex_str)//2)+1)) + '00' + hex_str + + return s + def sanitize_pin_adm(opts): """ The ADM pin can be supplied either in its hexadecimal form or as -- To view, visit https://gerrit.osmocom.org/c/pysim/+/18977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I864bda5505e9061391a727add294a6e90c50f9ef Gerrit-Change-Number: 18977 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:33:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 10:33:49 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: add configuration with frequency hopping parameters In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19160 ) Change subject: ttcn3-bts-test: add configuration with frequency hopping parameters ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7822c3581fccba3277a63577e740e7486307635d Gerrit-Change-Number: 19160 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 10:33:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:34:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 10:34:19 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: fix TDMA clock counter wrapping In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19225 ) Change subject: trx_toolkit/clck_gen.py: fix TDMA clock counter wrapping ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I157447c7610402f6d62d2b74c9f04fcaa0bc1724 Gerrit-Change-Number: 19225 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 10:34:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:34:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 10:34:29 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: support optional clock handler In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19227 ) Change subject: trx_toolkit/clck_gen.py: support optional clock handler ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I85b2182d9835ed035cf370e45ea039ac6a7e8405 Gerrit-Change-Number: 19227 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 10:34:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:36:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 10:36:13 +0000 Subject: Change in libosmocore[master]: fixup for gsm0808_create_common_id(): add API doc, use new MI API In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/18966 ) Change subject: fixup for gsm0808_create_common_id(): add API doc, use new MI API ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/18966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I979bca0c6aaa8fe4feddda922bd2e6c1cb49585b Gerrit-Change-Number: 18966 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 10:36:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:36:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 10:36:18 +0000 Subject: Change in libosmocore[master]: fixup for gsm0808_create_common_id(): add API doc, use new MI API In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/18966 ) Change subject: fixup for gsm0808_create_common_id(): add API doc, use new MI API ...................................................................... fixup for gsm0808_create_common_id(): add API doc, use new MI API Follows patch I353adc1aa72377f7d4b3336d2ff47791fb73d62c that was merged too soon. Applying my code review in form of this fixup patch. Change-Id: I979bca0c6aaa8fe4feddda922bd2e6c1cb49585b --- M src/gsm/gsm0808.c 1 file changed, 17 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index e1db175..a1d567d 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -1235,14 +1235,19 @@ return msg; } +/*! Create BSSMAP COMMON ID message, 3GPP TS 48.008 3.2.1.68. + * \param[in] imsi IMSI digits (decimal string). + * \param[in] selected_plmn_id Selected PLMN ID to encode, or NULL to not encode this IE. + * \param[in] last_used_eutran_plnm_id Last used E-UTRAN PLMN ID to encode, or NULL to not encode this IE. + * \returns callee-allocated msgb with BSSMAP COMMON ID message, or NULL if encoding failed. */ struct msgb *gsm0808_create_common_id(const char *imsi, const struct osmo_plmn_id *selected_plmn_id, const struct osmo_plmn_id *last_used_eutran_plnm_id) { struct msgb *msg; - uint8_t mid_buf[GSM48_MI_SIZE + 2]; uint8_t *out; - int mid_len; + struct osmo_mobile_identity mi; + int rc; msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "COMMON-ID"); if (!msg) @@ -1252,8 +1257,16 @@ msgb_v_put(msg, BSS_MAP_MSG_COMMON_ID); /* mandatory IMSI 3.2.2.6 */ - mid_len = gsm48_generate_mid_from_imsi(mid_buf, imsi); - msgb_tlv_put(msg, GSM0808_IE_IMSI, mid_len - 2, mid_buf + 2); + mi = (struct osmo_mobile_identity){ .type = GSM_MI_TYPE_IMSI }; + OSMO_STRLCPY_ARRAY(mi.imsi, imsi); + out = msgb_tl_put(msg, GSM0808_IE_IMSI); + rc = osmo_mobile_identity_encode_msgb(msg, &mi, false); + if (rc < 0) { + msgb_free(msg); + return NULL; + } + /* write the MI value length */ + *out = rc; /* not implemented: SNA Access Information */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/18966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I979bca0c6aaa8fe4feddda922bd2e6c1cb49585b Gerrit-Change-Number: 18966 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:38:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 10:38:05 +0000 Subject: Change in osmo-e1d[master]: _e1_rx_hdlcfs: const-ify input buffer argument In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19230 ) Change subject: _e1_rx_hdlcfs: const-ify input buffer argument ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: If772487124e26bafea23b451536b3b556d4c088c Gerrit-Change-Number: 19230 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Tue, 14 Jul 2020 10:38:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:38:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 10:38:27 +0000 Subject: Change in osmo-e1d[master]: _e1_rx_hdlcfs: const-ify input buffer argument In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19230 ) Change subject: _e1_rx_hdlcfs: const-ify input buffer argument ...................................................................... _e1_rx_hdlcfs: const-ify input buffer argument Change-Id: If772487124e26bafea23b451536b3b556d4c088c --- M src/intf_line.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/intf_line.c b/src/intf_line.c index 4c9c404..e206f76 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -142,7 +142,7 @@ // --------------------------------------------------------------------------- static int -_e1_rx_hdlcfs(struct e1_ts *ts, uint8_t *buf, int len) +_e1_rx_hdlcfs(struct e1_ts *ts, const uint8_t *buf, int len) { int rv, cl, oi; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: If772487124e26bafea23b451536b3b556d4c088c Gerrit-Change-Number: 19230 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:41:56 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 10:41:56 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: add configuration with frequency hopping parameters In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19160 ) Change subject: ttcn3-bts-test: add configuration with frequency hopping parameters ...................................................................... Patch Set 3: > Patch Set 3: > > So what's the idea here, run all tests using this config? That means expanding jenkins.sh right? Yes, the plan is to run the existing test cases (or at least some of them) on hopping channels. As was discussed in DM, I would need to patch the junit file, so the results appear in a properly named group (e.g. 'BTS_Tests:hopping'). -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7822c3581fccba3277a63577e740e7486307635d Gerrit-Change-Number: 19160 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 10:41:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:43:56 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 10:43:56 +0000 Subject: Change in docker-playground[master]: make: use $(nproc) instead of hard-coded number of cores In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19232 ) Change subject: make: use $(nproc) instead of hard-coded number of cores ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie93b81a8a9206c47c4e4d4834fc5c03d9bf4254c Gerrit-Change-Number: 19232 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 10:43:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:44:00 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 10:44:00 +0000 Subject: Change in docker-playground[master]: make: use $(nproc) instead of hard-coded number of cores In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19232 ) Change subject: make: use $(nproc) instead of hard-coded number of cores ...................................................................... make: use $(nproc) instead of hard-coded number of cores Change-Id: Ie93b81a8a9206c47c4e4d4834fc5c03d9bf4254c --- M gr-gsm-master/Dockerfile M osmo-bsc-master/Dockerfile M osmo-bts-master/Dockerfile M osmo-gerrit-libosmo/Dockerfile M osmo-ggsn-master/Dockerfile M osmo-hlr-master/Dockerfile M osmo-hnbgw-master/Dockerfile M osmo-mgw-master/Dockerfile M osmo-msc-master/Dockerfile M osmo-nitb-master/Dockerfile M osmo-pcu-master/Dockerfile M osmo-remsim-master/Dockerfile M osmo-sgsn-master/Dockerfile M osmo-sip-master/Dockerfile M osmo-stp-master/Dockerfile M osmo-uecups-master/Dockerfile M osmocom-bb-host-master/Dockerfile 17 files changed, 29 insertions(+), 29 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved fixeria: Verified diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile index 03cf427..a756b88 100644 --- a/gr-gsm-master/Dockerfile +++ b/gr-gsm-master/Dockerfile @@ -57,7 +57,7 @@ --disable-doxygen \ --disable-pcsc \ --prefix=/usr \ - && make -j5 \ + && make "-j$(nproc)" \ && make install \ && make distclean @@ -74,7 +74,7 @@ -Wno-dev \ -DENABLE_GRCC=OFF \ ../ \ - && make -j5 \ + && make "-j$(nproc)" \ && make install \ && cd ../ \ && rm -rf build/ diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile index 57b4b04..6cfaebd 100644 --- a/osmo-bsc-master/Dockerfile +++ b/osmo-bsc-master/Dockerfile @@ -61,7 +61,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ - make -j8 install + make "-j$(nproc)" install VOLUME /data diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile index 98b0bb0..6e208c6 100644 --- a/osmo-bts-master/Dockerfile +++ b/osmo-bts-master/Dockerfile @@ -62,7 +62,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure --enable-trx && \ - make -j8 install + make "-j$(nproc)" install VOLUME /data diff --git a/osmo-gerrit-libosmo/Dockerfile b/osmo-gerrit-libosmo/Dockerfile index 5442703..1b98c9f 100644 --- a/osmo-gerrit-libosmo/Dockerfile +++ b/osmo-gerrit-libosmo/Dockerfile @@ -48,7 +48,7 @@ git fetch && git checkout -f -B master origin/master && \ autoreconf -fi && \ ./configure && \ - make -j8 && \ + make "-j$(nproc)" && \ sudo make install && \ make clean && \ sudo ldconfig @@ -59,7 +59,7 @@ git fetch && git checkout -f -B master origin/master && \ autoreconf -fi && \ ./configure && \ - make -j1 && \ + make "-j$(nproc)" && \ sudo make install && \ make clean && \ sudo ldconfig @@ -70,7 +70,7 @@ git fetch && git checkout -f -B master origin/master && \ autoreconf -fi && \ ./configure && \ - make -j8 && \ + make "-j$(nproc)" && \ sudo make install && \ make clean && \ sudo ldconfig @@ -82,7 +82,7 @@ git fetch && git checkout -f -B master origin/master && \ autoreconf -fi && \ ./configure && \ - make -j8 && \ + make "-j$(nproc)" && \ sudo make install && \ make clean && \ sudo ldconfig @@ -92,7 +92,7 @@ git fetch && git checkout -f -B master origin/master && \ autoreconf -fi && \ ./configure && \ - make -j8 && \ + make "-j$(nproc)" && \ sudo make install && \ make clean && \ sudo ldconfig @@ -102,7 +102,7 @@ git fetch && git checkout -f -B master origin/master && \ autoreconf -fi && \ ./configure && \ - make -j8 && \ + make "-j$(nproc)" && \ sudo make install && \ make clean && \ sudo ldconfig @@ -112,7 +112,7 @@ git fetch && git checkout -f -B master origin/master && \ autoreconf -fi && \ ./configure && \ - make -j8 && \ + make "-j$(nproc)" && \ sudo make install && \ make clean && \ sudo ldconfig @@ -122,7 +122,7 @@ git fetch && git checkout -f -B master origin/master && \ autoreconf -fi && \ ./configure && \ - make -j8 && \ + make "-j$(nproc)" && \ sudo make install && \ make clean && \ sudo ldconfig @@ -132,11 +132,11 @@ git fetch && git checkout -f -B master origin/master && \ autoreconf -fi && \ ./configure && \ - make -j8 && \ + make "-j$(nproc)" && \ sudo make install && \ make clean && \ sudo ldconfig # example command which builds a single osmo-* application at 'docker run' time in tmpfs -CMD /bin/sh -c 'cd /tmpfs && git clone --reference /build/openbsc git://git.osmocom.org/openbsc.git && cd openbsc && git checkout -f -B master origin/master && cd openbsc && autoreconf -fi && ./configure --enable-nat --enable-osmo-bsc --enable-smpp --enable-vty-tests --enable-external-tests && make -j8 check' +CMD /bin/sh -c 'cd /tmpfs && git clone --reference /build/openbsc git://git.osmocom.org/openbsc.git && cd openbsc && git checkout -f -B master origin/master && cd openbsc && autoreconf -fi && ./configure --enable-nat --enable-osmo-bsc --enable-smpp --enable-vty-tests --enable-external-tests && make "-j$(nproc)" check' diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile index 81444d8..17ea3c9 100644 --- a/osmo-ggsn-master/Dockerfile +++ b/osmo-ggsn-master/Dockerfile @@ -50,7 +50,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ - make -j8 install && \ + make "-j$(nproc)" install && \ ldconfig VOLUME /data diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile index d4727cc..1595c11 100644 --- a/osmo-hlr-master/Dockerfile +++ b/osmo-hlr-master/Dockerfile @@ -56,7 +56,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ - make -j8 install && \ + make "-j$(nproc)" install && \ ldconfig VOLUME /data diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile index 951b95b..215b562 100644 --- a/osmo-hnbgw-master/Dockerfile +++ b/osmo-hnbgw-master/Dockerfile @@ -35,7 +35,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ - make -j8 install && \ + make "-j$(nproc)" install && \ ldconfig VOLUME /data diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile index 773c2a5..c07697e 100644 --- a/osmo-mgw-master/Dockerfile +++ b/osmo-mgw-master/Dockerfile @@ -56,7 +56,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ - make -j8 install && \ + make "-j$(nproc)" install && \ ldconfig VOLUME /data diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile index 366e77c..15b59f0 100644 --- a/osmo-msc-master/Dockerfile +++ b/osmo-msc-master/Dockerfile @@ -70,7 +70,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure --enable-smpp --enable-iu && \ - make -j8 install + make "-j$(nproc)" install VOLUME /data diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile index 0dad7fa..cd463fe 100644 --- a/osmo-nitb-master/Dockerfile +++ b/osmo-nitb-master/Dockerfile @@ -36,7 +36,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure --enable-nat --enable-osmo-bsc --enable-smpp && \ - make -j8 install && \ + make "-j$(nproc)" install && \ ldconfig VOLUME /data diff --git a/osmo-pcu-master/Dockerfile b/osmo-pcu-master/Dockerfile index e8ce5d8..8306837 100644 --- a/osmo-pcu-master/Dockerfile +++ b/osmo-pcu-master/Dockerfile @@ -52,7 +52,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ - make -j8 install + make "-j$(nproc)" install VOLUME /data diff --git a/osmo-remsim-master/Dockerfile b/osmo-remsim-master/Dockerfile index bed7f47..2653ac2 100644 --- a/osmo-remsim-master/Dockerfile +++ b/osmo-remsim-master/Dockerfile @@ -28,7 +28,7 @@ # build virtualsmartcard RUN git clone https://github.com/frankmorgner/vsmartcard.git -RUN cd vsmartcard/virtualsmartcard && autoreconf -fi && ./configure && make -j8 install +RUN cd vsmartcard/virtualsmartcard && autoreconf -fi && ./configure && make "-j$(nproc)" install ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" @@ -91,7 +91,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ - make -j8 install && \ + make "-j$(nproc)" install && \ ldconfig VOLUME /data diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile index 1121712..d3b2518 100644 --- a/osmo-sgsn-master/Dockerfile +++ b/osmo-sgsn-master/Dockerfile @@ -68,7 +68,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure --enable-iu && \ - make -j8 install && \ + make "-j$(nproc)" install && \ ldconfig VOLUME /data diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile index b15a2c9..1f40ff0 100644 --- a/osmo-sip-master/Dockerfile +++ b/osmo-sip-master/Dockerfile @@ -60,7 +60,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure --enable-smpp --enable-iu && \ - make -j8 install + make "-j$(nproc)" install VOLUME /data diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile index 6396b32..26ec494 100644 --- a/osmo-stp-master/Dockerfile +++ b/osmo-stp-master/Dockerfile @@ -50,7 +50,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ - make -j8 install && \ + make "-j$(nproc)" install && \ install examples/.libs/sccp_demo_user /usr/local/bin/ && \ ldconfig diff --git a/osmo-uecups-master/Dockerfile b/osmo-uecups-master/Dockerfile index 9684d08..777797f 100644 --- a/osmo-uecups-master/Dockerfile +++ b/osmo-uecups-master/Dockerfile @@ -35,7 +35,7 @@ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ - make -j8 install + make "-j$(nproc)" install VOLUME /data diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile index 1d79f06..4a41085 100644 --- a/osmocom-bb-host-master/Dockerfile +++ b/osmocom-bb-host-master/Dockerfile @@ -33,12 +33,12 @@ RUN cd osmocom-bb/src/host/trxcon && \ autoreconf -fi && \ ./configure && \ - make -j8 install + make "-j$(nproc)" install RUN cd osmocom-bb/src/host/virt_phy && \ autoreconf -fi && \ ./configure && \ - make -j8 install + make "-j$(nproc)" install RUN mkdir -p /data/unix -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie93b81a8a9206c47c4e4d4834fc5c03d9bf4254c Gerrit-Change-Number: 19232 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:52:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 10:52:34 +0000 Subject: Change in osmo-bsc[master]: bsc_main: Improve log line on Lost E1 link References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19247 ) Change subject: bsc_main: Improve log line on Lost E1 link ...................................................................... bsc_main: Improve log line on Lost E1 link Change-Id: Ia9f8d14d547b2443713fc406ac5c1005351f8cce --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/47/19247/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index dbd9701..4f9bc18 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -386,7 +386,7 @@ bootstrap_rsl(trx); break; case S_L_INP_TEI_DN: - LOGP(DLMI, LOGL_ERROR, "Lost some E1 TEI link: %d %p\n", isd->link_type, trx); + LOG_TRX(trx, DLMI, LOGL_ERROR, "Lost E1 %s link\n", e1inp_signtype_name(isd->link_type)); if (isd->link_type == E1INP_SIGN_OML) { rate_ctr_inc(&trx->bts->bts_ctrs->ctr[BTS_CTR_BTS_OML_FAIL]); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia9f8d14d547b2443713fc406ac5c1005351f8cce Gerrit-Change-Number: 19247 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:54:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 10:54:03 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/transceiver.py: implement the transmit burst queue In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19228 ) Change subject: trx_toolkit/transceiver.py: implement the transmit burst queue ...................................................................... Patch Set 3: Code-Review+2 Let's merge now, but to avoid possible ordering issues I think it makes sense to move it to an ordered list in the future. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie66ef9667dc8d156ad578ce324941a816c07c105 Gerrit-Change-Number: 19228 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 10:54:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 10:55:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 10:55:04 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: add configuration with frequency hopping parameters In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19160 ) Change subject: ttcn3-bts-test: add configuration with frequency hopping parameters ...................................................................... Patch Set 3: So what we suggested requires extra steps for this patch. Waiting to see them applied before merging. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7822c3581fccba3277a63577e740e7486307635d Gerrit-Change-Number: 19160 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 10:55:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 11:02:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 11:02:06 +0000 Subject: Change in osmo-bsc[master]: bsc_main: Use LOG_TRX in log line References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19248 ) Change subject: bsc_main: Use LOG_TRX in log line ...................................................................... bsc_main: Use LOG_TRX in log line Change-Id: I88b5f572cb2bae8ffa551789e2c344ec2ebb7e7b --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/48/19248/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 4f9bc18..ada6047 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -291,10 +291,9 @@ { unsigned int i; - LOGP(DRSL, LOGL_NOTICE, "bootstrapping RSL for BTS/TRX (%u/%u) " + LOG_TRX(trx, DRSL, LOGL_NOTICE, "bootstrapping RSL " "on ARFCN %u using MCC-MNC %s LAC=%u CID=%u BSIC=%u\n", - trx->bts->nr, trx->nr, trx->arfcn, - osmo_plmn_name(&bsc_gsmnet->plmn), + trx->arfcn, osmo_plmn_name(&bsc_gsmnet->plmn), trx->bts->location_area_code, trx->bts->cell_identity, trx->bts->bsic); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I88b5f572cb2bae8ffa551789e2c344ec2ebb7e7b Gerrit-Change-Number: 19248 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Jul 14 11:03:16 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 14 Jul 2020 11:03:16 +0000 Subject: Build failure of network:osmocom:latest/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0d9122bd994_32942b26effd85f441134a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/open5gs/Debian_Unstable/x86_64 Package network:osmocom:latest/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest open5gs Last lines of build log: [ 155s] dh_auto_configure -O--buildsystem=meson [ 155s] install -d obj-x86_64-linux-gnu [ 155s] cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu [ 155s] Traceback (most recent call last): [ 155s] File "/usr/bin/meson", line 17, in [ 155s] from mesonbuild import mesonmain [ 155s] File "/usr/lib/python3/dist-packages/mesonbuild/mesonmain.py", line 25, in [ 155s] from . import mconf, mdist, minit, minstall, mintro, msetup, mtest, rewriter, msubprojects, munstable_coredata, mcompile [ 155s] File "/usr/lib/python3/dist-packages/mesonbuild/mconf.py", line 16, in [ 155s] from . import coredata, environment, mesonlib, build, mintro, mlog [ 155s] File "/usr/lib/python3/dist-packages/mesonbuild/build.py", line 26, in [ 155s] from . import dependencies [ 155s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/__init__.py", line 15, in [ 155s] from .boost import BoostDependency [ 155s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/boost.py", line 25, in [ 155s] from .base import DependencyException, ExternalDependency, PkgConfigDependency [ 155s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/base.py", line 32, in [ 155s] import pkg_resources [ 155s] ModuleNotFoundError: No module named 'pkg_resources' [ 155s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 155s] make: *** [debian/rules:11: binary] Error 2 [ 155s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 155s] ### VM INTERACTION START ### [ 158s] [ 145.288716] sysrq: SysRq : Power Off [ 158s] [ 145.315226] reboot: Power down [ 158s] ### VM INTERACTION END ### [ 158s] [ 158s] lamb17 failed "build open5gs_1.3.0~eoan1.dsc" at Tue Jul 14 11:03:03 UTC 2020. [ 158s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jul 14 11:03:16 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 14 Jul 2020 11:03:16 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0d91237f0d1_32942b26effd85f44114c8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 149s] dh_auto_configure -O--buildsystem=meson [ 150s] install -d obj-x86_64-linux-gnu [ 150s] cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu [ 150s] Traceback (most recent call last): [ 150s] File "/usr/bin/meson", line 17, in [ 150s] from mesonbuild import mesonmain [ 150s] File "/usr/lib/python3/dist-packages/mesonbuild/mesonmain.py", line 25, in [ 150s] from . import mconf, mdist, minit, minstall, mintro, msetup, mtest, rewriter, msubprojects, munstable_coredata, mcompile [ 150s] File "/usr/lib/python3/dist-packages/mesonbuild/mconf.py", line 16, in [ 150s] from . import coredata, environment, mesonlib, build, mintro, mlog [ 150s] File "/usr/lib/python3/dist-packages/mesonbuild/build.py", line 26, in [ 150s] from . import dependencies [ 150s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/__init__.py", line 15, in [ 150s] from .boost import BoostDependency [ 150s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/boost.py", line 25, in [ 150s] from .base import DependencyException, ExternalDependency, PkgConfigDependency [ 150s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/base.py", line 32, in [ 150s] import pkg_resources [ 150s] ModuleNotFoundError: No module named 'pkg_resources' [ 150s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 150s] make: *** [debian/rules:11: binary] Error 2 [ 150s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 150s] ### VM INTERACTION START ### [ 153s] [ 126.015477] sysrq: SysRq : Power Off [ 153s] [ 126.028754] reboot: Power down [ 153s] ### VM INTERACTION END ### [ 153s] [ 153s] cloud114 failed "build open5gs_1.3.0~eoan1.20200714.dsc" at Tue Jul 14 11:03:12 UTC 2020. [ 153s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Jul 14 11:04:26 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 11:04:26 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: add configuration with frequency hopping parameters In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19160 ) Change subject: ttcn3-bts-test: add configuration with frequency hopping parameters ...................................................................... Patch Set 3: > Patch Set 3: > > So what we suggested requires extra steps for this patch. Waiting to see them applied before merging. Well, this change does what the commit message states - adding configuration files. I don't want to enable the new test cases given that some patches are still on review, and osmo-bsc would not even start with this osmo-bsc.cfg (it has hard-coded set of features, and osmo-bts lacks freq. hopping support in that set). -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7822c3581fccba3277a63577e740e7486307635d Gerrit-Change-Number: 19160 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 11:04:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 11:07:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 11:07:24 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: add configuration with frequency hopping parameters In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19160 ) Change subject: ttcn3-bts-test: add configuration with frequency hopping parameters ...................................................................... Patch Set 3: So what's the point in adding them if they are not used? That's why I'm simply saying to wait until everything required is merged and then the patch is updated to contain the required bits to run the test. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7822c3581fccba3277a63577e740e7486307635d Gerrit-Change-Number: 19160 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 11:07:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 11:11:32 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 11:11:32 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: add configuration with frequency hopping parameters In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19160 ) Change subject: ttcn3-bts-test: add configuration with frequency hopping parameters ...................................................................... Patch Set 3: > Patch Set 3: > > So what's the point in adding them if they are not used? That's why I'm simply saying to wait until everything required is merged and then the patch is updated to contain the required bits to run the test. Because I don't want to mix up changes, so I am not going to amend this patch. These configuration files will be used soon. I'll submit a separate change enabling them as soon as everything is ready. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7822c3581fccba3277a63577e740e7486307635d Gerrit-Change-Number: 19160 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 11:11:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 11:20:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 11:20:46 +0000 Subject: Change in osmo-e1d[master]: introduce concept of superchannel to data structures + CTL In-Reply-To: References: Message-ID: Hello tnt, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/19229 to look at the new patch set (#3). Change subject: introduce concept of superchannel to data structures + CTL ...................................................................... introduce concept of superchannel to data structures + CTL We treat the superchannel as an extra, separate timeslot. Initially I thought of simply re-using TS1, but keeping the superchannel separate ensures that it doesn't inherit any state (like half-sent HDLC frames) from another timeslot when we switch between the modes at runtime. Change-Id: I0aacf251e155de2bb6ad03ffc4181067b22f1c90 --- M include/osmocom/e1d/proto.h M src/ctl.c M src/e1d.h M src/intf_line.c 4 files changed, 32 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/29/19229/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I0aacf251e155de2bb6ad03ffc4181067b22f1c90 Gerrit-Change-Number: 19229 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 11:20:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 11:20:46 +0000 Subject: Change in osmo-e1d[master]: actually implement the superchannel mode In-Reply-To: References: Message-ID: Hello tnt, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/19231 to look at the new patch set (#3). Change subject: actually implement the superchannel mode ...................................................................... actually implement the superchannel mode In superchannel mode, all 31 TS are grouped together. Change-Id: Id340b1925471f427deb6cda7eb54e80dfc71faec --- M src/intf_line.c 1 file changed, 161 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/31/19231/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id340b1925471f427deb6cda7eb54e80dfc71faec Gerrit-Change-Number: 19231 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 11:20:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 11:20:47 +0000 Subject: Change in osmo-e1d[master]: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19249 ) Change subject: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel ...................................................................... Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel Change-Id: I765b5c3bc9e07b2353f8647e8260ff95df3727e6 --- M include/osmocom/e1d/proto.h M include/osmocom/e1d/proto_clnt.h M src/ctl.c M src/proto.c M src/proto_clnt.c 5 files changed, 120 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/49/19249/1 diff --git a/include/osmocom/e1d/proto.h b/include/osmocom/e1d/proto.h index 6711332..d8bce1f 100644 --- a/include/osmocom/e1d/proto.h +++ b/include/osmocom/e1d/proto.h @@ -2,6 +2,7 @@ * proto.h * * (C) 2019 by Sylvain Munaut + * (C) 2020 by Harald Welte * * All Rights Reserved * @@ -44,6 +45,11 @@ * in: n/a * out: array of osmo_e1dp_ts_info * + * E1DP_CMD_LINE_CONFIG + * filter: intf (required), line (required) + * in: osmo_e1dp_line_config + * out: osmo_e1dp_line_info + * * E1DP_CMD_TS_OPEN * filter: intf (required), line (required), ts (required) * in: osmo_e1dp_ts_config @@ -55,6 +61,7 @@ E1DP_CMD_INTF_QUERY = 0x00, E1DP_CMD_LINE_QUERY = 0x01, E1DP_CMD_TS_QUERY = 0x02, + E1DP_CMD_LINE_CONFIG = 0x03, E1DP_CMD_TS_OPEN = 0x04, E1DP_EVT_TYPE = 0x40, E1DP_RESP_TYPE = 0x80, @@ -62,6 +69,12 @@ E1DP_TYPE_MSK = 0xc0, }; +enum osmo_e1dp_line_mode { + E1DP_LMODE_OFF = 0x00, + E1DP_LMODE_CHANNELIZED = 0x20, + E1DP_LMODE_SUPERCHANNEL = 0x21, +}; + enum osmo_e1dp_ts_mode { E1DP_TSMODE_OFF = 0x00, E1DP_TSMODE_RAW = 0x10, @@ -91,8 +104,13 @@ uint8_t n_lines; } __attribute__((packed)); +struct osmo_e1dp_line_config { + uint8_t mode; +} __attribute__((packed)); + struct osmo_e1dp_line_info { uint8_t id; + struct osmo_e1dp_line_config cfg; uint8_t status; /* TBD */ } __attribute__((packed)); @@ -111,4 +129,5 @@ int osmo_e1dp_send(struct osmo_fd *ofd, struct msgb *msgb, int fd); extern const struct value_string osmo_e1dp_msg_type_names[]; +extern const struct value_string osmo_e1dp_line_mode_names[]; extern const struct value_string osmo_e1dp_ts_mode_names[]; diff --git a/include/osmocom/e1d/proto_clnt.h b/include/osmocom/e1d/proto_clnt.h index 0914de7..ff2cebf 100644 --- a/include/osmocom/e1d/proto_clnt.h +++ b/include/osmocom/e1d/proto_clnt.h @@ -41,6 +41,8 @@ int osmo_e1dp_client_ts_query(struct osmo_e1dp_client *clnt, struct osmo_e1dp_ts_info **ti, int *n, uint8_t intf, uint8_t line, uint8_t ts); +int osmo_e1dp_client_line_config(struct osmo_e1dp_client *clnt, + uint8_t intf, uint8_t line, enum osmo_e1dp_line_mode mode); int osmo_e1dp_client_ts_open(struct osmo_e1dp_client *clnt, uint8_t intf, uint8_t line, uint8_t ts, enum osmo_e1dp_ts_mode mode); diff --git a/src/ctl.c b/src/ctl.c index 5322ab4..96b41ce 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -2,6 +2,7 @@ * ctl.c * * (C) 2019 by Sylvain Munaut + * (C) 2020 by Harald Welte * * All Rights Reserved * @@ -87,6 +88,16 @@ _e1d_fill_line_info(struct osmo_e1dp_line_info *li, struct e1_line *line) { li->id = line->id; + switch (line->mode) { + case E1_LINE_MODE_CHANNELIZED: + li->cfg.mode = E1DP_LMODE_CHANNELIZED; + break; + case E1_LINE_MODE_SUPERCHANNEL: + li->cfg.mode = E1DP_LMODE_SUPERCHANNEL; + break; + default: + OSMO_ASSERT(0); + } li->status = 0x00; } @@ -273,6 +284,52 @@ } static int +_e1d_ctl_line_config(void *data, struct msgb *msgb, struct msgb *rmsgb, int *rfd) +{ + struct e1_daemon *e1d = (struct e1_daemon *)data; + struct osmo_e1dp_msg_hdr *hdr = msgb_l1(msgb); + struct osmo_e1dp_line_config *cfg = msgb_l2(msgb); + struct osmo_e1dp_line_info *info; + struct e1_intf *intf = NULL; + struct e1_line *line = NULL; + + /* Process query and find timeslot */ + intf = e1d_find_intf(e1d, hdr->intf); + if (!intf) + return 0; + + line = e1_intf_find_line(intf, hdr->line); + if (!line) + return 0; + + /* Select mode */ + switch (cfg->mode) { + case E1DP_LMODE_CHANNELIZED: + line->mode = E1_TS_MODE_RAW; + break; + case E1DP_LMODE_SUPERCHANNEL: + line->mode = E1_TS_MODE_HDLCFCS; + break; + default: + return 0; + } + + /* Allocate response */ + rmsgb->l2h = msgb_put(rmsgb, sizeof(struct osmo_e1dp_line_info)); + info = msgb_l2(rmsgb); + + memset(info, 0x00, sizeof(struct osmo_e1dp_line_info)); + + /* Fill reponse */ + _e1d_fill_line_info(info, line); + /* FIXME: why that A5 below? */ + info->status = 0xa5; + + return 0; +} + + +static int _e1d_ctl_ts_open(void *data, struct msgb *msgb, struct msgb *rmsgb, int *rfd) { struct e1_daemon *e1d = (struct e1_daemon *)data; @@ -355,6 +412,12 @@ .fn = _e1d_ctl_ts_query, }, { + .type = E1DP_CMD_LINE_CONFIG, + .flags = E1DP_SF_INTF_REQ | E1DP_SF_LINE_REQ, + .payload_len = sizeof(struct osmo_e1dp_line_config), + .fn = _e1d_ctl_line_config, + }, + { .type = E1DP_CMD_TS_OPEN, .flags = E1DP_SF_INTF_REQ | E1DP_SF_LINE_REQ | E1DP_SF_TS_REQ, .payload_len = sizeof(struct osmo_e1dp_ts_config), diff --git a/src/proto.c b/src/proto.c index 85f5115..479175a 100644 --- a/src/proto.c +++ b/src/proto.c @@ -46,6 +46,12 @@ { E1DP_ERR_TYPE, "ERR_TYPE" }, { 0, NULL } }; +const struct value_string osmo_e1dp_line_mode_names[] = { + { E1DP_LMODE_OFF, "OFF" }, + { E1DP_LMODE_CHANNELIZED, "CHANNELIZED" }, + { E1DP_LMODE_SUPERCHANNEL, "SUPERCHANNEL" }, + { 0, NULL } +}; const struct value_string osmo_e1dp_ts_mode_names[] = { { E1DP_TSMODE_OFF, "OFF" }, { E1DP_TSMODE_RAW, "RAW" }, diff --git a/src/proto_clnt.c b/src/proto_clnt.c index 7c6df27..ffac31f 100644 --- a/src/proto_clnt.c +++ b/src/proto_clnt.c @@ -2,6 +2,7 @@ * proto_clnt.c * * (C) 2019 by Sylvain Munaut + * (C) 2020 by Harald Welte * * All Rights Reserved * @@ -285,6 +286,35 @@ } int +osmo_e1dp_client_line_config(struct osmo_e1dp_client *clnt, + uint8_t intf, uint8_t line, enum osmo_e1dp_line_mode mode) +{ + struct msgb *msgb; + struct osmo_e1dp_msg_hdr hdr; + struct osmo_e1dp_line_config cfg; + int rc; + + memset(&hdr, 0x00, sizeof(struct osmo_e1dp_msg_hdr)); + hdr.type = E1DP_CMD_LINE_CONFIG; + hdr.intf = intf; + hdr.line = line; + + memset(&cfg, 0x00, sizeof(struct osmo_e1dp_line_config)); + cfg.mode = mode; + + rc = _e1dp_client_query_base(clnt, &hdr, &cfg, sizeof(struct osmo_e1dp_line_config), &msgb, NULL); + if (rc) + return rc; + + if (msgb_l2len(msgb) != sizeof(struct osmo_e1dp_line_info)) + return -EPIPE; + + msgb_free(msgb); + + return 0; +} + +int osmo_e1dp_client_ts_open(struct osmo_e1dp_client *clnt, uint8_t intf, uint8_t line, uint8_t ts, enum osmo_e1dp_ts_mode mode) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I765b5c3bc9e07b2353f8647e8260ff95df3727e6 Gerrit-Change-Number: 19249 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 11:23:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 11:23:15 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Fix log formatting of RESP_ID IPA attributes References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19250 ) Change subject: ipaccess: Fix log formatting of RESP_ID IPA attributes ...................................................................... ipaccess: Fix log formatting of RESP_ID IPA attributes Change-Id: Id5b4c39737a43c9ba68f3aacc889c10eba697920 --- M src/input/ipaccess.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/50/19250/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 28191b7..917a195 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -219,10 +219,10 @@ switch (msg_type) { case IPAC_MSGT_ID_RESP: - DEBUGP(DLMI, "ID_RESP\n"); + DEBUGP(DLMI, "ID_RESP "); /* parse tags, search for Unit ID */ ret = ipa_ccm_id_resp_parse(&tlvp, (const uint8_t *)msg->l2h+1, msgb_l2len(msg)-1); - DEBUGP(DLMI, "\n"); + DEBUGPC(DLMI, "\n"); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "IPA response message " "with malformed TLVs\n"); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Id5b4c39737a43c9ba68f3aacc889c10eba697920 Gerrit-Change-Number: 19250 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 11:24:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 11:24:41 +0000 Subject: Change in osmo-e1d[master]: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-e1d/+/19249 ) Change subject: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel ...................................................................... Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel Change-Id: I765b5c3bc9e07b2353f8647e8260ff95df3727e6 --- M include/osmocom/e1d/proto.h M include/osmocom/e1d/proto_clnt.h M src/ctl.c M src/proto.c M src/proto_clnt.c 5 files changed, 118 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/49/19249/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I765b5c3bc9e07b2353f8647e8260ff95df3727e6 Gerrit-Change-Number: 19249 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 11:25:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 11:25:27 +0000 Subject: Change in osmo-bsc[master]: bsc_main: Use LOG_TRX in log line In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19248 ) Change subject: bsc_main: Use LOG_TRX in log line ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I88b5f572cb2bae8ffa551789e2c344ec2ebb7e7b Gerrit-Change-Number: 19248 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 14 Jul 2020 11:25:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 11:25:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 11:25:43 +0000 Subject: Change in osmo-bsc[master]: bsc_main: Improve log line on Lost E1 link In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19247 ) Change subject: bsc_main: Improve log line on Lost E1 link ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia9f8d14d547b2443713fc406ac5c1005351f8cce Gerrit-Change-Number: 19247 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 14 Jul 2020 11:25:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 11:25:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 11:25:46 +0000 Subject: Change in osmo-bsc[master]: bsc_main: Improve log line on Lost E1 link In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19247 ) Change subject: bsc_main: Improve log line on Lost E1 link ...................................................................... bsc_main: Improve log line on Lost E1 link Change-Id: Ia9f8d14d547b2443713fc406ac5c1005351f8cce --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index dbd9701..4f9bc18 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -386,7 +386,7 @@ bootstrap_rsl(trx); break; case S_L_INP_TEI_DN: - LOGP(DLMI, LOGL_ERROR, "Lost some E1 TEI link: %d %p\n", isd->link_type, trx); + LOG_TRX(trx, DLMI, LOGL_ERROR, "Lost E1 %s link\n", e1inp_signtype_name(isd->link_type)); if (isd->link_type == E1INP_SIGN_OML) { rate_ctr_inc(&trx->bts->bts_ctrs->ctr[BTS_CTR_BTS_OML_FAIL]); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia9f8d14d547b2443713fc406ac5c1005351f8cce Gerrit-Change-Number: 19247 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 11:25:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 11:25:47 +0000 Subject: Change in osmo-bsc[master]: bsc_main: Use LOG_TRX in log line In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19248 ) Change subject: bsc_main: Use LOG_TRX in log line ...................................................................... bsc_main: Use LOG_TRX in log line Change-Id: I88b5f572cb2bae8ffa551789e2c344ec2ebb7e7b --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 4f9bc18..ada6047 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -291,10 +291,9 @@ { unsigned int i; - LOGP(DRSL, LOGL_NOTICE, "bootstrapping RSL for BTS/TRX (%u/%u) " + LOG_TRX(trx, DRSL, LOGL_NOTICE, "bootstrapping RSL " "on ARFCN %u using MCC-MNC %s LAC=%u CID=%u BSIC=%u\n", - trx->bts->nr, trx->nr, trx->arfcn, - osmo_plmn_name(&bsc_gsmnet->plmn), + trx->arfcn, osmo_plmn_name(&bsc_gsmnet->plmn), trx->bts->location_area_code, trx->bts->cell_identity, trx->bts->bsic); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I88b5f572cb2bae8ffa551789e2c344ec2ebb7e7b Gerrit-Change-Number: 19248 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 11:26:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 11:26:19 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Fix log formatting of RESP_ID IPA attributes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19250 ) Change subject: ipaccess: Fix log formatting of RESP_ID IPA attributes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Id5b4c39737a43c9ba68f3aacc889c10eba697920 Gerrit-Change-Number: 19250 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 14 Jul 2020 11:26:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 12:06:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 12:06:03 +0000 Subject: Change in osmo-bsc[master]: ipaccess_sign_link_up: Log sign_link type References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19251 ) Change subject: ipaccess_sign_link_up: Log sign_link type ...................................................................... ipaccess_sign_link_up: Log sign_link type Change-Id: If16d6feae56785a2c60b605227c0602f80b6f407 --- M src/osmo-bsc/bts_ipaccess_nanobts.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/51/19251/1 diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index f004c15..b21678b 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -533,7 +533,7 @@ ipaccess_sign_link_reject(dev, &line->ts[E1INP_SIGN_OML - 1]); return NULL; } - DEBUGP(DLINP, "Identified BTS %u/%u/%u\n", + DEBUGP(DLINP, "%s: Identified BTS %u/%u/%u\n", e1inp_signtype_name(type), dev->site_id, dev->bts_id, dev->trx_id); switch(type) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If16d6feae56785a2c60b605227c0602f80b6f407 Gerrit-Change-Number: 19251 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 12:17:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 12:17:19 +0000 Subject: Change in osmo-e1d[master]: introduce concept of superchannel to data structures + CTL In-Reply-To: References: Message-ID: Hello tnt, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/19229 to look at the new patch set (#4). Change subject: introduce concept of superchannel to data structures + CTL ...................................................................... introduce concept of superchannel to data structures + CTL We treat the superchannel as an extra, separate timeslot. Initially I thought of simply re-using TS1, but keeping the superchannel separate ensures that it doesn't inherit any state (like half-sent HDLC frames) from another timeslot when we switch between the modes at runtime. Change-Id: I0aacf251e155de2bb6ad03ffc4181067b22f1c90 --- M include/osmocom/e1d/proto.h M src/ctl.c M src/e1d.h M src/intf_line.c 4 files changed, 33 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/29/19229/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I0aacf251e155de2bb6ad03ffc4181067b22f1c90 Gerrit-Change-Number: 19229 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 12:17:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 12:17:19 +0000 Subject: Change in osmo-e1d[master]: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/19249 to look at the new patch set (#3). Change subject: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel ...................................................................... Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel Change-Id: I765b5c3bc9e07b2353f8647e8260ff95df3727e6 --- M include/osmocom/e1d/proto.h M include/osmocom/e1d/proto_clnt.h M src/ctl.c M src/proto.c M src/proto_clnt.c 5 files changed, 118 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/49/19249/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I765b5c3bc9e07b2353f8647e8260ff95df3727e6 Gerrit-Change-Number: 19249 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 12:23:34 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Tue, 14 Jul 2020 12:23:34 +0000 Subject: Change in osmo-e1d[master]: introduce concept of superchannel to data structures + CTL In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19229 ) Change subject: introduce concept of superchannel to data structures + CTL ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I0aacf251e155de2bb6ad03ffc4181067b22f1c90 Gerrit-Change-Number: 19229 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Tue, 14 Jul 2020 12:23:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 12:29:39 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Tue, 14 Jul 2020 12:29:39 +0000 Subject: Change in osmo-e1d[master]: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19249 ) Change subject: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-e1d/+/19249/3/src/ctl.c File src/ctl.c: https://gerrit.osmocom.org/c/osmo-e1d/+/19249/3/src/ctl.c at 315 PS3, Line 315: } Should this also force close all open TS in case of mode change ? Also, ts_open might need to validate the current mode line to allow/disallow opening TS. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I765b5c3bc9e07b2353f8647e8260ff95df3727e6 Gerrit-Change-Number: 19249 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: tnt Gerrit-Comment-Date: Tue, 14 Jul 2020 12:29:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 12:41:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 12:41:19 +0000 Subject: Change in osmo-e1d[master]: introduce concept of superchannel to data structures In-Reply-To: References: Message-ID: Hello tnt, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/19229 to look at the new patch set (#5). Change subject: introduce concept of superchannel to data structures ...................................................................... introduce concept of superchannel to data structures We treat the superchannel as an extra, separate timeslot. Initially I thought of simply re-using TS1, but keeping the superchannel separate ensures that it doesn't inherit any state (like half-sent HDLC frames) from another timeslot when we switch between the modes at runtime. Change-Id: I0aacf251e155de2bb6ad03ffc4181067b22f1c90 --- M include/osmocom/e1d/proto.h M src/ctl.c M src/e1d.h M src/intf_line.c 4 files changed, 33 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/29/19229/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I0aacf251e155de2bb6ad03ffc4181067b22f1c90 Gerrit-Change-Number: 19229 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 12:41:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 12:41:19 +0000 Subject: Change in osmo-e1d[master]: actually implement the superchannel mode In-Reply-To: References: Message-ID: Hello tnt, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/19231 to look at the new patch set (#5). Change subject: actually implement the superchannel mode ...................................................................... actually implement the superchannel mode In superchannel mode, all 31 TS are grouped together. There is no way to enable it yet, see next patch. Change-Id: Id340b1925471f427deb6cda7eb54e80dfc71faec --- M src/e1d.h M src/intf_line.c M src/vty.c 3 files changed, 172 insertions(+), 59 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/31/19231/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id340b1925471f427deb6cda7eb54e80dfc71faec Gerrit-Change-Number: 19231 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 12:41:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 12:41:19 +0000 Subject: Change in osmo-e1d[master]: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/19249 to look at the new patch set (#4). Change subject: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel ...................................................................... Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel This adds the related code to the server and client side of the CTL interface to switch a line between CHANNELIZED and SUPERCHANNEL. Change-Id: I765b5c3bc9e07b2353f8647e8260ff95df3727e6 --- M include/osmocom/e1d/proto.h M include/osmocom/e1d/proto_clnt.h M src/ctl.c M src/proto.c M src/proto_clnt.c 5 files changed, 122 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/49/19249/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I765b5c3bc9e07b2353f8647e8260ff95df3727e6 Gerrit-Change-Number: 19249 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 12:43:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 12:43:05 +0000 Subject: Change in osmo-e1d[master]: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19249 ) Change subject: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-e1d/+/19249/3/src/ctl.c File src/ctl.c: https://gerrit.osmocom.org/c/osmo-e1d/+/19249/3/src/ctl.c at 315 PS3, Line 315: } > Should this also force close all open TS in case of mode change ? [?] Actually, I consider it a feature that you can have timeslots open both for the channelized and the superchannel mode. This way you can switch 'seamless' between both modes. (I was thinking of Ericsson Packet Abis over E1 support, where one may try to switch to superchannel, and if that fails, go back to channelized). -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I765b5c3bc9e07b2353f8647e8260ff95df3727e6 Gerrit-Change-Number: 19249 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: tnt Gerrit-Comment-Date: Tue, 14 Jul 2020 12:43:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: tnt Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 13:31:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 13:31:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: share send templates for ChannelDescription References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19252 ) Change subject: library/GSM_RR_Types: share send templates for ChannelDescription ...................................................................... library/GSM_RR_Types: share send templates for ChannelDescription They're going to be used in other modules too, not only in BTS_Tests. Also, take a chance to rearrange the list of arguments, so the ones with default values are placed after mandatory ones. Change-Id: Ia33ebf2e680f16f774a981fc33422dfe5036637f --- M bts/BTS_Tests.ttcn M library/GSM_RR_Types.ttcn 2 files changed, 23 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/19252/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 47f8a29..1582fae 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2005,9 +2005,9 @@ /* Craft channel description (with or without frequency hopping parameters) */ if (ispresent(g_pars.maio_hsn)) { - ch_desc := valueof(ts_ChanDescH1(g_pars.chan_nr, maio_hsn := g_pars.maio_hsn)); + ch_desc := valueof(ts_ChanDescH1(g_pars.chan_nr, g_pars.maio_hsn)); } else { - ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr)); + ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, mp_trx0_arfcn)); } /* Send IMM.ASS via CCHAN */ @@ -3476,26 +3476,6 @@ ma := ''B } -private template (value) ChannelDescription ts_ChanDescH0(template (value) RslChannelNr chan_nr, - template (value) uint3_t tsc := 7, - template (value) uint12_t arfcn := mp_trx0_arfcn) := { - chan_nr := chan_nr, - tsc := tsc, - h := false, - arfcn := arfcn, - maio_hsn := omit -} - -private template (value) ChannelDescription ts_ChanDescH1(template (value) RslChannelNr chan_nr, - template (value) uint3_t tsc := 7, - template (value) MaioHsn maio_hsn) := { - chan_nr := chan_nr, - tsc := tsc, - h := true, - arfcn := omit, - maio_hsn := maio_hsn -} - private function f_fmt_ia_stats(integer num_tx, integer num_rx, integer num_del) return charstring { return int2str(num_tx) & " sent, " & int2str(num_rx) & " received, " @@ -3516,7 +3496,7 @@ f_l1_tune(L1CTL); for (var integer i := 0; i < num_total; i := i+1) { - var ChannelDescription ch_desc := valueof(ts_ChanDescH0(valueof(t_RslChanNr_SDCCH4(0, 0)))); + var ChannelDescription ch_desc := valueof(ts_ChanDescH0(t_RslChanNr_SDCCH4(0, 0), mp_trx0_arfcn)); var GsmRrMessage ia := valueof(ts_IMM_ASS(42, i, 5, ch_desc, c_MA_null)); var octetstring ia_enc := enc_GsmRrMessage(ia); RSL_CCHAN.send(ts_ASP_RSL_UD(ts_RSL_IMM_ASSIGN(ia_enc, 0))); diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index d0d5d8e..bf650b2 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -1082,4 +1082,24 @@ ext_ra := ext_ra }; + template (value) ChannelDescription ts_ChanDescH0(template (value) RslChannelNr chan_nr, + template (value) uint12_t arfcn, + template (value) uint3_t tsc := 7) := { + chan_nr := chan_nr, + tsc := tsc, + h := false, + arfcn := arfcn, + maio_hsn := omit + } + + template (value) ChannelDescription ts_ChanDescH1(template (value) RslChannelNr chan_nr, + template (value) MaioHsn maio_hsn, + template (value) uint3_t tsc := 7) := { + chan_nr := chan_nr, + tsc := tsc, + h := true, + arfcn := omit, + maio_hsn := maio_hsn + } + } with { encode "RAW" ; variant "FIELDORDER(msb)" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia33ebf2e680f16f774a981fc33422dfe5036637f Gerrit-Change-Number: 19252 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 13:31:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 13:31:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests_LAPDm: consider frequency hopping parameters References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19253 ) Change subject: BTS_Tests_LAPDm: consider frequency hopping parameters ...................................................................... BTS_Tests_LAPDm: consider frequency hopping parameters Change-Id: Idd1ffe0ee97805b40bb5e37645aa53a9b1dc4b0a Related: SYS#4868, OS#4546 --- M bts/BTS_Tests_LAPDm.ttcn M library/LAPDm_RAW_PT.ttcn 2 files changed, 32 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/53/19253/1 diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn index 4242502..9981bbc 100644 --- a/bts/BTS_Tests_LAPDm.ttcn +++ b/bts/BTS_Tests_LAPDm.ttcn @@ -6,6 +6,7 @@ import from LAPDm_Types all; import from RSL_Types all; import from BTS_Tests all; +import from GSM_RR_Types all; import from Misc_Helpers all; /* test that use exclusively only LAPDm over L1CTL */ @@ -51,9 +52,16 @@ } /* master function switching to a dedicated radio channel */ -function f_switch_dcch(Arfcn arfcn, RslChannelNr chan_nr, GsmTsc tsc) runs on lapdm_test_CT { - var BCCH_tune_req tune_req := { arfcn := arfcn, combined_ccch := true }; - var DCCH_switch_req sw_req := { arfcn, chan_nr, tsc }; +function f_switch_dcch() runs on ConnHdlr { + var BCCH_tune_req tune_req := { arfcn := { false, mp_trx0_arfcn }, combined_ccch := true }; + var DCCH_switch_req sw_req := { ma := g_pars.ma }; + + /* Craft channel description (with or without frequency hopping parameters) */ + if (ispresent(g_pars.maio_hsn)) { + sw_req.chan_desc := valueof(ts_ChanDescH1(g_pars.chan_nr, g_pars.maio_hsn)); + } else { + sw_req.chan_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, mp_trx0_arfcn)); + } LAPDM.send(tune_req); LAPDM.send(sw_req); @@ -237,7 +245,7 @@ /* activate the channel on the BTS side */ f_rsl_chan_act(g_pars.chan_mode, false, {}); /* activate the channel on the MS side */ - f_switch_dcch({false, mp_trx0_arfcn}, g_chan_nr, 7); + f_switch_dcch(); } private function fp_common_fini() runs on ConnHdlr diff --git a/library/LAPDm_RAW_PT.ttcn b/library/LAPDm_RAW_PT.ttcn index 394deab..77f0452 100644 --- a/library/LAPDm_RAW_PT.ttcn +++ b/library/LAPDm_RAW_PT.ttcn @@ -38,9 +38,8 @@ /* directly switch to a dedicated channel (without RACH/IMM.ASS */ type record DCCH_switch_req { - Arfcn arfcn, - RslChannelNr chan_nr, - GsmTsc tsc + ChannelDescription chan_desc, + L1ctlMA ma } type record DCCH_switch_res { @@ -236,17 +235,30 @@ /* store/save channel description */ chan_desc := imm_ass.chan_desc; - /* send DM_EST_REQ */ + /* send DM_EST_REQ, TODO: Mobile Allocation */ f_L1CTL_DM_EST_REQ_IA(L1CTL, imm_ass); set_ph_state(PH_STATE_DCH); } /* switching directly to a dedicated channel *without RACH/IMM-ASS */ - private function f_switch_dcch(Arfcn arfcn, RslChannelNr chan_nr, GsmTsc tsc) runs on lapdm_CT { + private function f_switch_dcch(in DCCH_switch_req sw_req) runs on lapdm_CT { set_ph_state(PH_STATE_TUNING_DCH); /* store/save channel description */ - chan_desc.chan_nr := chan_nr; - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(chan_nr, tsc, arfcn.arfcn)); + chan_desc := sw_req.chan_desc; + + /* tune the L1 to the indicated channel */ + if (chan_desc.h) { + L1CTL.send(ts_L1CTL_DM_EST_REQ_H1(chan_desc.chan_nr, + chan_desc.tsc, + chan_desc.maio_hsn.hsn, + chan_desc.maio_hsn.maio, + sw_req.ma)); + } else { + L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(chan_desc.chan_nr, + chan_desc.tsc, + chan_desc.arfcn)); + } + set_ph_state(PH_STATE_DCH); } @@ -431,7 +443,7 @@ } [] LAPDM_SP.receive(DCCH_switch_req:?) -> value sw_req { var DCCH_switch_res res; - f_switch_dcch(sw_req.arfcn, sw_req.chan_nr, sw_req.tsc); + f_switch_dcch(sw_req); if (ph_state == PH_STATE_DCH) { res := { omit }; } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idd1ffe0ee97805b40bb5e37645aa53a9b1dc4b0a Gerrit-Change-Number: 19253 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 13:31:34 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 13:31:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: implement optional frequency hopping support In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19245 ) Change subject: BTS_Tests: implement optional frequency hopping support ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If0318fd320d4f112341465844555bf8d65b5f88f Gerrit-Change-Number: 19245 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 13:31:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 13:42:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 13:42:21 +0000 Subject: Change in osmo-e1d[master]: introduce concept of superchannel to data structures In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19229 ) Change subject: introduce concept of superchannel to data structures ...................................................................... Patch Set 5: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-e1d/+/19229/5/src/e1d.h File src/e1d.h: https://gerrit.osmocom.org/c/osmo-e1d/+/19229/5/src/e1d.h at 79 PS5, Line 79: struct e1_ts superchan; union with the one above? -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I0aacf251e155de2bb6ad03ffc4181067b22f1c90 Gerrit-Change-Number: 19229 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Tue, 14 Jul 2020 13:42:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 13:45:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 13:45:06 +0000 Subject: Change in osmo-e1d[master]: actually implement the superchannel mode In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19231 ) Change subject: actually implement the superchannel mode ...................................................................... Patch Set 5: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-e1d/+/19231/5/src/intf_line.c File src/intf_line.c: https://gerrit.osmocom.org/c/osmo-e1d/+/19231/5/src/intf_line.c at 287 PS5, Line 287: buf[tsn+(i*32)] = buf_ts[i]; would be great having all these 32 defined somewhere. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id340b1925471f427deb6cda7eb54e80dfc71faec Gerrit-Change-Number: 19231 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Tue, 14 Jul 2020 13:45:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 13:47:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 13:47:24 +0000 Subject: Change in osmo-e1d[master]: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19249 ) Change subject: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-e1d/+/19249/4/src/ctl.c File src/ctl.c: https://gerrit.osmocom.org/c/osmo-e1d/+/19249/4/src/ctl.c at 305 PS4, Line 305: LOGPLI(line, DE1D, LOGL_NOTICE, "Setting line mode fron %s to %s\n", typo: fron -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I765b5c3bc9e07b2353f8647e8260ff95df3727e6 Gerrit-Change-Number: 19249 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-CC: tnt Gerrit-Comment-Date: Tue, 14 Jul 2020 13:47:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 13:48:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 13:48:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: share send templates for ChannelDescription In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19252 ) Change subject: library/GSM_RR_Types: share send templates for ChannelDescription ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia33ebf2e680f16f774a981fc33422dfe5036637f Gerrit-Change-Number: 19252 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 13:48:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 13:49:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 13:49:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: implement optional frequency hopping support In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19245 ) Change subject: BTS_Tests: implement optional frequency hopping support ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If0318fd320d4f112341465844555bf8d65b5f88f Gerrit-Change-Number: 19245 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 13:49:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 13:50:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 13:50:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests_LAPDm: consider frequency hopping parameters In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19253 ) Change subject: BTS_Tests_LAPDm: consider frequency hopping parameters ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idd1ffe0ee97805b40bb5e37645aa53a9b1dc4b0a Gerrit-Change-Number: 19253 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 13:50:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 14:16:38 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 14:16:38 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: add configuration with frequency hopping parameters In-Reply-To: References: Message-ID: Hello laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/19160 to look at the new patch set (#4). Change subject: ttcn3-bts-test: add configuration with frequency hopping parameters ...................................................................... ttcn3-bts-test: add configuration with frequency hopping parameters The Physical channel configuration is the same as in the non-hopping configuration file. Hopping parameters are listed below the table. == Physical channel configuration (FDMA) == +-------+------------------+------------------+------------------+------------------+ | # / # | TRX#0 | TRX#1 | TRX#2 | TRX#3 | +-------+------------------+------------------+------------------+------------------+ | ARFCN | 871 | 873 | 875 | 877 | +-------+------------------+------------------+------------------+------------------+ == Physical channel configuration (TDMA) == +-------+------------------+------------------+------------------+------------------+ | # / # | TRX#0 | TRX#1 | TRX#2 | TRX#3 | +-------+------------------+------------------+------------------+------------------+ | TS0 | CCCH+SDCCH4 | TCH/F (a) | TCH/F (a) | TCH/F (a) | +-------+------------------+------------------+------------------+------------------+ | TS1 | TCH/F | SDCCH8+CBCH | SDCCH8+CBCH (b) | SDCCH8+CBCH (b) | +-------+------------------+------------------+------------------+------------------+ | TS2 | TCH/F (c) | TCH/H (c) | TCH/F (d) | TCH/H (d) | +-------+------------------+------------------+------------------+------------------+ | TS3 | TCH/F_PDCH (e) | TCH/F_PDCH (e) | TCH/F_PDCH (e) | TCH/F_PDCH (e) | +-------+------------------+------------------+------------------+------------------+ | TS4 | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | +-------+------------------+------------------+------------------+------------------+ | TS5 | TCH/H (f) | TCH/H (f) | TCH/H (f) | TCH/H (f) | +-------+------------------+------------------+------------------+------------------+ | TS6 | SDCCH8 (g) | PDCH (h) | PDCH (h) | SDCCH8 (g) | +-------+------------------+------------------+------------------+------------------+ | TS7 | PDCH (i) | PDCH (j) | PDCH (i) | PDCH (j) | +-------+------------------+------------------+------------------+------------------+ == Hopping configuration == a) HSN=0, MAIO=0,1,2 b) HSN=1, MAIO=3,5 c) HSN=2, MAIO=0,1 d) HSN=2, MAIO=2,3 e) HSN=3, MAIO=3,2,1,0 f) HSN=5, MAIO=0,1,2,3 g) HSN=6, MAIO=1,0 h) HSN=6, MAIO=1,0 i) HSN=0, MAIO=1,3 j) HSN=0, MAIO=0,2 Change-Id: I7822c3581fccba3277a63577e740e7486307635d Related: SYS#4868, OS#4546 --- A ttcn3-bts-test/fh/BTS_Tests.cfg A ttcn3-bts-test/fh/osmo-bsc.cfg 2 files changed, 539 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/60/19160/4 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7822c3581fccba3277a63577e740e7486307635d Gerrit-Change-Number: 19160 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 14:19:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 14:19:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix PDCH tests: consider frequency hopping References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19254 ) Change subject: BTS_Tests: fix PDCH tests: consider frequency hopping ...................................................................... BTS_Tests: fix PDCH tests: consider frequency hopping Change-Id: I1d805bf5392e59c4b4834757ce6124e63b174a42 Related: SYS#4868, OS#4546 --- M bts/BTS_Tests.ttcn 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/54/19254/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 7c6886d..1232a6c 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -4701,7 +4701,9 @@ f_TC_pcu_act_req(0, 0, 7, true); /* Tune trxcon to that PDCH channel */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(ts_RslChanNr_PDCH(7), 7, mp_trx0_arfcn)); + var ConnHdlrPars pars := valueof(t_Pars(ts_RslChanNr_PDCH(7), ts_RSL_ChanMode_SIGN)); + f_resolve_fh_params(pars); + f_l1ctl_est_dchan(L1CTL, pars); /* Verify PTCCH/U: send several access bursts, make sure they're received */ for (var integer i := 0; i < 16; i := i + 1) { @@ -4962,7 +4964,9 @@ f_TC_pcu_act_req(0, 0, 7, true); /* Tune trxcon to that PDCH channel on TS7 */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(ts_RslChanNr_PDCH(7), 7, mp_trx0_arfcn)); + var ConnHdlrPars pars := valueof(t_Pars(ts_RslChanNr_PDCH(7), ts_RSL_ChanMode_SIGN)); + f_resolve_fh_params(pars); + f_l1ctl_est_dchan(L1CTL, pars); /* C/I in centiBels, test range: -256 .. +1280, step 128 */ for (var int16_t i := -256; i <= 1280; i := i + 128) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1d805bf5392e59c4b4834757ce6124e63b174a42 Gerrit-Change-Number: 19254 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 14:19:57 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 14:19:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: introduce and use helper f_l1ctl_est_dchan() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19244 ) Change subject: BTS_Tests: introduce and use helper f_l1ctl_est_dchan() ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia4f078ebbb278246ee117f580ff93f301dc60f7c Gerrit-Change-Number: 19244 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 14:19:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 14:37:42 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 14:37:42 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: add configuration with frequency hopping parameters In-Reply-To: References: Message-ID: Hello laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/19160 to look at the new patch set (#5). Change subject: ttcn3-bts-test: add configuration with frequency hopping parameters ...................................................................... ttcn3-bts-test: add configuration with frequency hopping parameters The Physical channel configuration is the same as in the non-hopping configuration file. Hopping parameters are listed below the table. == Physical channel configuration (FDMA) == +-------+------------------+------------------+------------------+------------------+ | # / # | TRX#0 | TRX#1 | TRX#2 | TRX#3 | +-------+------------------+------------------+------------------+------------------+ | ARFCN | 871 | 873 | 875 | 877 | +-------+------------------+------------------+------------------+------------------+ == Physical channel configuration (TDMA) == +-------+------------------+------------------+------------------+------------------+ | # / # | TRX#0 | TRX#1 | TRX#2 | TRX#3 | +-------+------------------+------------------+------------------+------------------+ | TS0 | CCCH+SDCCH4 | TCH/F (a) | TCH/F (a) | TCH/F (a) | +-------+------------------+------------------+------------------+------------------+ | TS1 | TCH/F | SDCCH8+CBCH | SDCCH8+CBCH (b) | SDCCH8+CBCH (b) | +-------+------------------+------------------+------------------+------------------+ | TS2 | TCH/F (c) | TCH/H (c) | TCH/F (d) | TCH/H (d) | +-------+------------------+------------------+------------------+------------------+ | TS3 | TCH/F_PDCH (e) | TCH/F_PDCH (e) | TCH/F_PDCH (e) | TCH/F_PDCH (e) | +-------+------------------+------------------+------------------+------------------+ | TS4 | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | +-------+------------------+------------------+------------------+------------------+ | TS5 | TCH/H (f) | TCH/H (f) | TCH/H (f) | TCH/H (f) | +-------+------------------+------------------+------------------+------------------+ | TS6 | SDCCH8 (g) | PDCH (h) | PDCH (h) | SDCCH8 (g) | +-------+------------------+------------------+------------------+------------------+ | TS7 | PDCH (i) | PDCH (j) | PDCH (i) | PDCH (j) | +-------+------------------+------------------+------------------+------------------+ == Hopping configuration == a) HSN=0, MAIO=0,1,2 b) HSN=1, MAIO=3,5 c) HSN=2, MAIO=0,1 d) HSN=2, MAIO=2,3 e) HSN=3, MAIO=3,2,1,0 f) HSN=5, MAIO=0,1,2,3 g) HSN=6, MAIO=1,0 h) HSN=6, MAIO=1,0 i) HSN=0, MAIO=1,3 j) HSN=0, MAIO=0,2 Change-Id: I7822c3581fccba3277a63577e740e7486307635d Related: SYS#4868, OS#4546 --- A ttcn3-bts-test/fh/BTS_Tests.cfg A ttcn3-bts-test/fh/osmo-bsc.cfg 2 files changed, 542 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/60/19160/5 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7822c3581fccba3277a63577e740e7486307635d Gerrit-Change-Number: 19160 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 14:45:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 14:45:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix PDCH tests: consider frequency hopping In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19254 ) Change subject: BTS_Tests: fix PDCH tests: consider frequency hopping ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1d805bf5392e59c4b4834757ce6124e63b174a42 Gerrit-Change-Number: 19254 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 14:45:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 14:57:21 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 14:57:21 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/jenkins.sh: enable frequency hopping test cases References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/19255 ) Change subject: ttcn3-bts-test/jenkins.sh: enable frequency hopping test cases ...................................................................... ttcn3-bts-test/jenkins.sh: enable frequency hopping test cases Change-Id: I2b8ee5037146203801ab92a1b4fe6703522d8093 Related: SYS#4868, OS#4546 --- M ttcn3-bts-test/jenkins.sh 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/55/19255/1 diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index c32682c..6f37e54 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -160,9 +160,23 @@ cp oml/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester/ start_testsuite +# 4) Frequency hopping tests require different configuration files +cp fh/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester/ +cp fh/osmo-bsc.cfg $VOL_BASE_DIR/bsc/ +cp osmo-bts.cfg $VOL_BASE_DIR/bts/ +# restart the BSC/BTS and run the testsuite again +docker container kill ${BUILD_TAG}-bts +start_bsc +start_bts trx 0 +start_testsuite +# rename the test results, so they appear as 'BTS_Tests:hopping' in Jenkins +sed -i "s#classname='BTS_Tests'#classname='BTS_Tests:hopping'#g" \ + $VOL_BASE_DIR/bts-tester/junit-xml-hopping-*.log + echo Stopping containers docker container kill ${BUILD_TAG}-trxcon docker container kill ${BUILD_TAG}-fake_trx +docker container kill ${BUILD_TAG}-bsc docker container kill ${BUILD_TAG}-bts -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2b8ee5037146203801ab92a1b4fe6703522d8093 Gerrit-Change-Number: 19255 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 15:28:42 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Tue, 14 Jul 2020 15:28:42 +0000 Subject: Change in osmo-bts[master]: bts-trx: introduce TRX provisioning FSM In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19167 ) Change subject: bts-trx: introduce TRX provisioning FSM ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2a00c23df15840e33fbb232c9e1dd6db128f63f6 Gerrit-Change-Number: 19167 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 15:28:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 15:33:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 15:33:15 +0000 Subject: Change in osmo-bts[master]: bts-trx: introduce TRX provisioning FSM In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19167 ) Change subject: bts-trx: introduce TRX provisioning FSM ...................................................................... Patch Set 4: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2a00c23df15840e33fbb232c9e1dd6db128f63f6 Gerrit-Change-Number: 19167 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 15:33:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 15:33:19 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 15:33:19 +0000 Subject: Change in osmo-bts[master]: bts-trx: introduce TRX provisioning FSM In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19167 ) Change subject: bts-trx: introduce TRX provisioning FSM ...................................................................... bts-trx: introduce TRX provisioning FSM With prior code state managing the TRXC side of osmo-bts-trx, there are plenty o cases (race conditions) where things can go wrong/unexpected, because there's really no infrastructure to wait and synchronize between different TRXs (eg wait until all are configured to POWERON), or to simply keep well known per-trx state regarding lower layers. In order to fix in the future all of those issues and to sanitize current code, a new per-trx FSM is introduced, which takes care of submitting TRXC commands and waiting for response when needed to manage the state of the TRX. Related: OS#4364 Change-Id: I2a00c23df15840e33fbb232c9e1dd6db128f63f6 --- M src/osmo-bts-trx/Makefile.am M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/trx_if.c A src/osmo-bts-trx/trx_provision_fsm.c A src/osmo-bts-trx/trx_provision_fsm.h 6 files changed, 537 insertions(+), 224 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/osmo-bts-trx/Makefile.am b/src/osmo-bts-trx/Makefile.am index ae69000..54d1af9 100644 --- a/src/osmo-bts-trx/Makefile.am +++ b/src/osmo-bts-trx/Makefile.am @@ -32,6 +32,7 @@ trx_if.h \ l1_if.h \ loops.h \ + trx_provision_fsm.h \ $(NULL) bin_PROGRAMS = osmo-bts-trx @@ -47,6 +48,7 @@ sched_lchan_pdtch.c \ sched_lchan_tchf.c \ sched_lchan_tchh.c \ + trx_provision_fsm.c \ trx_vty.c \ loops.c \ $(NULL) diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index a3bdf01..d65900f 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -45,6 +46,7 @@ #include "l1_if.h" #include "trx_if.h" +#include "trx_provision_fsm.h" #define RF_DISABLED_mdB to_mdB(-10) @@ -62,7 +64,7 @@ [GSM_PCHAN_UNKNOWN] = 0, }; -static enum gsm_phys_chan_config transceiver_chan_type_2_pchan(uint8_t type) +enum gsm_phys_chan_config transceiver_chan_type_2_pchan(uint8_t type) { int i; for (i = 0; i < _GSM_PCHAN_MAX; i++) { @@ -77,6 +79,8 @@ struct trx_l1h *l1h; l1h = talloc_zero(tall_ctx, struct trx_l1h); l1h->phy_inst = pinst; + l1h->provision_fi = osmo_fsm_inst_alloc(&trx_prov_fsm, l1h, l1h, LOGL_INFO, NULL); + OSMO_ASSERT(osmo_fsm_inst_update_id_f_sanitize(l1h->provision_fi, '-', phy_instance_name(pinst)) == 0); trx_if_init(l1h); return l1h; } @@ -140,7 +144,7 @@ return trx_sched_set_lchan(&l1h->l1s, gsm_lchan2chan_nr(lchan), LID_SACCH, false); } -static int l1if_trx_start_power_ramp(struct gsm_bts_trx *trx, ramp_compl_cb_t ramp_compl_cb) +int l1if_trx_start_power_ramp(struct gsm_bts_trx *trx, ramp_compl_cb_t ramp_compl_cb) { struct phy_instance *pinst = trx_phy_instance(trx); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; @@ -174,78 +178,6 @@ l1if_trx_start_power_ramp(trx, NULL); } -static void l1if_getnompower_cb(struct trx_l1h *l1h, int nominal_power, int rc) -{ - struct phy_instance *pinst = l1h->phy_inst; - struct gsm_bts_trx *trx = pinst->trx; - - LOGPPHI(pinst, DL1C, LOGL_DEBUG, "l1if_getnompower_cb(nominal_power=%d, rc=%d)\n", nominal_power, rc); - - l1if_trx_set_nominal_power(trx, nominal_power); -} - -static void l1if_setslot_cb(struct trx_l1h *l1h, uint8_t tn, uint8_t type, int rc) -{ - struct phy_instance *pinst = l1h->phy_inst; - struct gsm_bts_trx *trx = pinst->trx; - struct gsm_bts_trx_ts *ts; - enum gsm_phys_chan_config pchan; - - if (tn >= TRX_NR_TS) { - LOGPPHI(pinst, DL1C, LOGL_ERROR, "transceiver SETSLOT invalid param TN (%" PRIu8 ")\n", - tn); - return; - } - - pchan = transceiver_chan_type_2_pchan(type); - if (pchan == GSM_PCHAN_UNKNOWN) { - LOGPPHI(pinst, DL1C, LOGL_ERROR, "transceiver SETSLOT invalid param TS_TYPE (%" PRIu8 ")\n", - type); - return; - } - - ts = &trx->ts[tn]; - LOGPPHI(pinst, DL1C, LOGL_DEBUG, "%s l1if_setslot_cb(as_pchan=%s)," - " calling cb_ts_connected(rc=%d)\n", - gsm_ts_name(ts), gsm_pchan_name(pchan), rc); - cb_ts_connected(ts, rc); -} - -static void l1if_poweronoff_cb(struct trx_l1h *l1h, bool poweronoff, int rc) -{ - struct phy_instance *pinst = l1h->phy_inst; - struct phy_link *plink = pinst->phy_link; - - plink->u.osmotrx.powered = poweronoff; - plink->u.osmotrx.poweronoff_sent = false; - - if (poweronoff) { - if (rc == 0 && plink->state != PHY_LINK_CONNECTED) { - trx_sched_clock_started(pinst->trx->bts); - phy_link_state_set(plink, PHY_LINK_CONNECTED); - - /* Begin to ramp up the power on all TRX associated with this phy */ - llist_for_each_entry(pinst, &plink->instances, list) { - if (pinst->trx->mo.nm_state.administrative == NM_STATE_UNLOCKED) - l1if_trx_start_power_ramp(pinst->trx, NULL); - } - } else if (rc != 0 && plink->state != PHY_LINK_SHUTDOWN) { - trx_sched_clock_stopped(pinst->trx->bts); - phy_link_state_set(plink, PHY_LINK_SHUTDOWN); - } - } else { - if (plink->state != PHY_LINK_SHUTDOWN) { - trx_sched_clock_stopped(pinst->trx->bts); - phy_link_state_set(plink, PHY_LINK_SHUTDOWN); - - /* Notify TRX close on all TRX associated with this phy */ - llist_for_each_entry(pinst, &plink->instances, list) { - bts_model_trx_close_cb(pinst->trx, rc); - } - } - } -} - static void l1if_setpower_att_cb(struct trx_l1h *l1h, int power_att_db, int rc) { struct phy_instance *pinst = l1h->phy_inst; @@ -257,113 +189,6 @@ } /* - * transceiver provisioning - */ -int l1if_provision_transceiver_trx(struct trx_l1h *l1h) -{ - uint8_t tn; - struct phy_instance *pinst = l1h->phy_inst; - struct phy_link *plink = pinst->phy_link; - - /* During setup, pinst may still not be associated to a TRX nr */ - if (!pinst->trx) { - LOGPPHI(pinst, DL1C, LOGL_INFO, - "Delaying provision, TRX not yet assigned to phy instance\n"); - return -EIO; - } - - if (phy_link_state_get(plink) == PHY_LINK_SHUTDOWN) { - LOGPPHI(pinst, DL1C, LOGL_INFO, - "Delaying provision, TRX not yet available\n"); - return -EIO; - } - - if (l1h->config.enabled - && l1h->config.tsc_valid - && l1h->config.bsic_valid - && l1h->config.arfcn_valid) { - /* before power on */ - if (!l1h->config.arfcn_sent) { - trx_if_cmd_rxtune(l1h, l1h->config.arfcn); - trx_if_cmd_txtune(l1h, l1h->config.arfcn); - /* After TXTUNE is sent to TRX, get the tx nominal power - * (which may vary precisly on band/arfcn. Avoid sending - * it if we are forced by VTY to use a specific nominal - * power (because TRX may not support the command or - * provide broken values) */ - if (!l1h->config.nominal_power_set_by_vty) - trx_if_cmd_getnompower(l1h, l1if_getnompower_cb); - l1h->config.arfcn_sent = 1; - } - if (!l1h->config.tsc_sent) { - trx_if_cmd_settsc(l1h, l1h->config.tsc); - l1h->config.tsc_sent = 1; - } - if (!l1h->config.bsic_sent) { - trx_if_cmd_setbsic(l1h, l1h->config.bsic); - l1h->config.bsic_sent = 1; - } - - /* Ask transceiver to use the newest TRXD header version if not using it yet */ - if (!l1h->config.setformat_sent) { - if (l1h->config.trxd_hdr_ver_use != plink->u.osmotrx.trxd_hdr_ver_max) { - trx_if_cmd_setformat(l1h, plink->u.osmotrx.trxd_hdr_ver_max); - l1h->config.trxd_hdr_ver_req = plink->u.osmotrx.trxd_hdr_ver_max; - } else { - LOGPPHI(pinst, DL1C, LOGL_INFO, - "No need to negotiate TRXD version, " - "already using maximum configured one: %" PRIu8 "\n", - l1h->config.trxd_hdr_ver_use); - } - l1h->config.setformat_sent = 1; - } - - if (pinst->num == 0 && !plink->u.osmotrx.powered && !plink->u.osmotrx.poweronoff_sent) { - trx_if_cmd_poweron(l1h, l1if_poweronoff_cb); - plink->u.osmotrx.poweronoff_sent = true; - } - - /* after power on */ - if (l1h->config.rxgain_valid && !l1h->config.rxgain_sent) { - trx_if_cmd_setrxgain(l1h, l1h->config.rxgain); - l1h->config.rxgain_sent = 1; - } - if (l1h->config.maxdly_valid && !l1h->config.maxdly_sent) { - trx_if_cmd_setmaxdly(l1h, l1h->config.maxdly); - l1h->config.maxdly_sent = 1; - } - if (l1h->config.maxdlynb_valid && !l1h->config.maxdlynb_sent) { - trx_if_cmd_setmaxdlynb(l1h, l1h->config.maxdlynb); - l1h->config.maxdlynb_sent = 1; - } - - for (tn = 0; tn < TRX_NR_TS; tn++) { - if (l1h->config.slottype_valid[tn] - && !l1h->config.slottype_sent[tn]) { - trx_if_cmd_setslot(l1h, tn, - l1h->config.slottype[tn], l1if_setslot_cb); - l1h->config.slottype_sent[tn] = 1; - } - } - return 0; - } - - if (!l1h->config.enabled) { - if (pinst->num == 0 && plink->u.osmotrx.powered && !plink->u.osmotrx.poweronoff_sent) { - trx_if_cmd_poweroff(l1h, l1if_poweronoff_cb); - plink->u.osmotrx.poweronoff_sent = true; - } - l1h->config.rxgain_sent = 0; - l1h->config.maxdly_sent = 0; - l1h->config.maxdlynb_sent = 0; - for (tn = 0; tn < TRX_NR_TS; tn++) - l1h->config.slottype_sent[tn] = 0; - } - - return 0; -} - -/* * activation/configuration/deactivation of transceiver's TRX */ @@ -373,11 +198,7 @@ struct phy_instance *pinst = trx_phy_instance(trx); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; - /* power on transceiver, if not already */ - if (!l1h->config.enabled) { - l1h->config.enabled = true; - l1if_provision_transceiver_trx(l1h); - } + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CFG_ENABLE, (void*)(intptr_t)true); if (trx == trx->bts->c0) lchan_init_lapdm(&trx->ts[0].lchan[CCCH_LCHAN]); @@ -411,13 +232,7 @@ struct phy_instance *pinst = trx_phy_instance(trx); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; - /* power off transceiver, if not already */ - if (l1h->config.enabled) { - l1h->config.enabled = false; - l1if_provision_transceiver_trx(l1h); - } else if (!pinst->phy_link->u.osmotrx.poweronoff_sent) { - bts_model_trx_close_cb(trx, 0); - } /* else: poweroff in progress, cb will be called upon TRXC RSP */ + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_POWEROFF, NULL); /* Set to Operational State: Disabled */ check_transceiver_availability_trx(l1h, 0); @@ -446,12 +261,7 @@ struct phy_instance *pinst = trx_phy_instance(trx); struct phy_link *plink = pinst->phy_link; struct trx_l1h *l1h = pinst->u.osmotrx.hdl; - if (l1h->config.bsic != bsic || !l1h->config.bsic_valid) { - l1h->config.bsic = bsic; - l1h->config.bsic_valid = 1; - l1h->config.bsic_sent = 0; - l1if_provision_transceiver_trx(l1h); - } + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CFG_BSIC, (void*)(intptr_t)bsic); check_transceiver_availability_trx(l1h, phy_link_state_get(plink) != PHY_LINK_SHUTDOWN); } @@ -466,12 +276,7 @@ struct phy_link *plink = pinst->phy_link; uint16_t arfcn = trx->arfcn; - if (l1h->config.arfcn != arfcn || !l1h->config.arfcn_valid) { - l1h->config.arfcn = arfcn; - l1h->config.arfcn_valid = 1; - l1h->config.arfcn_sent = 0; - l1if_provision_transceiver_trx(l1h); - } + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CFG_ARFCN, (void*)(intptr_t)arfcn); /* Begin to ramp up the power if power reduction is set by OML and TRX is already running. Otherwise skip, power ramping will be started @@ -497,12 +302,7 @@ /* all TSC of all timeslots must be equal, because transceiver only * supports one TSC per TRX */ - if (l1h->config.tsc != tsc || !l1h->config.tsc_valid) { - l1h->config.tsc = tsc; - l1h->config.tsc_valid = 1; - l1h->config.tsc_sent = 0; - l1if_provision_transceiver_trx(l1h); - } + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CFG_TSC, (void*)(intptr_t)tsc); /* ignore disabled slots */ if (!(l1h->config.slotmask & (1 << tn))) @@ -525,13 +325,9 @@ slottype = transceiver_chan_types[pchan]; - if (l1h->config.slottype[tn] != slottype - || !l1h->config.slottype_valid[tn]) { - l1h->config.slottype[tn] = slottype; - l1h->config.slottype_valid[tn] = 1; - l1h->config.slottype_sent[tn] = 0; - l1if_provision_transceiver_trx(l1h); - } + + struct trx_prov_ev_cfg_ts_data data = { .tn = tn, .slottype = slottype }; + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CFG_TS, &data); return 0; } diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h index d2fdf06..07751f2 100644 --- a/src/osmo-bts-trx/l1_if.h +++ b/src/osmo-bts-trx/l1_if.h @@ -114,6 +114,7 @@ /* transceiver config */ struct trx_config config; + struct osmo_fsm_inst *provision_fi; struct l1sched_trx l1s; }; @@ -122,6 +123,8 @@ int l1if_provision_transceiver_trx(struct trx_l1h *l1h); int l1if_mph_time_ind(struct gsm_bts *bts, uint32_t fn); void l1if_trx_set_nominal_power(struct gsm_bts_trx *trx, int nominal_power); +int l1if_trx_start_power_ramp(struct gsm_bts_trx *trx, ramp_compl_cb_t ramp_compl_cb); +enum gsm_phys_chan_config transceiver_chan_type_2_pchan(uint8_t type); static inline struct l1sched_trx *trx_l1sched_hdl(struct gsm_bts_trx *trx) { diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index 7508606..e650d79 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -47,6 +48,7 @@ #include "l1_if.h" #include "trx_if.h" +#include "trx_provision_fsm.h" /* * socket helper functions @@ -1231,12 +1233,6 @@ if (rc < 0) goto err; - /* enable all slots */ - l1h->config.slotmask = 0xff; - - if (pinst->num == 0) - trx_if_cmd_poweroff(l1h, NULL); - return 0; err: @@ -1301,8 +1297,10 @@ /* open the individual instances with their ctrl+data sockets */ llist_for_each_entry(pinst, &plink->instances, list) { + struct trx_l1h *l1h = pinst->u.osmotrx.hdl; if (trx_phy_inst_open(pinst) < 0) goto cleanup; + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_OPEN, NULL); } return 0; diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c new file mode 100644 index 0000000..c3b266d --- /dev/null +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -0,0 +1,459 @@ +/* BTS shutdown FSM */ + +/* (C) 2020 by sysmocom - s.m.f.c. GmbH + * Author: Pau Espin Pedrol + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "l1_if.h" +#include "trx_provision_fsm.h" + +#define X(s) (1 << (s)) + +#define trx_prov_fsm_state_chg(fi, NEXT_STATE) \ + osmo_fsm_inst_state_chg(fi, NEXT_STATE, 0, 0) + +static void l1if_poweronoff_cb(struct trx_l1h *l1h, bool poweronoff, int rc) +{ + struct phy_instance *pinst = l1h->phy_inst; + struct phy_link *plink = pinst->phy_link; + + plink->u.osmotrx.powered = poweronoff; + plink->u.osmotrx.poweronoff_sent = false; + + if (poweronoff) + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_POWERON_CNF, (void*)(intptr_t)rc); + else + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_POWEROFF_CNF, (void*)(intptr_t)rc); +} + +static void l1if_getnompower_cb(struct trx_l1h *l1h, int nominal_power, int rc) +{ + struct phy_instance *pinst = l1h->phy_inst; + struct gsm_bts_trx *trx = pinst->trx; + + LOGPPHI(pinst, DL1C, LOGL_DEBUG, "l1if_getnompower_cb(nominal_power=%d, rc=%d)\n", nominal_power, rc); + + l1if_trx_set_nominal_power(trx, nominal_power); +} + +/* + * transceiver provisioning + */ +int l1if_provision_transceiver_trx(struct trx_l1h *l1h) +{ + struct phy_instance *pinst = l1h->phy_inst; + struct phy_link *plink = pinst->phy_link; + + /* During setup, pinst may still not be associated to a TRX nr */ + if (!pinst->trx) { + LOGPPHI(pinst, DL1C, LOGL_INFO, + "Delaying provision, TRX not yet assigned to phy instance\n"); + return -EIO; + } + + if (phy_link_state_get(plink) == PHY_LINK_SHUTDOWN) { + LOGPPHI(pinst, DL1C, LOGL_INFO, + "Delaying provision, TRX not yet available\n"); + return -EIO; + } + + if (l1h->config.enabled + && l1h->config.tsc_valid + && l1h->config.bsic_valid + && l1h->config.arfcn_valid) { + /* before power on */ + if (!l1h->config.arfcn_sent) { + trx_if_cmd_rxtune(l1h, l1h->config.arfcn); + trx_if_cmd_txtune(l1h, l1h->config.arfcn); + /* After TXTUNE is sent to TRX, get the tx nominal power + * (which may vary precisly on band/arfcn. Avoid sending + * it if we are forced by VTY to use a specific nominal + * power (because TRX may not support the command or + * provide broken values) */ + if (!l1h->config.nominal_power_set_by_vty) + trx_if_cmd_getnompower(l1h, l1if_getnompower_cb); + l1h->config.arfcn_sent = 1; + } + if (!l1h->config.tsc_sent) { + trx_if_cmd_settsc(l1h, l1h->config.tsc); + l1h->config.tsc_sent = 1; + } + if (!l1h->config.bsic_sent) { + trx_if_cmd_setbsic(l1h, l1h->config.bsic); + l1h->config.bsic_sent = 1; + } + + /* Ask transceiver to use the newest TRXD header version if not using it yet */ + if (!l1h->config.setformat_sent) { + if (l1h->config.trxd_hdr_ver_use != plink->u.osmotrx.trxd_hdr_ver_max) { + trx_if_cmd_setformat(l1h, plink->u.osmotrx.trxd_hdr_ver_max); + l1h->config.trxd_hdr_ver_req = plink->u.osmotrx.trxd_hdr_ver_max; + } else { + LOGPPHI(pinst, DL1C, LOGL_INFO, + "No need to negotiate TRXD version, " + "already using maximum configured one: %" PRIu8 "\n", + l1h->config.trxd_hdr_ver_use); + } + l1h->config.setformat_sent = 1; + } + + if (pinst->num == 0 && !plink->u.osmotrx.powered && !plink->u.osmotrx.poweronoff_sent) { + trx_if_cmd_poweron(l1h, l1if_poweronoff_cb); + plink->u.osmotrx.poweronoff_sent = true; + } + + return 0; + } + LOGPPHI(pinst, DL1C, LOGL_INFO, "Delaying provision, TRX attributes not yet received from BSC:%s%s%s%s\n", + l1h->config.enabled ? "" :" enable", + l1h->config.tsc_valid ? "" : " tsc", + l1h->config.bsic_valid ? "" : " bsic", + l1h->config.arfcn_valid ? "" : " arfcn"); + return 1; +} + +static void l1if_setslot_cb(struct trx_l1h *l1h, uint8_t tn, uint8_t type, int rc) +{ + struct phy_instance *pinst = l1h->phy_inst; + struct gsm_bts_trx *trx = pinst->trx; + struct gsm_bts_trx_ts *ts; + enum gsm_phys_chan_config pchan; + + if (tn >= TRX_NR_TS) { + LOGPPHI(pinst, DL1C, LOGL_ERROR, "transceiver SETSLOT invalid param TN (%" PRIu8 ")\n", + tn); + return; + } + + pchan = transceiver_chan_type_2_pchan(type); + if (pchan == GSM_PCHAN_UNKNOWN) { + LOGPPHI(pinst, DL1C, LOGL_ERROR, "transceiver SETSLOT invalid param TS_TYPE (%" PRIu8 ")\n", + type); + return; + } + + ts = &trx->ts[tn]; + LOGPPHI(pinst, DL1C, LOGL_DEBUG, "%s l1if_setslot_cb(as_pchan=%s)," + " calling cb_ts_connected(rc=%d)\n", + gsm_ts_name(ts), gsm_pchan_name(pchan), rc); + cb_ts_connected(ts, rc); +} + +/* Returns true if any TS changed, false otherwise */ +static bool update_ts_data(struct trx_l1h *l1h, struct trx_prov_ev_cfg_ts_data* ts_data) { + + if (l1h->config.slottype[ts_data->tn] != ts_data->slottype || + !l1h->config.slottype_valid[ts_data->tn]) { + l1h->config.slottype[ts_data->tn] = ts_data->slottype; + l1h->config.slottype_valid[ts_data->tn] = 1; + l1h->config.slottype_sent[ts_data->tn] = 0; + return true; + } + return false; +} + + +////////////////////////// +// FSM STATE ACTIONS +////////////////////////// + +static void st_closed(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; + + switch(event) { + case TRX_PROV_EV_OPEN: + /* enable all slots */ + l1h->config.slotmask = 0xff; + if (l1h->phy_inst->num == 0) + trx_if_cmd_poweroff(l1h, NULL); /* TODO: jump to poweroff upon cb received */ + trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_POWEROFF); + break; + } +} + +static void st_open_poweroff(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; + uint8_t bsic; + uint16_t arfcn; + uint16_t tsc; + + switch(event) { + case TRX_PROV_EV_CFG_ENABLE: + l1h->config.enabled =(bool)data; + break; + case TRX_PROV_EV_CFG_BSIC: + bsic = (uint8_t)(intptr_t)data; + if (l1h->config.bsic != bsic || !l1h->config.bsic_valid) { + l1h->config.bsic = bsic; + l1h->config.bsic_valid = 1; + l1h->config.bsic_sent = 0; + } + break; + case TRX_PROV_EV_CFG_ARFCN: + arfcn = (uint16_t)(intptr_t)data; + if (l1h->config.arfcn != arfcn || !l1h->config.arfcn_valid) { + l1h->config.arfcn = arfcn; + l1h->config.arfcn_valid = 1; + l1h->config.arfcn_sent = 0; + } + break; + case TRX_PROV_EV_CFG_TSC: + tsc = (uint16_t)(intptr_t)data; + if (l1h->config.tsc != tsc || !l1h->config.tsc_valid) { + l1h->config.tsc = tsc; + l1h->config.tsc_valid = 1; + l1h->config.tsc_sent = 0; + } + break; + case TRX_PROV_EV_CFG_TS: + update_ts_data(l1h, (struct trx_prov_ev_cfg_ts_data*)data); + break; + } + + /* 0 = if we gathered all date and could go forward :*/ + if (l1if_provision_transceiver_trx(l1h) == 0) { + if (l1h->phy_inst->num == 0) + trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWERON_CNF); + else + trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_POWERON); + } +} + +static void st_open_wait_power_cnf(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; + struct phy_instance *pinst = l1h->phy_inst; + struct phy_link *plink = pinst->phy_link; + int rc; + + switch(event) { + case TRX_PROV_EV_POWERON_CNF: + rc = (uint16_t)(intptr_t)data; + if (rc == 0 && plink->state != PHY_LINK_CONNECTED) { + trx_sched_clock_started(pinst->trx->bts); + phy_link_state_set(plink, PHY_LINK_CONNECTED); + + /* Begin to ramp up the power on all TRX associated with this phy */ + llist_for_each_entry(pinst, &plink->instances, list) { + if (pinst->trx->mo.nm_state.administrative == NM_STATE_UNLOCKED) + l1if_trx_start_power_ramp(pinst->trx, NULL); + } + + trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_POWERON); + } else if (rc != 0 && plink->state != PHY_LINK_SHUTDOWN) { + trx_sched_clock_stopped(pinst->trx->bts); + phy_link_state_set(plink, PHY_LINK_SHUTDOWN); + } + break; + case TRX_PROV_EV_CFG_TS: + update_ts_data(l1h, (struct trx_prov_ev_cfg_ts_data*)data); + break; + } +} + +static void st_open_poweron_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; + uint8_t tn; + + /* after power on */ + if (l1h->config.rxgain_valid && !l1h->config.rxgain_sent) { + trx_if_cmd_setrxgain(l1h, l1h->config.rxgain); + l1h->config.rxgain_sent = 1; + } + if (l1h->config.maxdly_valid && !l1h->config.maxdly_sent) { + trx_if_cmd_setmaxdly(l1h, l1h->config.maxdly); + l1h->config.maxdly_sent = 1; + } + if (l1h->config.maxdlynb_valid && !l1h->config.maxdlynb_sent) { + trx_if_cmd_setmaxdlynb(l1h, l1h->config.maxdlynb); + l1h->config.maxdlynb_sent = 1; + } + + for (tn = 0; tn < TRX_NR_TS; tn++) { + if (l1h->config.slottype_valid[tn] + && !l1h->config.slottype_sent[tn]) { + trx_if_cmd_setslot(l1h, tn, + l1h->config.slottype[tn], l1if_setslot_cb); + l1h->config.slottype_sent[tn] = 1; + } + } +} + +static void st_open_poweron(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; + struct phy_instance *pinst = l1h->phy_inst; + struct phy_link *plink = pinst->phy_link; + struct trx_prov_ev_cfg_ts_data* ts_data; + uint8_t tn; + + switch(event) { + case TRX_PROV_EV_CLOSE: + /* power off transceiver, if not already */ + if (l1h->config.enabled) { + if (pinst->num == 0 && plink->u.osmotrx.powered && !plink->u.osmotrx.poweronoff_sent) { + trx_if_cmd_poweroff(l1h, l1if_poweronoff_cb); + plink->u.osmotrx.poweronoff_sent = true; + } + l1h->config.rxgain_sent = 0; + l1h->config.maxdly_sent = 0; + l1h->config.maxdlynb_sent = 0; + for (tn = 0; tn < TRX_NR_TS; tn++) + l1h->config.slottype_sent[tn] = 0; + } else if (!pinst->phy_link->u.osmotrx.poweronoff_sent) { + bts_model_trx_close_cb(pinst->trx, 0); + } /* else: poweroff in progress, cb will be called upon TRXC RSP */ + + if (pinst->num == 0) + trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF); + else + trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_POWEROFF); + break; + case TRX_PROV_EV_CFG_TS: + ts_data = (struct trx_prov_ev_cfg_ts_data*)data; + if (update_ts_data(l1h, ts_data)) { + trx_if_cmd_setslot(l1h, ts_data->tn, + l1h->config.slottype[ ts_data->tn], l1if_setslot_cb); + l1h->config.slottype_sent[ ts_data->tn] = 1; + } + + break; + } +} + +static void st_open_wait_poweroff_cnf(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; + struct phy_instance *pinst = l1h->phy_inst; + struct phy_link *plink = pinst->phy_link; + int rc; + + switch(event) { + case TRX_PROV_EV_POWEROFF_CNF: + rc = (uint16_t)(intptr_t)data; + if (plink->state != PHY_LINK_SHUTDOWN) { + trx_sched_clock_stopped(pinst->trx->bts); + phy_link_state_set(plink, PHY_LINK_SHUTDOWN); + + /* Notify TRX close on all TRX associated with this phy */ + llist_for_each_entry(pinst, &plink->instances, list) { + bts_model_trx_close_cb(pinst->trx, rc); + } + } + break; + } +} + +static struct osmo_fsm_state trx_prov_fsm_states[] = { + [TRX_PROV_ST_CLOSED] = { + .in_event_mask = + X(TRX_PROV_EV_OPEN), + .out_state_mask = + X(TRX_PROV_ST_OPEN_POWEROFF), + .name = "CLOSED", + .action = st_closed, + }, + [TRX_PROV_ST_OPEN_POWEROFF] = { + .in_event_mask = + X(TRX_PROV_EV_CFG_ENABLE) | + X(TRX_PROV_EV_CFG_BSIC) | + X(TRX_PROV_EV_CFG_ARFCN) | + X(TRX_PROV_EV_CFG_TSC) | + X(TRX_PROV_EV_CFG_TS), + .out_state_mask = + X(TRX_PROV_ST_OPEN_WAIT_POWERON_CNF) | + X(TRX_PROV_ST_OPEN_POWERON), + .name = "OPEN_POWEROFF", + .action = st_open_poweroff, + }, + [TRX_PROV_ST_OPEN_WAIT_POWERON_CNF] = { + .in_event_mask = + X(TRX_PROV_EV_POWERON_CNF) | + X(TRX_PROV_EV_CFG_TS), + .out_state_mask = + X(TRX_PROV_ST_OPEN_POWERON), + .name = "OPEN_WAIT_POWERON_CNF", + .action = st_open_wait_power_cnf, + }, + [TRX_PROV_ST_OPEN_POWERON] = { + .in_event_mask = + X(TRX_PROV_EV_POWEROFF) | + X(TRX_PROV_EV_CFG_TS), + .out_state_mask = + X(TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF) | + X(TRX_PROV_ST_OPEN_POWEROFF), + .name = "OPEN_POWERON", + .onenter = st_open_poweron_on_enter, + .action = st_open_poweron, + }, + [TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF] = { + .in_event_mask = + X(TRX_PROV_EV_POWEROFF_CNF), + .out_state_mask = + X(TRX_PROV_ST_OPEN_POWEROFF), + .name = "OPEN_WAIT_POWEROFF_CNF", + .action = st_open_wait_poweroff_cnf, + }, +}; + +const struct value_string trx_prov_fsm_event_names[] = { + OSMO_VALUE_STRING(TRX_PROV_EV_OPEN), + OSMO_VALUE_STRING(TRX_PROV_EV_CFG_ENABLE), + OSMO_VALUE_STRING(TRX_PROV_EV_CFG_BSIC), + OSMO_VALUE_STRING(TRX_PROV_EV_CFG_ARFCN), + OSMO_VALUE_STRING(TRX_PROV_EV_CFG_TSC), + OSMO_VALUE_STRING(TRX_PROV_EV_CFG_TS), + OSMO_VALUE_STRING(TRX_PROV_EV_CFG_RXGAIN), + OSMO_VALUE_STRING(TRX_PROV_EV_CFG_SETMAXDLY), + OSMO_VALUE_STRING(TRX_PROV_EV_POWERON_CNF), + OSMO_VALUE_STRING(TRX_PROV_EV_POWEROFF), + OSMO_VALUE_STRING(TRX_PROV_EV_POWEROFF_CNF), + OSMO_VALUE_STRING(TRX_PROV_EV_CLOSE), + { 0, NULL } +}; + +struct osmo_fsm trx_prov_fsm = { + .name = "TRX_PROV", + .states = trx_prov_fsm_states, + .num_states = ARRAY_SIZE(trx_prov_fsm_states), + .event_names = trx_prov_fsm_event_names, + .log_subsys = DL1C, +}; + +static __attribute__((constructor)) void trx_prov_fsm_init(void) +{ + OSMO_ASSERT(osmo_fsm_register(&trx_prov_fsm) == 0); +} diff --git a/src/osmo-bts-trx/trx_provision_fsm.h b/src/osmo-bts-trx/trx_provision_fsm.h new file mode 100644 index 0000000..7fede35 --- /dev/null +++ b/src/osmo-bts-trx/trx_provision_fsm.h @@ -0,0 +1,55 @@ +/* Provision TRX over TRXC protocol FSM */ + +/* (C) 2020 by sysmocom - s.m.f.c. GmbH + * Author: Pau Espin Pedrol + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#pragma once + +#include + +enum trx_provision_fsm_states { + TRX_PROV_ST_CLOSED, + TRX_PROV_ST_OPEN_POWEROFF, + TRX_PROV_ST_OPEN_WAIT_POWERON_CNF, + TRX_PROV_ST_OPEN_POWERON, + TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF, +}; + +struct trx_prov_ev_cfg_ts_data { + uint8_t tn; + uint8_t slottype; +}; + +enum trx_provision_fsm_events { + TRX_PROV_EV_OPEN, + TRX_PROV_EV_CFG_ENABLE, + TRX_PROV_EV_CFG_BSIC, + TRX_PROV_EV_CFG_ARFCN, + TRX_PROV_EV_CFG_TSC, + TRX_PROV_EV_CFG_TS, + TRX_PROV_EV_CFG_RXGAIN, + TRX_PROV_EV_CFG_SETMAXDLY, + TRX_PROV_EV_POWERON_CNF, + TRX_PROV_EV_POWEROFF, + TRX_PROV_EV_POWEROFF_CNF, + TRX_PROV_EV_CLOSE, +}; + +extern struct osmo_fsm trx_prov_fsm; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2a00c23df15840e33fbb232c9e1dd6db128f63f6 Gerrit-Change-Number: 19167 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 16:58:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 16:58:07 +0000 Subject: Change in osmo-e1d[master]: introduce concept of superchannel to data structures In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19229 ) Change subject: introduce concept of superchannel to data structures ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-e1d/+/19229/5/src/e1d.h File src/e1d.h: https://gerrit.osmocom.org/c/osmo-e1d/+/19229/5/src/e1d.h at 79 PS5, Line 79: struct e1_ts superchan; > union with the one above? no, not at all. As discussed two patches later, I think it is a feature that you can have both of them open at the same time, and then quickly switch between either of the two modes at runtime, without having to close/re-open everything. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I0aacf251e155de2bb6ad03ffc4181067b22f1c90 Gerrit-Change-Number: 19229 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Tue, 14 Jul 2020 16:58:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 16:58:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 16:58:57 +0000 Subject: Change in osmo-e1d[master]: actually implement the superchannel mode In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19231 ) Change subject: actually implement the superchannel mode ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-e1d/+/19231/5/src/intf_line.c File src/intf_line.c: https://gerrit.osmocom.org/c/osmo-e1d/+/19231/5/src/intf_line.c at 287 PS5, Line 287: buf[tsn+(i*32)] = buf_ts[i]; > would be great having all these 32 defined somewhere. yes, that was one of my thoughts, too. However, it's actually not all too bad to read. And the new code follows the existing style. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id340b1925471f427deb6cda7eb54e80dfc71faec Gerrit-Change-Number: 19231 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Tue, 14 Jul 2020 16:58:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 17:00:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 17:00:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: add ts/tr templates for MaioHsn In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19243 ) Change subject: library/GSM_RR_Types: add ts/tr templates for MaioHsn ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0c5581c3d95018d808907bd2bc5e8ddd0a730bea Gerrit-Change-Number: 19243 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 17:00:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 17:01:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 17:01:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: share send templates for ChannelDescription In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19252 ) Change subject: library/GSM_RR_Types: share send templates for ChannelDescription ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia33ebf2e680f16f774a981fc33422dfe5036637f Gerrit-Change-Number: 19252 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 17:01:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 17:01:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 17:01:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: introduce and use helper f_l1ctl_est_dchan() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19244 ) Change subject: BTS_Tests: introduce and use helper f_l1ctl_est_dchan() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia4f078ebbb278246ee117f580ff93f301dc60f7c Gerrit-Change-Number: 19244 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 17:01:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 17:02:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 17:02:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: implement optional frequency hopping support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19245 ) Change subject: BTS_Tests: implement optional frequency hopping support ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If0318fd320d4f112341465844555bf8d65b5f88f Gerrit-Change-Number: 19245 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 17:02:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 17:02:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 17:02:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests_LAPDm: consider frequency hopping parameters In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19253 ) Change subject: BTS_Tests_LAPDm: consider frequency hopping parameters ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idd1ffe0ee97805b40bb5e37645aa53a9b1dc4b0a Gerrit-Change-Number: 19253 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 17:02:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 17:02:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 17:02:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix PDCH tests: consider frequency hopping In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19254 ) Change subject: BTS_Tests: fix PDCH tests: consider frequency hopping ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1d805bf5392e59c4b4834757ce6124e63b174a42 Gerrit-Change-Number: 19254 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 17:02:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 17:03:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 17:03:22 +0000 Subject: Change in osmo-bsc[master]: ipaccess_sign_link_up: Log sign_link type In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19251 ) Change subject: ipaccess_sign_link_up: Log sign_link type ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If16d6feae56785a2c60b605227c0602f80b6f407 Gerrit-Change-Number: 19251 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 14 Jul 2020 17:03:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 17:03:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 17:03:26 +0000 Subject: Change in osmo-bsc[master]: ipaccess_sign_link_up: Log sign_link type In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19251 ) Change subject: ipaccess_sign_link_up: Log sign_link type ...................................................................... ipaccess_sign_link_up: Log sign_link type Change-Id: If16d6feae56785a2c60b605227c0602f80b6f407 --- M src/osmo-bsc/bts_ipaccess_nanobts.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index f004c15..b21678b 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -533,7 +533,7 @@ ipaccess_sign_link_reject(dev, &line->ts[E1INP_SIGN_OML - 1]); return NULL; } - DEBUGP(DLINP, "Identified BTS %u/%u/%u\n", + DEBUGP(DLINP, "%s: Identified BTS %u/%u/%u\n", e1inp_signtype_name(type), dev->site_id, dev->bts_id, dev->trx_id); switch(type) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If16d6feae56785a2c60b605227c0602f80b6f407 Gerrit-Change-Number: 19251 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 17:04:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 17:04:21 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: add configuration with frequency hopping parameters In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19160 ) Change subject: ttcn3-bts-test: add configuration with frequency hopping parameters ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7822c3581fccba3277a63577e740e7486307635d Gerrit-Change-Number: 19160 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 17:04:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 18:24:02 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 18:24:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: add ts/tr templates for MaioHsn In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19243 ) Change subject: library/GSM_RR_Types: add ts/tr templates for MaioHsn ...................................................................... library/GSM_RR_Types: add ts/tr templates for MaioHsn Change-Id: I0c5581c3d95018d808907bd2bc5e8ddd0a730bea --- M library/GSM_RR_Types.ttcn 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index 4b460b1..d0d5d8e 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -186,6 +186,18 @@ uint6_t hsn } with { variant "" }; + /* It's more handy to pass HSN first, so the arguments' order is reversed. */ + template (value) MaioHsn ts_HsnMaio(template (value) uint6_t hsn, + template (value) uint6_t maio) := { + maio := maio, + hsn := hsn + }; + template MaioHsn tr_HsnMaio(template (present) uint6_t hsn, + template (present) uint6_t maio) := { + maio := maio, + hsn := hsn + }; + /* TS 24.008 10.5.1.1 */ type uint16_t CellIdentity; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0c5581c3d95018d808907bd2bc5e8ddd0a730bea Gerrit-Change-Number: 19243 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 18:24:03 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 18:24:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: share send templates for ChannelDescription In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19252 ) Change subject: library/GSM_RR_Types: share send templates for ChannelDescription ...................................................................... library/GSM_RR_Types: share send templates for ChannelDescription They're going to be used in other modules too, not only in BTS_Tests. Also, take a chance to rearrange the list of arguments, so the ones with default values are placed after mandatory ones. Change-Id: Ia33ebf2e680f16f774a981fc33422dfe5036637f --- M bts/BTS_Tests.ttcn M library/GSM_RR_Types.ttcn 2 files changed, 23 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 47f8a29..1582fae 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2005,9 +2005,9 @@ /* Craft channel description (with or without frequency hopping parameters) */ if (ispresent(g_pars.maio_hsn)) { - ch_desc := valueof(ts_ChanDescH1(g_pars.chan_nr, maio_hsn := g_pars.maio_hsn)); + ch_desc := valueof(ts_ChanDescH1(g_pars.chan_nr, g_pars.maio_hsn)); } else { - ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr)); + ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, mp_trx0_arfcn)); } /* Send IMM.ASS via CCHAN */ @@ -3476,26 +3476,6 @@ ma := ''B } -private template (value) ChannelDescription ts_ChanDescH0(template (value) RslChannelNr chan_nr, - template (value) uint3_t tsc := 7, - template (value) uint12_t arfcn := mp_trx0_arfcn) := { - chan_nr := chan_nr, - tsc := tsc, - h := false, - arfcn := arfcn, - maio_hsn := omit -} - -private template (value) ChannelDescription ts_ChanDescH1(template (value) RslChannelNr chan_nr, - template (value) uint3_t tsc := 7, - template (value) MaioHsn maio_hsn) := { - chan_nr := chan_nr, - tsc := tsc, - h := true, - arfcn := omit, - maio_hsn := maio_hsn -} - private function f_fmt_ia_stats(integer num_tx, integer num_rx, integer num_del) return charstring { return int2str(num_tx) & " sent, " & int2str(num_rx) & " received, " @@ -3516,7 +3496,7 @@ f_l1_tune(L1CTL); for (var integer i := 0; i < num_total; i := i+1) { - var ChannelDescription ch_desc := valueof(ts_ChanDescH0(valueof(t_RslChanNr_SDCCH4(0, 0)))); + var ChannelDescription ch_desc := valueof(ts_ChanDescH0(t_RslChanNr_SDCCH4(0, 0), mp_trx0_arfcn)); var GsmRrMessage ia := valueof(ts_IMM_ASS(42, i, 5, ch_desc, c_MA_null)); var octetstring ia_enc := enc_GsmRrMessage(ia); RSL_CCHAN.send(ts_ASP_RSL_UD(ts_RSL_IMM_ASSIGN(ia_enc, 0))); diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index d0d5d8e..bf650b2 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -1082,4 +1082,24 @@ ext_ra := ext_ra }; + template (value) ChannelDescription ts_ChanDescH0(template (value) RslChannelNr chan_nr, + template (value) uint12_t arfcn, + template (value) uint3_t tsc := 7) := { + chan_nr := chan_nr, + tsc := tsc, + h := false, + arfcn := arfcn, + maio_hsn := omit + } + + template (value) ChannelDescription ts_ChanDescH1(template (value) RslChannelNr chan_nr, + template (value) MaioHsn maio_hsn, + template (value) uint3_t tsc := 7) := { + chan_nr := chan_nr, + tsc := tsc, + h := true, + arfcn := omit, + maio_hsn := maio_hsn + } + } with { encode "RAW" ; variant "FIELDORDER(msb)" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia33ebf2e680f16f774a981fc33422dfe5036637f Gerrit-Change-Number: 19252 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 18:24:04 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 18:24:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: introduce and use helper f_l1ctl_est_dchan() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19244 ) Change subject: BTS_Tests: introduce and use helper f_l1ctl_est_dchan() ...................................................................... BTS_Tests: introduce and use helper f_l1ctl_est_dchan() This is required for the upcoming test cases running on hopping channels. Dealing with module / hopping parameters in every test case is definitely not a good idea, so let's add a function. Change-Id: Ia4f078ebbb278246ee117f580ff93f301dc60f7c Related: SYS#4868, OS#4546 --- M bts/BTS_Tests.ttcn 1 file changed, 22 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 1582fae..1cecf4e 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1149,7 +1149,7 @@ f_rsl_chan_act(g_pars.chan_mode, act_type := t_RSL_IE_ActType_HO_ASYNC); /* don't perform immediate assignment here, as we're testing non-IA case */ /* enable dedicated mode */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn)); + f_l1ctl_est_dchan(L1CTL, g_pars); /* Verify that no DL SACCH is being received */ f_sacch_missing(?); @@ -1167,7 +1167,7 @@ f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_ASYNC); /* don't perform immediate assignment here, as we're testing non-IA case */ /* enable dedicated mode */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn)); + f_l1ctl_est_dchan(L1CTL, g_pars); /* Verify that DL SACCH is being received */ f_sacch_present(si5); @@ -1205,7 +1205,7 @@ f_rsl_chan_act(g_pars.chan_mode, act_type := t_RSL_IE_ActType_HO_SYNC); /* don't perform immediate assignment here, as we're testing non-IA case */ /* enable dedicated mode */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn)); + f_l1ctl_est_dchan(L1CTL, g_pars); /* Verify that no DL SACCH is being received */ f_sacch_missing(?); @@ -1223,7 +1223,7 @@ f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_SYNC); /* don't perform immediate assignment here, as we're testing non-IA case */ /* enable dedicated mode */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn)); + f_l1ctl_est_dchan(L1CTL, g_pars); /* Verify that no DL SACCH is being received */ f_sacch_missing(?); @@ -1241,7 +1241,7 @@ f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_SYNC); /* don't perform immediate assignment here, as we're testing non-IA case */ /* enable dedicated mode */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn)); + f_l1ctl_est_dchan(L1CTL, g_pars); /* Verify that no DL SACCH is being received */ f_sacch_missing(?); @@ -1260,7 +1260,7 @@ f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_SYNC); /* don't perform immediate assignment here, as we're testing non-IA case */ /* enable dedicated mode */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn)); + f_l1ctl_est_dchan(L1CTL, g_pars); /* Verify that DL SACCH is being received */ f_sacch_present(si5); @@ -1626,7 +1626,7 @@ /* Switch the MS side (e.g. trxcon) to a dedicated channel without * waiting for Immediate Assignment and sending Access Burst */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn)); + f_l1ctl_est_dchan(L1CTL, g_pars); /* Send handover Access Burst */ fn := f_L1CTL_RACH(L1CTL, ho_ref, chan_nr := g_pars.chan_nr); @@ -1990,6 +1990,21 @@ return fn; } +/* Tune to a dedicated channel: L1CTL only */ +private function f_l1ctl_est_dchan(L1CTL_PT pt, ConnHdlrPars pars) { + if (not ispresent(pars.maio_hsn)) { + pt.send(ts_L1CTL_DM_EST_REQ_H0(pars.chan_nr, + 7 /* TODO: mp_tsc */, + mp_trx0_arfcn)); + } else { + pt.send(ts_L1CTL_DM_EST_REQ_H1(pars.chan_nr, + 7 /* TODO: mp_tsc */, + pars.maio_hsn.hsn, + pars.maio_hsn.maio, + pars.ma)); + } +} + /* Establish dedicated channel: L1CTL + RSL side */ private function f_est_dchan(boolean encr_enable := false, RSL_IE_List more_ies := {}) runs on ConnHdlr { var GsmFrameNumber fn; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia4f078ebbb278246ee117f580ff93f301dc60f7c Gerrit-Change-Number: 19244 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 18:24:04 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 18:24:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: implement optional frequency hopping support In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19245 ) Change subject: BTS_Tests: implement optional frequency hopping support ...................................................................... BTS_Tests: implement optional frequency hopping support Change-Id: If0318fd320d4f112341465844555bf8d65b5f88f Depends: I7822c3581fccba3277a63577e740e7486307635d Related: SYS#4868, OS#4546 --- M bts/BTS_Tests.ttcn M bts/BTS_Tests_LAPDm.ttcn 2 files changed, 58 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 1cecf4e..7c6886d 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -111,6 +111,10 @@ boolean mp_l1_supports_gprs := false; /* how many transceivers do we expect to connect */ integer mp_transceiver_num := 1; + /* frequency hopping status */ + boolean mp_freq_hop_enabled := false; + /* frequency hopping parameters */ + FreqHopConfig mp_fh_config; } type record of RslChannelNr ChannelNrs; @@ -510,6 +514,49 @@ private type function void_fn(charstring id) runs on ConnHdlr; +private type record length(8) of FreqHopGroups FreqHopConfig; + +private type record of FreqHopGroup FreqHopGroups; +private type record FreqHopGroup { + uint6_t hsn, + FreqHopGroupItems trx_maio +}; + +private type record of FreqHopGroupItem FreqHopGroupItems; +private type record FreqHopGroupItem { + uint8_t trx_nr, + uint6_t maio +}; + +friend function f_resolve_fh_params(inout ConnHdlrPars pars, uint8_t trx_nr := 0) +{ + var FreqHopGroups groups := mp_fh_config[pars.chan_nr.tn]; + var integer i, j; + + for (i := 0; i < lengthof(groups); i := i + 1) { + var FreqHopGroup g := groups[i]; + for (j := 0; j < lengthof(g.trx_maio); j := j + 1) { + var FreqHopGroupItem gi := g.trx_maio[j]; + if (gi.trx_nr == trx_nr) { + pars.maio_hsn := valueof(ts_HsnMaio(g.hsn, gi.maio)); + pars.ma := { }; /* to be composed below */ + break; + } + } + + if (ispresent(pars.maio_hsn)) { + /* Compose the Mobile Allocation */ + for (j := 0; j < lengthof(g.trx_maio); j := j + 1) { + var FreqHopGroupItem gi := g.trx_maio[j]; + pars.ma := pars.ma & { l1ctl_ma_def[gi.trx_nr] }; + } + + log("Freq. hopping parameters: ", pars.maio_hsn, pars.ma); + break; /* We're done */ + } + } +} + /* create a new test component */ friend function f_start_handler(void_fn fn, ConnHdlrPars pars, boolean pcu_comp := false, @@ -535,6 +582,11 @@ map(vc_conn:BTS_TRXC, system:BTS_TRXC); } + /* Obtain frequency hopping parameters for a given timeslot */ + if (mp_freq_hop_enabled and mp_transceiver_num > 1) { + f_resolve_fh_params(pars); + } + vc_conn.start(f_handler_init(fn, id, pars)); return vc_conn; } diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn index 4d4a988..4242502 100644 --- a/bts/BTS_Tests_LAPDm.ttcn +++ b/bts/BTS_Tests_LAPDm.ttcn @@ -228,6 +228,12 @@ /* undo what f_start_handler is doing and pull LAPDm_CT into the loop */ unmap(self:L1CTL, system:L1CTL); f_lapdm_init(); + + /* Obtain frequency hopping parameters for a given timeslot */ + if (mp_freq_hop_enabled and mp_transceiver_num > 1) { + f_resolve_fh_params(g_pars); + } + /* activate the channel on the BTS side */ f_rsl_chan_act(g_pars.chan_mode, false, {}); /* activate the channel on the MS side */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If0318fd320d4f112341465844555bf8d65b5f88f Gerrit-Change-Number: 19245 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 18:24:05 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 18:24:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests_LAPDm: consider frequency hopping parameters In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19253 ) Change subject: BTS_Tests_LAPDm: consider frequency hopping parameters ...................................................................... BTS_Tests_LAPDm: consider frequency hopping parameters Change-Id: Idd1ffe0ee97805b40bb5e37645aa53a9b1dc4b0a Related: SYS#4868, OS#4546 --- M bts/BTS_Tests_LAPDm.ttcn M library/LAPDm_RAW_PT.ttcn 2 files changed, 32 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn index 4242502..9981bbc 100644 --- a/bts/BTS_Tests_LAPDm.ttcn +++ b/bts/BTS_Tests_LAPDm.ttcn @@ -6,6 +6,7 @@ import from LAPDm_Types all; import from RSL_Types all; import from BTS_Tests all; +import from GSM_RR_Types all; import from Misc_Helpers all; /* test that use exclusively only LAPDm over L1CTL */ @@ -51,9 +52,16 @@ } /* master function switching to a dedicated radio channel */ -function f_switch_dcch(Arfcn arfcn, RslChannelNr chan_nr, GsmTsc tsc) runs on lapdm_test_CT { - var BCCH_tune_req tune_req := { arfcn := arfcn, combined_ccch := true }; - var DCCH_switch_req sw_req := { arfcn, chan_nr, tsc }; +function f_switch_dcch() runs on ConnHdlr { + var BCCH_tune_req tune_req := { arfcn := { false, mp_trx0_arfcn }, combined_ccch := true }; + var DCCH_switch_req sw_req := { ma := g_pars.ma }; + + /* Craft channel description (with or without frequency hopping parameters) */ + if (ispresent(g_pars.maio_hsn)) { + sw_req.chan_desc := valueof(ts_ChanDescH1(g_pars.chan_nr, g_pars.maio_hsn)); + } else { + sw_req.chan_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, mp_trx0_arfcn)); + } LAPDM.send(tune_req); LAPDM.send(sw_req); @@ -237,7 +245,7 @@ /* activate the channel on the BTS side */ f_rsl_chan_act(g_pars.chan_mode, false, {}); /* activate the channel on the MS side */ - f_switch_dcch({false, mp_trx0_arfcn}, g_chan_nr, 7); + f_switch_dcch(); } private function fp_common_fini() runs on ConnHdlr diff --git a/library/LAPDm_RAW_PT.ttcn b/library/LAPDm_RAW_PT.ttcn index 394deab..77f0452 100644 --- a/library/LAPDm_RAW_PT.ttcn +++ b/library/LAPDm_RAW_PT.ttcn @@ -38,9 +38,8 @@ /* directly switch to a dedicated channel (without RACH/IMM.ASS */ type record DCCH_switch_req { - Arfcn arfcn, - RslChannelNr chan_nr, - GsmTsc tsc + ChannelDescription chan_desc, + L1ctlMA ma } type record DCCH_switch_res { @@ -236,17 +235,30 @@ /* store/save channel description */ chan_desc := imm_ass.chan_desc; - /* send DM_EST_REQ */ + /* send DM_EST_REQ, TODO: Mobile Allocation */ f_L1CTL_DM_EST_REQ_IA(L1CTL, imm_ass); set_ph_state(PH_STATE_DCH); } /* switching directly to a dedicated channel *without RACH/IMM-ASS */ - private function f_switch_dcch(Arfcn arfcn, RslChannelNr chan_nr, GsmTsc tsc) runs on lapdm_CT { + private function f_switch_dcch(in DCCH_switch_req sw_req) runs on lapdm_CT { set_ph_state(PH_STATE_TUNING_DCH); /* store/save channel description */ - chan_desc.chan_nr := chan_nr; - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(chan_nr, tsc, arfcn.arfcn)); + chan_desc := sw_req.chan_desc; + + /* tune the L1 to the indicated channel */ + if (chan_desc.h) { + L1CTL.send(ts_L1CTL_DM_EST_REQ_H1(chan_desc.chan_nr, + chan_desc.tsc, + chan_desc.maio_hsn.hsn, + chan_desc.maio_hsn.maio, + sw_req.ma)); + } else { + L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(chan_desc.chan_nr, + chan_desc.tsc, + chan_desc.arfcn)); + } + set_ph_state(PH_STATE_DCH); } @@ -431,7 +443,7 @@ } [] LAPDM_SP.receive(DCCH_switch_req:?) -> value sw_req { var DCCH_switch_res res; - f_switch_dcch(sw_req.arfcn, sw_req.chan_nr, sw_req.tsc); + f_switch_dcch(sw_req); if (ph_state == PH_STATE_DCH) { res := { omit }; } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idd1ffe0ee97805b40bb5e37645aa53a9b1dc4b0a Gerrit-Change-Number: 19253 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 18:24:05 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 18:24:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix PDCH tests: consider frequency hopping In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19254 ) Change subject: BTS_Tests: fix PDCH tests: consider frequency hopping ...................................................................... BTS_Tests: fix PDCH tests: consider frequency hopping Change-Id: I1d805bf5392e59c4b4834757ce6124e63b174a42 Related: SYS#4868, OS#4546 --- M bts/BTS_Tests.ttcn 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 7c6886d..1232a6c 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -4701,7 +4701,9 @@ f_TC_pcu_act_req(0, 0, 7, true); /* Tune trxcon to that PDCH channel */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(ts_RslChanNr_PDCH(7), 7, mp_trx0_arfcn)); + var ConnHdlrPars pars := valueof(t_Pars(ts_RslChanNr_PDCH(7), ts_RSL_ChanMode_SIGN)); + f_resolve_fh_params(pars); + f_l1ctl_est_dchan(L1CTL, pars); /* Verify PTCCH/U: send several access bursts, make sure they're received */ for (var integer i := 0; i < 16; i := i + 1) { @@ -4962,7 +4964,9 @@ f_TC_pcu_act_req(0, 0, 7, true); /* Tune trxcon to that PDCH channel on TS7 */ - L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(ts_RslChanNr_PDCH(7), 7, mp_trx0_arfcn)); + var ConnHdlrPars pars := valueof(t_Pars(ts_RslChanNr_PDCH(7), ts_RSL_ChanMode_SIGN)); + f_resolve_fh_params(pars); + f_l1ctl_est_dchan(L1CTL, pars); /* C/I in centiBels, test range: -256 .. +1280, step 128 */ for (var int16_t i := -256; i <= 1280; i := i + 128) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1d805bf5392e59c4b4834757ce6124e63b174a42 Gerrit-Change-Number: 19254 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 18:24:54 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 18:24:54 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: call send_clck_ind() on every TDMA frame In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19226 ) Change subject: trx_toolkit/clck_gen.py: call send_clck_ind() on every TDMA frame ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6d53e5266fa3b1f2eb55822d1c14975789b202ed Gerrit-Change-Number: 19226 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 18:24:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 18:25:01 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 18:25:01 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: call send_clck_ind() on every TDMA frame In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19226 ) Change subject: trx_toolkit/clck_gen.py: call send_clck_ind() on every TDMA frame ...................................................................... trx_toolkit/clck_gen.py: call send_clck_ind() on every TDMA frame Change-Id: I6d53e5266fa3b1f2eb55822d1c14975789b202ed --- M src/target/trx_toolkit/clck_gen.py 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index 0219bb4..92be8b0 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -53,7 +53,6 @@ # Calculate counter time self.ctr_interval = self.GSM_FRAME_US - self.LO_DELAY_US self.ctr_interval /= self.SEC_DELAY_US - self.ctr_interval *= self.ind_period @property def running(self): @@ -109,7 +108,7 @@ log.debug(payload.rstrip("\0")) # Increase frame count - self.clck_src += self.ind_period + self.clck_src += 1 # Just a wrapper for independent usage class Application(ApplicationBase): -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6d53e5266fa3b1f2eb55822d1c14975789b202ed Gerrit-Change-Number: 19226 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 18:25:02 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 18:25:02 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: fix TDMA clock counter wrapping In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19225 ) Change subject: trx_toolkit/clck_gen.py: fix TDMA clock counter wrapping ...................................................................... trx_toolkit/clck_gen.py: fix TDMA clock counter wrapping Change-Id: I157447c7610402f6d62d2b74c9f04fcaa0bc1724 --- M src/target/trx_toolkit/clck_gen.py 1 file changed, 2 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index 92be8b0..9f39643 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -91,10 +91,6 @@ self.send_clck_ind() def send_clck_ind(self): - # Keep clock cycle - if self.clck_src % GSM_HYPERFRAME >= 0: - self.clck_src %= GSM_HYPERFRAME - # We don't need to send so often if self.clck_src % self.ind_period == 0: # Create UDP payload @@ -107,8 +103,8 @@ # Debug print log.debug(payload.rstrip("\0")) - # Increase frame count - self.clck_src += 1 + # Increase frame count (modular arithmetic) + self.clck_src = (self.clck_src + 1) % GSM_HYPERFRAME # Just a wrapper for independent usage class Application(ApplicationBase): -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I157447c7610402f6d62d2b74c9f04fcaa0bc1724 Gerrit-Change-Number: 19225 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 18:25:04 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 18:25:04 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: support optional clock handler In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19227 ) Change subject: trx_toolkit/clck_gen.py: support optional clock handler ...................................................................... trx_toolkit/clck_gen.py: support optional clock handler Change-Id: I85b2182d9835ed035cf370e45ea039ac6a7e8405 --- M src/target/trx_toolkit/clck_gen.py 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index 9f39643..6c09316 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -54,6 +54,9 @@ self.ctr_interval = self.GSM_FRAME_US - self.LO_DELAY_US self.ctr_interval /= self.SEC_DELAY_US + # (Optional) clock consumer + self.clck_handler = None + @property def running(self): if self._thread is None: @@ -103,6 +106,9 @@ # Debug print log.debug(payload.rstrip("\0")) + if self.clck_handler is not None: + self.clck_handler(self.clck_src) + # Increase frame count (modular arithmetic) self.clck_src = (self.clck_src + 1) % GSM_HYPERFRAME -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I85b2182d9835ed035cf370e45ea039ac6a7e8405 Gerrit-Change-Number: 19227 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 18:25:05 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 18:25:05 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/transceiver.py: implement the transmit burst queue In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19228 ) Change subject: trx_toolkit/transceiver.py: implement the transmit burst queue ...................................................................... trx_toolkit/transceiver.py: implement the transmit burst queue In order to reflect the UL/DL delay caused by the premature burst scheduling (a.k.a. 'fn-advance') in a virtual environment, the Transceiver implementation now queues all to be transmitted bursts, so they remain in the queue until the appropriate time of transmission. The API user is supposed to call recv_data_msg() in order to obtain a L12TRX message on the TRXD (data) inteface, so it gets queued by this function. Then, to ensure the timeous transmission, the user of this implementation needs to call clck_tick() on each TDMA frame. Both functions are thread-safe (queue mutex). In a multi-trx configuration, the use of queue additionally ensures proper burst aggregation on multiple TRXD connections, so all L12TRX messages are guaranteed to be sent in the right order, i.e. with monolithically-increasing TDMA frame numbers. Of course, this change increases the overall CPU usage, given that each transceiver gets its own queue, and we need to serve them all on every TDMA frame. According to my measurements, when running test cases from ttcn3-bts-test, the average load is ~50% higher than what it used to be. Still not significantly high, though. Change-Id: Ie66ef9667dc8d156ad578ce324941a816c07c105 Related: OS#4658, OS#4546 --- M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/transceiver.py 2 files changed, 75 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 27c2b88..b487a93 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -388,6 +388,8 @@ # Init shared clock generator self.clck_gen = CLCKGen([]) + # This method will be called on each TDMA frame + self.clck_gen.clck_handler = self.clck_handler # Power measurement emulation # Noise: -120 .. -105 @@ -456,14 +458,18 @@ for trx in self.trx_list.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) + trx.recv_data_msg() # CTRL interface if trx.ctrl_if.sock in r_event: trx.ctrl_if.handle_rx() + # This method will be called by the clock thread + def clck_handler(self, fn): + # We assume that this list is immutable at run-time + for trx in self.trx_list.trx_list: + trx.clck_tick(self.burst_fwd, fn) + def shutdown(self): log.info("Shutting down...") diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 474834d..3c1ddc8 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -24,6 +24,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import logging as log +import threading from ctrl_if_trx import CTRLInterfaceTRX from data_if import DATAInterface @@ -123,6 +124,37 @@ Transceiver and all its timeslots, so using in for the BTS side does not make any sense (imagine BCCH hopping together with DCCH). + == The transmit burst queue + + According to 3GPP 45.002, the time difference between Uplink and + Downlink corresponds to three TDMA timeslot periods. However, + in general the L1 implementations (such as osmo-bts-trx and trxcon) + never schedule to be transmitted bursts for the current TDMA frame + immediately. Instead, they are being scheduled prematurely. + + The rationale is that both transceiver and the L1 implementation + are separete processes that are not perfectly synchronized in time. + Moreover, the transceiver needs some time to prepare a burst for + transmission. This is why the time difference between Uplink and + Downlink is actually much higher on practice (20 TDMA frame periods + by default, at the moment of writing this patch). + + In order to reflect that delay in a virtual environment, this + implementation, just like a normal transceiver (e.g. osmo-trx), + queues all to be transmitted (L12TRX) bursts, so hey remain in + the transmit queue until the appropriate time of transmission. + + The API user is supposed to call recv_data_msg() in order to obtain + a L12TRX message on the TRXD (data) inteface, so it gets queued by + this function. Then, to ensure the timeous transmission, the user + of this implementation needs to call clck_tick() on each TDMA + frame. Both functions are thread-safe (queue mutex). + + In a multi-trx configuration, the use of queue additionally ensures + proper burst aggregation on multiple TRXD connections, so all L12TRX + messages are guaranteed to be sent in the right order, i.e. with + monolithically-increasing TDMA frame numbers. + """ def __init__(self, bind_addr, remote_addr, base_port, name = None, @@ -178,6 +210,10 @@ # List of child transceivers self.child_trx_list = TRXList() + # Tx (L12TRX) burst queue and mutex + self._tx_queue_lock = threading.Lock() + self._tx_queue = [] + def __str__(self): desc = "%s:%d" % (self.remote_addr, self.base_port) if self.child_idx > 0: @@ -234,10 +270,12 @@ trx.running = True elif event == "POWEROFF": trx.running = False + trx.tx_queue_clear() trx.disable_fh() - # Reset frequency hopping parameters + # Reset frequency hopping parameters, clear the queue if event == "POWEROFF": + self.tx_queue_clear() self.disable_fh() # Trigger clock generator if required @@ -275,8 +313,35 @@ "configured => dropping..." % (self, msg.desc_hdr())) return None + # Enque the message, it will be sent later + self.tx_queue_append(msg) return msg def handle_data_msg(self, msg): # TODO: make legacy mode configurable (via argv?) self.data_if.send_msg(msg, legacy = True) + + def tx_queue_append(self, msg): + with self._tx_queue_lock: + self._tx_queue.append(msg) + + def tx_queue_clear(self): + with self._tx_queue_lock: + # TODO: Python3: self._tx_queue.clear() + del self._tx_queue[:] + + def clck_tick(self, fwd, fn): + if not self.running: + return + + self._tx_queue_lock.acquire() + + for msg in self._tx_queue: + if msg.fn == fn: + fwd.forward_msg(self, msg) + elif msg.fn < fn: + log.warning("(%s) Stale TRXD message (fn=%u): %s" + % (self, fn, msg.desc_hdr())) + + self._tx_queue = [msg for msg in self._tx_queue if msg.fn > fn] + self._tx_queue_lock.release() -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie66ef9667dc8d156ad578ce324941a816c07c105 Gerrit-Change-Number: 19228 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 18:52:53 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 18:52:53 +0000 Subject: Change in libosmo-abis[master]: ipaccess.c: Drop repeated ipaccess_keepalive_fsm_cleanup in write err... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19246 ) Change subject: ipaccess.c: Drop repeated ipaccess_keepalive_fsm_cleanup in write error path ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I00d0557fe81861d4b913a4c76e4b56f93e656103 Gerrit-Change-Number: 19246 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 14 Jul 2020 18:52:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 18:56:38 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 14 Jul 2020 18:56:38 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Fix log formatting of RESP_ID IPA attributes In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19250 ) Change subject: ipaccess: Fix log formatting of RESP_ID IPA attributes ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmo-abis/+/19250/1/src/input/ipaccess.c File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/19250/1/src/input/ipaccess.c at 224 PS1, Line 224: ipa_ccm_id_resp_parse Maybe we should rather do this in ipa_ccm_id_resp_parse()? It's not even documented that this function calls DEBUGPC(DLMI, ...). -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Id5b4c39737a43c9ba68f3aacc889c10eba697920 Gerrit-Change-Number: 19250 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 14 Jul 2020 18:56:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 19:52:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 19:52:36 +0000 Subject: Change in libosmo-abis[master]: e1_input: Use osmo_use_count in e1inp_line References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19256 ) Change subject: e1_input: Use osmo_use_count in e1inp_line ...................................................................... e1_input: Use osmo_use_count in e1inp_line struct e1inp_line fields changing is fine since it is allocated through an API and a pointer should be used by clients. e1inp_line_clone API is changed but it's not used by anyone outside libosmo-abis,so it's fine. Related: OS#4624 Change-Id: I0658b2e9c452598025cc0f1d0b060076171767cc --- M include/osmocom/abis/e1_input.h M src/e1_input.c M src/input/ipaccess.c 3 files changed, 76 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/56/19256/1 diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index 8230e44..1b98cc7 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -49,7 +50,7 @@ enum e1inp_sign_type type; - /* trx for msg->trx of received msgs */ + /* trx for msg->trx of received msgs */ struct gsm_bts_trx *trx; /* msgb queue of to-be-transmitted msgs */ @@ -191,7 +192,7 @@ struct e1inp_line { struct llist_head list; - int refcnt; + struct osmo_use_count use_count; unsigned int num; const char *name; @@ -245,14 +246,18 @@ struct e1inp_line *e1inp_line_create(uint8_t e1_nr, const char *driver_name); /* clone one existing E1 input line */ -struct e1inp_line *e1inp_line_clone(void *ctx, struct e1inp_line *line); +struct e1inp_line *e1inp_line_clone(void *ctx, struct e1inp_line *line, const char *use); -/* increment refcount use of E1 input line */ +/* increment refcount use of E1 input line. Deprecated, use e1inp_line_get2() instead. */ void e1inp_line_get(struct e1inp_line *line); -/* decrement refcount use of E1 input line, release if unused */ +/* decrement refcount use of E1 input line, release if unused. Deprecated, use e1inp_line_put2() instead. */ void e1inp_line_put(struct e1inp_line *line); +/* Convenience macros for struct foo instances. These are strict about use count errors. */ +#define e1inp_line_get2(line, USE) OSMO_ASSERT( osmo_use_count_get_put(&(line)->use_count, USE, 1) == 0 ); +#define e1inp_line_put2(line, USE) OSMO_ASSERT( osmo_use_count_get_put(&(line)->use_count, USE, -1) == 0 ); + /* bind operations to one E1 input line */ void e1inp_line_bind_ops(struct e1inp_line *line, const struct e1inp_line_ops *ops); diff --git a/src/e1_input.c b/src/e1_input.c index 9ea4f17..32ffec6 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -366,6 +367,48 @@ return 0; } +static int e1inp_line_use_cb(struct osmo_use_count_entry *use_count_entry, int32_t old_use_count, + const char *file, int file_line) +{ + char buf[512]; + struct osmo_use_count *uc = use_count_entry->use_count; + struct e1inp_line *line = uc->talloc_object; + + LOGPSRC(DLINP, LOGL_INFO, file, file_line, + "E1L(%u) Line (%p) reference count %s changed %" PRId32 " -> %" PRId32 " [%s]\n", + (line)->num, line, use_count_entry->use, + old_use_count, use_count_entry->count, + osmo_use_count_name_buf(buf, sizeof(buf), uc)); + + if (!use_count_entry->count) + osmo_use_count_free(use_count_entry); + + if (osmo_use_count_total(uc) > 0) + return 0; + + /* Remove our counter group from libosmocore's global counter + * list if we are freeing the last remaining talloc context. + * Otherwise we get a use-after-free when libosmocore's timer + * ticks again and attempts to update these counters (OS#3011). + * + * Note that talloc internally counts "secondary" references + * _in addition to_ the initial allocation context, so yes, + * we must check for *zero* remaining secondary contexts here. */ + if (talloc_reference_count(line->rate_ctr) == 0) { + rate_ctr_group_free(line->rate_ctr); + } else { + /* We are not freeing the last talloc context. + * Instead of calling talloc_free(), unlink this 'line' pointer + * which serves as one of several talloc contexts for the rate + * counters and driver private state. */ + talloc_unlink(line, line->rate_ctr); + if (line->driver_data) + talloc_unlink(line, line->driver_data); + } + talloc_free(line); + return 0; +} + struct e1inp_line *e1inp_line_find(uint8_t e1_nr) { struct e1inp_line *e1i_line; @@ -417,14 +460,18 @@ line->ts[i].num = i+1; line->ts[i].line = line; } - line->refcnt++; + + line->use_count.talloc_object = line; + line->use_count.use_cb = e1inp_line_use_cb; + e1inp_line_get2(line, "ctor"); + llist_add_tail(&line->list, &e1inp_line_list); return line; } struct e1inp_line * -e1inp_line_clone(void *ctx, struct e1inp_line *line) +e1inp_line_clone(void *ctx, struct e1inp_line *line, const char *use) { struct e1inp_line *clone; @@ -453,47 +500,23 @@ if (line->driver_data) clone->driver_data = talloc_reference(clone, line->driver_data); - clone->refcnt = 1; + clone->use_count = (struct osmo_use_count) { + .talloc_object = clone, + .use_cb = e1inp_line_use_cb, + .use_counts = {0}, + }; + e1inp_line_get2(clone, use); /* Clone is used internally for bfd */ return clone; } void e1inp_line_get(struct e1inp_line *line) { - int old_refcnt = line->refcnt++; - - LOGPIL(line, DLINP, LOGL_DEBUG, "Line '%s' (%p) reference count get: %d -> %d\n", - line->name, line, old_refcnt, line->refcnt); + e1inp_line_get2(line, "unknown"); } void e1inp_line_put(struct e1inp_line *line) { - int old_refcnt = line->refcnt--; - - LOGPIL(line, DLINP, LOGL_DEBUG, "Line '%s' (%p) reference count put: %d -> %d\n", - line->name, line, old_refcnt, line->refcnt); - - if (line->refcnt == 0) { - /* Remove our counter group from libosmocore's global counter - * list if we are freeing the last remaining talloc context. - * Otherwise we get a use-after-free when libosmocore's timer - * ticks again and attempts to update these counters (OS#3011). - * - * Note that talloc internally counts "secondary" references - * _in addition to_ the initial allocation context, so yes, - * we must check for *zero* remaining secondary contexts here. */ - if (talloc_reference_count(line->rate_ctr) == 0) { - rate_ctr_group_free(line->rate_ctr); - } else { - /* We are not freeing the last talloc context. - * Instead of calling talloc_free(), unlink this 'line' pointer - * which serves as one of several talloc contexts for the rate - * counters and driver private state. */ - talloc_unlink(line, line->rate_ctr); - if (line->driver_data) - talloc_unlink(line, line->driver_data); - } - talloc_free(line); - } + e1inp_line_put2(line, "unknown"); } void @@ -586,7 +609,7 @@ link->tei = tei; link->sapi = sapi; - e1inp_line_get(link->ts->line); + e1inp_line_get2(link->ts->line, "e1inp_sign_link"); llist_add_tail(&link->list, &ts->sign.sign_links); @@ -609,7 +632,7 @@ if (link->ts->line->driver->close) link->ts->line->driver->close(link); - e1inp_line_put(link->ts->line); + e1inp_line_put2(link->ts->line, "e1inp_sign_link"); talloc_free(link); } diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 917a195..5d17839 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -293,7 +293,7 @@ /* Finally, we know which OML link is associated with * this RSL link, attach it to this socket. */ bfd->data = new_line = sign_link->ts->line; - e1inp_line_get(new_line); + e1inp_line_get2(new_line, "ipa_bfd"); ts = e1inp_line_ipa_rsl_ts(new_line, unit_data.trx_id); newbfd = &ts->driver.ipaccess.fd; @@ -310,7 +310,7 @@ goto err; } /* now we can release the dummy RSL line. */ - e1inp_line_put(line); + e1inp_line_put2(line, "ipa_bfd"); e1i_ts = ipaccess_line_ts(newbfd, new_line); ipaccess_bsc_keepalive_fsm_alloc(e1i_ts, newbfd, "rsl_bsc_to_bts"); @@ -328,7 +328,7 @@ close(bfd->fd); bfd->fd = -1; } - e1inp_line_put(line); + e1inp_line_put2(line, "ipa_bfd"); return -1; } @@ -603,7 +603,7 @@ struct osmo_fd *bfd; /* clone virtual E1 line for this new OML link. */ - line = e1inp_line_clone(tall_ipa_ctx, link->line); + line = e1inp_line_clone(tall_ipa_ctx, link->line, "ipa_bfd"); if (line == NULL) { LOGP(DLINP, LOGL_ERROR, "could not clone E1 line\n"); return -ENOMEM; @@ -642,7 +642,7 @@ err_line: close(bfd->fd); bfd->fd = -1; - e1inp_line_put(line); + e1inp_line_put2(line, "ipa_bfd"); return ret; } @@ -655,7 +655,7 @@ /* We don't know yet which OML link to associate it with. Thus, we * allocate a temporary E1 line until we have received ID. */ - line = e1inp_line_clone(tall_ipa_ctx, link->line); + line = e1inp_line_clone(tall_ipa_ctx, link->line, "ipa_bfd"); if (line == NULL) { LOGP(DLINP, LOGL_ERROR, "could not clone E1 line\n"); return -ENOMEM; @@ -692,7 +692,7 @@ err_line: close(bfd->fd); bfd->fd = -1; - e1inp_line_put(line); + e1inp_line_put2(line, "ipa_bfd"); return ret; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0658b2e9c452598025cc0f1d0b060076171767cc Gerrit-Change-Number: 19256 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 19:52:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 19:52:37 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Drop e1inp_line reference in ipacess_drop() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19257 ) Change subject: ipaccess: Drop e1inp_line reference in ipacess_drop() ...................................................................... ipaccess: Drop e1inp_line reference in ipacess_drop() the bfd->data handles a reference to the e1np_line (obtained through e1inp_line_get() during bfd setup), so remember to drop it under this condition. Related: OS#4624 Change-Id: I418064df04872befe2e936e21768b6ea01263120 --- M src/input/ipaccess.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/57/19257/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 5d17839..08b34a4 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -92,6 +92,13 @@ osmo_fd_unregister(bfd); close(bfd->fd); bfd->fd = -1; + /* This is BSC code, ipaccess_drop() is only called for + accepted() sockets, hence the bfd holds a reference to + e1inp_line in ->data that needs to be released */ + OSMO_ASSERT(bfd->data == line); + bfd->data = NULL; + e1inp_line_put2(line, "ipa_bfd"); + ret = -ENOENT; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I418064df04872befe2e936e21768b6ea01263120 Gerrit-Change-Number: 19257 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 19:52:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 19:52:37 +0000 Subject: Change in libosmo-abis[master]: ipacces: Fix e1inp_line reference put in ipaccess_close References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19258 ) Change subject: ipacces: Fix e1inp_line reference put in ipaccess_close ...................................................................... ipacces: Fix e1inp_line reference put in ipaccess_close Drop the function e1inp_close_socket since it's only used by the caller at hand, and it's only exported through "internal.h", so no app is using it. Remove it because there's only a caller, and furthermore because keeping it (and putting bfd->data==line) would introduce a layer violation because the bfd->data==line is only used for ipaccess so far. Triggering path: handle_ts1_read ret=0 "Sign link vanished" ipaccess_drop line->ops->sign_link_down (osmo-bsc) ipaccess_drop_oml e1inp_sign_link_destroy link->ts->line->driver->close ipaccess_close Related: OS#4624 Change-Id: If23cc722106a9f70c998e591369a4acafa52c519 --- M include/internal.h M src/e1_input.c M src/input/ipaccess.c 3 files changed, 15 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/58/19258/1 diff --git a/include/internal.h b/include/internal.h index c931d4f..8a5aa2e 100644 --- a/include/internal.h +++ b/include/internal.h @@ -20,13 +20,7 @@ struct msgb; struct msgb *ipa_msg_alloc(int headroom); -/* - * helper for internal drivers, not public - */ -void e1inp_close_socket(struct e1inp_ts *ts, - struct e1inp_sign_link *sign_link, - struct osmo_fd *bfd); - +int e1inp_int_snd_event(struct e1inp_ts *ts, struct e1inp_sign_link *link, int evt); #endif diff --git a/src/e1_input.c b/src/e1_input.c index 32ffec6..ccc96d7 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -816,7 +816,7 @@ return msg; } -static int e1inp_int_snd_event(struct e1inp_ts *ts, +int e1inp_int_snd_event(struct e1inp_ts *ts, struct e1inp_sign_link *link, int evt) { struct input_signal_data isd; @@ -844,19 +844,6 @@ return e1inp_int_snd_event(ts, link, evt); } -void e1inp_close_socket(struct e1inp_ts *ts, - struct e1inp_sign_link *sign_link, - struct osmo_fd *bfd) -{ - e1inp_int_snd_event(ts, sign_link, S_L_INP_TEI_DN); - /* the first e1inp_sign_link_destroy call closes the socket. */ - if (bfd->fd != -1) { - osmo_fd_unregister(bfd); - close(bfd->fd); - bfd->fd = -1; - } -} - /* register a driver with the E1 core */ int e1inp_driver_register(struct e1inp_driver *drv) { diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 08b34a4..4d55e71 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -431,7 +431,19 @@ } - return e1inp_close_socket(e1i_ts, sign_link, bfd); + e1inp_int_snd_event(e1i_ts, sign_link, S_L_INP_TEI_DN); + /* the first e1inp_sign_link_destroy call closes the socket. */ + if (bfd->fd != -1) { + osmo_fd_unregister(bfd); + close(bfd->fd); + bfd->fd = -1; + /* If The bfd holds a reference to e1inp_line in ->data (BSC + * accepted() sockets), then release it */ + if (bfd->data == line) { + bfd->data = NULL; + e1inp_line_put2(line, "ipa_bfd"); + } + } } static void timeout_ts1_write(void *data) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If23cc722106a9f70c998e591369a4acafa52c519 Gerrit-Change-Number: 19258 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 19:52:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 19:52:37 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Set bfd->data to NULL before releasing its reference References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19259 ) Change subject: ipaccess: Set bfd->data to NULL before releasing its reference ...................................................................... ipaccess: Set bfd->data to NULL before releasing its reference Since the reference is dropped, make sure no one accesses it through that pointer anymore. It must be done before calling the put() method, otherwise it may already be released when put() returns. Change-Id: Ic3f261b2a995efcbc8eece9669ee3ae63af7b5c0 --- M src/input/ipaccess.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/59/19259/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 4d55e71..3ff59f4 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -661,6 +661,7 @@ err_line: close(bfd->fd); bfd->fd = -1; + bfd->data = NULL; e1inp_line_put2(line, "ipa_bfd"); return ret; } @@ -711,6 +712,7 @@ err_line: close(bfd->fd); bfd->fd = -1; + bfd->data = NULL; e1inp_line_put2(line, "ipa_bfd"); return ret; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic3f261b2a995efcbc8eece9669ee3ae63af7b5c0 Gerrit-Change-Number: 19259 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 19:52:38 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 19:52:38 +0000 Subject: Change in libosmo-abis[master]: ipaccess_recvmsg: Clean up release steps upon error condition References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19260 ) Change subject: ipaccess_recvmsg: Clean up release steps upon error condition ...................................................................... ipaccess_recvmsg: Clean up release steps upon error condition Related: OS#4624 Change-Id: I47a3e477d6861620a741193d3d3d3e286836fd44 --- M src/input/ipaccess.c 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/60/19260/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 3ff59f4..8a7142d 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -330,12 +330,15 @@ } return 0; err: - osmo_fd_unregister(bfd); if (bfd->fd != -1) { + osmo_fd_unregister(bfd); close(bfd->fd); bfd->fd = -1; + /* This is a BSC accepted socket, bfd->data holds a reference to line, drop it */ + OSMO_ASSERT(bfd->data == line); + bfd->data = NULL; + e1inp_line_put2(line, "ipa_bfd"); } - e1inp_line_put2(line, "ipa_bfd"); return -1; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I47a3e477d6861620a741193d3d3d3e286836fd44 Gerrit-Change-Number: 19260 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 19:52:38 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 19:52:38 +0000 Subject: Change in libosmo-abis[master]: ipaccess_recvmsg: Assert the new bfd from new line differs from the o... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19261 ) Change subject: ipaccess_recvmsg: Assert the new bfd from new line differs from the old one ...................................................................... ipaccess_recvmsg: Assert the new bfd from new line differs from the old one Related: OS#4624 Change-Id: I45818e04af0da7b1109d909642a1ea378a85a636 --- M src/input/ipaccess.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/61/19261/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 8a7142d..02a5028 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -303,6 +303,7 @@ e1inp_line_get2(new_line, "ipa_bfd"); ts = e1inp_line_ipa_rsl_ts(new_line, unit_data.trx_id); newbfd = &ts->driver.ipaccess.fd; + OSMO_ASSERT(newbfd != bfd); /* get rid of our old temporary bfd */ /* preserve 'newbfd->when' flags potentially set by sign_link_up() */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I45818e04af0da7b1109d909642a1ea378a85a636 Gerrit-Change-Number: 19261 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 19:52:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 14 Jul 2020 19:52:39 +0000 Subject: Change in libosmo-abis[master]: ipaccess_recvmsg: Untangle code updating line References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19262 ) Change subject: ipaccess_recvmsg: Untangle code updating line ...................................................................... ipaccess_recvmsg: Untangle code updating line This patch untangles the code a bit by changing the order where actions are taken and variables are assigned. The only real changes in behavour are the introduced assert, and that bfd->data is set to NULL before releasing the related line. Related: OS#4624 Change-Id: I947f64f8fa20f87fdc84538402623a6bcf35fdf9 --- M src/input/ipaccess.c 1 file changed, 13 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/62/19262/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 02a5028..d81191c 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -288,37 +288,42 @@ "closing socket.\n"); goto err; } + /* Finally, we know which OML link is associated with + * this RSL link, attach it to this socket. */ + new_line = sign_link->ts->line; /* this is a bugtrap, the BSC should be using the * virtual E1 line used by OML for this RSL link. */ - if (sign_link->ts->line == line) { + if (new_line == line) { LOGP(DLINP, LOGL_ERROR, "Fix your BSC, you should use the " "E1 line used by the OML link for " "your RSL link.\n"); return 0; } - /* Finally, we know which OML link is associated with - * this RSL link, attach it to this socket. */ - bfd->data = new_line = sign_link->ts->line; e1inp_line_get2(new_line, "ipa_bfd"); ts = e1inp_line_ipa_rsl_ts(new_line, unit_data.trx_id); newbfd = &ts->driver.ipaccess.fd; OSMO_ASSERT(newbfd != bfd); - /* get rid of our old temporary bfd */ /* preserve 'newbfd->when' flags potentially set by sign_link_up() */ osmo_fd_setup(newbfd, bfd->fd, newbfd->when | bfd->when, bfd->cb, - bfd->data, E1INP_SIGN_RSL + unit_data.trx_id); + new_line, E1INP_SIGN_RSL + unit_data.trx_id); + + + /* now we can release the dummy RSL line (old temporary bfd). */ osmo_fd_unregister(bfd); bfd->fd = -1; + /* bfd->data holds a reference to line, drop it */ + OSMO_ASSERT(bfd->data == line); + bfd->data = NULL; + e1inp_line_put2(line, "ipa_bfd"); + ret = osmo_fd_register(newbfd); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "could not register FD\n"); goto err; } - /* now we can release the dummy RSL line. */ - e1inp_line_put2(line, "ipa_bfd"); e1i_ts = ipaccess_line_ts(newbfd, new_line); ipaccess_bsc_keepalive_fsm_alloc(e1i_ts, newbfd, "rsl_bsc_to_bts"); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I947f64f8fa20f87fdc84538402623a6bcf35fdf9 Gerrit-Change-Number: 19262 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 20:50:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 20:50:50 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Avoid various "Unhandled message" errors on BS-11 startup References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19263 ) Change subject: abis_nm: Avoid various "Unhandled message" errors on BS-11 startup ...................................................................... abis_nm: Avoid various "Unhandled message" errors on BS-11 startup There are a number of OML messages which are not seen on IP based BTSs. Those are perfectly normal and expected on E1 based BTS. Change-Id: Icd87fc9f3652b21f9d569af2572d080c9ac89e8b Closes: OS#4665 --- M src/osmo-bsc/abis_nm.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/63/19263/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index e17c6f5..8dde8de 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -969,6 +969,18 @@ case NM_MT_GET_ATTR_RESP: ret = abis_nm_rx_get_attr_resp(mb, gsm_bts_trx_num(bts, (foh)->obj_inst.trx_nr)); break; + case NM_MT_ESTABLISH_TEI_ACK: + case NM_MT_CONN_TERR_SIGN_ACK: + case NM_MT_DISC_TERR_SIGN_ACK: + case NM_MT_CONN_TERR_TRAF_ACK: + case NM_MT_DISC_MDROP_LINK_ACK: + case NM_MT_STOP_EVENT_REP_ACK: + case NM_MT_REST_EVENT_REP_ACK: + case NM_MT_BS11_BEGIN_DB_TX_ACK: + case NM_MT_BS11_END_DB_TX_ACK: + case NM_MT_BS11_SET_ATTR_ACK: + DEBUGPFOH(DNM, foh, "%s\n", get_value_string(abis_nm_msgtype_names, mt)); + break; default: LOGPFOH(DNM, LOGL_ERROR, foh, "Unhandled message %s\n", get_value_string(abis_nm_msgtype_names, mt)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icd87fc9f3652b21f9d569af2572d080c9ac89e8b Gerrit-Change-Number: 19263 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 20:50:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 20:50:51 +0000 Subject: Change in osmo-bsc[master]: bts_nokia_site: Clean up logging References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19264 ) Change subject: bts_nokia_site: Clean up logging ...................................................................... bts_nokia_site: Clean up logging We don't want to fprintf directly, and we want to make sure to always log as much context as possible. Change-Id: I29ec935669175a08cb42e1666559b681c50a6e72 --- M src/osmo-bsc/bts_nokia_site.c 1 file changed, 38 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/64/19264/1 diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c index 0d0dbb5..6223f56 100644 --- a/src/osmo-bsc/bts_nokia_site.c +++ b/src/osmo-bsc/bts_nokia_site.c @@ -59,7 +59,7 @@ static void bootstrap_om_bts(struct gsm_bts *bts) { - LOGP(DNM, LOGL_NOTICE, "bootstrapping OML for BTS %u\n", bts->nr); + LOG_BTS(bts, DNM, LOGL_NOTICE, "bootstrapping OML for BTS %u\n", bts->nr); if (!bts->nokia.skip_reset) { if (!bts->nokia.did_reset) @@ -72,8 +72,7 @@ static void bootstrap_om_trx(struct gsm_bts_trx *trx) { - LOGP(DNM, LOGL_NOTICE, "bootstrapping OML for TRX %u/%u\n", - trx->bts->nr, trx->nr); + LOG_TRX(trx, DNM, LOGL_NOTICE, "bootstrapping OML for TRX %u/%u\n", trx->bts->nr, trx->nr); gsm_trx_all_ts_dispatch(trx, TS_EV_OML_READY, NULL); } @@ -762,7 +761,7 @@ /* set CA */ if (generate_cell_chan_list(&fu_config[38], trx->bts) != 0) { - fprintf(stderr, "generate_cell_chan_list failed\n"); + LOG_TRX(trx, DNM, LOGL_ERROR, "generate_cell_chan_list failed\n"); return 0; } @@ -810,8 +809,7 @@ chan_config = 11; break; default: - fprintf(stderr, - "unsupported channel config %s for timeslot %d\n", + LOG_TRX(trx, DNM, LOGL_ERROR, "unsupported channel config %s for timeslot %d\n", gsm_pchan_name(ts->pchan_from_config), i); return 0; } @@ -1000,17 +998,17 @@ build the configuration data */ -static int make_bts_config(uint8_t bts_type, int n_trx, uint8_t * fu_config, +static int make_bts_config(struct gsm_bts *bts, uint8_t bts_type, int n_trx, uint8_t * fu_config, int need_hopping) { /* is it an InSite BTS ? */ if (bts_type == 0x0E || bts_type == 0x0F || bts_type == 0x10) { /* TODO */ if (n_trx != 1) { - fprintf(stderr, "InSite has only one TRX\n"); + LOG_BTS(bts, DNM, LOGL_ERROR, "InSite has only one TRX\n"); return 0; } if (need_hopping != 0) { - fprintf(stderr, "InSite does not support hopping\n"); + LOG_BTS(bts, DNM, LOGL_ERROR, "InSite does not support hopping\n"); return 0; } memcpy(fu_config, bts_config_insite, sizeof(bts_config_insite)); @@ -1090,7 +1088,7 @@ noh->reference = htons(ref); memcpy(noh->data, data, len_data); - DEBUGPC(DNM, "Sending %s\n", get_msg_type_name_string(msg_type)); + LOG_BTS(bts, DNM, LOGL_DEBUG, "Sending %s\n", get_msg_type_name_string(msg_type)); return abis_nm_sendmsg(bts, msg); } @@ -1165,7 +1163,7 @@ { uint8_t *data = reset; int len_data = sizeof(reset); - LOGP(DLINP, LOGL_INFO, "Nokia BTS reset timer: %d\n", bts->nokia.bts_reset_timer_cnf); + LOG_BTS(bts, DLINP, LOGL_INFO, "Nokia BTS reset timer: %d\n", bts->nokia.bts_reset_timer_cnf); return abis_nm_send(bts, NOKIA_MSG_RESET_REQ, ref, data, len_data); } @@ -1252,7 +1250,7 @@ memcpy(oh->data, data, len_to_send); } - DEBUGPC(DNM, "Sending multi-segment %d\n", seq); + LOG_BTS(bts, DNM, LOGL_DEBUG, "Sending multi-segment %d\n", seq); ret = abis_nm_sendmsg(bts, msg); if (ret < 0) @@ -1306,7 +1304,7 @@ idx++; } - ret = make_bts_config(bts_type, idx, config + len, need_hopping); + ret = make_bts_config(bts, bts_type, idx, config + len, need_hopping); len += ret; #if 0 /* debugging */ @@ -1502,8 +1500,8 @@ /* OML link */ line = e1inp_line_find(e1_link->e1_nr); if (!line) { - LOGP(DLINP, LOGL_ERROR, "BTS %u OML link referring to non-existing E1 line %u\n", - bts->nr, e1_link->e1_nr); + LOG_BTS(bts, DLINP, LOGL_ERROR, "BTS %u OML link referring to non-existing E1 line %u\n", + bts->nr, e1_link->e1_nr); return; } @@ -1555,18 +1553,17 @@ int len_data; if (bts->nokia.wait_reset) { - LOGP(DNM, LOGL_INFO, - "Ignore message while waiting for reset\n"); + LOG_BTS(bts, DNM, LOGL_INFO, "Ignoring message while waiting for reset: %s\n", msgb_hexdump(mb)); return ret; } if (oh->length < sizeof(struct abis_om_nokia_hdr)) { - LOGP(DNM, LOGL_ERROR, "Message too short\n"); + LOG_BTS(bts, DNM, LOGL_ERROR, "Message too short: %s\n", msgb_hexdump(mb)); return -EINVAL; } len_data = oh->length - sizeof(struct abis_om_nokia_hdr); - LOGP(DNM, LOGL_INFO, "(0x%02X) %s\n", mt, get_msg_type_name_string(mt)); + LOG_BTS(bts, DNM, LOGL_INFO, "Rx (0x%02X) %s\n", mt, get_msg_type_name_string(mt)); #if 0 /* debugging */ dump_elements(noh->data, len_data); #endif @@ -1576,11 +1573,10 @@ if (find_element(noh->data, len_data, NOKIA_EI_BTS_TYPE, &bts->nokia.bts_type, sizeof(uint8_t)) == sizeof(uint8_t)) - LOGP(DNM, LOGL_INFO, "BTS type = %d (%s)\n", - bts->nokia.bts_type, - get_bts_type_string(bts->nokia.bts_type)); + LOG_BTS(bts, DNM, LOGL_INFO, "Rx BTS type = %d (%s)\n", bts->nokia.bts_type, + get_bts_type_string(bts->nokia.bts_type)); else - LOGP(DNM, LOGL_ERROR, "BTS type not found\n"); + LOG_BTS(bts, DNM, LOGL_ERROR, "BTS type not found in NOKIA_MSG_OMU_STARTED\n"); /* send START_DOWNLOAD_REQ */ abis_nm_download_req(bts, ref); break; @@ -1598,14 +1594,13 @@ if (find_element (noh->data, len_data, NOKIA_EI_ACK, &ack, sizeof(uint8_t)) == sizeof(uint8_t)) { - LOGP(DNM, LOGL_INFO, "ACK = %d\n", ack); + LOG_BTS(bts, DNM, LOGL_INFO, "Rx ACK = %u\n", ack); if (ack != 1) { - LOGP(DNM, LOGL_ERROR, "No ACK received (%d)\n", - ack); + LOG_BTS(bts, DNM, LOGL_ERROR, "Rx No ACK (%u): don't know how to proceed\n", ack); /* TODO: properly handle failures (NACK) */ } } else - LOGP(DNM, LOGL_ERROR, "ACK not found\n"); + LOG_BTS(bts, DNM, LOGL_ERROR, "Rx MSG_ACK but no EI_ACK found: %s\n", msgb_hexdump(mb)); /* TODO: the assumption for the following is that no NACK was received */ @@ -1647,11 +1642,9 @@ /* RSL Link */ line = e1inp_line_find(e1_link->e1_nr); if (!line) { - LOGP(DLINP, LOGL_ERROR, - "TRX (%u/%u) RSL link referring " - "to non-existing E1 line %u\n", - sign_link->trx->bts->nr, sign_link->trx->nr, - e1_link->e1_nr); + LOG_BTS(bts, DLINP, LOGL_ERROR, "TRX (%u/%u) RSL link referring to " + "non-existing E1 line %u\n", sign_link->trx->bts->nr, + sign_link->trx->nr, e1_link->e1_nr); return -ENOMEM; } /* start TRX */ @@ -1681,21 +1674,17 @@ sizeof(info)); if (str_len > 0) { info[str_len] = 0; - LOGP(DNM, LOGL_INFO, "ALARM Severity %s (%d) : %s\n", - get_severity_string(severity), severity, info); + LOG_BTS(bts, DNM, LOGL_NOTICE, "Rx ALARM Severity %s (%d) : %s\n", + get_severity_string(severity), severity, info); } else { /* nothing found, try details */ str_len = - find_element(noh->data, len_data, - NOKIA_EI_ALARM_DETAIL, info, - sizeof(info)); + find_element(noh->data, len_data, NOKIA_EI_ALARM_DETAIL, info, sizeof(info)); if (str_len > 0) { uint16_t code; info[str_len] = 0; code = (info[0] << 8) + info[1]; - LOGP(DNM, LOGL_INFO, - "ALARM Severity %s (%d), code 0x%X : %s\n", - get_severity_string(severity), severity, - code, info + 2); + LOG_BTS(bts, DNM, LOGL_NOTICE, "Rx ALARM Severity %s (%d), code 0x%X : %s\n", + get_severity_string(severity), severity, code, info + 2); } } /* send ACK */ @@ -1712,41 +1701,37 @@ int abis_nokia_rcvmsg(struct msgb *msg) { + struct e1inp_sign_link *sign_link = (struct e1inp_sign_link *)msg->dst; + struct gsm_bts *bts = sign_link->trx->bts; struct abis_om_hdr *oh = msgb_l2(msg); int rc = 0; /* Various consistency checks */ if (oh->placement != ABIS_OM_PLACEMENT_ONLY) { - LOGP(DNM, LOGL_ERROR, "ABIS OML placement 0x%x not supported\n", - oh->placement); + LOG_BTS(bts, DNM, LOGL_ERROR, "Rx ABIS OML placement 0x%x not supported\n", oh->placement); if (oh->placement != ABIS_OM_PLACEMENT_FIRST) return -EINVAL; } if (oh->sequence != 0) { - LOGP(DNM, LOGL_ERROR, "ABIS OML sequence 0x%x != 0x00\n", - oh->sequence); + LOG_BTS(bts, DNM, LOGL_ERROR, "Rx ABIS OML sequence 0x%x != 0x00\n", oh->sequence); return -EINVAL; } msg->l3h = (unsigned char *)oh + sizeof(*oh); switch (oh->mdisc) { case ABIS_OM_MDISC_FOM: - LOGP(DNM, LOGL_INFO, "ABIS_OM_MDISC_FOM\n"); + LOG_BTS(bts, DNM, LOGL_INFO, "Rx ABIS_OM_MDISC_FOM\n"); rc = abis_nm_rcvmsg_fom(msg); break; case ABIS_OM_MDISC_MANUF: - LOGP(DNM, LOGL_INFO, "ABIS_OM_MDISC_MANUF\n"); + LOG_BTS(bts, DNM, LOGL_INFO, "Rx ABIS_OM_MDISC_MANUF: ignoring\n"); break; case ABIS_OM_MDISC_MMI: case ABIS_OM_MDISC_TRAU: - LOGP(DNM, LOGL_ERROR, - "unimplemented ABIS OML message discriminator 0x%x\n", - oh->mdisc); + LOG_BTS(bts, DNM, LOGL_ERROR, "Rx unimplemented ABIS OML message discriminator 0x%x\n", oh->mdisc); break; default: - LOGP(DNM, LOGL_ERROR, - "unknown ABIS OML message discriminator 0x%x\n", - oh->mdisc); + LOG_BTS(bts, DNM, LOGL_ERROR, "Rx unknown ABIS OML message discriminator 0x%x\n", oh->mdisc); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I29ec935669175a08cb42e1666559b681c50a6e72 Gerrit-Change-Number: 19264 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 21:54:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 21:54:51 +0000 Subject: Change in osmo-bsc[master]: Don't print 'bogus channel load sample' message if total == 0 In-Reply-To: References: Message-ID: Hello tnt, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19132 to look at the new patch set (#3). Change subject: Don't print 'bogus channel load sample' message if total == 0 ...................................................................... Don't print 'bogus channel load sample' message if total == 0 Change-Id: I857fecc76dc16ba4431f3c0142bb0d798a9f73dc Closes: OS#4614 --- M src/osmo-bsc/chan_alloc.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/32/19132/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I857fecc76dc16ba4431f3c0142bb0d798a9f73dc Gerrit-Change-Number: 19132 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 21:54:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 21:54:51 +0000 Subject: Change in osmo-bsc[master]: Bring timeslot FSMs on BS-11 out of NOT_INITIALIZED state References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19265 ) Change subject: Bring timeslot FSMs on BS-11 out of NOT_INITIALIZED state ...................................................................... Bring timeslot FSMs on BS-11 out of NOT_INITIALIZED state When we introduced the timeslot FSMs in I82e3f918295daa83274a4cf803f046979f284366, the BS-11 stopped to work, as the timeslot FSMs are never brought out of NOT_INITIALIZED stage. Closes: OS#4666 Change-Id: I557cb105247552887ca47a0f2c1b06b71bca6cac --- M src/osmo-bsc/bts_siemens_bs11.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/19265/1 diff --git a/src/osmo-bsc/bts_siemens_bs11.c b/src/osmo-bsc/bts_siemens_bs11.c index d0fe38b..2750f8c 100644 --- a/src/osmo-bsc/bts_siemens_bs11.c +++ b/src/osmo-bsc/bts_siemens_bs11.c @@ -523,6 +523,11 @@ /* restart sending event reports */ abis_nm_event_reports(bts, 1); + + /* make the timeslot FSM happy. Siemens doesn't send us + * OML state changes for individual timeslots, so we + * bring all of them up here */ + gsm_bts_all_ts_dispatch(bts, TS_EV_OML_READY, NULL); } static int shutdown_om(struct gsm_bts *bts) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I557cb105247552887ca47a0f2c1b06b71bca6cac Gerrit-Change-Number: 19265 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 22:25:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 22:25:18 +0000 Subject: Change in osmo-bsc[master]: Add example configuration files for E1 BTS References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19266 ) Change subject: Add example configuration files for E1 BTS ...................................................................... Add example configuration files for E1 BTS This adds osmo-bsc config files for Ericsson RBS2308, Siemens BS-11 and Nokia InSite which were working in July 2020 to get the BTS initialized, recognized by MS and up to signalling. Voice/TRAU support is still missing in OsmoBSC, but should be added relatively soon. Change-Id: I1fe15cc3654025e52fc1110ac3052fb1f7a009a0 Closes: OS4651 --- A doc/examples/osmo-bsc/ericsson/osmo-bsc.cfg A doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg A doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg A doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg 4 files changed, 343 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/66/19266/1 diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.cfg new file mode 100644 index 0000000..f79d457 --- /dev/null +++ b/doc/examples/osmo-bsc/ericsson/osmo-bsc.cfg @@ -0,0 +1,101 @@ +! +! OpenBSC (0.9.11.308-62d46) configuration saved from vty +!! +password foo +! +line vty + no login +! +log stderr + logging level lmi info + logging level linp info + logging level nm debug + logging level rsl debug + logging level llapd notice +log file bsc-rbs2k.log + logging timestamp 1 + logging filter all 1 + logging level lmi info + logging level linp info + logging level nm debug + logging level rsl debug +network + network country code 262 + mobile network code 42 + neci 0 + paging any use tch 0 + handover 0 + handover window rxlev averaging 10 + handover window rxqual averaging 1 + handover window rxlev neighbor averaging 10 + handover power budget interval 6 + handover power budget hysteresis 3 + handover maximum distance 9999 + timer t3101 10 + timer t3105 40 + timer t3109 4 + timer t3113 60 + bts 0 + type rbs2000 + band PCS1900 + cell_identity 0 + location_area_code 1 + training_sequence_code 7 + base_station_id_code 63 + ms max power 33 + cell reselection hysteresis 4 + rxlev access min 0 + channel allocator descending + rach tx integer 9 + rach max transmission 7 + oml e1 line 0 timeslot 1 sub-slot full + oml e1 tei 62 + neighbor-list mode automatic + gprs mode none + is-connection-list add 4 512 12 + is-connection-list add 16 524 12 + is-connection-list add 28 536 12 + is-connection-list add 40 548 12 + trx 0 + rf_locked 0 + arfcn 800 + nominal power 43 + max_power_red 14 + rsl e1 line 0 timeslot 1 sub-slot full + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + e1 line 0 timeslot 1 sub-slot full + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 3 +e1_input + e1_line 0 driver dahdi + e1_line 0 port 1 + pcap 20200703-rbs2k-10.pcap diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg new file mode 100644 index 0000000..f79d457 --- /dev/null +++ b/doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg @@ -0,0 +1,101 @@ +! +! OpenBSC (0.9.11.308-62d46) configuration saved from vty +!! +password foo +! +line vty + no login +! +log stderr + logging level lmi info + logging level linp info + logging level nm debug + logging level rsl debug + logging level llapd notice +log file bsc-rbs2k.log + logging timestamp 1 + logging filter all 1 + logging level lmi info + logging level linp info + logging level nm debug + logging level rsl debug +network + network country code 262 + mobile network code 42 + neci 0 + paging any use tch 0 + handover 0 + handover window rxlev averaging 10 + handover window rxqual averaging 1 + handover window rxlev neighbor averaging 10 + handover power budget interval 6 + handover power budget hysteresis 3 + handover maximum distance 9999 + timer t3101 10 + timer t3105 40 + timer t3109 4 + timer t3113 60 + bts 0 + type rbs2000 + band PCS1900 + cell_identity 0 + location_area_code 1 + training_sequence_code 7 + base_station_id_code 63 + ms max power 33 + cell reselection hysteresis 4 + rxlev access min 0 + channel allocator descending + rach tx integer 9 + rach max transmission 7 + oml e1 line 0 timeslot 1 sub-slot full + oml e1 tei 62 + neighbor-list mode automatic + gprs mode none + is-connection-list add 4 512 12 + is-connection-list add 16 524 12 + is-connection-list add 28 536 12 + is-connection-list add 40 548 12 + trx 0 + rf_locked 0 + arfcn 800 + nominal power 43 + max_power_red 14 + rsl e1 line 0 timeslot 1 sub-slot full + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + e1 line 0 timeslot 1 sub-slot full + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 3 +e1_input + e1_line 0 driver dahdi + e1_line 0 port 1 + pcap 20200703-rbs2k-10.pcap diff --git a/doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg b/doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg new file mode 100644 index 0000000..a8e8e5c --- /dev/null +++ b/doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg @@ -0,0 +1,65 @@ +! +! OpenBSC configuration saved from vty +! ! +password foo +! +line vty + no login +! +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 0 + logging print category 1 + logging print file 1 + logging level llapd notice + logging level nm debug +e1_input + e1_line 0 driver dahdi + e1_line 0 port 3 + pcap 2020004-insite.pcap +network + network country code 1 + mobile network code 1 + timer t3101 10 + timer t3113 60 + bts 0 + type nokia_site + band GSM1900 + cell_identity 1 + location_area_code 1 + base_station_id_code 63 + training_sequence_code 7 + + oml e1 line 0 timeslot 1 sub-slot full + oml e1 tei 1 + + trx 0 + arfcn 810 + max_power_red 0 + rsl e1 line 0 timeslot 1 sub-slot full + rsl e1 tei 1 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + e1 line 0 timeslot 2 sub-slot full + timeslot 1 + phys_chan_config SDCCH8 + e1 line 0 timeslot 2 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + e1 line 0 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + e1 line 0 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 3 diff --git a/doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg b/doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg new file mode 100644 index 0000000..a308db5 --- /dev/null +++ b/doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg @@ -0,0 +1,76 @@ +! +! OpenBSC configuration saved from vty +! ! +password foo +! +line vty + no login +! +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 0 + logging print category 1 + logging timestamp 1 + logging print file 1 + logging level llapd notice + logging level linp notice + logging level lmi notice + logging level lmib info + logging level rsl debug + logging level rll debug + logging level nm debug + logging level mm debug + logging level rr debug +e1_input + e1_line 0 driver dahdi + e1_line 0 port 0 + e1_line 1 driver dahdi + e1_line 1 port 1 + e1_line 2 driver dahdi + e1_line 2 port 2 + pcap 20200714-bs11.pcap +network + network country code 1 + mobile network code 1 + timer t3101 10 + timer t3113 60 + bts 0 + type bs11 + band GSM900 + cell_identity 1 + location_area_code 1 + training_sequence_code 7 + base_station_id_code 63 + oml e1 line 2 timeslot 1 sub-slot full + oml e1 tei 25 + trx 0 + arfcn 121 + max_power_red 00 + rsl e1 line 2 timeslot 1 sub-slot full + rsl e1 tei 1 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + e1 line 2 timeslot 1 sub-slot full + timeslot 1 + phys_chan_config TCH/F + e1 line 2 timeslot 2 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + e1 line 2 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + e1 line 2 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + e1 line 2 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + e1 line 2 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + e1 line 2 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + e1 line 2 timeslot 3 sub-slot 3 + -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1fe15cc3654025e52fc1110ac3052fb1f7a009a0 Gerrit-Change-Number: 19266 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 22:31:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 22:31:05 +0000 Subject: Change in libosmo-abis[master]: e1_input: Use osmo_use_count in e1inp_line In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19256 ) Change subject: e1_input: Use osmo_use_count in e1inp_line ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmo-abis/+/19256/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmo-abis/+/19256/1//COMMIT_MSG at 9 PS1, Line 9: struct e1inp_line fields changing is fine since it is allocated through : an API and a pointer should be used by clients. it is fine for API compatibility but definitely breaks ABI. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0658b2e9c452598025cc0f1d0b060076171767cc Gerrit-Change-Number: 19256 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 14 Jul 2020 22:31:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 22:32:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 22:32:29 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Set bfd->data to NULL before releasing its reference In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19259 ) Change subject: ipaccess: Set bfd->data to NULL before releasing its reference ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic3f261b2a995efcbc8eece9669ee3ae63af7b5c0 Gerrit-Change-Number: 19259 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 14 Jul 2020 22:32:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 14 22:32:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 14 Jul 2020 22:32:52 +0000 Subject: Change in libosmo-abis[master]: ipaccess_recvmsg: Clean up release steps upon error condition In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19260 ) Change subject: ipaccess_recvmsg: Clean up release steps upon error condition ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I47a3e477d6861620a741193d3d3d3e286836fd44 Gerrit-Change-Number: 19260 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 14 Jul 2020 22:32:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 15 01:34:57 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 15 Jul 2020 01:34:57 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0e5d4b4a12c_32942b26effd85f462844c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 146s] dh_auto_configure -O--buildsystem=meson [ 146s] install -d obj-x86_64-linux-gnu [ 146s] cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu [ 146s] Traceback (most recent call last): [ 146s] File "/usr/bin/meson", line 17, in [ 146s] from mesonbuild import mesonmain [ 146s] File "/usr/lib/python3/dist-packages/mesonbuild/mesonmain.py", line 25, in [ 146s] from . import mconf, mdist, minit, minstall, mintro, msetup, mtest, rewriter, msubprojects, munstable_coredata, mcompile [ 146s] File "/usr/lib/python3/dist-packages/mesonbuild/mconf.py", line 16, in [ 146s] from . import coredata, environment, mesonlib, build, mintro, mlog [ 146s] File "/usr/lib/python3/dist-packages/mesonbuild/build.py", line 26, in [ 146s] from . import dependencies [ 146s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/__init__.py", line 15, in [ 146s] from .boost import BoostDependency [ 146s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/boost.py", line 25, in [ 146s] from .base import DependencyException, ExternalDependency, PkgConfigDependency [ 146s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/base.py", line 32, in [ 146s] import pkg_resources [ 146s] ModuleNotFoundError: No module named 'pkg_resources' [ 146s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 146s] make: *** [debian/rules:11: binary] Error 2 [ 146s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 146s] ### VM INTERACTION START ### [ 149s] [ 136.431475] sysrq: SysRq : Power Off [ 149s] [ 136.439270] reboot: Power down [ 149s] ### VM INTERACTION END ### [ 149s] [ 149s] lamb28 failed "build open5gs_1.3.0.20200715.dsc" at Wed Jul 15 01:34:48 UTC 2020. [ 149s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 15 05:07:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 05:07:07 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Avoid various "Unhandled message" errors on BS-11 startup In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19263 ) Change subject: abis_nm: Avoid various "Unhandled message" errors on BS-11 startup ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icd87fc9f3652b21f9d569af2572d080c9ac89e8b Gerrit-Change-Number: 19263 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 15 Jul 2020 05:07:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 05:07:51 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 05:07:51 +0000 Subject: Change in osmo-bsc[master]: Bring timeslot FSMs on BS-11 out of NOT_INITIALIZED state In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19265 ) Change subject: Bring timeslot FSMs on BS-11 out of NOT_INITIALIZED state ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I557cb105247552887ca47a0f2c1b06b71bca6cac Gerrit-Change-Number: 19265 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 15 Jul 2020 05:07:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 05:10:09 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 05:10:09 +0000 Subject: Change in osmo-bsc[master]: Don't print 'bogus channel load sample' message if total == 0 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19132 ) Change subject: Don't print 'bogus channel load sample' message if total == 0 ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/19132/3/src/osmo-bsc/chan_alloc.c File src/osmo-bsc/chan_alloc.c: https://gerrit.osmocom.org/c/osmo-bsc/+/19132/3/src/osmo-bsc/chan_alloc.c at 210 PS3, Line 210: used > total This check looks redundant given that you already have it on line#206. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I857fecc76dc16ba4431f3c0142bb0d798a9f73dc Gerrit-Change-Number: 19132 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 15 Jul 2020 05:10:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 05:15:01 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 05:15:01 +0000 Subject: Change in osmo-bsc[master]: bts_nokia_site: Clean up logging In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19264 ) Change subject: bts_nokia_site: Clean up logging ...................................................................... Patch Set 2: (4 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/19264/2/src/osmo-bsc/bts_nokia_site.c File src/osmo-bsc/bts_nokia_site.c: https://gerrit.osmocom.org/c/osmo-bsc/+/19264/2/src/osmo-bsc/bts_nokia_site.c at 62 PS2, Line 62: %u\n", bts->nr This information becomes redundant: (bts=0) bootstrapping OML for BTS 0 https://gerrit.osmocom.org/c/osmo-bsc/+/19264/2/src/osmo-bsc/bts_nokia_site.c at 75 PS2, Line 75: %u/%u\n", trx->bts->nr, trx->nr Same here: (bts=0,trx=0) bootstrapping OML for TRX 0/0 https://gerrit.osmocom.org/c/osmo-bsc/+/19264/2/src/osmo-bsc/bts_nokia_site.c at 1503 PS2, Line 1503: BTS %u Same here. https://gerrit.osmocom.org/c/osmo-bsc/+/19264/2/src/osmo-bsc/bts_nokia_site.c at 1645 PS2, Line 1645: TRX (%u/%u) Same here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I29ec935669175a08cb42e1666559b681c50a6e72 Gerrit-Change-Number: 19264 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 15 Jul 2020 05:15:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 06:39:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 06:39:29 +0000 Subject: Change in osmo-bsc[master]: Don't print 'bogus channel load sample' message if total == 0 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19132 ) Change subject: Don't print 'bogus channel load sample' message if total == 0 ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/19132/3/src/osmo-bsc/chan_alloc.c File src/osmo-bsc/chan_alloc.c: https://gerrit.osmocom.org/c/osmo-bsc/+/19132/3/src/osmo-bsc/chan_alloc.c at 210 PS3, Line 210: used > total > This check looks redundant given that you already have it on line#206. nope. In Line 206 we just print a warning message for one of the two cases (used > total), while here we take action (changing bts field members) for two cases. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I857fecc76dc16ba4431f3c0142bb0d798a9f73dc Gerrit-Change-Number: 19132 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 15 Jul 2020 06:39:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 06:50:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 06:50:31 +0000 Subject: Change in osmo-bsc[master]: bts_nokia_site: Clean up logging In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19264 to look at the new patch set (#3). Change subject: bts_nokia_site: Clean up logging ...................................................................... bts_nokia_site: Clean up logging We don't want to fprintf directly, and we want to make sure to always log as much context as possible. Change-Id: I29ec935669175a08cb42e1666559b681c50a6e72 --- M src/osmo-bsc/bts_nokia_site.c 1 file changed, 37 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/64/19264/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I29ec935669175a08cb42e1666559b681c50a6e72 Gerrit-Change-Number: 19264 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 06:54:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 06:54:25 +0000 Subject: Change in ...osmo-python-tests[master]: remove_tmpdir(): Support recursion / sub-directories References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/19267 ) Change subject: remove_tmpdir(): Support recursion / sub-directories ...................................................................... remove_tmpdir(): Support recursion / sub-directories The existing code assumed that tmpdir only contained regular files, not an entire hierarchy of files with sub-directories or the like. In case sub-directories exist, the current code fails as follows: line 176, in test_all_apps remove_tmpdir(tmpdir) File "/usr/local/lib/python3.5/dist-packages/osmopython-0.2.0-py3.5.egg/EGG-INFO/scripts/osmotestconfig.py", line 142, in remove_tmpdir os.unlink(os.path.join(tmpdir, f)) IsADirectoryError: [Errno 21] Is a directory: 'writtenconfig/ericsson' Change-Id: I896b99032d94ba0cdd340a8eed7c7b625661ad69 --- M scripts/osmotestconfig.py 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/67/19267/1 diff --git a/scripts/osmotestconfig.py b/scripts/osmotestconfig.py index 3c96ca6..8b3bb84 100755 --- a/scripts/osmotestconfig.py +++ b/scripts/osmotestconfig.py @@ -15,6 +15,7 @@ # along with this program. If not, see . import os import os.path +import shutil import time import sys, shutil, stat import tempfile @@ -137,10 +138,7 @@ def remove_tmpdir(tmpdir): - files = os.listdir(tmpdir) - for f in files: - os.unlink(os.path.join(tmpdir, f)) - os.rmdir(tmpdir) + shutil.rmtree(tmpdir) def check_configs_tested(basedir, app_configs, ignore_configs): -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/19267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I896b99032d94ba0cdd340a8eed7c7b625661ad69 Gerrit-Change-Number: 19267 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 06:54:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 06:54:57 +0000 Subject: Change in osmo-bsc[master]: Add example configuration files for E1 BTS In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19266 to look at the new patch set (#2). Change subject: Add example configuration files for E1 BTS ...................................................................... Add example configuration files for E1 BTS This adds osmo-bsc config files for Ericsson RBS2308, Siemens BS-11 and Nokia InSite which were working in July 2020 to get the BTS initialized, recognized by MS and up to signalling. Voice/TRAU support is still missing in OsmoBSC, but should be added relatively soon. Change-Id: I1fe15cc3654025e52fc1110ac3052fb1f7a009a0 Depends: osmo-python-tests I896b99032d94ba0cdd340a8eed7c7b625661ad69 Closes: OS4651 --- A doc/examples/osmo-bsc/ericsson/osmo-bsc.cfg A doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg A doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg A doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg 4 files changed, 343 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/66/19266/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1fe15cc3654025e52fc1110ac3052fb1f7a009a0 Gerrit-Change-Number: 19266 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 07:27:56 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 07:27:56 +0000 Subject: Change in osmo-bsc[master]: Don't print 'bogus channel load sample' message if total == 0 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19132 ) Change subject: Don't print 'bogus channel load sample' message if total == 0 ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I857fecc76dc16ba4431f3c0142bb0d798a9f73dc Gerrit-Change-Number: 19132 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 15 Jul 2020 07:27:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 07:28:38 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 07:28:38 +0000 Subject: Change in osmo-bsc[master]: bts_nokia_site: Clean up logging In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19264 ) Change subject: bts_nokia_site: Clean up logging ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I29ec935669175a08cb42e1666559b681c50a6e72 Gerrit-Change-Number: 19264 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 15 Jul 2020 07:28:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 07:43:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 07:43:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: fixup PDCH tests: consider frequency hopping References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19268 ) Change subject: BTS_Tests: fixup PDCH tests: consider frequency hopping ...................................................................... BTS_Tests: fixup PDCH tests: consider frequency hopping Do not resolve frequency hopping parameters unconditionally. Change-Id: I1735a7f155f737c384e5d1e3e6f4ac97511a1c7c Related: SYS#4868, OS#4546 --- M bts/BTS_Tests.ttcn 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/19268/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 1232a6c..574d47b 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -4702,7 +4702,8 @@ /* Tune trxcon to that PDCH channel */ var ConnHdlrPars pars := valueof(t_Pars(ts_RslChanNr_PDCH(7), ts_RSL_ChanMode_SIGN)); - f_resolve_fh_params(pars); + if (mp_freq_hop_enabled and mp_transceiver_num > 1) + { f_resolve_fh_params(pars); } f_l1ctl_est_dchan(L1CTL, pars); /* Verify PTCCH/U: send several access bursts, make sure they're received */ @@ -4965,7 +4966,8 @@ /* Tune trxcon to that PDCH channel on TS7 */ var ConnHdlrPars pars := valueof(t_Pars(ts_RslChanNr_PDCH(7), ts_RSL_ChanMode_SIGN)); - f_resolve_fh_params(pars); + if (mp_freq_hop_enabled and mp_transceiver_num > 1) + { f_resolve_fh_params(pars); } f_l1ctl_est_dchan(L1CTL, pars); /* C/I in centiBels, test range: -256 .. +1280, step 128 */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1735a7f155f737c384e5d1e3e6f4ac97511a1c7c Gerrit-Change-Number: 19268 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 07:44:19 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 07:44:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: fixup PDCH tests: consider frequency hopping In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19268 ) Change subject: BTS_Tests: fixup PDCH tests: consider frequency hopping ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1735a7f155f737c384e5d1e3e6f4ac97511a1c7c Gerrit-Change-Number: 19268 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 15 Jul 2020 07:44:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 07:44:33 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 07:44:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: fixup PDCH tests: consider frequency hopping In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19268 ) Change subject: BTS_Tests: fixup PDCH tests: consider frequency hopping ...................................................................... BTS_Tests: fixup PDCH tests: consider frequency hopping Do not resolve frequency hopping parameters unconditionally. Change-Id: I1735a7f155f737c384e5d1e3e6f4ac97511a1c7c Related: SYS#4868, OS#4546 --- M bts/BTS_Tests.ttcn 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 1232a6c..574d47b 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -4702,7 +4702,8 @@ /* Tune trxcon to that PDCH channel */ var ConnHdlrPars pars := valueof(t_Pars(ts_RslChanNr_PDCH(7), ts_RSL_ChanMode_SIGN)); - f_resolve_fh_params(pars); + if (mp_freq_hop_enabled and mp_transceiver_num > 1) + { f_resolve_fh_params(pars); } f_l1ctl_est_dchan(L1CTL, pars); /* Verify PTCCH/U: send several access bursts, make sure they're received */ @@ -4965,7 +4966,8 @@ /* Tune trxcon to that PDCH channel on TS7 */ var ConnHdlrPars pars := valueof(t_Pars(ts_RslChanNr_PDCH(7), ts_RSL_ChanMode_SIGN)); - f_resolve_fh_params(pars); + if (mp_freq_hop_enabled and mp_transceiver_num > 1) + { f_resolve_fh_params(pars); } f_l1ctl_est_dchan(L1CTL, pars); /* C/I in centiBels, test range: -256 .. +1280, step 128 */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1735a7f155f737c384e5d1e3e6f4ac97511a1c7c Gerrit-Change-Number: 19268 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 08:39:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 08:39:59 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp-client: fix memleak in case if no response is received In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18881 ) Change subject: libosmo-mgcp-client: fix memleak in case if no response is received ...................................................................... Patch Set 5: I would argue the solution to the problem - if I understand it correctly - would be to not terminate the mgcp_endpoint_fsm when sending the DLCX. The proper course of action would be to * send the DLCX * enter some WAIT_DLCX state (with timer) * destroy FSM on receipt of DLCX_ACK or timer expiration I don't like adding another timer to work around what looks like a bug in the FSM logic. What do you think? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18881 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia2e89f31685a0822e5cb147a06cc1fc68efc1ec4 Gerrit-Change-Number: 18881 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 15 Jul 2020 08:39:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 08:43:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 08:43:42 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp-client: fix memleak in case if no response is received In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18881 ) Change subject: libosmo-mgcp-client: fix memleak in case if no response is received ...................................................................... Patch Set 5: Other topics: a) why are we actually ending up in this code path? As the comment in the code clearly states, the user should always shut down cleanly. and the "abrupt" is actually an error message. b) given that we are in an "this should not happen" path, we might simply bypass creating/storing the 'response_pending' in this situation. So it seems to me, that irrespective how we fix this here, there is an additional bug in the application leading to this situation which must be fixed. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18881 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia2e89f31685a0822e5cb147a06cc1fc68efc1ec4 Gerrit-Change-Number: 18881 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 15 Jul 2020 08:43:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:02:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 09:02:25 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_init(): consider "talloc returns NULL" case References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19269 ) Change subject: mgcp_client_init(): consider "talloc returns NULL" case ...................................................................... mgcp_client_init(): consider "talloc returns NULL" case Change-Id: I131019b3c04a7860a118991c8f3bb31185fb11e4 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/69/19269/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 819461d..eeb5e4f 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -735,6 +735,8 @@ struct mgcp_client *mgcp; mgcp = talloc_zero(ctx, struct mgcp_client); + if (!mgcp) + return NULL; INIT_LLIST_HEAD(&mgcp->responses_pending); INIT_LLIST_HEAD(&mgcp->inuse_endpoints); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I131019b3c04a7860a118991c8f3bb31185fb11e4 Gerrit-Change-Number: 19269 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:02:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 09:02:25 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_pending_add(): Consider "talloc returns NULL" case References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19270 ) Change subject: mgcp_client_pending_add(): Consider "talloc returns NULL" case ...................................................................... mgcp_client_pending_add(): Consider "talloc returns NULL" case Change-Id: I43a4715fa41fba5a5506fc08e3c21ef6f9ca2521 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/70/19270/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index eeb5e4f..bbf805b 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -911,6 +911,9 @@ struct mgcp_response_pending *pending; pending = talloc_zero(mgcp, struct mgcp_response_pending); + if (!pending) + return NULL; + pending->trans_id = trans_id; pending->response_cb = response_cb; pending->priv = priv; @@ -943,6 +946,10 @@ } pending = mgcp_client_pending_add(mgcp, trans_id, response_cb, priv); + if (!pending) { + talloc_free(msg); + return -ENOMEM; + } if (msgb_l2len(msg) > 4096) { LOGP(DLMGCP, LOGL_ERROR, -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I43a4715fa41fba5a5506fc08e3c21ef6f9ca2521 Gerrit-Change-Number: 19270 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:02:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 09:02:26 +0000 Subject: Change in osmo-mgw[master]: WIP: attempt to fix memleak References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19271 ) Change subject: WIP: attempt to fix memleak ...................................................................... WIP: attempt to fix memleak FIXME Change-Id: I83938ff47fa8570b8d9dc810a184864a0c0b58aa --- M src/libosmo-mgcp-client/mgcp_client_fsm.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/71/19271/1 diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index e38a4ba..b015ec3 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -527,8 +527,12 @@ msg = make_dlcx_msg(mgcp_ctx); if (!msg) LOGPFSML(fi, LOGL_ERROR, "MGW/DLCX: Error composing DLCX message\n"); - else + else { + mgcp_trans_id_t trans_id = mgcp_msg_trans_id(msg); mgcp_client_tx(mgcp, msg, NULL, NULL); + /* immediately remove the 'response_pending' entry */ + mgcp_client_cancel(mgcp, trans_id); + } } talloc_free(mgcp_ctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I83938ff47fa8570b8d9dc810a184864a0c0b58aa Gerrit-Change-Number: 19271 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:12:47 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 09:12:47 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_init(): consider "talloc returns NULL" case In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19269 ) Change subject: mgcp_client_init(): consider "talloc returns NULL" case ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I131019b3c04a7860a118991c8f3bb31185fb11e4 Gerrit-Change-Number: 19269 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 15 Jul 2020 09:12:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:13:27 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 09:13:27 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_pending_add(): Consider "talloc returns NULL" case In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19270 ) Change subject: mgcp_client_pending_add(): Consider "talloc returns NULL" case ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I43a4715fa41fba5a5506fc08e3c21ef6f9ca2521 Gerrit-Change-Number: 19270 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 15 Jul 2020 09:13:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:21:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 09:21:25 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_init(): consider "talloc returns NULL" case In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19269 ) Change subject: mgcp_client_init(): consider "talloc returns NULL" case ...................................................................... mgcp_client_init(): consider "talloc returns NULL" case Change-Id: I131019b3c04a7860a118991c8f3bb31185fb11e4 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 819461d..eeb5e4f 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -735,6 +735,8 @@ struct mgcp_client *mgcp; mgcp = talloc_zero(ctx, struct mgcp_client); + if (!mgcp) + return NULL; INIT_LLIST_HEAD(&mgcp->responses_pending); INIT_LLIST_HEAD(&mgcp->inuse_endpoints); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I131019b3c04a7860a118991c8f3bb31185fb11e4 Gerrit-Change-Number: 19269 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:21:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 09:21:25 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_pending_add(): Consider "talloc returns NULL" case In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19270 ) Change subject: mgcp_client_pending_add(): Consider "talloc returns NULL" case ...................................................................... mgcp_client_pending_add(): Consider "talloc returns NULL" case Change-Id: I43a4715fa41fba5a5506fc08e3c21ef6f9ca2521 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index eeb5e4f..bbf805b 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -911,6 +911,9 @@ struct mgcp_response_pending *pending; pending = talloc_zero(mgcp, struct mgcp_response_pending); + if (!pending) + return NULL; + pending->trans_id = trans_id; pending->response_cb = response_cb; pending->priv = priv; @@ -943,6 +946,10 @@ } pending = mgcp_client_pending_add(mgcp, trans_id, response_cb, priv); + if (!pending) { + talloc_free(msg); + return -ENOMEM; + } if (msgb_l2len(msg) > 4096) { LOGP(DLMGCP, LOGL_ERROR, -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I43a4715fa41fba5a5506fc08e3c21ef6f9ca2521 Gerrit-Change-Number: 19270 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:22:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 09:22:24 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Avoid various "Unhandled message" errors on BS-11 startup In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19263 ) Change subject: abis_nm: Avoid various "Unhandled message" errors on BS-11 startup ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icd87fc9f3652b21f9d569af2572d080c9ac89e8b Gerrit-Change-Number: 19263 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 09:22:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:22:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 09:22:30 +0000 Subject: Change in osmo-bsc[master]: Bring timeslot FSMs on BS-11 out of NOT_INITIALIZED state In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19265 ) Change subject: Bring timeslot FSMs on BS-11 out of NOT_INITIALIZED state ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I557cb105247552887ca47a0f2c1b06b71bca6cac Gerrit-Change-Number: 19265 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 09:22:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:23:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 09:23:10 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Avoid various "Unhandled message" errors on BS-11 startup In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19263 ) Change subject: abis_nm: Avoid various "Unhandled message" errors on BS-11 startup ...................................................................... abis_nm: Avoid various "Unhandled message" errors on BS-11 startup There are a number of OML messages which are not seen on IP based BTSs. Those are perfectly normal and expected on E1 based BTS. Change-Id: Icd87fc9f3652b21f9d569af2572d080c9ac89e8b Closes: OS#4665 --- M src/osmo-bsc/abis_nm.c 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index e17c6f5..8dde8de 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -969,6 +969,18 @@ case NM_MT_GET_ATTR_RESP: ret = abis_nm_rx_get_attr_resp(mb, gsm_bts_trx_num(bts, (foh)->obj_inst.trx_nr)); break; + case NM_MT_ESTABLISH_TEI_ACK: + case NM_MT_CONN_TERR_SIGN_ACK: + case NM_MT_DISC_TERR_SIGN_ACK: + case NM_MT_CONN_TERR_TRAF_ACK: + case NM_MT_DISC_MDROP_LINK_ACK: + case NM_MT_STOP_EVENT_REP_ACK: + case NM_MT_REST_EVENT_REP_ACK: + case NM_MT_BS11_BEGIN_DB_TX_ACK: + case NM_MT_BS11_END_DB_TX_ACK: + case NM_MT_BS11_SET_ATTR_ACK: + DEBUGPFOH(DNM, foh, "%s\n", get_value_string(abis_nm_msgtype_names, mt)); + break; default: LOGPFOH(DNM, LOGL_ERROR, foh, "Unhandled message %s\n", get_value_string(abis_nm_msgtype_names, mt)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icd87fc9f3652b21f9d569af2572d080c9ac89e8b Gerrit-Change-Number: 19263 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:23:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 09:23:10 +0000 Subject: Change in osmo-bsc[master]: Bring timeslot FSMs on BS-11 out of NOT_INITIALIZED state In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19265 ) Change subject: Bring timeslot FSMs on BS-11 out of NOT_INITIALIZED state ...................................................................... Bring timeslot FSMs on BS-11 out of NOT_INITIALIZED state When we introduced the timeslot FSMs in I82e3f918295daa83274a4cf803f046979f284366, the BS-11 stopped to work, as the timeslot FSMs are never brought out of NOT_INITIALIZED stage. Closes: OS#4666 Change-Id: I557cb105247552887ca47a0f2c1b06b71bca6cac --- M src/osmo-bsc/bts_siemens_bs11.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/bts_siemens_bs11.c b/src/osmo-bsc/bts_siemens_bs11.c index d0fe38b..2750f8c 100644 --- a/src/osmo-bsc/bts_siemens_bs11.c +++ b/src/osmo-bsc/bts_siemens_bs11.c @@ -523,6 +523,11 @@ /* restart sending event reports */ abis_nm_event_reports(bts, 1); + + /* make the timeslot FSM happy. Siemens doesn't send us + * OML state changes for individual timeslots, so we + * bring all of them up here */ + gsm_bts_all_ts_dispatch(bts, TS_EV_OML_READY, NULL); } static int shutdown_om(struct gsm_bts *bts) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I557cb105247552887ca47a0f2c1b06b71bca6cac Gerrit-Change-Number: 19265 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:23:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 09:23:10 +0000 Subject: Change in osmo-bsc[master]: Don't print 'bogus channel load sample' message if total == 0 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19132 ) Change subject: Don't print 'bogus channel load sample' message if total == 0 ...................................................................... Don't print 'bogus channel load sample' message if total == 0 Change-Id: I857fecc76dc16ba4431f3c0142bb0d798a9f73dc Closes: OS#4614 --- M src/osmo-bsc/chan_alloc.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/chan_alloc.c b/src/osmo-bsc/chan_alloc.c index f23a982..9b80df3 100644 --- a/src/osmo-bsc/chan_alloc.c +++ b/src/osmo-bsc/chan_alloc.c @@ -203,9 +203,11 @@ } /* Check for invalid samples (shouldn't happen). */ - if (total == 0 || used > total) { + if (used > total) { LOG_BTS(bts, DRLL, LOGL_NOTICE, "bogus channel load sample (used=%"PRIu64" / total=%"PRIu32")\n", used, total); + } + if (total == 0 || used > total) { bts->T3122 = 0; /* disable override of network-wide default value */ bts->chan_load_samples_idx = 0; /* invalidate other samples collected so far */ return; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I857fecc76dc16ba4431f3c0142bb0d798a9f73dc Gerrit-Change-Number: 19132 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:23:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 09:23:11 +0000 Subject: Change in osmo-bsc[master]: bts_nokia_site: Clean up logging In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19264 ) Change subject: bts_nokia_site: Clean up logging ...................................................................... bts_nokia_site: Clean up logging We don't want to fprintf directly, and we want to make sure to always log as much context as possible. Change-Id: I29ec935669175a08cb42e1666559b681c50a6e72 --- M src/osmo-bsc/bts_nokia_site.c 1 file changed, 37 insertions(+), 53 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c index 0d0dbb5..51710b8 100644 --- a/src/osmo-bsc/bts_nokia_site.c +++ b/src/osmo-bsc/bts_nokia_site.c @@ -59,7 +59,7 @@ static void bootstrap_om_bts(struct gsm_bts *bts) { - LOGP(DNM, LOGL_NOTICE, "bootstrapping OML for BTS %u\n", bts->nr); + LOG_BTS(bts, DNM, LOGL_NOTICE, "bootstrapping OML\n"); if (!bts->nokia.skip_reset) { if (!bts->nokia.did_reset) @@ -72,8 +72,7 @@ static void bootstrap_om_trx(struct gsm_bts_trx *trx) { - LOGP(DNM, LOGL_NOTICE, "bootstrapping OML for TRX %u/%u\n", - trx->bts->nr, trx->nr); + LOG_TRX(trx, DNM, LOGL_NOTICE, "bootstrapping OML\n"); gsm_trx_all_ts_dispatch(trx, TS_EV_OML_READY, NULL); } @@ -762,7 +761,7 @@ /* set CA */ if (generate_cell_chan_list(&fu_config[38], trx->bts) != 0) { - fprintf(stderr, "generate_cell_chan_list failed\n"); + LOG_TRX(trx, DNM, LOGL_ERROR, "generate_cell_chan_list failed\n"); return 0; } @@ -810,8 +809,7 @@ chan_config = 11; break; default: - fprintf(stderr, - "unsupported channel config %s for timeslot %d\n", + LOG_TRX(trx, DNM, LOGL_ERROR, "unsupported channel config %s for timeslot %d\n", gsm_pchan_name(ts->pchan_from_config), i); return 0; } @@ -1000,17 +998,17 @@ build the configuration data */ -static int make_bts_config(uint8_t bts_type, int n_trx, uint8_t * fu_config, +static int make_bts_config(struct gsm_bts *bts, uint8_t bts_type, int n_trx, uint8_t * fu_config, int need_hopping) { /* is it an InSite BTS ? */ if (bts_type == 0x0E || bts_type == 0x0F || bts_type == 0x10) { /* TODO */ if (n_trx != 1) { - fprintf(stderr, "InSite has only one TRX\n"); + LOG_BTS(bts, DNM, LOGL_ERROR, "InSite has only one TRX\n"); return 0; } if (need_hopping != 0) { - fprintf(stderr, "InSite does not support hopping\n"); + LOG_BTS(bts, DNM, LOGL_ERROR, "InSite does not support hopping\n"); return 0; } memcpy(fu_config, bts_config_insite, sizeof(bts_config_insite)); @@ -1090,7 +1088,7 @@ noh->reference = htons(ref); memcpy(noh->data, data, len_data); - DEBUGPC(DNM, "Sending %s\n", get_msg_type_name_string(msg_type)); + LOG_BTS(bts, DNM, LOGL_DEBUG, "Sending %s\n", get_msg_type_name_string(msg_type)); return abis_nm_sendmsg(bts, msg); } @@ -1165,7 +1163,7 @@ { uint8_t *data = reset; int len_data = sizeof(reset); - LOGP(DLINP, LOGL_INFO, "Nokia BTS reset timer: %d\n", bts->nokia.bts_reset_timer_cnf); + LOG_BTS(bts, DLINP, LOGL_INFO, "Nokia BTS reset timer: %d\n", bts->nokia.bts_reset_timer_cnf); return abis_nm_send(bts, NOKIA_MSG_RESET_REQ, ref, data, len_data); } @@ -1252,7 +1250,7 @@ memcpy(oh->data, data, len_to_send); } - DEBUGPC(DNM, "Sending multi-segment %d\n", seq); + LOG_BTS(bts, DNM, LOGL_DEBUG, "Sending multi-segment %d\n", seq); ret = abis_nm_sendmsg(bts, msg); if (ret < 0) @@ -1306,7 +1304,7 @@ idx++; } - ret = make_bts_config(bts_type, idx, config + len, need_hopping); + ret = make_bts_config(bts, bts_type, idx, config + len, need_hopping); len += ret; #if 0 /* debugging */ @@ -1502,8 +1500,8 @@ /* OML link */ line = e1inp_line_find(e1_link->e1_nr); if (!line) { - LOGP(DLINP, LOGL_ERROR, "BTS %u OML link referring to non-existing E1 line %u\n", - bts->nr, e1_link->e1_nr); + LOG_BTS(bts, DLINP, LOGL_ERROR, "BTS OML link referring to non-existing E1 line %u\n", + e1_link->e1_nr); return; } @@ -1555,18 +1553,17 @@ int len_data; if (bts->nokia.wait_reset) { - LOGP(DNM, LOGL_INFO, - "Ignore message while waiting for reset\n"); + LOG_BTS(bts, DNM, LOGL_INFO, "Ignoring message while waiting for reset: %s\n", msgb_hexdump(mb)); return ret; } if (oh->length < sizeof(struct abis_om_nokia_hdr)) { - LOGP(DNM, LOGL_ERROR, "Message too short\n"); + LOG_BTS(bts, DNM, LOGL_ERROR, "Message too short: %s\n", msgb_hexdump(mb)); return -EINVAL; } len_data = oh->length - sizeof(struct abis_om_nokia_hdr); - LOGP(DNM, LOGL_INFO, "(0x%02X) %s\n", mt, get_msg_type_name_string(mt)); + LOG_BTS(bts, DNM, LOGL_INFO, "Rx (0x%02X) %s\n", mt, get_msg_type_name_string(mt)); #if 0 /* debugging */ dump_elements(noh->data, len_data); #endif @@ -1576,11 +1573,10 @@ if (find_element(noh->data, len_data, NOKIA_EI_BTS_TYPE, &bts->nokia.bts_type, sizeof(uint8_t)) == sizeof(uint8_t)) - LOGP(DNM, LOGL_INFO, "BTS type = %d (%s)\n", - bts->nokia.bts_type, - get_bts_type_string(bts->nokia.bts_type)); + LOG_BTS(bts, DNM, LOGL_INFO, "Rx BTS type = %d (%s)\n", bts->nokia.bts_type, + get_bts_type_string(bts->nokia.bts_type)); else - LOGP(DNM, LOGL_ERROR, "BTS type not found\n"); + LOG_BTS(bts, DNM, LOGL_ERROR, "BTS type not found in NOKIA_MSG_OMU_STARTED\n"); /* send START_DOWNLOAD_REQ */ abis_nm_download_req(bts, ref); break; @@ -1598,14 +1594,13 @@ if (find_element (noh->data, len_data, NOKIA_EI_ACK, &ack, sizeof(uint8_t)) == sizeof(uint8_t)) { - LOGP(DNM, LOGL_INFO, "ACK = %d\n", ack); + LOG_BTS(bts, DNM, LOGL_INFO, "Rx ACK = %u\n", ack); if (ack != 1) { - LOGP(DNM, LOGL_ERROR, "No ACK received (%d)\n", - ack); + LOG_BTS(bts, DNM, LOGL_ERROR, "Rx No ACK (%u): don't know how to proceed\n", ack); /* TODO: properly handle failures (NACK) */ } } else - LOGP(DNM, LOGL_ERROR, "ACK not found\n"); + LOG_BTS(bts, DNM, LOGL_ERROR, "Rx MSG_ACK but no EI_ACK found: %s\n", msgb_hexdump(mb)); /* TODO: the assumption for the following is that no NACK was received */ @@ -1647,11 +1642,8 @@ /* RSL Link */ line = e1inp_line_find(e1_link->e1_nr); if (!line) { - LOGP(DLINP, LOGL_ERROR, - "TRX (%u/%u) RSL link referring " - "to non-existing E1 line %u\n", - sign_link->trx->bts->nr, sign_link->trx->nr, - e1_link->e1_nr); + LOG_BTS(bts, DLINP, LOGL_ERROR, "RSL link referring to " + "non-existing E1 line %u\n", e1_link->e1_nr); return -ENOMEM; } /* start TRX */ @@ -1681,21 +1673,17 @@ sizeof(info)); if (str_len > 0) { info[str_len] = 0; - LOGP(DNM, LOGL_INFO, "ALARM Severity %s (%d) : %s\n", - get_severity_string(severity), severity, info); + LOG_BTS(bts, DNM, LOGL_NOTICE, "Rx ALARM Severity %s (%d) : %s\n", + get_severity_string(severity), severity, info); } else { /* nothing found, try details */ str_len = - find_element(noh->data, len_data, - NOKIA_EI_ALARM_DETAIL, info, - sizeof(info)); + find_element(noh->data, len_data, NOKIA_EI_ALARM_DETAIL, info, sizeof(info)); if (str_len > 0) { uint16_t code; info[str_len] = 0; code = (info[0] << 8) + info[1]; - LOGP(DNM, LOGL_INFO, - "ALARM Severity %s (%d), code 0x%X : %s\n", - get_severity_string(severity), severity, - code, info + 2); + LOG_BTS(bts, DNM, LOGL_NOTICE, "Rx ALARM Severity %s (%d), code 0x%X : %s\n", + get_severity_string(severity), severity, code, info + 2); } } /* send ACK */ @@ -1712,41 +1700,37 @@ int abis_nokia_rcvmsg(struct msgb *msg) { + struct e1inp_sign_link *sign_link = (struct e1inp_sign_link *)msg->dst; + struct gsm_bts *bts = sign_link->trx->bts; struct abis_om_hdr *oh = msgb_l2(msg); int rc = 0; /* Various consistency checks */ if (oh->placement != ABIS_OM_PLACEMENT_ONLY) { - LOGP(DNM, LOGL_ERROR, "ABIS OML placement 0x%x not supported\n", - oh->placement); + LOG_BTS(bts, DNM, LOGL_ERROR, "Rx ABIS OML placement 0x%x not supported\n", oh->placement); if (oh->placement != ABIS_OM_PLACEMENT_FIRST) return -EINVAL; } if (oh->sequence != 0) { - LOGP(DNM, LOGL_ERROR, "ABIS OML sequence 0x%x != 0x00\n", - oh->sequence); + LOG_BTS(bts, DNM, LOGL_ERROR, "Rx ABIS OML sequence 0x%x != 0x00\n", oh->sequence); return -EINVAL; } msg->l3h = (unsigned char *)oh + sizeof(*oh); switch (oh->mdisc) { case ABIS_OM_MDISC_FOM: - LOGP(DNM, LOGL_INFO, "ABIS_OM_MDISC_FOM\n"); + LOG_BTS(bts, DNM, LOGL_INFO, "Rx ABIS_OM_MDISC_FOM\n"); rc = abis_nm_rcvmsg_fom(msg); break; case ABIS_OM_MDISC_MANUF: - LOGP(DNM, LOGL_INFO, "ABIS_OM_MDISC_MANUF\n"); + LOG_BTS(bts, DNM, LOGL_INFO, "Rx ABIS_OM_MDISC_MANUF: ignoring\n"); break; case ABIS_OM_MDISC_MMI: case ABIS_OM_MDISC_TRAU: - LOGP(DNM, LOGL_ERROR, - "unimplemented ABIS OML message discriminator 0x%x\n", - oh->mdisc); + LOG_BTS(bts, DNM, LOGL_ERROR, "Rx unimplemented ABIS OML message discriminator 0x%x\n", oh->mdisc); break; default: - LOGP(DNM, LOGL_ERROR, - "unknown ABIS OML message discriminator 0x%x\n", - oh->mdisc); + LOG_BTS(bts, DNM, LOGL_ERROR, "Rx unknown ABIS OML message discriminator 0x%x\n", oh->mdisc); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I29ec935669175a08cb42e1666559b681c50a6e72 Gerrit-Change-Number: 19264 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:29:15 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 15 Jul 2020 09:29:15 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: add function to generate e1-endpoint names In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19075 to look at the new patch set (#8). Change subject: mgcp_client: add function to generate e1-endpoint names ...................................................................... mgcp_client: add function to generate e1-endpoint names mgcp_client.h offers functions to generate endpoint names for wildcarded request. This is used in osmo-bsc, lets now also add a function that can generate e1-endpoint names. Change-Id: Iec35b5bae8a7b07ddb3559f7114a24dcd10e8f14 Related: OS#2547 --- M include/osmocom/mgcp_client/mgcp_client.h M src/libosmo-mgcp-client/mgcp_client.c M tests/mgcp_client/mgcp_client_test.c M tests/mgcp_client/mgcp_client_test.err M tests/mgcp_client/mgcp_client_test.ok 5 files changed, 126 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/75/19075/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iec35b5bae8a7b07ddb3559f7114a24dcd10e8f14 Gerrit-Change-Number: 19075 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:29:15 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 15 Jul 2020 09:29:15 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: fix endpoint number configuration In-Reply-To: References: Message-ID: Hello pespin, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 to look at the new patch set (#6). Change subject: mgcp_vty: fix endpoint number configuration ...................................................................... mgcp_vty: fix endpoint number configuration At the moment the number of possible E1 endpoints (depends on the number of E1 timeslots that should be used) is hardcoded and the configuration of the number of virtual endpoints has an off-by-one problem. For the E1 timeslots one might choose not to occupy all E1 timeslots of once. A one TRX E1 BTS usually requires 3 E1 timeslots. One as D-Channel timeslot and two to cover the voice channels. The voice channels timeslots need to be set up in osmo-mgw, while the D-Channel timeslot must not be touched. The VTY config needs to be able to reflect that. Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Related: OS#2547 --- M src/libosmo-mgcp/mgcp_trunk.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 3 files changed, 37 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/21/19121/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Gerrit-Change-Number: 19121 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:29:15 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 15 Jul 2020 09:29:15 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: add function to claim an endpoint In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/19166 to look at the new patch set (#4). Change subject: mgcp_endp: add function to claim an endpoint ...................................................................... mgcp_endp: add function to claim an endpoint At the moment where the first CRCX writes the CALLID to the endp struct the endpoint is marked as "serving a call", which could also be described as a "claimed" state. Lets have a function to do that. This way we also create an entry point where the endpoint could call some type specific initalization functions. Change-Id: I402ac43dffd2c85789e4f0308a540e227063cc28 Related: OS#2659 --- M include/osmocom/mgcp/mgcp_endp.h M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_protocol.c 3 files changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/66/19166/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I402ac43dffd2c85789e4f0308a540e227063cc28 Gerrit-Change-Number: 19166 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:30:34 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 15 Jul 2020 09:30:34 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: be more specific about E1 trunks In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19103 ) Change subject: mgcp_vty: be more specific about E1 trunks ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I22c39ee9a36e4e737992c91677f3e315907a4c7e Gerrit-Change-Number: 19103 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:38:44 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 09:38:44 +0000 Subject: Change in libosmo-abis[master]: e1_input: Use osmo_use_count in e1inp_line In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19256 ) Change subject: e1_input: Use osmo_use_count in e1inp_line ...................................................................... Patch Set 1: (4 comments) https://gerrit.osmocom.org/c/libosmo-abis/+/19256/1/include/osmocom/abis/e1_input.h File include/osmocom/abis/e1_input.h: https://gerrit.osmocom.org/c/libosmo-abis/+/19256/1/include/osmocom/abis/e1_input.h at 249 PS1, Line 249: e1inp_line_clone This is a public API, so I don't think you can change it. https://gerrit.osmocom.org/c/libosmo-abis/+/19256/1/include/osmocom/abis/e1_input.h at 251 PS1, Line 251: Deprecated, use e1inp_line_get2() instead OSMO_DEPRECATED()? https://gerrit.osmocom.org/c/libosmo-abis/+/19256/1/include/osmocom/abis/e1_input.h at 254 PS1, Line 254: Deprecated OSMO_DEPRECATED()? https://gerrit.osmocom.org/c/libosmo-abis/+/19256/1/src/e1_input.c File src/e1_input.c: https://gerrit.osmocom.org/c/libosmo-abis/+/19256/1/src/e1_input.c at 504 PS1, Line 504: Cosmetic: unusual spacing, in most cases it's just one tab. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0658b2e9c452598025cc0f1d0b060076171767cc Gerrit-Change-Number: 19256 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 09:38:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:39:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 09:39:45 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Drop e1inp_line reference in ipacess_drop() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19257 ) Change subject: ipaccess: Drop e1inp_line reference in ipacess_drop() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I418064df04872befe2e936e21768b6ea01263120 Gerrit-Change-Number: 19257 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 15 Jul 2020 09:39:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:42:55 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Wed, 15 Jul 2020 09:42:55 +0000 Subject: Change in osmo-e1d[master]: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19249 ) Change subject: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I765b5c3bc9e07b2353f8647e8260ff95df3727e6 Gerrit-Change-Number: 19249 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 15 Jul 2020 09:42:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:43:27 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 09:43:27 +0000 Subject: Change in libosmo-abis[master]: ipacces: Fix e1inp_line reference put in ipaccess_close In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19258 ) Change subject: ipacces: Fix e1inp_line reference put in ipaccess_close ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmo-abis/+/19258/1/src/e1_input.c File src/e1_input.c: https://gerrit.osmocom.org/c/libosmo-abis/+/19258/1/src/e1_input.c at 820 PS1, Line 820: Please keep it aligned, thanks! -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If23cc722106a9f70c998e591369a4acafa52c519 Gerrit-Change-Number: 19258 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 15 Jul 2020 09:43:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:44:05 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 09:44:05 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Set bfd->data to NULL before releasing its reference In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19259 ) Change subject: ipaccess: Set bfd->data to NULL before releasing its reference ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic3f261b2a995efcbc8eece9669ee3ae63af7b5c0 Gerrit-Change-Number: 19259 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 09:44:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:44:53 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Wed, 15 Jul 2020 09:44:53 +0000 Subject: Change in osmo-e1d[master]: introduce concept of superchannel to data structures In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19229 ) Change subject: introduce concept of superchannel to data structures ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I0aacf251e155de2bb6ad03ffc4181067b22f1c90 Gerrit-Change-Number: 19229 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 15 Jul 2020 09:44:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 09:59:32 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Wed, 15 Jul 2020 09:59:32 +0000 Subject: Change in osmo-e1d[master]: actually implement the superchannel mode In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19231 ) Change subject: actually implement the superchannel mode ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id340b1925471f427deb6cda7eb54e80dfc71faec Gerrit-Change-Number: 19231 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 15 Jul 2020 09:59:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 10:23:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 10:23:50 +0000 Subject: Change in libosmocore[master]: vty: Avoid ultra-long multi-line strings cluttering talloc reports References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19272 ) Change subject: vty: Avoid ultra-long multi-line strings cluttering talloc reports ...................................................................... vty: Avoid ultra-long multi-line strings cluttering talloc reports The talloc_asprintf() series includes an unconditional call to talloc_set_name_const(), turning the entire long constructed string into the name of the talloc object. That simply doesn't work when creating kilobytes-sized VTY reference strings including linefeeds. Let's add an explicit talloc_set_name_const() to prevent this. Change-Id: Ibd77684b88cc3572047daa98c9a6b9119fba041b Closes: OS#4668 --- M src/vty/logging_vty.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/19272/1 diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index c51b437..0e1782a 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -337,6 +337,9 @@ osmo_talloc_asprintf(tall_log_ctx, cmd_str, ") %s", level_args); osmo_talloc_asprintf(tall_log_ctx, doc_str, "%s", level_strs); + talloc_set_name_const(cmd_str, "vty_log_level_cmd_str"); + talloc_set_name_const(doc_str, "vty_log_level_doc_str"); + cmd->string = cmd_str; cmd->doc = doc_str; } @@ -1048,6 +1051,9 @@ osmo_talloc_asprintf(tall_log_ctx, doc_str, "Arbitrary message to log on given category and log level\n"); + talloc_set_name_const(cmd_str, "vty_logp_cmd_str"); + talloc_set_name_const(doc_str, "vty_logp_doc_str"); + cmd->string = cmd_str; cmd->doc = doc_str; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibd77684b88cc3572047daa98c9a6b9119fba041b Gerrit-Change-Number: 19272 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 10:26:17 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 10:26:17 +0000 Subject: Change in libosmocore[master]: vty: Avoid ultra-long multi-line strings cluttering talloc reports In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19272 ) Change subject: vty: Avoid ultra-long multi-line strings cluttering talloc reports ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibd77684b88cc3572047daa98c9a6b9119fba041b Gerrit-Change-Number: 19272 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: fixeria Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 15 Jul 2020 10:26:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 10:26:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 10:26:21 +0000 Subject: Change in osmo-e1d[master]: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel In-Reply-To: References: Message-ID: Hello tnt, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/19249 to look at the new patch set (#5). Change subject: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel ...................................................................... Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel This adds the related code to the server and client side of the CTL interface to switch a line between CHANNELIZED and SUPERCHANNEL. Change-Id: I765b5c3bc9e07b2353f8647e8260ff95df3727e6 --- M include/osmocom/e1d/proto.h M include/osmocom/e1d/proto_clnt.h M src/ctl.c M src/proto.c M src/proto_clnt.c 5 files changed, 122 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/49/19249/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I765b5c3bc9e07b2353f8647e8260ff95df3727e6 Gerrit-Change-Number: 19249 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 10:26:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 10:26:27 +0000 Subject: Change in osmo-e1d[master]: actually implement the superchannel mode In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19231 ) Change subject: actually implement the superchannel mode ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id340b1925471f427deb6cda7eb54e80dfc71faec Gerrit-Change-Number: 19231 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 15 Jul 2020 10:26:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 10:26:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 10:26:32 +0000 Subject: Change in osmo-e1d[master]: introduce concept of superchannel to data structures In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19229 ) Change subject: introduce concept of superchannel to data structures ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I0aacf251e155de2bb6ad03ffc4181067b22f1c90 Gerrit-Change-Number: 19229 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 15 Jul 2020 10:26:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 10:26:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 10:26:42 +0000 Subject: Change in osmo-e1d[master]: introduce concept of superchannel to data structures In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19229 ) Change subject: introduce concept of superchannel to data structures ...................................................................... introduce concept of superchannel to data structures We treat the superchannel as an extra, separate timeslot. Initially I thought of simply re-using TS1, but keeping the superchannel separate ensures that it doesn't inherit any state (like half-sent HDLC frames) from another timeslot when we switch between the modes at runtime. Change-Id: I0aacf251e155de2bb6ad03ffc4181067b22f1c90 --- M include/osmocom/e1d/proto.h M src/ctl.c M src/e1d.h M src/intf_line.c 4 files changed, 33 insertions(+), 6 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/e1d/proto.h b/include/osmocom/e1d/proto.h index 56064b8..6711332 100644 --- a/include/osmocom/e1d/proto.h +++ b/include/osmocom/e1d/proto.h @@ -71,6 +71,7 @@ #define E1DP_MAGIC 0x00e1 #define E1DP_MAX_LEN 4096 +#define E1DP_TS_SUPERCHAN 0xfe #define E1DP_INVALID 0xff #define E1DP_DEFAULT_SOCKET "/tmp/osmo-e1d.ctl" diff --git a/src/ctl.c b/src/ctl.c index 482366f..5322ab4 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -68,7 +68,12 @@ static struct e1_ts * _e1d_get_ts(struct e1_line *line, uint8_t ts) { - return (ts < 32) ? &line->ts[ts] : NULL; + if (ts < 32) + return &line->ts[ts]; + else if (ts == E1DP_TS_SUPERCHAN) + return &line->superchan; + else + return NULL; } static void diff --git a/src/e1d.h b/src/e1d.h index f556e8f..2b8e32b 100644 --- a/src/e1d.h +++ b/src/e1d.h @@ -55,15 +55,28 @@ int fd; }; +enum e1_line_mode { + /* 31 individual 64k timeslots, as used on 3GPP Abis, 3GPP A or ISDN */ + E1_LINE_MODE_CHANNELIZED, + /* 1 channel group spanning all 31 TS, as used e.g. when using Frame Relay + * or raw HDLC over channelized E1. */ + E1_LINE_MODE_SUPERCHANNEL, +}; + struct e1_line { struct llist_head list; struct e1_intf *intf; uint8_t id; + enum e1_line_mode mode; + void *drv_data; + /* timeslots for channelized mode */ struct e1_ts ts[32]; + /* superchannel */ + struct e1_ts superchan; }; enum e1_driver { diff --git a/src/intf_line.c b/src/intf_line.c index e206f76..421c528 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -33,6 +33,7 @@ #include #include +#include #include "e1d.h" #include "log.h" @@ -90,6 +91,14 @@ talloc_free(intf); } +static void +_ts_init(struct e1_ts *ts, struct e1_line *line, int id) +{ + ts->line = line; + ts->id = id; + ts->fd = -1; +} + struct e1_line * e1_line_new(struct e1_intf *intf, void *drv_data) { @@ -100,12 +109,11 @@ line->intf = intf; line->drv_data = drv_data; + line->mode = E1_LINE_MODE_CHANNELIZED; - for (int i=0; i<32; i++) { - line->ts[i].line = line; - line->ts[i].id = i; - line->ts[i].fd = -1; - } + for (int i=0; i<32; i++) + _ts_init(&line->ts[i], line, i); + _ts_init(&line->superchan, line, E1DP_TS_SUPERCHAN); INIT_LLIST_HEAD(&line->list); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I0aacf251e155de2bb6ad03ffc4181067b22f1c90 Gerrit-Change-Number: 19229 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 10:26:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 10:26:43 +0000 Subject: Change in osmo-e1d[master]: actually implement the superchannel mode In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19231 ) Change subject: actually implement the superchannel mode ...................................................................... actually implement the superchannel mode In superchannel mode, all 31 TS are grouped together. There is no way to enable it yet, see next patch. Change-Id: Id340b1925471f427deb6cda7eb54e80dfc71faec --- M src/e1d.h M src/intf_line.c M src/vty.c 3 files changed, 172 insertions(+), 59 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/e1d.h b/src/e1d.h index 2b8e32b..fca7d3e 100644 --- a/src/e1d.h +++ b/src/e1d.h @@ -85,6 +85,7 @@ }; extern const struct value_string e1_driver_names[]; +extern const struct value_string e1_line_mode_names[]; struct e1_intf { struct llist_head list; diff --git a/src/intf_line.c b/src/intf_line.c index 421c528..af0d45d 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -177,7 +177,7 @@ oi += cl; } - return 0; + return len; } static int @@ -233,6 +233,83 @@ return len; } +/* read from a timeslot-FD (direction application -> hardware) */ +static int +_e1_ts_read(struct e1_ts *ts, uint8_t *buf, size_t len) +{ + int l; + + switch (ts->mode) { + case E1_TS_MODE_RAW: + l = read(ts->fd, buf, len); + /* FIXME: handle underflow */ + break; + case E1_TS_MODE_HDLCFCS: + l = _e1_tx_hdlcfs(ts, buf, len); + break; + default: + OSMO_ASSERT(0); + break; + } + + if (l < 0 && errno != EAGAIN) { + LOGPTS(ts, DE1D, LOGL_ERROR, "dead socket during read: %s\n", + strerror(errno)); + e1_ts_stop(ts); + } else if (l < len) { + LOGPTS(ts, DE1D, LOGL_NOTICE, "TS read underflow: We had %zu bytes to read, " + "but socket returned only %d\n", len, l); + } + + return l; +} + +static void +_e1_line_mux_out_channelized(struct e1_line *line, uint8_t *buf, int fts) +{ + OSMO_ASSERT(line->mode == E1_LINE_MODE_CHANNELIZED); + + /* Scan timeslots */ + for (int tsn=1; tsn<32; tsn++) + { + struct e1_ts *ts = &line->ts[tsn]; + uint8_t buf_ts[fts]; + int l; + + if (ts->mode == E1_TS_MODE_OFF) + continue; + + l = _e1_ts_read(ts, buf_ts, sizeof(buf_ts)); + if (l <= 0) + continue; + + for (int i=0; isuperchan; + uint8_t sc_buf[31*fts]; + int l; + + OSMO_ASSERT(line->mode == E1_LINE_MODE_SUPERCHANNEL); + + if (ts->mode == E1_TS_MODE_OFF) + return; + + /* first pull all we need out of the source */ + l = _e1_ts_read(ts, sc_buf, sizeof(sc_buf)); + if (l <= 0) + return; + + /* then form E1 frames from it, sprinkling in some gaps for TS0 */ + for (int i = 0; i < fts; i++) + memcpy(buf + i*32 + 1, sc_buf + i*31, 31); +} + /*! generate (multiplex) output data for the specified e1_line * \param[in] line E1 line for which to genrate output data * \param[in] buf caller-allocated output buffer for multiplexed data @@ -247,42 +324,91 @@ tsz = 32 * fts; memset(buf, 0xff, tsz); - /* Scan timeslots */ + switch (line->mode) { + case E1_LINE_MODE_CHANNELIZED: + _e1_line_mux_out_channelized(line, buf, fts); + break; + case E1_LINE_MODE_SUPERCHANNEL: + _e1_line_mux_out_superchan(line, buf, fts); + break; + default: + OSMO_ASSERT(0); + } + + return tsz; +} + +/* write data to a timeslot (hardware -> application direction) */ +static int +_e1_ts_write(struct e1_ts *ts, const uint8_t *buf, size_t len) +{ + int rv; + + switch (ts->mode) { + case E1_TS_MODE_RAW: + rv = write(ts->fd, buf, len); + break; + case E1_TS_MODE_HDLCFCS: + rv = _e1_rx_hdlcfs(ts, buf, len); + break; + default: + OSMO_ASSERT(0); + break; + } + + if (rv < 0 && errno != EAGAIN) { + LOGPTS(ts, DE1D, LOGL_ERROR, "dead socket during write: %s\n", + strerror(errno)); + e1_ts_stop(ts); + } else if (rv < len) { + LOGPTS(ts, DE1D, LOGL_NOTICE, "TS write overflow: We had %zu bytes to send, " + "but write returned only %d\n", len, rv); + } + + return rv; +} + +static int +_e1_line_demux_in_superchan(struct e1_line *line, const uint8_t *buf, int ftr) +{ + struct e1_ts *ts = &line->superchan; + uint8_t sc_buf[ftr*31]; + + OSMO_ASSERT(line->mode == E1_LINE_MODE_SUPERCHANNEL); + + if (ts->mode == E1_TS_MODE_OFF) + return 0; + + /* first gather input data from multiple frames*/ + for (int i = 0; i < ftr; i++) + memcpy(sc_buf + (i*31), buf + (i*32) + 1, 31); + + /* then dispatch to appropriate action */ + _e1_ts_write(ts, sc_buf, ftr*31); + + return 0; +} + +static int +_e1_line_demux_in_channelized(struct e1_line *line, const uint8_t *buf, int ftr) +{ + OSMO_ASSERT(line->mode == E1_LINE_MODE_CHANNELIZED); + for (int tsn=1; tsn<32; tsn++) { struct e1_ts *ts = &line->ts[tsn]; - uint8_t buf_ts[fts]; - int l; + uint8_t buf_ts[ftr]; if (ts->mode == E1_TS_MODE_OFF) continue; - switch (ts->mode) { - case E1_TS_MODE_RAW: - l = read(ts->fd, buf_ts, fts); - break; - case E1_TS_MODE_HDLCFCS: - l = _e1_tx_hdlcfs(ts, buf_ts, fts); - break; - default: - OSMO_ASSERT(0); - continue; - } + for (int i=0; its[tsn]; - uint8_t buf_ts[ftr]; - int rv; - - if (ts->mode == E1_TS_MODE_OFF) - continue; - - for (int i=0; imode) { - case E1_TS_MODE_RAW: - rv = write(ts->fd, buf_ts, ftr); - break; - case E1_TS_MODE_HDLCFCS: - rv = _e1_rx_hdlcfs(ts, buf_ts, ftr); - break; - default: - OSMO_ASSERT(0); - continue; - } - if (rv < 0 && errno != EAGAIN) { - LOGPTS(ts, DE1D, LOGL_ERROR, "dead socket during write: %s\n", - strerror(errno)); - e1_ts_stop(ts); - } - + switch (line->mode) { + case E1_LINE_MODE_CHANNELIZED: + return _e1_line_demux_in_channelized(line, buf, ftr); + case E1_LINE_MODE_SUPERCHANNEL: + return _e1_line_demux_in_superchan(line, buf, ftr); + default: + OSMO_ASSERT(0); } - - return 0; } diff --git a/src/vty.c b/src/vty.c index 5e3f37c..0690177 100644 --- a/src/vty.c +++ b/src/vty.c @@ -93,11 +93,18 @@ { 0, NULL } }; +const struct value_string e1_line_mode_names[] = { + { E1_LINE_MODE_CHANNELIZED, "CHANNELIZED" }, + { E1_LINE_MODE_SUPERCHANNEL, "SUPERCHANNEL" }, + { 0, NULL } +}; + static void vty_dump_line(struct vty *vty, const struct e1_line *line) { int tn; - vty_out(vty, "Interface #%u, Line #%u:%s", line->intf->id, line->id, VTY_NEWLINE); + vty_out(vty, "Interface #%u, Line #%u, Mode %s:%s", line->intf->id, line->id, + get_value_string(e1_line_mode_names, line->mode), VTY_NEWLINE); for (tn = 0; tn < ARRAY_SIZE(line->ts); tn++) { const struct e1_ts *ts = &line->ts[tn]; @@ -105,6 +112,9 @@ ts->id, get_value_string(e1_ts_mode_names, ts->mode), ts->fd, get_remote_pid(ts->fd), VTY_NEWLINE); } + vty_out(vty, " SC: Mode %s, FD %d, Peer PID %d%s", + get_value_string(e1_ts_mode_names, line->superchan.mode), + line->superchan.fd, get_remote_pid(line->superchan.fd), VTY_NEWLINE); } DEFUN(show_line, show_line_cmd, "show line [<0-255>]", -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id340b1925471f427deb6cda7eb54e80dfc71faec Gerrit-Change-Number: 19231 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 10:34:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 10:34:35 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: add function to generate e1-endpoint names In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19075 ) Change subject: mgcp_client: add function to generate e1-endpoint names ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iec35b5bae8a7b07ddb3559f7114a24dcd10e8f14 Gerrit-Change-Number: 19075 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Wed, 15 Jul 2020 10:34:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 10:35:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 10:35:43 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: use define constant to define max number of E1 subslots In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19118 ) Change subject: mgcp_endp: use define constant to define max number of E1 subslots ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If7cb74e486946aff09e22abf8a8885bf0693f34e Gerrit-Change-Number: 19118 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jul 2020 10:35:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 10:36:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 10:36:45 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: remove double check In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19119 ) Change subject: mgcp_trunk: remove double check ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I91fb8cf6e3b077ba8f18fdbcd071275c6fd7cacd Gerrit-Change-Number: 19119 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jul 2020 10:36:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 10:37:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 10:37:16 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: do not access endpoint array elements directly In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19120 ) Change subject: mgcp_test: do not access endpoint array elements directly ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic950c427f23be4a792af94972554637c2b0fbdf2 Gerrit-Change-Number: 19120 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jul 2020 10:37:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 10:40:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 10:40:08 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: fix endpoint number configuration In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19121 ) Change subject: mgcp_vty: fix endpoint number configuration ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Gerrit-Change-Number: 19121 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jul 2020 10:40:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 10:41:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 10:41:14 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: add function to claim an endpoint In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19166 ) Change subject: mgcp_endp: add function to claim an endpoint ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I402ac43dffd2c85789e4f0308a540e227063cc28 Gerrit-Change-Number: 19166 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-Comment-Date: Wed, 15 Jul 2020 10:41:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 10:59:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 10:59:49 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: add configuration with frequency hopping parameters In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19160 ) Change subject: ttcn3-bts-test: add configuration with frequency hopping parameters ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7822c3581fccba3277a63577e740e7486307635d Gerrit-Change-Number: 19160 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jul 2020 10:59:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 11:01:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 11:01:34 +0000 Subject: Change in ...osmo-python-tests[master]: remove_tmpdir(): Support recursion / sub-directories In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/19267 ) Change subject: remove_tmpdir(): Support recursion / sub-directories ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/19267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I896b99032d94ba0cdd340a8eed7c7b625661ad69 Gerrit-Change-Number: 19267 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jul 2020 11:01:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 11:06:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 11:06:39 +0000 Subject: Change in libosmo-abis[master]: e1_input: Use osmo_use_count in e1inp_line In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19256 ) Change subject: e1_input: Use osmo_use_count in e1inp_line ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/libosmo-abis/+/19256/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmo-abis/+/19256/1//COMMIT_MSG at 9 PS1, Line 9: struct e1inp_line fields changing is fine since it is allocated through : an API and a pointer should be used by clients. > it is fine for API compatibility but definitely breaks ABI. Ah indeed I wanted to keep the old recount field unused and add this to the end, but I forgot to do so after going through all the fixes. https://gerrit.osmocom.org/c/libosmo-abis/+/19256/1/include/osmocom/abis/e1_input.h File include/osmocom/abis/e1_input.h: https://gerrit.osmocom.org/c/libosmo-abis/+/19256/1/include/osmocom/abis/e1_input.h at 249 PS1, Line 249: e1inp_line_clone > This is a public API, so I don't think you can change it. It's not being used out of libosmo-abis by any known osmocom program, so I went through in this case. https://gerrit.osmocom.org/c/libosmo-abis/+/19256/1/include/osmocom/abis/e1_input.h at 251 PS1, Line 251: Deprecated, use e1inp_line_get2() instead > OSMO_DEPRECATED()? Indeed, I forgot to do so. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0658b2e9c452598025cc0f1d0b060076171767cc Gerrit-Change-Number: 19256 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 11:06:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 11:07:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 11:07:32 +0000 Subject: Change in libosmocore[master]: vty: Avoid ultra-long multi-line strings cluttering talloc reports In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19272 ) Change subject: vty: Avoid ultra-long multi-line strings cluttering talloc reports ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibd77684b88cc3572047daa98c9a6b9119fba041b Gerrit-Change-Number: 19272 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jul 2020 11:07:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 11:08:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 11:08:04 +0000 Subject: Change in osmo-e1d[master]: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19249 ) Change subject: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I765b5c3bc9e07b2353f8647e8260ff95df3727e6 Gerrit-Change-Number: 19249 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 15 Jul 2020 11:08:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 11:10:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 11:10:44 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: add function to claim an endpoint In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19166 ) Change subject: mgcp_endp: add function to claim an endpoint ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/19166/4/src/libosmo-mgcp/mgcp_endp.c File src/libosmo-mgcp/mgcp_endp.c: https://gerrit.osmocom.org/c/osmo-mgw/+/19166/4/src/libosmo-mgcp/mgcp_endp.c at 619 PS4, Line 619: * \param[in] endp endpoint to claim. */ missing param callid. Is the activation you mention implicit to having a callid associated? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I402ac43dffd2c85789e4f0308a540e227063cc28 Gerrit-Change-Number: 19166 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 15 Jul 2020 11:10:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 11:57:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 11:57:28 +0000 Subject: Change in osmo-trx[master]: Transceiver: Provide initial value for TransceiverState::mFiller in c... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/19273 ) Change subject: Transceiver: Provide initial value for TransceiverState::mFiller in constructor ...................................................................... Transceiver: Provide initial value for TransceiverState::mFiller in constructor Fixes: Coverity CID#211258 Change-Id: Ic00cc5939ca46407cb5bf8b6fcbcf3dc677041a2 --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/73/19273/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 5e42178..56da2e2 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -61,7 +61,7 @@ } TransceiverState::TransceiverState() - : mRetrans(false), mNoiseLev(0.0), mNoises(NOISE_CNT), mPower(0.0) + : mFiller(FILLER_ZERO), mRetrans(false), mNoiseLev(0.0), mNoises(NOISE_CNT), mPower(0.0) { for (int i = 0; i < 8; i++) { chanType[i] = Transceiver::NONE; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ic00cc5939ca46407cb5bf8b6fcbcf3dc677041a2 Gerrit-Change-Number: 19273 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 12:06:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 12:06:08 +0000 Subject: Change in osmo-trx[master]: Transceiver: Use already obtained value from Rx msg structure References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/19274 ) Change subject: Transceiver: Use already obtained value from Rx msg structure ...................................................................... Transceiver: Use already obtained value from Rx msg structure Change-Id: I3854f284e6d6a561b3816b467985f59e690a282b --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/74/19274/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 56da2e2..d750218 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -1062,7 +1062,7 @@ } LOGCHAN(chan, DTRXDDL, DEBUG) << "Rx TRXD message (hdr_ver=" << unsigned(dl->common.version) - << "): fn=" << fn << ", tn=" << unsigned(dl->common.tn) << ", burst_len=" << burstLen; + << "): fn=" << fn << ", tn=" << unsigned(tn) << ", burst_len=" << burstLen; TransceiverState *state = &mStates[chan]; GSM::Time currTime = GSM::Time(fn, tn); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3854f284e6d6a561b3816b467985f59e690a282b Gerrit-Change-Number: 19274 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 12:11:39 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 12:11:39 +0000 Subject: Change in osmo-trx[master]: Transceiver: Provide initial value for TransceiverState::mFiller in c... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19273 ) Change subject: Transceiver: Provide initial value for TransceiverState::mFiller in constructor ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ic00cc5939ca46407cb5bf8b6fcbcf3dc677041a2 Gerrit-Change-Number: 19273 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 15 Jul 2020 12:11:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 12:12:36 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 12:12:36 +0000 Subject: Change in osmo-trx[master]: Transceiver: Use already obtained value from Rx msg structure In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19274 ) Change subject: Transceiver: Use already obtained value from Rx msg structure ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3854f284e6d6a561b3816b467985f59e690a282b Gerrit-Change-Number: 19274 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 15 Jul 2020 12:12:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 12:44:53 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 15 Jul 2020 12:44:53 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_{mme, enb}: make sure mcc/mnc are zero padded In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19204 to look at the new patch set (#2). Change subject: amarisoft_{mme,enb}: make sure mcc/mnc are zero padded ...................................................................... amarisoft_{mme,enb}: make sure mcc/mnc are zero padded same as for srsEPC this is also required for Amarisoft MME and eNB to support, i.e. 001/01 Note that the 3 digit MNC isn't covered by this. Change-Id: I80a84e01ec9530c285634452d7c18c17bdd595ce --- M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl M src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/04/19204/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I80a84e01ec9530c285634452d7c18c17bdd595ce Gerrit-Change-Number: 19204 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: srs_andre Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 12:44:54 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 15 Jul 2020 12:44:54 +0000 Subject: Change in osmo-gsm-tester[master]: iperf3: increase additional wait time for iperf client References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19275 ) Change subject: iperf3: increase additional wait time for iperf client ...................................................................... iperf3: increase additional wait time for iperf client we've noticed that the Iperf client times out too soon in some experiment. It seems that this happens with ZMQ if the RAT is too slow (slower than realtime) and the eNB buffers too much data. This causes iperf to still receive DL data for example long after the configured runtime. Change-Id: I9b823ab22812c96920d54fb7342c8d4c578d5270 --- M src/osmo_gsm_tester/obj/iperf3.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/75/19275/1 diff --git a/src/osmo_gsm_tester/obj/iperf3.py b/src/osmo_gsm_tester/obj/iperf3.py index 252c55a..2039a9b 100644 --- a/src/osmo_gsm_tester/obj/iperf3.py +++ b/src/osmo_gsm_tester/obj/iperf3.py @@ -277,7 +277,7 @@ proc = self.prepare_test_proc_locally(netns, popen_args) else: proc = self.prepare_test_proc_remotely(netns, popen_args) - proc.set_default_wait_timeout(time_sec + 30) # leave 30 extra sec for remote run, ctrl conn establishment, etc. + proc.set_default_wait_timeout(time_sec + 120) # leave extra time for remote run, ctrl conn establishment, buffer draining, etc. return proc def prepare_test_proc_remotely(self, netns, popen_args): -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I9b823ab22812c96920d54fb7342c8d4c578d5270 Gerrit-Change-Number: 19275 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 12:44:55 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 15 Jul 2020 12:44:55 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_drb: adapt QCI 8 config for ZMQ operation References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19276 ) Change subject: amarisoft_drb: adapt QCI 8 config for ZMQ operation ...................................................................... amarisoft_drb: adapt QCI 8 config for ZMQ operation we use the otherwise unused QCI 8 as a slightly modified version of QCI 7 (default RLC UM) with a PDCP discard timer set to infinity to avoid dropping PDCP SDUs if packets arive faster than can be processed in the DL Change-Id: I06b7b583701f90827fba36564f969b5d58c9b9ad --- M src/osmo_gsm_tester/templates/amarisoft_drb.cfg.tmpl 1 file changed, 7 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/76/19276/1 diff --git a/src/osmo_gsm_tester/templates/amarisoft_drb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_drb.cfg.tmpl index 38281b5..d244c8e 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_drb.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_drb.cfg.tmpl @@ -254,21 +254,18 @@ }, }, { - qci: 8, /* AM - best effort (Internet traffic) */ + qci: 8, /* Modified UM - best effort (Internet traffic) with full PDCP buffering */ pdcp_config: { discardTimer: 0, /* in ms, 0 means infinity */ - statusReportRequired: true, + pdcp_SN_Size: 12, }, rlc_config: { - ul_am: { - t_PollRetransmit: 80, /* in ms */ - pollPDU: 64, - pollByte: 125, /* in kBytes, 0 means infinity */ - maxRetxThreshold: 32, + ul_um: { + sn_FieldLength: 10, }, - dl_am: { - t_Reordering: 45, /* in ms, should be > to max_harq_tx * HARQ latency */ - t_StatusProhibit: 60, /* in ms */ + dl_um: { + sn_FieldLength: 10, + t_Reordering: 45, /* should be > to max_harq_tx * HARQ latency */ }, }, logical_channel_config: { -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I06b7b583701f90827fba36564f969b5d58c9b9ad Gerrit-Change-Number: 19276 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 12:44:55 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Wed, 15 Jul 2020 12:44:55 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_enb.cfg.tmpl: enable eNB PCAP if configured References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19277 ) Change subject: amarisoft_enb.cfg.tmpl: enable eNB PCAP if configured ...................................................................... amarisoft_enb.cfg.tmpl: enable eNB PCAP if configured enable PCAP output in eNB config Change-Id: I8482315ce854c5b21a90b77de55dbb82f3049bcd --- M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/77/19277/1 diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl index 64d16f9..155ad47 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl @@ -32,6 +32,10 @@ log_options: "${enb.log_options}", log_filename: "${enb.log_filename}", +% if enb.enable_pcap == 'true': + pcap: {filename:"${enb.pcap_filename}"}, +%endif + /* Enable remote API and Web interface */ com_addr: "${enb.addr}:9001", -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I8482315ce854c5b21a90b77de55dbb82f3049bcd Gerrit-Change-Number: 19277 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 12:54:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 12:54:50 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_{mme, enb}: make sure mcc/mnc are zero padded In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19204 ) Change subject: amarisoft_{mme,enb}: make sure mcc/mnc are zero padded ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I80a84e01ec9530c285634452d7c18c17bdd595ce Gerrit-Change-Number: 19204 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 12:54:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 12:55:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 12:55:13 +0000 Subject: Change in osmo-gsm-tester[master]: iperf3: increase additional wait time for iperf client In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19275 ) Change subject: iperf3: increase additional wait time for iperf client ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I9b823ab22812c96920d54fb7342c8d4c578d5270 Gerrit-Change-Number: 19275 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jul 2020 12:55:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 12:55:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 12:55:39 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_drb: adapt QCI 8 config for ZMQ operation In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19276 ) Change subject: amarisoft_drb: adapt QCI 8 config for ZMQ operation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I06b7b583701f90827fba36564f969b5d58c9b9ad Gerrit-Change-Number: 19276 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jul 2020 12:55:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 12:55:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 12:55:58 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_enb.cfg.tmpl: enable eNB PCAP if configured In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19277 ) Change subject: amarisoft_enb.cfg.tmpl: enable eNB PCAP if configured ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I8482315ce854c5b21a90b77de55dbb82f3049bcd Gerrit-Change-Number: 19277 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jul 2020 12:55:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 12:59:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 12:59:35 +0000 Subject: Change in libosmo-abis[master]: ipaccess.c: Drop repeated ipaccess_keepalive_fsm_cleanup in write err... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19246 ) Change subject: ipaccess.c: Drop repeated ipaccess_keepalive_fsm_cleanup in write error path ...................................................................... Patch Set 1: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I00d0557fe81861d4b913a4c76e4b56f93e656103 Gerrit-Change-Number: 19246 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jul 2020 12:59:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 12:59:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 12:59:44 +0000 Subject: Change in libosmo-abis[master]: ipaccess.c: Drop repeated ipaccess_keepalive_fsm_cleanup in write err... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19246 ) Change subject: ipaccess.c: Drop repeated ipaccess_keepalive_fsm_cleanup in write error path ...................................................................... ipaccess.c: Drop repeated ipaccess_keepalive_fsm_cleanup in write error path The function is already being called by ipaccess_drop(). Change-Id: I00d0557fe81861d4b913a4c76e4b56f93e656103 --- M src/input/ipaccess.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 96828eb..28191b7 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -486,7 +486,6 @@ msgb_free(msg); return ret; err: - ipaccess_keepalive_fsm_cleanup(e1i_ts); ipaccess_drop(bfd, line); msgb_free(msg); return ret; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I00d0557fe81861d4b913a4c76e4b56f93e656103 Gerrit-Change-Number: 19246 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 12:59:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 12:59:44 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Fix log formatting of RESP_ID IPA attributes In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19250 ) Change subject: ipaccess: Fix log formatting of RESP_ID IPA attributes ...................................................................... ipaccess: Fix log formatting of RESP_ID IPA attributes Change-Id: Id5b4c39737a43c9ba68f3aacc889c10eba697920 --- M src/input/ipaccess.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 28191b7..917a195 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -219,10 +219,10 @@ switch (msg_type) { case IPAC_MSGT_ID_RESP: - DEBUGP(DLMI, "ID_RESP\n"); + DEBUGP(DLMI, "ID_RESP "); /* parse tags, search for Unit ID */ ret = ipa_ccm_id_resp_parse(&tlvp, (const uint8_t *)msg->l2h+1, msgb_l2len(msg)-1); - DEBUGP(DLMI, "\n"); + DEBUGPC(DLMI, "\n"); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "IPA response message " "with malformed TLVs\n"); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Id5b4c39737a43c9ba68f3aacc889c10eba697920 Gerrit-Change-Number: 19250 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 13:22:19 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 13:22:19 +0000 Subject: Change in libosmo-abis[master]: e1_input: Use osmo_use_count in e1inp_line In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/19256 to look at the new patch set (#2). Change subject: e1_input: Use osmo_use_count in e1inp_line ...................................................................... e1_input: Use osmo_use_count in e1inp_line osmo_use_count is available since libosmocore 1.1.0 release, so bump required libosmocore version in autotools and packages. struct e1inp_line field refcnt is kept in order to keep ABI compatibility accessing struct fields. The new use_count is added at the end. Size of struct changing is fine since it is allocated through an API and a pointer should be used by clients. e1inp_line_clone API is changed but it's not used by anyone outside libosmo-abis, so it's fine. Related: OS#4624 Change-Id: I0658b2e9c452598025cc0f1d0b060076171767cc --- M configure.ac M contrib/libosmo-abis.spec.in M debian/control M include/osmocom/abis/e1_input.h M src/e1_input.c M src/input/ipaccess.c 6 files changed, 84 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/56/19256/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0658b2e9c452598025cc0f1d0b060076171767cc Gerrit-Change-Number: 19256 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 13:22:19 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 13:22:19 +0000 Subject: Change in libosmo-abis[master]: ipacces: Fix e1inp_line reference put in ipaccess_close In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/19258 to look at the new patch set (#2). Change subject: ipacces: Fix e1inp_line reference put in ipaccess_close ...................................................................... ipacces: Fix e1inp_line reference put in ipaccess_close Drop the function e1inp_close_socket since it's only used by the caller at hand, and it's only exported through "internal.h", so no app is using it. Remove it because there's only a caller, and furthermore because keeping it (and putting bfd->data==line) would introduce a layer violation because the bfd->data==line is only used for ipaccess so far. Triggering path: handle_ts1_read ret=0 "Sign link vanished" ipaccess_drop line->ops->sign_link_down (osmo-bsc) ipaccess_drop_oml e1inp_sign_link_destroy link->ts->line->driver->close ipaccess_close Related: OS#4624 Change-Id: If23cc722106a9f70c998e591369a4acafa52c519 --- M include/internal.h M src/e1_input.c M src/input/ipaccess.c 3 files changed, 15 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/58/19258/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If23cc722106a9f70c998e591369a4acafa52c519 Gerrit-Change-Number: 19258 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 13:22:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 13:22:20 +0000 Subject: Change in libosmo-abis[master]: cosmetic: e1_input.h: Fix trailing whitespace References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19278 ) Change subject: cosmetic: e1_input.h: Fix trailing whitespace ...................................................................... cosmetic: e1_input.h: Fix trailing whitespace Change-Id: Ie323a28409a44aeeef6646b247f244d278758f66 --- M include/osmocom/abis/e1_input.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/78/19278/1 diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index 8230e44..ee33ae6 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -49,7 +49,7 @@ enum e1inp_sign_type type; - /* trx for msg->trx of received msgs */ + /* trx for msg->trx of received msgs */ struct gsm_bts_trx *trx; /* msgb queue of to-be-transmitted msgs */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie323a28409a44aeeef6646b247f244d278758f66 Gerrit-Change-Number: 19278 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 13:38:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 13:38:46 +0000 Subject: Change in libosmocore[master]: vty: Avoid ultra-long multi-line strings cluttering talloc reports In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19272 ) Change subject: vty: Avoid ultra-long multi-line strings cluttering talloc reports ...................................................................... vty: Avoid ultra-long multi-line strings cluttering talloc reports The talloc_asprintf() series includes an unconditional call to talloc_set_name_const(), turning the entire long constructed string into the name of the talloc object. That simply doesn't work when creating kilobytes-sized VTY reference strings including linefeeds. Let's add an explicit talloc_set_name_const() to prevent this. Change-Id: Ibd77684b88cc3572047daa98c9a6b9119fba041b Closes: OS#4668 --- M src/vty/logging_vty.c 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index c51b437..0e1782a 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -337,6 +337,9 @@ osmo_talloc_asprintf(tall_log_ctx, cmd_str, ") %s", level_args); osmo_talloc_asprintf(tall_log_ctx, doc_str, "%s", level_strs); + talloc_set_name_const(cmd_str, "vty_log_level_cmd_str"); + talloc_set_name_const(doc_str, "vty_log_level_doc_str"); + cmd->string = cmd_str; cmd->doc = doc_str; } @@ -1048,6 +1051,9 @@ osmo_talloc_asprintf(tall_log_ctx, doc_str, "Arbitrary message to log on given category and log level\n"); + talloc_set_name_const(cmd_str, "vty_logp_cmd_str"); + talloc_set_name_const(doc_str, "vty_logp_doc_str"); + cmd->string = cmd_str; cmd->doc = doc_str; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibd77684b88cc3572047daa98c9a6b9119fba041b Gerrit-Change-Number: 19272 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 13:39:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 13:39:00 +0000 Subject: Change in osmo-e1d[master]: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19249 ) Change subject: Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel ...................................................................... Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel This adds the related code to the server and client side of the CTL interface to switch a line between CHANNELIZED and SUPERCHANNEL. Change-Id: I765b5c3bc9e07b2353f8647e8260ff95df3727e6 --- M include/osmocom/e1d/proto.h M include/osmocom/e1d/proto_clnt.h M src/ctl.c M src/proto.c M src/proto_clnt.c 5 files changed, 122 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/osmocom/e1d/proto.h b/include/osmocom/e1d/proto.h index 6711332..d8bce1f 100644 --- a/include/osmocom/e1d/proto.h +++ b/include/osmocom/e1d/proto.h @@ -2,6 +2,7 @@ * proto.h * * (C) 2019 by Sylvain Munaut + * (C) 2020 by Harald Welte * * All Rights Reserved * @@ -44,6 +45,11 @@ * in: n/a * out: array of osmo_e1dp_ts_info * + * E1DP_CMD_LINE_CONFIG + * filter: intf (required), line (required) + * in: osmo_e1dp_line_config + * out: osmo_e1dp_line_info + * * E1DP_CMD_TS_OPEN * filter: intf (required), line (required), ts (required) * in: osmo_e1dp_ts_config @@ -55,6 +61,7 @@ E1DP_CMD_INTF_QUERY = 0x00, E1DP_CMD_LINE_QUERY = 0x01, E1DP_CMD_TS_QUERY = 0x02, + E1DP_CMD_LINE_CONFIG = 0x03, E1DP_CMD_TS_OPEN = 0x04, E1DP_EVT_TYPE = 0x40, E1DP_RESP_TYPE = 0x80, @@ -62,6 +69,12 @@ E1DP_TYPE_MSK = 0xc0, }; +enum osmo_e1dp_line_mode { + E1DP_LMODE_OFF = 0x00, + E1DP_LMODE_CHANNELIZED = 0x20, + E1DP_LMODE_SUPERCHANNEL = 0x21, +}; + enum osmo_e1dp_ts_mode { E1DP_TSMODE_OFF = 0x00, E1DP_TSMODE_RAW = 0x10, @@ -91,8 +104,13 @@ uint8_t n_lines; } __attribute__((packed)); +struct osmo_e1dp_line_config { + uint8_t mode; +} __attribute__((packed)); + struct osmo_e1dp_line_info { uint8_t id; + struct osmo_e1dp_line_config cfg; uint8_t status; /* TBD */ } __attribute__((packed)); @@ -111,4 +129,5 @@ int osmo_e1dp_send(struct osmo_fd *ofd, struct msgb *msgb, int fd); extern const struct value_string osmo_e1dp_msg_type_names[]; +extern const struct value_string osmo_e1dp_line_mode_names[]; extern const struct value_string osmo_e1dp_ts_mode_names[]; diff --git a/include/osmocom/e1d/proto_clnt.h b/include/osmocom/e1d/proto_clnt.h index 0914de7..ff2cebf 100644 --- a/include/osmocom/e1d/proto_clnt.h +++ b/include/osmocom/e1d/proto_clnt.h @@ -41,6 +41,8 @@ int osmo_e1dp_client_ts_query(struct osmo_e1dp_client *clnt, struct osmo_e1dp_ts_info **ti, int *n, uint8_t intf, uint8_t line, uint8_t ts); +int osmo_e1dp_client_line_config(struct osmo_e1dp_client *clnt, + uint8_t intf, uint8_t line, enum osmo_e1dp_line_mode mode); int osmo_e1dp_client_ts_open(struct osmo_e1dp_client *clnt, uint8_t intf, uint8_t line, uint8_t ts, enum osmo_e1dp_ts_mode mode); diff --git a/src/ctl.c b/src/ctl.c index 5322ab4..4e74485 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -2,6 +2,7 @@ * ctl.c * * (C) 2019 by Sylvain Munaut + * (C) 2020 by Harald Welte * * All Rights Reserved * @@ -87,6 +88,16 @@ _e1d_fill_line_info(struct osmo_e1dp_line_info *li, struct e1_line *line) { li->id = line->id; + switch (line->mode) { + case E1_LINE_MODE_CHANNELIZED: + li->cfg.mode = E1DP_LMODE_CHANNELIZED; + break; + case E1_LINE_MODE_SUPERCHANNEL: + li->cfg.mode = E1DP_LMODE_SUPERCHANNEL; + break; + default: + OSMO_ASSERT(0); + } li->status = 0x00; } @@ -273,6 +284,53 @@ } static int +_e1d_ctl_line_config(void *data, struct msgb *msgb, struct msgb *rmsgb, int *rfd) +{ + struct e1_daemon *e1d = (struct e1_daemon *)data; + struct osmo_e1dp_msg_hdr *hdr = msgb_l1(msgb); + struct osmo_e1dp_line_config *cfg = msgb_l2(msgb); + struct osmo_e1dp_line_info *info; + struct e1_intf *intf = NULL; + struct e1_line *line = NULL; + + /* Process query and find timeslot */ + intf = e1d_find_intf(e1d, hdr->intf); + if (!intf) + return 0; + + line = e1_intf_find_line(intf, hdr->line); + if (!line) + return 0; + + LOGPLI(line, DE1D, LOGL_NOTICE, "Setting line mode from %s to %s\n", + get_value_string(e1_line_mode_names, line->mode), + get_value_string(osmo_e1dp_line_mode_names, cfg->mode)); + /* Select mode */ + switch (cfg->mode) { + case E1DP_LMODE_CHANNELIZED: + line->mode = E1_LINE_MODE_CHANNELIZED; + break; + case E1DP_LMODE_SUPERCHANNEL: + line->mode = E1_LINE_MODE_SUPERCHANNEL; + break; + default: + return 0; + } + + /* Allocate response */ + rmsgb->l2h = msgb_put(rmsgb, sizeof(struct osmo_e1dp_line_info)); + info = msgb_l2(rmsgb); + + memset(info, 0x00, sizeof(struct osmo_e1dp_line_info)); + + /* Fill reponse */ + _e1d_fill_line_info(info, line); + + return 0; +} + + +static int _e1d_ctl_ts_open(void *data, struct msgb *msgb, struct msgb *rmsgb, int *rfd) { struct e1_daemon *e1d = (struct e1_daemon *)data; @@ -355,6 +413,12 @@ .fn = _e1d_ctl_ts_query, }, { + .type = E1DP_CMD_LINE_CONFIG, + .flags = E1DP_SF_INTF_REQ | E1DP_SF_LINE_REQ, + .payload_len = sizeof(struct osmo_e1dp_line_config), + .fn = _e1d_ctl_line_config, + }, + { .type = E1DP_CMD_TS_OPEN, .flags = E1DP_SF_INTF_REQ | E1DP_SF_LINE_REQ | E1DP_SF_TS_REQ, .payload_len = sizeof(struct osmo_e1dp_ts_config), diff --git a/src/proto.c b/src/proto.c index 85f5115..479175a 100644 --- a/src/proto.c +++ b/src/proto.c @@ -46,6 +46,12 @@ { E1DP_ERR_TYPE, "ERR_TYPE" }, { 0, NULL } }; +const struct value_string osmo_e1dp_line_mode_names[] = { + { E1DP_LMODE_OFF, "OFF" }, + { E1DP_LMODE_CHANNELIZED, "CHANNELIZED" }, + { E1DP_LMODE_SUPERCHANNEL, "SUPERCHANNEL" }, + { 0, NULL } +}; const struct value_string osmo_e1dp_ts_mode_names[] = { { E1DP_TSMODE_OFF, "OFF" }, { E1DP_TSMODE_RAW, "RAW" }, diff --git a/src/proto_clnt.c b/src/proto_clnt.c index 7c6df27..ca62abe 100644 --- a/src/proto_clnt.c +++ b/src/proto_clnt.c @@ -2,6 +2,7 @@ * proto_clnt.c * * (C) 2019 by Sylvain Munaut + * (C) 2020 by Harald Welte * * All Rights Reserved * @@ -285,6 +286,36 @@ } int +osmo_e1dp_client_line_config(struct osmo_e1dp_client *clnt, + uint8_t intf, uint8_t line, enum osmo_e1dp_line_mode mode) +{ + struct msgb *msgb; + struct osmo_e1dp_msg_hdr hdr; + struct osmo_e1dp_line_config cfg; + int rc; + + memset(&hdr, 0x00, sizeof(struct osmo_e1dp_msg_hdr)); + hdr.type = E1DP_CMD_LINE_CONFIG; + hdr.intf = intf; + hdr.line = line; + hdr.ts = E1DP_INVALID; + + memset(&cfg, 0x00, sizeof(struct osmo_e1dp_line_config)); + cfg.mode = mode; + + rc = _e1dp_client_query_base(clnt, &hdr, &cfg, sizeof(struct osmo_e1dp_line_config), &msgb, NULL); + if (rc) + return rc; + + if (msgb_l2len(msgb) != sizeof(struct osmo_e1dp_line_info)) + return -EPIPE; + + msgb_free(msgb); + + return 0; +} + +int osmo_e1dp_client_ts_open(struct osmo_e1dp_client *clnt, uint8_t intf, uint8_t line, uint8_t ts, enum osmo_e1dp_ts_mode mode) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I765b5c3bc9e07b2353f8647e8260ff95df3727e6 Gerrit-Change-Number: 19249 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 13:40:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 13:40:16 +0000 Subject: Change in libosmo-abis[master]: cosmetic: e1_input.h: Fix trailing whitespace In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19278 ) Change subject: cosmetic: e1_input.h: Fix trailing whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie323a28409a44aeeef6646b247f244d278758f66 Gerrit-Change-Number: 19278 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 13:40:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 13:41:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 13:41:48 +0000 Subject: Change in libosmo-abis[master]: e1_input: Use osmo_use_count in e1inp_line In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19256 ) Change subject: e1_input: Use osmo_use_count in e1inp_line ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmo-abis/+/19256/2/include/osmocom/abis/e1_input.h File include/osmocom/abis/e1_input.h: https://gerrit.osmocom.org/c/libosmo-abis/+/19256/2/include/osmocom/abis/e1_input.h at 195 PS2, Line 195: int maybe rename it to _refcnt_unused or something like that to reserve the space but break anyone who wants to actually access that member? -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0658b2e9c452598025cc0f1d0b060076171767cc Gerrit-Change-Number: 19256 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 13:41:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 13:41:54 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 13:41:54 +0000 Subject: Change in libosmocore[master]: use_count.h: Fix API doc example References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19279 ) Change subject: use_count.h: Fix API doc example ...................................................................... use_count.h: Fix API doc example Change-Id: Ib28ea88c8e8e9b33d70d58156d03af9a41e9e012 --- M include/osmocom/core/use_count.h 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/79/19279/1 diff --git a/include/osmocom/core/use_count.h b/include/osmocom/core/use_count.h index 6a4bf1f..a019525 100644 --- a/include/osmocom/core/use_count.h +++ b/include/osmocom/core/use_count.h @@ -130,8 +130,9 @@ * int foo_use_cb(struct osmo_use_count_entry *use_count_entry, int32_t old_use_count, const char *file, int line) * { * struct foo *foo = use_count_entry->use_count->talloc_object; - * if (osmo_use_count_total(&use_count_entry->use_count) == 0) + * if (osmo_use_count_total(use_count_entry->use_count) == 0) * talloc_free(foo); + * return 0; * } * * // The function name is a convenient use token: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib28ea88c8e8e9b33d70d58156d03af9a41e9e012 Gerrit-Change-Number: 19279 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 13:42:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 13:42:07 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Drop e1inp_line reference in ipacess_drop() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19257 ) Change subject: ipaccess: Drop e1inp_line reference in ipacess_drop() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I418064df04872befe2e936e21768b6ea01263120 Gerrit-Change-Number: 19257 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 13:42:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 13:42:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 13:42:40 +0000 Subject: Change in libosmo-abis[master]: e1_input: Use osmo_use_count in e1inp_line In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/19256 to look at the new patch set (#3). Change subject: e1_input: Use osmo_use_count in e1inp_line ...................................................................... e1_input: Use osmo_use_count in e1inp_line osmo_use_count is available since libosmocore 1.1.0 release, so bump required libosmocore version in autotools and packages. struct e1inp_line field refcnt is kept in order to keep ABI compatibility accessing struct fields. The new use_count is added at the end. Size of struct changing is fine since it is allocated through an API and a pointer should be used by clients. e1inp_line_clone API is changed but it's not used by anyone outside libosmo-abis, so it's fine. Related: OS#4624 Change-Id: I0658b2e9c452598025cc0f1d0b060076171767cc --- M TODO-RELEASE M configure.ac M contrib/libosmo-abis.spec.in M debian/control M include/osmocom/abis/e1_input.h M src/e1_input.c M src/input/ipaccess.c 7 files changed, 85 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/56/19256/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0658b2e9c452598025cc0f1d0b060076171767cc Gerrit-Change-Number: 19256 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 13:42:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 13:42:41 +0000 Subject: Change in libosmo-abis[master]: cosmetic: lapd: Fix trailing whitespace References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19280 ) Change subject: cosmetic: lapd: Fix trailing whitespace ...................................................................... cosmetic: lapd: Fix trailing whitespace Change-Id: I7a6af2f417f6f924a3f27cfa12462158f2c2a1c6 --- M src/input/lapd.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/80/19280/1 diff --git a/src/input/lapd.c b/src/input/lapd.c index 5c0a6b6..5359a64 100644 --- a/src/input/lapd.c +++ b/src/input/lapd.c @@ -647,7 +647,7 @@ container_of(dl, struct lapd_sap, dl); struct lapd_instance *li; uint8_t tei, sapi; - char *op = (dp->oph.operation == PRIM_OP_INDICATION) ? "indication" + char *op = (dp->oph.operation == PRIM_OP_INDICATION) ? "indication" : "confirm"; li = sap->tei->li; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7a6af2f417f6f924a3f27cfa12462158f2c2a1c6 Gerrit-Change-Number: 19280 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 13:42:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 13:42:41 +0000 Subject: Change in libosmo-abis[master]: lapd: Use lapd_dl_init2 instead of deprecated lapd_dl_init References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19281 ) Change subject: lapd: Use lapd_dl_init2 instead of deprecated lapd_dl_init ...................................................................... lapd: Use lapd_dl_init2 instead of deprecated lapd_dl_init Change-Id: If25957d10bf9e32d2fe601111a9c1311aee21094 --- M TODO-RELEASE M src/input/lapd.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/81/19281/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index aa278ec..bf3ef84 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -11,3 +11,4 @@ libosmo-trau API change add new function osmo_rtp_socket_set_dscp() libosmo-abis API change major: add parameter to struct lapd_instance libosmo-abis Field added struct e1inp_line "use_count". REMINDER: Upon LIBVERSION c bump, take the chance to drop struct e1inp_line "refcnt" field. +libosmo-abis libosmogsm dep Use of lapd_dl_init2() requires libosmocore > 1.3.0 (not yet released, 00b2faf8217338d4d7d1f4d27331af3151447350) diff --git a/src/input/lapd.c b/src/input/lapd.c index 5359a64..d8c67e4 100644 --- a/src/input/lapd.c +++ b/src/input/lapd.c @@ -259,8 +259,7 @@ LOGP(DLLAPD, LOGL_NOTICE, "%s: k=%d N200=%d N201=%d T200=%d.%d T203=%d.%d\n", name, k, profile->n200, profile->n201, profile->t200_sec, profile->t200_usec, profile->t203_sec, profile->t203_usec); - lapd_dl_init(dl, k, 128, profile->n201); - lapd_dl_set_name(dl, name); + lapd_dl_init2(dl, k, 128, profile->n201, name); dl->use_sabme = 1; /* use SABME instead of SABM (GSM) */ dl->send_ph_data_req = send_ph_data_req; dl->send_dlsap = send_dlsap; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If25957d10bf9e32d2fe601111a9c1311aee21094 Gerrit-Change-Number: 19281 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 13:45:19 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 13:45:19 +0000 Subject: Change in libosmo-abis[master]: e1_input: Use osmo_use_count in e1inp_line In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19256 ) Change subject: e1_input: Use osmo_use_count in e1inp_line ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmo-abis/+/19256/2/include/osmocom/abis/e1_input.h File include/osmocom/abis/e1_input.h: https://gerrit.osmocom.org/c/libosmo-abis/+/19256/2/include/osmocom/abis/e1_input.h at 195 PS2, Line 195: int > maybe rename it to _refcnt_unused or something like that to reserve the space but break anyone who w [?] Check last version with comment in TODO-RELEASE, I simply left it there but it's going to be removed anyway during next release since we already broke the ABI due to previous changes, so new version requires an ABI bump anyway. I'm leaving it there to avoid crashes with people using it during development. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0658b2e9c452598025cc0f1d0b060076171767cc Gerrit-Change-Number: 19256 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 13:45:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 13:49:48 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 13:49:48 +0000 Subject: Change in libosmo-abis[master]: tests: Use API e1inp_line_put2 instead of deprecated e1inp_line_put References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19282 ) Change subject: tests: Use API e1inp_line_put2 instead of deprecated e1inp_line_put ...................................................................... tests: Use API e1inp_line_put2 instead of deprecated e1inp_line_put Change-Id: If3fb68fda1c109f6aa15aa68c5bce285054efda7 --- M tests/e1inp_ipa_bsc_test.c M tests/e1inp_ipa_bts_test.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/82/19282/1 diff --git a/tests/e1inp_ipa_bsc_test.c b/tests/e1inp_ipa_bsc_test.c index a7317f8..12c436b 100644 --- a/tests/e1inp_ipa_bsc_test.c +++ b/tests/e1inp_ipa_bsc_test.c @@ -205,7 +205,7 @@ static void sighandler(int foo) { - e1inp_line_put(line); + e1inp_line_put2(line, "ctor"); exit(EXIT_SUCCESS); } diff --git a/tests/e1inp_ipa_bts_test.c b/tests/e1inp_ipa_bts_test.c index 10fe0e8..d6c3772 100644 --- a/tests/e1inp_ipa_bts_test.c +++ b/tests/e1inp_ipa_bts_test.c @@ -244,7 +244,7 @@ static void sighandler(int foo) { - e1inp_line_put(line); + e1inp_line_put2(line, "ctor"); exit(EXIT_SUCCESS); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19282 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If3fb68fda1c109f6aa15aa68c5bce285054efda7 Gerrit-Change-Number: 19282 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 15 13:56:35 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 15 Jul 2020 13:56:35 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f0f0b19b51c7_32942b26effd85f4809713@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Testing/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 117s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 117s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 117s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 117s] | | [ 117s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 117s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 117s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 117s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 117s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 117s] 2425 | MHD_start_daemon (unsigned int flags, [ 117s] | ^~~~~~~~~~~~~~~~ [ 117s] cc1: all warnings being treated as errors [ 117s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 117s] make[3]: *** Waiting for unfinished jobs.... [ 117s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 117s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 117s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 117s] make[1]: *** [Makefile:166: all] Error 2 [ 117s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 117s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 117s] make: *** [debian/rules:9: build] Error 25 [ 117s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 117s] ### VM INTERACTION START ### [ 120s] [ 109.036724] sysrq: SysRq : Power Off [ 120s] [ 109.043564] reboot: Power down [ 120s] ### VM INTERACTION END ### [ 120s] [ 120s] lamb21 failed "build ulfius_2.5.2-4.1.dsc" at Wed Jul 15 13:56:18 UTC 2020. [ 120s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 15 13:58:38 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 15 Jul 2020 13:58:38 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f0f0ba96e826_32942b26effd85f4810741@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Testing/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 129s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 129s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 129s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 129s] | | [ 129s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 129s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 129s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 129s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 129s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 129s] 2425 | MHD_start_daemon (unsigned int flags, [ 129s] | ^~~~~~~~~~~~~~~~ [ 130s] cc1: all warnings being treated as errors [ 130s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 130s] make[3]: *** Waiting for unfinished jobs.... [ 130s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 130s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 130s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 130s] make[1]: *** [Makefile:166: all] Error 2 [ 130s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 130s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 130s] make: *** [debian/rules:9: build] Error 25 [ 130s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 130s] ### VM INTERACTION START ### [ 133s] [ 121.548222] sysrq: SysRq : Power Off [ 133s] [ 121.552813] reboot: Power down [ 133s] ### VM INTERACTION END ### [ 133s] [ 133s] lamb21 failed "build ulfius_2.5.2-4.1.dsc" at Wed Jul 15 13:58:24 UTC 2020. [ 133s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 15 14:48:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 14:48:07 +0000 Subject: Change in libosmo-abis[master]: e1_input: Use osmo_use_count in e1inp_line In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19256 ) Change subject: e1_input: Use osmo_use_count in e1inp_line ...................................................................... Patch Set 3: (4 comments) https://gerrit.osmocom.org/c/libosmo-abis/+/19256/3/TODO-RELEASE File TODO-RELEASE: https://gerrit.osmocom.org/c/libosmo-abis/+/19256/3/TODO-RELEASE at 12 PS3, Line 12: libosmo-abis API change major: add parameter to struct lapd_instance If you're still planning to break the API, please reflect this breakage here. https://gerrit.osmocom.org/c/libosmo-abis/+/19256/3/include/osmocom/abis/e1_input.h File include/osmocom/abis/e1_input.h: https://gerrit.osmocom.org/c/libosmo-abis/+/19256/3/include/osmocom/abis/e1_input.h at 195 PS3, Line 195: refcnt I think OSMO_DEPRECATED() could be used here too, but AFAIK only clang wold print a warning, while gcc would just ignore it. https://gerrit.osmocom.org/c/libosmo-abis/+/19256/3/include/osmocom/abis/e1_input.h at 251 PS3, Line 251: const char *use I am still not sure if you can selectively break this API. I see that Osmocom programs are not using it, but what if some non-Osmocom program does? Would it be enough to keep it as is and use __func__ inside the function? https://gerrit.osmocom.org/c/libosmo-abis/+/19256/3/src/e1_input.c File src/e1_input.c: https://gerrit.osmocom.org/c/libosmo-abis/+/19256/3/src/e1_input.c at 378 PS3, Line 378: Line (%p) Do we really need to print pointer address here? It makes the output non-deterministic. And in general, I thought the reference count changes are logged by the refcount API, or not? -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0658b2e9c452598025cc0f1d0b060076171767cc Gerrit-Change-Number: 19256 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 14:48:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 14:53:52 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 14:53:52 +0000 Subject: Change in libosmo-abis[master]: e1_input: Use osmo_use_count in e1inp_line In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19256 ) Change subject: e1_input: Use osmo_use_count in e1inp_line ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/libosmo-abis/+/19256/3/include/osmocom/abis/e1_input.h File include/osmocom/abis/e1_input.h: https://gerrit.osmocom.org/c/libosmo-abis/+/19256/3/include/osmocom/abis/e1_input.h at 251 PS3, Line 251: const char *use > I am still not sure if you can selectively break this API. [?] If you know of any program (be it osmocom or not) using this API, I'm happy to lose time and efforts creating a new API with it, otherwise I see no point in doing so. https://gerrit.osmocom.org/c/libosmo-abis/+/19256/3/src/e1_input.c File src/e1_input.c: https://gerrit.osmocom.org/c/libosmo-abis/+/19256/3/src/e1_input.c at 378 PS3, Line 378: Line (%p) > Do we really need to print pointer address here? It makes the output non-deterministic. [?] It's still really useful to see the pointer, it's a quick way to identify line, specially since we keep around sometimes dummy lines temporarily. I can tell you, I have been debugging this for hours and it's useful. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0658b2e9c452598025cc0f1d0b060076171767cc Gerrit-Change-Number: 19256 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 14:53:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 15:04:36 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 15:04:36 +0000 Subject: Change in ...osmo-python-tests[master]: remove_tmpdir(): Support recursion / sub-directories In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/19267 ) Change subject: remove_tmpdir(): Support recursion / sub-directories ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/19267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I896b99032d94ba0cdd340a8eed7c7b625661ad69 Gerrit-Change-Number: 19267 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jul 2020 15:04:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 15 15:50:19 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 15 Jul 2020 15:50:19 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0f25c86cd84_32942b26effd85f48387be@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 131s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 131s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 131s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 131s] | | [ 131s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 131s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 131s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 131s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 131s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 131s] 2425 | MHD_start_daemon (unsigned int flags, [ 131s] | ^~~~~~~~~~~~~~~~ [ 131s] cc1: all warnings being treated as errors [ 131s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 131s] make[3]: *** Waiting for unfinished jobs.... [ 132s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 132s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 132s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 132s] make[1]: *** [Makefile:166: all] Error 2 [ 132s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 132s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 132s] make: *** [debian/rules:9: build] Error 25 [ 132s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 132s] ### VM INTERACTION START ### [ 135s] [ 107.445062] sysrq: SysRq : Power Off [ 135s] [ 107.458224] reboot: Power down [ 135s] ### VM INTERACTION END ### [ 135s] [ 135s] cloud109 failed "build ulfius_2.5.2-4.1.dsc" at Wed Jul 15 15:49:58 UTC 2020. [ 135s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 15 15:57:41 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 15 Jul 2020 15:57:41 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0f279d5591f_32942b26effd85f4840979@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 80s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 80s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 80s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 80s] | | [ 80s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 80s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 80s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 80s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 80s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 80s] 2425 | MHD_start_daemon (unsigned int flags, [ 80s] | ^~~~~~~~~~~~~~~~ [ 80s] cc1: all warnings being treated as errors [ 80s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 80s] make[3]: *** Waiting for unfinished jobs.... [ 80s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 80s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 80s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 80s] make[1]: *** [Makefile:166: all] Error 2 [ 80s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 80s] dh_auto_build: error: cd build && make -j6 "INSTALL=install --strip-program=true" returned exit code 2 [ 80s] make: *** [debian/rules:9: build] Error 25 [ 80s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 81s] ### VM INTERACTION START ### [ 84s] [ 74.367168] sysrq: SysRq : Power Off [ 84s] [ 74.371019] reboot: Power down [ 84s] ### VM INTERACTION END ### [ 84s] [ 84s] sheep85 failed "build ulfius_2.5.2-4.1.dsc" at Wed Jul 15 15:57:30 UTC 2020. [ 84s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 15 15:59:41 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 15 Jul 2020 15:59:41 +0000 Subject: Build failure of network:osmocom:latest/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0f280093de0_32942b26effd85f4841114@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/open5gs/Debian_Unstable/x86_64 Package network:osmocom:latest/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest open5gs Last lines of build log: [ 92s] dh_auto_configure -O--buildsystem=meson [ 92s] install -d obj-x86_64-linux-gnu [ 92s] cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu [ 92s] Traceback (most recent call last): [ 92s] File "/usr/bin/meson", line 17, in [ 92s] from mesonbuild import mesonmain [ 92s] File "/usr/lib/python3/dist-packages/mesonbuild/mesonmain.py", line 25, in [ 92s] from . import mconf, mdist, minit, minstall, mintro, msetup, mtest, rewriter, msubprojects, munstable_coredata, mcompile [ 92s] File "/usr/lib/python3/dist-packages/mesonbuild/mconf.py", line 16, in [ 92s] from . import coredata, environment, mesonlib, build, mintro, mlog [ 92s] File "/usr/lib/python3/dist-packages/mesonbuild/build.py", line 26, in [ 92s] from . import dependencies [ 92s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/__init__.py", line 15, in [ 92s] from .boost import BoostDependency [ 92s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/boost.py", line 25, in [ 92s] from .base import DependencyException, ExternalDependency, PkgConfigDependency [ 92s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/base.py", line 32, in [ 92s] import pkg_resources [ 92s] ModuleNotFoundError: No module named 'pkg_resources' [ 92s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 92s] make: *** [debian/rules:11: binary] Error 2 [ 92s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 92s] ### VM INTERACTION START ### [ 95s] [ 84.876097] sysrq: SysRq : Power Off [ 95s] [ 84.879199] reboot: Power down [ 95s] ### VM INTERACTION END ### [ 95s] [ 95s] sheep88 failed "build open5gs_1.3.0~eoan1.dsc" at Wed Jul 15 15:59:25 UTC 2020. [ 95s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 15 16:23:28 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 15 Jul 2020 16:23:28 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0f2da023fa2_32942b26effd85f48464f8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 160s] dh_auto_configure -O--buildsystem=meson [ 160s] install -d obj-x86_64-linux-gnu [ 160s] cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu [ 161s] Traceback (most recent call last): [ 161s] File "/usr/bin/meson", line 17, in [ 161s] from mesonbuild import mesonmain [ 161s] File "/usr/lib/python3/dist-packages/mesonbuild/mesonmain.py", line 25, in [ 161s] from . import mconf, mdist, minit, minstall, mintro, msetup, mtest, rewriter, msubprojects, munstable_coredata, mcompile [ 161s] File "/usr/lib/python3/dist-packages/mesonbuild/mconf.py", line 16, in [ 161s] from . import coredata, environment, mesonlib, build, mintro, mlog [ 161s] File "/usr/lib/python3/dist-packages/mesonbuild/build.py", line 26, in [ 161s] from . import dependencies [ 161s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/__init__.py", line 15, in [ 161s] from .boost import BoostDependency [ 161s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/boost.py", line 25, in [ 161s] from .base import DependencyException, ExternalDependency, PkgConfigDependency [ 161s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/base.py", line 32, in [ 161s] import pkg_resources [ 161s] ModuleNotFoundError: No module named 'pkg_resources' [ 161s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 161s] make: *** [debian/rules:11: binary] Error 2 [ 161s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 161s] ### VM INTERACTION START ### [ 164s] [ 150.842502] sysrq: SysRq : Power Off [ 164s] [ 150.848897] reboot: Power down [ 164s] ### VM INTERACTION END ### [ 164s] [ 164s] lamb58 failed "build open5gs_1.3.0.20200715.dsc" at Wed Jul 15 16:23:20 UTC 2020. [ 164s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 15 16:37:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 16:37:56 +0000 Subject: Change in osmo-bsc[master]: ipaccess_nanobts: Log ipaccess_sign_link_down event References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19283 ) Change subject: ipaccess_nanobts: Log ipaccess_sign_link_down event ...................................................................... ipaccess_nanobts: Log ipaccess_sign_link_down event Change-Id: I7c864e67fb2149685c687c137a59d567f5a03ca3 --- M src/osmo-bsc/bts_ipaccess_nanobts.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/83/19283/1 diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index b21678b..5b60367 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -604,6 +604,8 @@ struct gsm_bts *bts = NULL; struct e1inp_sign_link *link; + LOGPIL(line, DLINP, LOGL_NOTICE, "Signalling link down\n"); + llist_for_each_entry(link, &ts->sign.sign_links, list) { /* Get bts pointer from the first element of the list. */ if (bts == NULL) @@ -614,6 +616,8 @@ } if (bts != NULL) ipaccess_drop_oml(bts, "link down"); + else + LOGPIL(line, DLINP, LOGL_NOTICE, "Signalling link down for unknown BTS\n"); } /* This function is called if we receive one OML/RSL message. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7c864e67fb2149685c687c137a59d567f5a03ca3 Gerrit-Change-Number: 19283 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 16:38:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 16:38:33 +0000 Subject: Change in osmo-bsc[master]: Use OSMO_FD_* instead of deprecated BSC_FD_* References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19284 ) Change subject: Use OSMO_FD_* instead of deprecated BSC_FD_* ...................................................................... Use OSMO_FD_* instead of deprecated BSC_FD_* New define is available since libosmocore 1.1.0, and we already require 1.3.0, so no need to update dependenices. Let's change it to avoid people re-using old BSC_FD_* symbols when copy-pasting somewhere else. Change-Id: Ia5a656567d212fa265aef1375d714d0c5fee5dd6 --- M src/ipaccess/abisip-find.c M src/ipaccess/ipaccess-config.c M src/ipaccess/ipaccess-proxy.c M src/osmo-bsc/bsc_rf_ctrl.c M src/osmo-bsc/meas_feed.c M src/osmo-bsc/osmo_bsc_mgcp.c M src/osmo-bsc/osmo_bsc_msc.c M src/osmo-bsc/pcu_sock.c M src/utils/meas_json.c M src/utils/meas_udp2db.c M src/utils/meas_vis.c 11 files changed, 35 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/84/19284/1 diff --git a/src/ipaccess/abisip-find.c b/src/ipaccess/abisip-find.c index 21ed50e..11b2851 100644 --- a/src/ipaccess/abisip-find.c +++ b/src/ipaccess/abisip-find.c @@ -403,10 +403,10 @@ static int bfd_cb(struct osmo_fd *bfd, unsigned int flags) { - if (flags & BSC_FD_READ) + if (flags & OSMO_FD_READ) return read_response(bfd->fd); - if (flags & BSC_FD_WRITE) { - bfd->when &= ~BSC_FD_WRITE; + if (flags & OSMO_FD_WRITE) { + bfd->when &= ~OSMO_FD_WRITE; return bcast_find(bfd->fd); } return 0; @@ -418,7 +418,7 @@ { struct osmo_fd *bfd = _data; - bfd->when |= BSC_FD_WRITE; + bfd->when |= OSMO_FD_WRITE; base_stations_bump(false); @@ -447,7 +447,7 @@ fprintf(stdout, "\nWARNING: the --timeout should be larger than --interval.\n\n"); bfd.cb = bfd_cb; - bfd.when = BSC_FD_READ | BSC_FD_WRITE; + bfd.when = OSMO_FD_READ | OSMO_FD_WRITE; bfd.fd = udp_sock(cmdline_opts.ifname, cmdline_opts.bind_ip); if (bfd.fd < 0) { perror("Cannot create local socket for broadcast udp"); diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 306cc87..f7d7332 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -92,7 +92,7 @@ bfd->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); bfd->cb = ipaccess_fd_cb; - bfd->when = BSC_FD_READ | BSC_FD_WRITE; + bfd->when = OSMO_FD_READ | OSMO_FD_WRITE; bfd->data = line; bfd->priv_nr = E1INP_SIGN_OML; diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index f4d620b..05a6f63 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -283,7 +283,7 @@ if (other_conn) { /* enqueue the message for TX on the respective FD */ msgb_enqueue(&other_conn->tx_queue, msg); - other_conn->fd.when |= BSC_FD_WRITE; + other_conn->fd.when |= OSMO_FD_WRITE; } else msgb_free(msg); @@ -293,7 +293,7 @@ static int handle_udp_write(struct osmo_fd *bfd) { /* not implemented yet */ - bfd->when &= ~BSC_FD_WRITE; + bfd->when &= ~OSMO_FD_WRITE; return -EIO; } @@ -303,9 +303,9 @@ { int rc = 0; - if (what & BSC_FD_READ) + if (what & OSMO_FD_READ) rc = handle_udp_read(bfd); - if (what & BSC_FD_WRITE) + if (what & OSMO_FD_WRITE) rc = handle_udp_write(bfd); return rc; @@ -840,7 +840,7 @@ /* enqueue packet towards BSC */ msgb_enqueue(&bsc_conn->tx_queue, msg); /* mark respective filedescriptor as 'we want to write' */ - bsc_conn->fd.when |= BSC_FD_WRITE; + bsc_conn->fd.when |= OSMO_FD_WRITE; } else { logp_ipbc_uid(DLINP, LOGL_INFO, ipbc, bfd->priv_nr >> 8); LOGPC(DLINP, LOGL_INFO, "Dropping packet from %s, " @@ -869,7 +869,7 @@ /* get the next msg for this timeslot */ if (llist_empty(&ipc->tx_queue)) { - bfd->when &= ~BSC_FD_WRITE; + bfd->when &= ~OSMO_FD_WRITE; return 0; } lh = ipc->tx_queue.next; @@ -897,12 +897,12 @@ { int rc = 0; - if (what & BSC_FD_READ) { + if (what & OSMO_FD_READ) { rc = handle_tcp_read(bfd); if (rc < 0) return rc; } - if (what & BSC_FD_WRITE) + if (what & OSMO_FD_WRITE) rc = handle_tcp_write(bfd); return rc; @@ -917,7 +917,7 @@ struct sockaddr_in sa; socklen_t sa_len = sizeof(sa); - if (!(what & BSC_FD_READ)) + if (!(what & OSMO_FD_READ)) return 0; ret = accept(listen_bfd->fd, (struct sockaddr *) &sa, &sa_len); @@ -940,7 +940,7 @@ bfd->data = ipc; bfd->priv_nr = listen_bfd->priv_nr; bfd->cb = proxy_ipaccess_fd_cb; - bfd->when = BSC_FD_READ; + bfd->when = OSMO_FD_READ; ret = osmo_fd_register(bfd); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "could not register FD\n"); @@ -1019,7 +1019,7 @@ bfd = &ipc->fd; bfd->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); bfd->cb = ipaccess_fd_cb; - bfd->when = BSC_FD_READ | BSC_FD_WRITE; + bfd->when = OSMO_FD_READ | OSMO_FD_WRITE; bfd->data = ipc; bfd->priv_nr = priv_nr; diff --git a/src/osmo-bsc/bsc_rf_ctrl.c b/src/osmo-bsc/bsc_rf_ctrl.c index 11cd224..c72154a 100644 --- a/src/osmo-bsc/bsc_rf_ctrl.c +++ b/src/osmo-bsc/bsc_rf_ctrl.c @@ -373,7 +373,7 @@ osmo_wqueue_init(&conn->queue, 10); conn->queue.bfd.data = conn; conn->queue.bfd.fd = fd; - conn->queue.bfd.when = BSC_FD_READ | BSC_FD_WRITE; + conn->queue.bfd.when = OSMO_FD_READ | OSMO_FD_WRITE; conn->queue.read_cb = rf_read_cmd; conn->queue.write_cb = rf_write_cmd; conn->rf = rf; @@ -483,7 +483,7 @@ return -1; } - bfd->when = BSC_FD_READ; + bfd->when = OSMO_FD_READ; bfd->cb = rf_ctrl_accept; bfd->data = rf; diff --git a/src/osmo-bsc/meas_feed.c b/src/osmo-bsc/meas_feed.c index 8450f69..f9a3626 100644 --- a/src/osmo-bsc/meas_feed.c +++ b/src/osmo-bsc/meas_feed.c @@ -118,7 +118,7 @@ char buf[256]; rc = read(ofd->fd, buf, sizeof(buf)); - ofd->fd &= ~BSC_FD_READ; + ofd->fd &= ~OSMO_FD_READ; return rc; } @@ -158,7 +158,7 @@ if (rc < 0) return rc; - g_mfs.wqueue.bfd.when &= ~BSC_FD_READ; + g_mfs.wqueue.bfd.when &= ~OSMO_FD_READ; if (g_mfs.dst_host) talloc_free(g_mfs.dst_host); diff --git a/src/osmo-bsc/osmo_bsc_mgcp.c b/src/osmo-bsc/osmo_bsc_mgcp.c index bec7930..90a73e5 100644 --- a/src/osmo-bsc/osmo_bsc_mgcp.c +++ b/src/osmo-bsc/osmo_bsc_mgcp.c @@ -71,7 +71,7 @@ struct msgb *msg; int rc; - if (!(what & BSC_FD_READ)) + if (!(what & OSMO_FD_READ)) return 0; msg = msgb_alloc_headroom(1024, 16, "MGCP->IPA"); diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index f969146..f2a1e5b 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -253,7 +253,7 @@ msc_data->audio_support[4]->ver = 3; msc_data->audio_support[4]->hr = 1; - osmo_fd_setup(&msc_data->mgcp_ipa.ofd, -1, BSC_FD_READ, &bsc_sccplite_mgcp_proxy_cb, msc_data, 0); + osmo_fd_setup(&msc_data->mgcp_ipa.ofd, -1, OSMO_FD_READ, &bsc_sccplite_mgcp_proxy_cb, msc_data, 0); msc_data->mgcp_ipa.local_addr = talloc_strdup(msc_data, "0.0.0.0"); msc_data->mgcp_ipa.local_port = 0; /* dynamic */ diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index bb18746..e75c2d4 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -458,7 +458,7 @@ return -EIO; } msgb_enqueue(&state->upqueue, msg); - conn_bfd->when |= BSC_FD_WRITE; + conn_bfd->when |= OSMO_FD_WRITE; return 0; } @@ -481,7 +481,7 @@ osmo_fd_unregister(bfd); /* re-enable the generation of ACCEPT for new connections */ - state->listen_bfd.when |= BSC_FD_READ; + state->listen_bfd.when |= OSMO_FD_READ; #if 0 /* remove si13, ... */ @@ -560,7 +560,7 @@ msg = llist_entry(state->upqueue.next, struct msgb, list); pcu_prim = (struct gsm_pcu_if *)msg->data; - bfd->when &= ~BSC_FD_WRITE; + bfd->when &= ~OSMO_FD_WRITE; /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */ if (!msgb_length(msg)) { @@ -575,7 +575,7 @@ goto close; if (rc < 0) { if (errno == EAGAIN) { - bfd->when |= BSC_FD_WRITE; + bfd->when |= OSMO_FD_WRITE; break; } goto close; @@ -599,12 +599,12 @@ { int rc = 0; - if (flags & BSC_FD_READ) + if (flags & OSMO_FD_READ) rc = pcu_sock_read(bfd); if (rc < 0) return rc; - if (flags & BSC_FD_WRITE) + if (flags & OSMO_FD_WRITE) rc = pcu_sock_write(bfd); return rc; @@ -630,13 +630,13 @@ LOGP(DPCU, LOGL_NOTICE, "PCU connects but we already have " "another active connection ?!?\n"); /* We already have one PCU connected, this is all we support */ - state->listen_bfd.when &= ~BSC_FD_READ; + state->listen_bfd.when &= ~OSMO_FD_READ; close(rc); return 0; } conn_bfd->fd = rc; - conn_bfd->when = BSC_FD_READ; + conn_bfd->when = OSMO_FD_READ; conn_bfd->cb = pcu_sock_cb; conn_bfd->data = state; @@ -679,7 +679,7 @@ return -1; } - bfd->when = BSC_FD_READ; + bfd->when = OSMO_FD_READ; bfd->cb = pcu_sock_accept; bfd->data = state; diff --git a/src/utils/meas_json.c b/src/utils/meas_json.c index 6aa531a..0fd99c0 100644 --- a/src/utils/meas_json.c +++ b/src/utils/meas_json.c @@ -158,7 +158,7 @@ { int rc; - if (what & BSC_FD_READ) { + if (what & OSMO_FD_READ) { struct msgb *msg = msgb_alloc(1024, "UDP Rx"); rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg)); diff --git a/src/utils/meas_udp2db.c b/src/utils/meas_udp2db.c index 34f8385..07023c3 100644 --- a/src/utils/meas_udp2db.c +++ b/src/utils/meas_udp2db.c @@ -71,7 +71,7 @@ { int rc; - if (what & BSC_FD_READ) { + if (what & OSMO_FD_READ) { struct msgb *msg = msgb_alloc(1024, "UDP Rx"); rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg)); diff --git a/src/utils/meas_vis.c b/src/utils/meas_vis.c index 01be986..73ccfc4 100644 --- a/src/utils/meas_vis.c +++ b/src/utils/meas_vis.c @@ -125,7 +125,7 @@ { int rc; - if (what & BSC_FD_READ) { + if (what & OSMO_FD_READ) { struct msgb *msg = msgb_alloc(1024, "UDP Rx"); rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia5a656567d212fa265aef1375d714d0c5fee5dd6 Gerrit-Change-Number: 19284 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 17:30:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 17:30:31 +0000 Subject: Change in osmo-bsc[master]: gsm_data.h: Drop duplicated include stdint.h References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19285 ) Change subject: gsm_data.h: Drop duplicated include stdint.h ...................................................................... gsm_data.h: Drop duplicated include stdint.h Change-Id: I7610cffc3a641975e05ba4ea9f469e12c99e407f --- M include/osmocom/bsc/gsm_data.h 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/85/19285/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 0f5fc54..5336ebe 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -4,7 +4,6 @@ #include #include #include -#include #include #include -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7610cffc3a641975e05ba4ea9f469e12c99e407f Gerrit-Change-Number: 19285 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 15 17:33:43 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 15 Jul 2020 17:33:43 +0000 Subject: Build failure of network:osmocom:latest/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0f3e1735ec5_32942b26effd85f486797f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/open5gs/Debian_Unstable/x86_64 Package network:osmocom:latest/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest open5gs Last lines of build log: [ 144s] dh_auto_configure -O--buildsystem=meson [ 144s] install -d obj-x86_64-linux-gnu [ 144s] cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu [ 144s] Traceback (most recent call last): [ 144s] File "/usr/bin/meson", line 17, in [ 144s] from mesonbuild import mesonmain [ 144s] File "/usr/lib/python3/dist-packages/mesonbuild/mesonmain.py", line 25, in [ 144s] from . import mconf, mdist, minit, minstall, mintro, msetup, mtest, rewriter, msubprojects, munstable_coredata, mcompile [ 144s] File "/usr/lib/python3/dist-packages/mesonbuild/mconf.py", line 16, in [ 144s] from . import coredata, environment, mesonlib, build, mintro, mlog [ 144s] File "/usr/lib/python3/dist-packages/mesonbuild/build.py", line 26, in [ 144s] from . import dependencies [ 144s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/__init__.py", line 15, in [ 144s] from .boost import BoostDependency [ 144s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/boost.py", line 25, in [ 144s] from .base import DependencyException, ExternalDependency, PkgConfigDependency [ 144s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/base.py", line 32, in [ 144s] import pkg_resources [ 144s] ModuleNotFoundError: No module named 'pkg_resources' [ 144s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 144s] make: *** [debian/rules:11: binary] Error 2 [ 144s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 144s] ### VM INTERACTION START ### [ 147s] [ 134.448904] sysrq: SysRq : Power Off [ 147s] [ 134.453914] reboot: Power down [ 147s] ### VM INTERACTION END ### [ 147s] [ 147s] lamb02 failed "build open5gs_1.3.0~eoan1.dsc" at Wed Jul 15 17:33:41 UTC 2020. [ 147s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 15 18:06:36 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 15 Jul 2020 18:06:36 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0f45b51cb6c_32942b26effd85f4878973@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 138s] dh_auto_configure -O--buildsystem=meson [ 138s] install -d obj-x86_64-linux-gnu [ 138s] cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu [ 138s] Traceback (most recent call last): [ 138s] File "/usr/bin/meson", line 17, in [ 138s] from mesonbuild import mesonmain [ 138s] File "/usr/lib/python3/dist-packages/mesonbuild/mesonmain.py", line 25, in [ 138s] from . import mconf, mdist, minit, minstall, mintro, msetup, mtest, rewriter, msubprojects, munstable_coredata, mcompile [ 138s] File "/usr/lib/python3/dist-packages/mesonbuild/mconf.py", line 16, in [ 138s] from . import coredata, environment, mesonlib, build, mintro, mlog [ 138s] File "/usr/lib/python3/dist-packages/mesonbuild/build.py", line 26, in [ 138s] from . import dependencies [ 138s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/__init__.py", line 15, in [ 138s] from .boost import BoostDependency [ 138s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/boost.py", line 25, in [ 138s] from .base import DependencyException, ExternalDependency, PkgConfigDependency [ 138s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/base.py", line 32, in [ 138s] import pkg_resources [ 138s] ModuleNotFoundError: No module named 'pkg_resources' [ 138s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 138s] make: *** [debian/rules:11: binary] Error 2 [ 138s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 138s] ### VM INTERACTION START ### [ 141s] [ 129.028202] sysrq: SysRq : Power Off [ 141s] [ 129.031610] reboot: Power down [ 141s] ### VM INTERACTION END ### [ 141s] [ 141s] lamb60 failed "build open5gs_1.3.0.20200715.dsc" at Wed Jul 15 18:06:27 UTC 2020. [ 141s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 15 18:56:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 18:56:24 +0000 Subject: Change in osmo-bsc[master]: Fix trailing whitespace in several files References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19286 ) Change subject: Fix trailing whitespace in several files ...................................................................... Fix trailing whitespace in several files Change-Id: Ide9921dfce3b6d7c580edaa612a3063c94319a02 --- M include/osmocom/bsc/abis_nm.h M src/osmo-bsc/bts_nokia_site.c M src/osmo-bsc/bts_siemens_bs11.c M src/osmo-bsc/codec_pref.c M src/osmo-bsc/handover_vty.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/pcu_sock.c 7 files changed, 9 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/86/19286/1 diff --git a/include/osmocom/bsc/abis_nm.h b/include/osmocom/bsc/abis_nm.h index 83bc2f8..3a0cb0e 100644 --- a/include/osmocom/bsc/abis_nm.h +++ b/include/osmocom/bsc/abis_nm.h @@ -1,4 +1,4 @@ -/* GSM Network Management messages on the A-bis interface +/* GSM Network Management messages on the A-bis interface * 3GPP TS 12.21 version 8.0.0 Release 1999 / ETSI TS 100 623 V8.0.0 */ /* (C) 2008-2009 by Harald Welte @@ -151,7 +151,7 @@ int abis_nm_ipaccess_set_attr(struct gsm_bts *bts, uint8_t obj_class, uint8_t bts_nr, uint8_t trx_nr, uint8_t ts_nr, uint8_t *attr, uint8_t attr_len); -int abis_nm_ipaccess_rsl_connect(struct gsm_bts_trx *trx, +int abis_nm_ipaccess_rsl_connect(struct gsm_bts_trx *trx, uint32_t ip, uint16_t port, uint8_t stream); void abis_nm_ipaccess_cgi(uint8_t *buf, struct gsm_bts *bts); int ipac_parse_bcch_info(struct ipac_bcch_info *binf, uint8_t *buf); diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c index 51710b8..523c9ed 100644 --- a/src/osmo-bsc/bts_nokia_site.c +++ b/src/osmo-bsc/bts_nokia_site.c @@ -1533,7 +1533,7 @@ - receive ACK, start RSL link(s) ACK some other messages received from the BTS. - Probably its also possible to configure the BTS without a reset, this + Probably its also possible to configure the BTS without a reset, this has not been tested yet. */ @@ -1608,8 +1608,8 @@ if (!bts->nokia.did_reset) { bts->nokia.did_reset = 1; - /* - TODO: For the InSite processing the received data is + /* + TODO: For the InSite processing the received data is blocked in the driver during reset. Otherwise the LAPD module might assert because the InSite sends garbage on the E1 line during reset. diff --git a/src/osmo-bsc/bts_siemens_bs11.c b/src/osmo-bsc/bts_siemens_bs11.c index 2750f8c..057a0e1 100644 --- a/src/osmo-bsc/bts_siemens_bs11.c +++ b/src/osmo-bsc/bts_siemens_bs11.c @@ -61,7 +61,7 @@ [NM_ATT_BS11_L1_PROT_TYPE] = { TLV_TYPE_TV }, [NM_ATT_BS11_BIT_ERR_THESH] = { TLV_TYPE_FIXED, 2 }, [NM_ATT_BS11_DIVERSITY] = { TLV_TYPE_TLV }, - [NM_ATT_BS11_LMT_LOGON_SESSION]={ TLV_TYPE_TLV }, + [NM_ATT_BS11_LMT_LOGON_SESSION]={ TLV_TYPE_TLV }, [NM_ATT_BS11_LMT_LOGIN_TIME] = { TLV_TYPE_TLV }, [NM_ATT_BS11_LMT_USER_ACC_LEV] ={ TLV_TYPE_TLV }, [NM_ATT_BS11_LMT_USER_NAME] = { TLV_TYPE_TLV }, diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index be442b5..6ec6d05 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -270,7 +270,7 @@ static int match_amr_s15_s0(struct channel_mode_and_rate *ch_mode_rate, const struct bsc_msc_data *msc, const struct gsm_bts *bts, const struct gsm0808_speech_codec *sc_match, uint8_t perm_spch) { uint16_t amr_s15_s0_supported; - + /* Normally the MSC should never try to advertise an AMR codec * configuration that we did not previously advertised as supported. * However, to ensure that no unsupported AMR codec configuration @@ -278,7 +278,7 @@ * and generate an intersection. All further processing is then done * with this intersection result. At the same time we will make sure * that the intersection contains at least one rate setting. */ - + amr_s15_s0_supported = gen_bss_supported_amr_s15_s0(msc, bts, (perm_spch == GSM0808_PERM_HR3)); /* NOTE: The sc_match pointer points to a speech codec from the speech diff --git a/src/osmo-bsc/handover_vty.c b/src/osmo-bsc/handover_vty.c index e9333ec..a418aa7 100644 --- a/src/osmo-bsc/handover_vty.c +++ b/src/osmo-bsc/handover_vty.c @@ -175,4 +175,3 @@ ho_vty_init_cmds(BTS_NODE); } - diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index a1bf857..68eef4b 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1015,7 +1015,7 @@ * TODO: that's how the code was before lchan FSM, is this correct/useful? */ handle_rll_rel_ind_or_conf(fi, event, data); break; - + case LCHAN_EV_RTP_RELEASED: case LCHAN_EV_RTP_ERROR: break; diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index e75c2d4..3e0b7bf 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -716,4 +716,3 @@ talloc_free(state); bts->pcu_state = NULL; } - -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ide9921dfce3b6d7c580edaa612a3063c94319a02 Gerrit-Change-Number: 19286 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 18:56:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 18:56:24 +0000 Subject: Change in osmo-bsc[master]: Move struct gsm_bts: gsm_data.* => bts.* References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19287 ) Change subject: Move struct gsm_bts: gsm_data.* => bts.* ...................................................................... Move struct gsm_bts: gsm_data.* => bts.* Place all code related to the object into the related file. Having all the data model in one file made sense in early stage of development to make progress quickly, but nowadays it hurts more than helps, due to constantly growing size and more and more bits being added to the model, gaining in complexity. Currently, having lots of different objects mixed up in gsm_data.h is a hole of despair, where nobody can make any sense were to properly put new stuff in, ending up with functions related to same object in different files or with wrong prefixes, declarations of non-existing functions, etc. because people cannot make up their mind on strict relation to objects in the data model. Splitting them in files really helps finding code operating on a specific object and helping with logically splitting in the future. Change-Id: I00c15f5285b5c1a0109279b7ab192d5467a04ece --- M include/osmocom/bsc/Makefile.am A include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M src/ipaccess/Makefile.am M src/ipaccess/ipaccess-config.c M src/osmo-bsc/Makefile.am M src/osmo-bsc/abis_nm.c M src/osmo-bsc/abis_om2000.c M src/osmo-bsc/abis_om2000_vty.c M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/acc_ramp.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_ctrl_commands.c M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bsc_rf_ctrl.c M src/osmo-bsc/bsc_vty.c A src/osmo-bsc/bts.c M src/osmo-bsc/bts_ericsson_rbs2000.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c M src/osmo-bsc/bts_nokia_site.c M src/osmo-bsc/bts_siemens_bs11.c M src/osmo-bsc/bts_sysmobts.c M src/osmo-bsc/bts_unknown.c M src/osmo-bsc/cbch_scheduler.c M src/osmo-bsc/chan_alloc.c M src/osmo-bsc/codec_pref.c M src/osmo-bsc/e1_config.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/handover_decision.c M src/osmo-bsc/handover_decision_2.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/handover_logic.c M src/osmo-bsc/handover_vty.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c M src/osmo-bsc/lchan_select.c M src/osmo-bsc/meas_feed.c M src/osmo-bsc/neighbor_ident_vty.c M src/osmo-bsc/osmo_bsc_bssap.c M src/osmo-bsc/osmo_bsc_ctrl.c M src/osmo-bsc/osmo_bsc_filter.c M src/osmo-bsc/osmo_bsc_grace.c M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/osmo_bsc_msc.c M src/osmo-bsc/osmo_bsc_sigtran.c M src/osmo-bsc/paging.c M src/osmo-bsc/pcu_sock.c M src/osmo-bsc/rest_octets.c M src/osmo-bsc/smscb.c M src/osmo-bsc/system_information.c M src/osmo-bsc/timeslot_fsm.c M src/utils/Makefile.am M src/utils/bs11_config.c M tests/abis/Makefile.am M tests/abis/abis_test.c M tests/bsc/Makefile.am M tests/codec_pref/codec_pref_test.c M tests/gsm0408/Makefile.am M tests/gsm0408/gsm0408_test.c M tests/handover/Makefile.am M tests/handover/handover_test.c M tests/nanobts_omlattr/Makefile.am M tests/nanobts_omlattr/nanobts_omlattr_test.c 66 files changed, 1,458 insertions(+), 1,343 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/87/19287/1 diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am index 7a296e4..4d2df20 100644 --- a/include/osmocom/bsc/Makefile.am +++ b/include/osmocom/bsc/Makefile.am @@ -10,6 +10,7 @@ bsc_subscriber.h \ bsc_subscr_conn_fsm.h \ bss.h \ + bts.h \ bts_ipaccess_nanobts_omlattr.h \ chan_alloc.h \ codec_pref.h \ diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h new file mode 100644 index 0000000..a18d8ae --- /dev/null +++ b/include/osmocom/bsc/bts.h @@ -0,0 +1,632 @@ +#pragma once + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include "osmocom/bsc/gsm_data.h" + +enum bts_counter_id { + BTS_CTR_CHREQ_TOTAL, + BTS_CTR_CHREQ_SUCCESSFUL, + BTS_CTR_CHREQ_NO_CHANNEL, + BTS_CTR_CHAN_RF_FAIL, + BTS_CTR_CHAN_RLL_ERR, + BTS_CTR_BTS_OML_FAIL, + BTS_CTR_BTS_RSL_FAIL, + BTS_CTR_CODEC_AMR_F, + BTS_CTR_CODEC_AMR_H, + BTS_CTR_CODEC_EFR, + BTS_CTR_CODEC_V1_FR, + BTS_CTR_CODEC_V1_HR, + BTS_CTR_PAGING_ATTEMPTED, + BTS_CTR_PAGING_ALREADY, + BTS_CTR_PAGING_RESPONDED, + BTS_CTR_PAGING_EXPIRED, + BTS_CTR_PAGING_NO_ACTIVE_PAGING, + BTS_CTR_PAGING_MSC_FLUSH, + BTS_CTR_CHAN_ACT_TOTAL, + BTS_CTR_CHAN_ACT_NACK, + BTS_CTR_RSL_UNKNOWN, + BTS_CTR_RSL_IPA_NACK, + BTS_CTR_RSL_DELETE_IND, + BTS_CTR_MODE_MODIFY_NACK, + BTS_CTR_LCHAN_BORKEN_FROM_UNUSED, + BTS_CTR_LCHAN_BORKEN_FROM_WAIT_ACTIV_ACK, + BTS_CTR_LCHAN_BORKEN_FROM_WAIT_RF_RELEASE_ACK, + BTS_CTR_LCHAN_BORKEN_FROM_BORKEN, + BTS_CTR_LCHAN_BORKEN_FROM_UNKNOWN, + BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_ACK, + BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_NACK, + BTS_CTR_LCHAN_BORKEN_EV_RF_CHAN_REL_ACK, + BTS_CTR_LCHAN_BORKEN_EV_VTY, + BTS_CTR_LCHAN_BORKEN_EV_TEARDOWN, + BTS_CTR_TS_BORKEN_FROM_NOT_INITIALIZED, + BTS_CTR_TS_BORKEN_FROM_UNUSED, + BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_ACT, + BTS_CTR_TS_BORKEN_FROM_PDCH, + BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_DEACT, + BTS_CTR_TS_BORKEN_FROM_IN_USE, + BTS_CTR_TS_BORKEN_FROM_BORKEN, + BTS_CTR_TS_BORKEN_FROM_UNKNOWN, + BTS_CTR_TS_BORKEN_EV_PDCH_ACT_ACK_NACK, + BTS_CTR_TS_BORKEN_EV_PDCH_DEACT_ACK_NACK, + BTS_CTR_TS_BORKEN_EV_TEARDOWN, + BTS_CTR_ASSIGNMENT_ATTEMPTED, + BTS_CTR_ASSIGNMENT_COMPLETED, + BTS_CTR_ASSIGNMENT_STOPPED, + BTS_CTR_ASSIGNMENT_NO_CHANNEL, + BTS_CTR_ASSIGNMENT_TIMEOUT, + BTS_CTR_ASSIGNMENT_FAILED, + BTS_CTR_ASSIGNMENT_ERROR, +}; + +static const struct rate_ctr_desc bts_ctr_description[] = { + [BTS_CTR_CHREQ_TOTAL] = {"chreq:total", "Received channel requests"}, + [BTS_CTR_CHREQ_SUCCESSFUL] = {"chreq:successful", "Successful channel requests (immediate assign sent)"}, + [BTS_CTR_CHREQ_NO_CHANNEL] = {"chreq:no_channel", "Sent to MS no channel available"}, + [BTS_CTR_CHAN_RF_FAIL] = {"chan:rf_fail", "Received a RF failure indication from BTS"}, + [BTS_CTR_CHAN_RLL_ERR] = {"chan:rll_err", "Received a RLL failure with T200 cause from BTS"}, + [BTS_CTR_BTS_OML_FAIL] = {"oml_fail", "Received a TEI down on a OML link"}, + [BTS_CTR_BTS_RSL_FAIL] = {"rsl_fail", "Received a TEI down on a OML link"}, + [BTS_CTR_CODEC_AMR_F] = {"codec:amr_f", "Count the usage of AMR/F codec by channel mode requested"}, + [BTS_CTR_CODEC_AMR_H] = {"codec:amr_h", "Count the usage of AMR/H codec by channel mode requested"}, + [BTS_CTR_CODEC_EFR] = {"codec:efr", "Count the usage of EFR codec by channel mode requested"}, + [BTS_CTR_CODEC_V1_FR] = {"codec:fr", "Count the usage of FR codec by channel mode requested"}, + [BTS_CTR_CODEC_V1_HR] = {"codec:hr", "Count the usage of HR codec by channel mode requested"}, + + [BTS_CTR_PAGING_ATTEMPTED] = {"paging:attempted", "Paging attempts for a subscriber"}, + [BTS_CTR_PAGING_ALREADY] = {"paging:already", "Paging attempts ignored as subscriber was already being paged"}, + [BTS_CTR_PAGING_RESPONDED] = {"paging:responded", "Paging attempts with successful paging response"}, + [BTS_CTR_PAGING_EXPIRED] = {"paging:expired", "Paging Request expired because of timeout T3113"}, + [BTS_CTR_PAGING_NO_ACTIVE_PAGING] = {"paging:no_active_paging", "Paging response without an active paging request (arrived after paging expiration?)"}, + [BTS_CTR_PAGING_MSC_FLUSH] = {"paging:msc_flush", "Paging flushed due to MSC Reset BSSMAP message"}, + [BTS_CTR_CHAN_ACT_TOTAL] = {"chan_act:total", "Total number of Channel Activations"}, + [BTS_CTR_CHAN_ACT_NACK] = {"chan_act:nack", "Number of Channel Activations that the BTS NACKed"}, + [BTS_CTR_RSL_UNKNOWN] = {"rsl:unknown", "Number of unknown/unsupported RSL messages received from BTS"}, + [BTS_CTR_RSL_IPA_NACK] = {"rsl:ipa_nack", "Number of IPA (RTP/dyn-PDCH) related NACKs received from BTS"}, + [BTS_CTR_RSL_DELETE_IND] = {"rsl:delete_ind", "Number of RSL DELETE INDICATION (DL CCCH overload)"}, + [BTS_CTR_MODE_MODIFY_NACK] = {"chan:mode_modify_nack", "Number of Channel Mode Modify NACKs received from BTS"}, + + /* lchan/TS BORKEN state counters */ + [BTS_CTR_LCHAN_BORKEN_FROM_UNUSED] = {"lchan_borken:from_state:unused", "Transitions from lchan UNUSED state to BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_FROM_WAIT_ACTIV_ACK] = {"lchan_borken:from_state:wait_activ_ack", "Transitions from lchan WAIT_ACTIV_ACK state to BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_FROM_WAIT_RF_RELEASE_ACK] = {"lchan_borken:from_state:wait_rf_release_ack", "Transitions from lchan WAIT_RF_RELEASE_ACK state to BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_FROM_BORKEN] = {"lchan_borken:from_state:borken", "Transitions from lchan BORKEN state to BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_FROM_UNKNOWN] = {"lchan_borken:from_state:unknown", "Transitions from an unknown lchan state to BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_ACK] = {"lchan_borken:event:chan_activ_ack", "CHAN_ACTIV_ACK received in the lchan BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_NACK] = {"lchan_borken:event:chan_activ_nack", "CHAN_ACTIV_NACK received in the lchan BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_EV_RF_CHAN_REL_ACK] = {"lchan_borken:event:rf_chan_rel_ack", "RF_CHAN_REL_ACK received in the lchan BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_EV_VTY] = {"lchan_borken:event:vty", "VTY commands received in the lchan BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_EV_TEARDOWN] = {"lchan_borken:event:teardown", "lchan in a BORKEN state is shutting down (BTS disconnected?)"}, + [BTS_CTR_TS_BORKEN_FROM_NOT_INITIALIZED] = {"ts_borken:from_state:not_initialized", "Transitions from TS NOT_INITIALIZED state to BORKEN state"}, + [BTS_CTR_TS_BORKEN_FROM_UNUSED] = {"ts_borken:from_state:unused", "Transitions from TS UNUSED state to BORKEN state"}, + [BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_ACT] = {"ts_borken:from_state:wait_pdch_act", "Transitions from TS WAIT_PDCH_ACT state to BORKEN state"}, + [BTS_CTR_TS_BORKEN_FROM_PDCH] = {"ts_borken:from_state:pdch", "Transitions from TS PDCH state to BORKEN state"}, + [BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_DEACT] = {"ts_borken:from_state:wait_pdch_deact", "Transitions from TS WAIT_PDCH_DEACT state to BORKEN state"}, + [BTS_CTR_TS_BORKEN_FROM_IN_USE] = {"ts_borken:from_state:in_use", "Transitions from TS IN_USE state to BORKEN state"}, + [BTS_CTR_TS_BORKEN_FROM_BORKEN] = {"ts_borken:from_state:borken", "Transitions from TS BORKEN state to BORKEN state"}, + [BTS_CTR_TS_BORKEN_FROM_UNKNOWN] = {"ts_borken:from_state:unknown", "Transitions from an unknown TS state to BORKEN state"}, + [BTS_CTR_TS_BORKEN_EV_PDCH_ACT_ACK_NACK] = {"ts_borken:event:pdch_act_ack_nack", "PDCH_ACT_ACK/NACK received in the TS BORKEN state"}, + [BTS_CTR_TS_BORKEN_EV_PDCH_DEACT_ACK_NACK] = {"ts_borken:event:pdch_deact_ack_nack", "PDCH_DEACT_ACK/NACK received in the TS BORKEN state"}, + [BTS_CTR_TS_BORKEN_EV_TEARDOWN] = {"ts_borken:event:teardown", "TS in a BORKEN state is shutting down (BTS disconnected?)"}, + [BTS_CTR_ASSIGNMENT_ATTEMPTED] = {"assignment:attempted", "Assignment attempts"}, + [BTS_CTR_ASSIGNMENT_COMPLETED] = {"assignment:completed", "Assignment completed"}, + [BTS_CTR_ASSIGNMENT_STOPPED] = {"assignment:stopped", "Connection ended during Assignment"}, + [BTS_CTR_ASSIGNMENT_NO_CHANNEL] = {"assignment:no_channel", "Failure to allocate lchan for Assignment"}, + [BTS_CTR_ASSIGNMENT_TIMEOUT] = {"assignment:timeout", "Assignment timed out"}, + [BTS_CTR_ASSIGNMENT_FAILED] = {"assignment:failed", "Received Assignment Failure message"}, + [BTS_CTR_ASSIGNMENT_ERROR] = {"assignment:error", "Assignment failed for other reason"}, + +}; + +static const struct rate_ctr_group_desc bts_ctrg_desc = { + "bts", + "base transceiver station", + OSMO_STATS_CLASS_GLOBAL, + ARRAY_SIZE(bts_ctr_description), + bts_ctr_description, +}; + +enum { + BTS_STAT_CHAN_LOAD_AVERAGE, + BTS_STAT_CHAN_CCCH_SDCCH4_USED, + BTS_STAT_CHAN_CCCH_SDCCH4_TOTAL, + BTS_STAT_CHAN_TCH_F_USED, + BTS_STAT_CHAN_TCH_F_TOTAL, + BTS_STAT_CHAN_TCH_H_USED, + BTS_STAT_CHAN_TCH_H_TOTAL, + BTS_STAT_CHAN_SDCCH8_USED, + BTS_STAT_CHAN_SDCCH8_TOTAL, + BTS_STAT_CHAN_TCH_F_PDCH_USED, + BTS_STAT_CHAN_TCH_F_PDCH_TOTAL, + BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_USED, + BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_TOTAL, + BTS_STAT_CHAN_SDCCH8_CBCH_USED, + BTS_STAT_CHAN_SDCCH8_CBCH_TOTAL, + BTS_STAT_CHAN_TCH_F_TCH_H_PDCH_USED, + BTS_STAT_CHAN_TCH_F_TCH_H_PDCH_TOTAL, + BTS_STAT_T3122, + BTS_STAT_RACH_BUSY, + BTS_STAT_RACH_ACCESS, + BTS_STAT_OML_CONNECTED, + BTS_STAT_RSL_CONNECTED, + BTS_STAT_LCHAN_BORKEN, + BTS_STAT_TS_BORKEN, +}; + +enum gsm_bts_type { + GSM_BTS_TYPE_UNKNOWN, + GSM_BTS_TYPE_BS11, + GSM_BTS_TYPE_NANOBTS, + GSM_BTS_TYPE_RBS2000, + GSM_BTS_TYPE_NOKIA_SITE, + GSM_BTS_TYPE_OSMOBTS, + _NUM_GSM_BTS_TYPE +}; +extern const struct value_string bts_type_names[_NUM_GSM_BTS_TYPE+1]; +extern const struct value_string bts_type_descs[_NUM_GSM_BTS_TYPE+1]; + +enum gsm_bts_type_variant { + BTS_UNKNOWN, + BTS_OSMO_LITECELL15, + BTS_OSMO_OCTPHY, + BTS_OSMO_SYSMO, + BTS_OSMO_TRX, + _NUM_BTS_VARIANT +}; + +/* Used by OML layer for BTS Attribute reporting */ +enum bts_attribute { + BTS_TYPE_VARIANT, + BTS_SUB_MODEL, + TRX_PHY_VERSION, +}; + +struct vty; + +struct gsm_bts_model { + struct llist_head list; + + enum gsm_bts_type type; + enum gsm_bts_type_variant variant; + const char *name; + + bool started; + int (*start)(struct gsm_network *net); + int (*oml_rcvmsg)(struct msgb *msg); + char * (*oml_status)(const struct gsm_bts *bts); + + void (*e1line_bind_ops)(struct e1inp_line *line); + + void (*config_write_bts)(struct vty *vty, struct gsm_bts *bts); + void (*config_write_trx)(struct vty *vty, struct gsm_bts_trx *trx); + void (*config_write_ts)(struct vty *vty, struct gsm_bts_trx_ts *ts); + + /* Should SI2bis and SI2ter be disabled by default on this BTS model? */ + bool force_combined_si; + + struct tlv_definition nm_att_tlvdef; + + /* features of a given BTS model set via gsm_bts_model_register() locally */ + struct bitvec features; + uint8_t _features_data[MAX_BTS_FEATURES/8]; +}; + +/* One BTS */ +struct gsm_bts { + /* list header in net->bts_list */ + struct llist_head list; + + /* Geographical location of the BTS */ + struct llist_head loc_list; + + /* number of this BTS in network */ + uint8_t nr; + /* human readable name / description */ + char *description; + /* Cell Identity */ + uint16_t cell_identity; + /* location area code of this BTS */ + uint16_t location_area_code; + /* Base Station Identification Code (BSIC), lower 3 bits is BCC, + * which is used as TSC for the CCCH */ + uint8_t bsic; + /* type of BTS */ + enum gsm_bts_type type; + enum gsm_bts_type_variant variant; + struct gsm_bts_model *model; + enum gsm_band band; + char version[MAX_VERSION_LENGTH]; + char sub_model[MAX_VERSION_LENGTH]; + + /* features of a given BTS set/reported via OML */ + struct bitvec features; + uint8_t _features_data[MAX_BTS_FEATURES/8]; + + /* Connected PCU version (if any) */ + char pcu_version[MAX_VERSION_LENGTH]; + + /* maximum Tx power that the MS is permitted to use in this cell */ + int ms_max_power; + + /* how do we talk OML with this TRX? */ + struct gsm_e1_subslot oml_e1_link; + uint8_t oml_tei; + struct e1inp_sign_link *oml_link; + /* Timer to use for deferred drop of OML link, see \ref ipaccess_drop_oml_deferred */ + struct osmo_timer_list oml_drop_link_timer; + /* when OML link was established */ + time_t uptime; + + /* Abis network management O&M handle */ + struct abis_nm_h *nmh; + + struct gsm_abis_mo mo; + + /* number of this BTS on given E1 link */ + uint8_t bts_nr; + + /* DTX features of this BTS */ + enum gsm48_dtx_mode dtxu; + bool dtxd; + + /* paging state and control */ + struct gsm_bts_paging_state paging; + + /* CCCH is on C0 */ + struct gsm_bts_trx *c0; + + struct { + struct gsm_abis_mo mo; + } site_mgr; + + /* bitmask of all SI that are present/valid in si_buf */ + uint32_t si_valid; + /* 3GPP TS 44.018 Table 10.5.2.33b.1 INDEX and COUNT for SI2quater */ + uint8_t si2q_index; /* distinguish individual SI2quater messages */ + uint8_t si2q_count; /* si2q_index for the last (highest indexed) individual SI2quater message */ + /* buffers where we put the pre-computed SI */ + sysinfo_buf_t si_buf[_MAX_SYSINFO_TYPE][SI2Q_MAX_NUM]; + /* offsets used while generating SI2quater */ + size_t e_offset; + size_t u_offset; + /* 3GPP TS 08.58 ?8.5.1 BCCH INFORMATION. Some nanoBTS fail upon + * receival of empty SI disabling unsupported SI. see OS#3707. */ + bool si_unused_send_empty; + + /* ip.access Unit ID's have Site/BTS/TRX layout */ + union { + struct { + uint16_t site_id; + uint16_t bts_id; + uint32_t flags; + uint32_t rsl_ip; + } ip_access; + struct { + struct { + struct gsm_abis_mo mo; + } cclk; + struct { + struct gsm_abis_mo mo; + } rack; + struct gsm_envabtse envabtse[4]; + } bs11; + struct { + struct { + struct om2k_mo om2k_mo; + struct gsm_abis_mo mo; + struct llist_head conn_groups; + } cf; + struct { + struct om2k_mo om2k_mo; + struct gsm_abis_mo mo; + struct llist_head conn_groups; + } is; + struct { + struct om2k_mo om2k_mo; + struct gsm_abis_mo mo; + struct llist_head conn_groups; + } con; + struct { + struct om2k_mo om2k_mo; + struct gsm_abis_mo mo; + } dp; + struct { + struct om2k_mo om2k_mo; + struct gsm_abis_mo mo; + } tf; + struct { + struct om2k_mo om2k_mo; + struct gsm_abis_mo mo; + } mctr; + uint32_t use_superchannel:1; + struct { + uint16_t limit; + uint16_t active; + } om2k_version[16]; + } rbs2000; + struct { + uint8_t bts_type; + unsigned int configured:1, /* we sent the config data request */ + skip_reset:1, /* skip reset at bootstrap */ + no_loc_rel_cnf:1, /* don't wait for RSL REL CONF */ + bts_reset_timer_cnf, /* timer for BTS RESET */ + did_reset:1, /* we received a RESET ACK */ + wait_reset:2; /* we are waiting for reset to complete */ + struct osmo_timer_list reset_timer; + } nokia; + }; + + /* Not entirely sure how ip.access specific this is */ + struct { + enum bts_gprs_mode mode; + struct { + struct gsm_abis_mo mo; + uint16_t nsei; + uint8_t timer[7]; + } nse; + struct { + struct gsm_abis_mo mo; + uint16_t bvci; + uint8_t timer[11]; + struct gprs_rlc_cfg rlc_cfg; + } cell; + struct gsm_bts_gprs_nsvc nsvc[2]; + uint8_t rac; + uint8_t net_ctrl_ord; + bool ctrl_ack_type_use_block; + bool egprs_pkt_chan_request; + } gprs; + + /* threshold (in percent) when BTS shall send CCCH LOAD IND */ + int ccch_load_ind_thresh; + + /* RACH NM values */ + int rach_b_thresh; + int rach_ldavg_slots; + + /* transceivers */ + int num_trx; + struct llist_head trx_list; + + /* SI related items */ + int force_combined_si; + bool force_combined_si_set; + int bcch_change_mark; + + /* Abis NM queue */ + struct llist_head abis_queue; + int abis_nm_pend; + + struct gsm_network *network; + + /* should the channel allocator allocate channels from high TRX to TRX0, + * rather than starting from TRX0 and go upwards? */ + int chan_alloc_reverse; + + enum neigh_list_manual_mode neigh_list_manual_mode; + /* parameters from which we build SYSTEM INFORMATION */ + struct { + struct gsm48_rach_control rach_control; + uint8_t ncc_permitted; + struct gsm48_cell_sel_par cell_sel_par; + struct gsm48_si_selection_params cell_ro_sel_par; /* rest octet */ + struct gsm48_cell_options cell_options; + struct gsm48_control_channel_descr chan_desc; + struct bitvec neigh_list; + struct bitvec cell_alloc; + struct bitvec si5_neigh_list; + struct osmo_earfcn_si2q si2quater_neigh_list; + size_t uarfcn_length; /* index for uarfcn and scramble lists */ + struct { + /* bitmask large enough for all possible ARFCN's */ + uint8_t neigh_list[1024/8]; + uint8_t cell_alloc[1024/8]; + /* If the user wants a different neighbor list in SI5 than in SI2 */ + uint8_t si5_neigh_list[1024/8]; + uint8_t meas_bw_list[MAX_EARFCN_LIST]; + uint16_t earfcn_list[MAX_EARFCN_LIST]; + uint16_t uarfcn_list[MAX_EARFCN_LIST]; + uint16_t scramble_list[MAX_EARFCN_LIST]; + } data; + } si_common; + bool early_classmark_allowed; + bool early_classmark_allowed_3g; + /* for testing only: Have an infinitely long radio link timeout */ + bool infinite_radio_link_timeout; + + /* do we use static (user-defined) system information messages? (bitmask) */ + uint32_t si_mode_static; + + /* access control class ramping */ + struct acc_ramp acc_ramp; + + /* exclude the BTS from the global RF Lock handling */ + int excl_from_rf_lock; + + /* supported codecs beside FR */ + struct bts_codec_conf codec; + + /* BTS dependencies bit field */ + uint32_t depends_on[256/(8*4)]; + + /* full and half rate multirate config */ + struct amr_multirate_conf mr_full; + struct amr_multirate_conf mr_half; + + /* PCU socket state */ + char *pcu_sock_path; + struct pcu_sock_state *pcu_state; + + struct rate_ctr_group *bts_ctrs; + struct osmo_stat_item_group *bts_statg; + + struct handover_cfg *ho; + + /* A list of struct gsm_bts_ref, indicating neighbors of this BTS. + * When the si_common neigh_list is in automatic mode, it is populated from this list as well as + * gsm_network->neighbor_bss_cells. */ + struct llist_head local_neighbors; + + /* BTS-specific overrides for timer values from struct gsm_network. */ + uint8_t T3122; /* ASSIGNMENT REJECT wait indication */ + bool T3113_dynamic; /* Calculate T3113 timeout dynamically based on BTS channel config and load */ + + /* Periodic channel load measurements are used to maintain T3122. */ + struct load_counter chan_load_samples[7]; + int chan_load_samples_idx; + uint8_t chan_load_avg; /* current channel load average in percent (0 - 100). */ + + /* cell broadcast system */ + struct osmo_timer_list cbch_timer; + struct bts_smscb_chan_state cbch_basic; + struct bts_smscb_chan_state cbch_extended; + struct osmo_timer_list etws_timer; /* when to stop ETWS PN */ + + struct llist_head oml_fail_rep; +}; + +#define GSM_BTS_SI2Q(bts, i) (struct gsm48_system_information_type_2quater *)((bts)->si_buf[SYSINFO_TYPE_2quater][i]) +#define GSM_BTS_HAS_SI(bts, i) ((bts)->si_valid & (1 << i)) +#define GSM_BTS_SI(bts, i) (void *)((bts)->si_buf[i][0]) + +/* this actually refers to the IPA transport, not the BTS model */ +static inline int is_ipaccess_bts(const struct gsm_bts *bts) +{ + switch (bts->type) { + case GSM_BTS_TYPE_NANOBTS: + case GSM_BTS_TYPE_OSMOBTS: + return 1; + default: + break; + } + return 0; +} + +static inline int is_sysmobts_v2(const struct gsm_bts *bts) +{ + switch (bts->type) { + case GSM_BTS_TYPE_OSMOBTS: + return 1; + default: + break; + } + return 0; +} + +static inline int is_siemens_bts(const struct gsm_bts *bts) +{ + switch (bts->type) { + case GSM_BTS_TYPE_BS11: + return 1; + default: + break; + } + + return 0; +} + +static inline int is_nokia_bts(const struct gsm_bts *bts) +{ + switch (bts->type) { + case GSM_BTS_TYPE_NOKIA_SITE: + return 1; + default: + break; + } + + return 0; +} + +static inline int is_ericsson_bts(const struct gsm_bts *bts) +{ + switch (bts->type) { + case GSM_BTS_TYPE_RBS2000: + return 1; + default: + break; + } + + return 0; +} + +static inline int is_e1_bts(const struct gsm_bts *bts) +{ + switch (bts->type) { + case GSM_BTS_TYPE_BS11: + case GSM_BTS_TYPE_RBS2000: + case GSM_BTS_TYPE_NOKIA_SITE: + return 1; + default: + break; + } + + return 0; +} + +static inline const struct osmo_location_area_id *bts_lai(struct gsm_bts *bts) +{ + static struct osmo_location_area_id lai; + lai = (struct osmo_location_area_id){ + .plmn = bts->network->plmn, + .lac = bts->location_area_code, + }; + return &lai; +} + +struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, uint8_t bts_num); + +bool gsm_bts_matches_lai(const struct gsm_bts *bts, const struct osmo_location_area_id *lai); +bool gsm_bts_matches_cell_id(const struct gsm_bts *bts, const struct gsm0808_cell_id *cell_id); + +int gsm_bts_local_neighbor_add(struct gsm_bts *bts, struct gsm_bts *neighbor); +int gsm_bts_local_neighbor_del(struct gsm_bts *bts, const struct gsm_bts *neighbor); + +/* return the gsm_lchan for the CBCH (if it exists at all) */ +struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts); + +int gsm_set_bts_type(struct gsm_bts *bts, enum gsm_bts_type type); + +struct gsm_bts_trx *gsm_bts_trx_by_nr(struct gsm_bts *bts, int nr); + +int bts_gprs_mode_is_compat(struct gsm_bts *bts, enum bts_gprs_mode mode); + +unsigned long long bts_uptime(const struct gsm_bts *bts); + +char *get_model_oml_status(const struct gsm_bts *bts); +/* reset the state of all MO in the BTS */ +void gsm_bts_mo_reset(struct gsm_bts *bts); + +/* dependency handling */ +void bts_depend_mark(struct gsm_bts *bts, int dep); +void bts_depend_clear(struct gsm_bts *bts, int dep); +int bts_depend_check(struct gsm_bts *bts); +int bts_depend_is_depedency(struct gsm_bts *base, struct gsm_bts *other); + +int gsm_bts_get_radio_link_timeout(const struct gsm_bts *bts); +void gsm_bts_set_radio_link_timeout(struct gsm_bts *bts, int value); + +void gsm_bts_all_ts_dispatch(struct gsm_bts *bts, uint32_t ts_ev, void *data); + +int bts_count_free_ts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan); + +int gsm_bts_model_register(struct gsm_bts_model *model); +struct gsm_bts_model *bts_model_find(enum gsm_bts_type type); + +enum gsm_bts_type str2btstype(const char *arg); +const char *btstype2str(enum gsm_bts_type type); + +enum bts_attribute str2btsattr(const char *s); +const char *btsatttr2str(enum bts_attribute v); + +enum gsm_bts_type_variant str2btsvariant(const char *arg); +const char *btsvariant2str(enum gsm_bts_type_variant v); diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 5336ebe..e075d6b 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -39,6 +39,8 @@ struct mgcp_client; struct gsm0808_cell_id; struct osmo_mgcpc_ep; +struct gsm_bts; +struct gsm_bts_model; /** annotations for msgb ownership */ #define __uses @@ -771,69 +773,8 @@ struct gsm_bts_trx_ts ts[TRX_NR_TS]; }; -#define GSM_BTS_SI2Q(bts, i) (struct gsm48_system_information_type_2quater *)((bts)->si_buf[SYSINFO_TYPE_2quater][i]) -#define GSM_BTS_HAS_SI(bts, i) ((bts)->si_valid & (1 << i)) -#define GSM_BTS_SI(bts, i) (void *)((bts)->si_buf[i][0]) #define GSM_LCHAN_SI(lchan, i) (void *)((lchan)->si.buf[i][0]) -enum gsm_bts_type { - GSM_BTS_TYPE_UNKNOWN, - GSM_BTS_TYPE_BS11, - GSM_BTS_TYPE_NANOBTS, - GSM_BTS_TYPE_RBS2000, - GSM_BTS_TYPE_NOKIA_SITE, - GSM_BTS_TYPE_OSMOBTS, - _NUM_GSM_BTS_TYPE -}; - -enum gsm_bts_type_variant { - BTS_UNKNOWN, - BTS_OSMO_LITECELL15, - BTS_OSMO_OCTPHY, - BTS_OSMO_SYSMO, - BTS_OSMO_TRX, - _NUM_BTS_VARIANT -}; - -/* Used by OML layer for BTS Attribute reporting */ -enum bts_attribute { - BTS_TYPE_VARIANT, - BTS_SUB_MODEL, - TRX_PHY_VERSION, -}; - -struct vty; - -struct gsm_bts_model { - struct llist_head list; - - enum gsm_bts_type type; - enum gsm_bts_type_variant variant; - const char *name; - - bool started; - int (*start)(struct gsm_network *net); - int (*oml_rcvmsg)(struct msgb *msg); - char * (*oml_status)(const struct gsm_bts *bts); - - void (*e1line_bind_ops)(struct e1inp_line *line); - - void (*config_write_bts)(struct vty *vty, struct gsm_bts *bts); - void (*config_write_trx)(struct vty *vty, struct gsm_bts_trx *trx); - void (*config_write_ts)(struct vty *vty, struct gsm_bts_trx_ts *ts); - - /* Should SI2bis and SI2ter be disabled by default on this BTS model? */ - bool force_combined_si; - - struct tlv_definition nm_att_tlvdef; - - /* features of a given BTS model set via gsm_bts_model_register() locally */ - struct bitvec features; - uint8_t _features_data[MAX_BTS_FEATURES/8]; -}; - - - /* * This keeps track of the paging status of one BTS. It * includes a number of pending requests, a back pointer @@ -1003,280 +944,6 @@ struct msgb *mb; }; -/* One BTS */ -struct gsm_bts { - /* list header in net->bts_list */ - struct llist_head list; - - /* Geographical location of the BTS */ - struct llist_head loc_list; - - /* number of this BTS in network */ - uint8_t nr; - /* human readable name / description */ - char *description; - /* Cell Identity */ - uint16_t cell_identity; - /* location area code of this BTS */ - uint16_t location_area_code; - /* Base Station Identification Code (BSIC), lower 3 bits is BCC, - * which is used as TSC for the CCCH */ - uint8_t bsic; - /* type of BTS */ - enum gsm_bts_type type; - enum gsm_bts_type_variant variant; - struct gsm_bts_model *model; - enum gsm_band band; - char version[MAX_VERSION_LENGTH]; - char sub_model[MAX_VERSION_LENGTH]; - - /* features of a given BTS set/reported via OML */ - struct bitvec features; - uint8_t _features_data[MAX_BTS_FEATURES/8]; - - /* Connected PCU version (if any) */ - char pcu_version[MAX_VERSION_LENGTH]; - - /* maximum Tx power that the MS is permitted to use in this cell */ - int ms_max_power; - - /* how do we talk OML with this TRX? */ - struct gsm_e1_subslot oml_e1_link; - uint8_t oml_tei; - struct e1inp_sign_link *oml_link; - /* Timer to use for deferred drop of OML link, see \ref ipaccess_drop_oml_deferred */ - struct osmo_timer_list oml_drop_link_timer; - /* when OML link was established */ - time_t uptime; - - /* Abis network management O&M handle */ - struct abis_nm_h *nmh; - - struct gsm_abis_mo mo; - - /* number of this BTS on given E1 link */ - uint8_t bts_nr; - - /* DTX features of this BTS */ - enum gsm48_dtx_mode dtxu; - bool dtxd; - - /* paging state and control */ - struct gsm_bts_paging_state paging; - - /* CCCH is on C0 */ - struct gsm_bts_trx *c0; - - struct { - struct gsm_abis_mo mo; - } site_mgr; - - /* bitmask of all SI that are present/valid in si_buf */ - uint32_t si_valid; - /* 3GPP TS 44.018 Table 10.5.2.33b.1 INDEX and COUNT for SI2quater */ - uint8_t si2q_index; /* distinguish individual SI2quater messages */ - uint8_t si2q_count; /* si2q_index for the last (highest indexed) individual SI2quater message */ - /* buffers where we put the pre-computed SI */ - sysinfo_buf_t si_buf[_MAX_SYSINFO_TYPE][SI2Q_MAX_NUM]; - /* offsets used while generating SI2quater */ - size_t e_offset; - size_t u_offset; - /* 3GPP TS 08.58 ?8.5.1 BCCH INFORMATION. Some nanoBTS fail upon - * receival of empty SI disabling unsupported SI. see OS#3707. */ - bool si_unused_send_empty; - - /* ip.access Unit ID's have Site/BTS/TRX layout */ - union { - struct { - uint16_t site_id; - uint16_t bts_id; - uint32_t flags; - uint32_t rsl_ip; - } ip_access; - struct { - struct { - struct gsm_abis_mo mo; - } cclk; - struct { - struct gsm_abis_mo mo; - } rack; - struct gsm_envabtse envabtse[4]; - } bs11; - struct { - struct { - struct om2k_mo om2k_mo; - struct gsm_abis_mo mo; - struct llist_head conn_groups; - } cf; - struct { - struct om2k_mo om2k_mo; - struct gsm_abis_mo mo; - struct llist_head conn_groups; - } is; - struct { - struct om2k_mo om2k_mo; - struct gsm_abis_mo mo; - struct llist_head conn_groups; - } con; - struct { - struct om2k_mo om2k_mo; - struct gsm_abis_mo mo; - } dp; - struct { - struct om2k_mo om2k_mo; - struct gsm_abis_mo mo; - } tf; - struct { - struct om2k_mo om2k_mo; - struct gsm_abis_mo mo; - } mctr; - uint32_t use_superchannel:1; - struct { - uint16_t limit; - uint16_t active; - } om2k_version[16]; - } rbs2000; - struct { - uint8_t bts_type; - unsigned int configured:1, /* we sent the config data request */ - skip_reset:1, /* skip reset at bootstrap */ - no_loc_rel_cnf:1, /* don't wait for RSL REL CONF */ - bts_reset_timer_cnf, /* timer for BTS RESET */ - did_reset:1, /* we received a RESET ACK */ - wait_reset:2; /* we are waiting for reset to complete */ - struct osmo_timer_list reset_timer; - } nokia; - }; - - /* Not entirely sure how ip.access specific this is */ - struct { - enum bts_gprs_mode mode; - struct { - struct gsm_abis_mo mo; - uint16_t nsei; - uint8_t timer[7]; - } nse; - struct { - struct gsm_abis_mo mo; - uint16_t bvci; - uint8_t timer[11]; - struct gprs_rlc_cfg rlc_cfg; - } cell; - struct gsm_bts_gprs_nsvc nsvc[2]; - uint8_t rac; - uint8_t net_ctrl_ord; - bool ctrl_ack_type_use_block; - bool egprs_pkt_chan_request; - } gprs; - - /* threshold (in percent) when BTS shall send CCCH LOAD IND */ - int ccch_load_ind_thresh; - - /* RACH NM values */ - int rach_b_thresh; - int rach_ldavg_slots; - - /* transceivers */ - int num_trx; - struct llist_head trx_list; - - /* SI related items */ - int force_combined_si; - bool force_combined_si_set; - int bcch_change_mark; - - /* Abis NM queue */ - struct llist_head abis_queue; - int abis_nm_pend; - - struct gsm_network *network; - - /* should the channel allocator allocate channels from high TRX to TRX0, - * rather than starting from TRX0 and go upwards? */ - int chan_alloc_reverse; - - enum neigh_list_manual_mode neigh_list_manual_mode; - /* parameters from which we build SYSTEM INFORMATION */ - struct { - struct gsm48_rach_control rach_control; - uint8_t ncc_permitted; - struct gsm48_cell_sel_par cell_sel_par; - struct gsm48_si_selection_params cell_ro_sel_par; /* rest octet */ - struct gsm48_cell_options cell_options; - struct gsm48_control_channel_descr chan_desc; - struct bitvec neigh_list; - struct bitvec cell_alloc; - struct bitvec si5_neigh_list; - struct osmo_earfcn_si2q si2quater_neigh_list; - size_t uarfcn_length; /* index for uarfcn and scramble lists */ - struct { - /* bitmask large enough for all possible ARFCN's */ - uint8_t neigh_list[1024/8]; - uint8_t cell_alloc[1024/8]; - /* If the user wants a different neighbor list in SI5 than in SI2 */ - uint8_t si5_neigh_list[1024/8]; - uint8_t meas_bw_list[MAX_EARFCN_LIST]; - uint16_t earfcn_list[MAX_EARFCN_LIST]; - uint16_t uarfcn_list[MAX_EARFCN_LIST]; - uint16_t scramble_list[MAX_EARFCN_LIST]; - } data; - } si_common; - bool early_classmark_allowed; - bool early_classmark_allowed_3g; - /* for testing only: Have an infinitely long radio link timeout */ - bool infinite_radio_link_timeout; - - /* do we use static (user-defined) system information messages? (bitmask) */ - uint32_t si_mode_static; - - /* access control class ramping */ - struct acc_ramp acc_ramp; - - /* exclude the BTS from the global RF Lock handling */ - int excl_from_rf_lock; - - /* supported codecs beside FR */ - struct bts_codec_conf codec; - - /* BTS dependencies bit field */ - uint32_t depends_on[256/(8*4)]; - - /* full and half rate multirate config */ - struct amr_multirate_conf mr_full; - struct amr_multirate_conf mr_half; - - /* PCU socket state */ - char *pcu_sock_path; - struct pcu_sock_state *pcu_state; - - struct rate_ctr_group *bts_ctrs; - struct osmo_stat_item_group *bts_statg; - - struct handover_cfg *ho; - - /* A list of struct gsm_bts_ref, indicating neighbors of this BTS. - * When the si_common neigh_list is in automatic mode, it is populated from this list as well as - * gsm_network->neighbor_bss_cells. */ - struct llist_head local_neighbors; - - /* BTS-specific overrides for timer values from struct gsm_network. */ - uint8_t T3122; /* ASSIGNMENT REJECT wait indication */ - bool T3113_dynamic; /* Calculate T3113 timeout dynamically based on BTS channel config and load */ - - /* Periodic channel load measurements are used to maintain T3122. */ - struct load_counter chan_load_samples[7]; - int chan_load_samples_idx; - uint8_t chan_load_avg; /* current channel load average in percent (0 - 100). */ - - /* cell broadcast system */ - struct osmo_timer_list cbch_timer; - struct bts_smscb_chan_state cbch_basic; - struct bts_smscb_chan_state cbch_extended; - struct osmo_timer_list etws_timer; /* when to stop ETWS PN */ - - struct llist_head oml_fail_rep; -}; - /* One rejected BTS */ struct gsm_bts_rejected { /* list header in net->bts_rejected */ @@ -1290,28 +957,14 @@ struct gsm_network *gsm_network_init(void *ctx); -struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, uint8_t bts_num); struct gsm_bts *gsm_bts_num(const struct gsm_network *net, int num); -bool gsm_bts_matches_lai(const struct gsm_bts *bts, const struct osmo_location_area_id *lai); -bool gsm_bts_matches_cell_id(const struct gsm_bts *bts, const struct gsm0808_cell_id *cell_id); struct gsm_bts *gsm_bts_by_cell_id(const struct gsm_network *net, const struct gsm0808_cell_id *cell_id, int match_idx); -int gsm_bts_local_neighbor_add(struct gsm_bts *bts, struct gsm_bts *neighbor); -int gsm_bts_local_neighbor_del(struct gsm_bts *bts, const struct gsm_bts *neighbor); struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts); struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num); -enum gsm_bts_type str2btstype(const char *arg); -const char *btstype2str(enum gsm_bts_type type); - -enum bts_attribute str2btsattr(const char *s); -const char *btsatttr2str(enum bts_attribute v); - -enum gsm_bts_type_variant str2btsvariant(const char *arg); -const char *btsvariant2str(enum gsm_bts_type_variant v); - extern const struct value_string gsm_chreq_descs[]; extern const struct value_string gsm_pchant_names[]; extern const struct value_string gsm_pchant_descs[]; @@ -1334,6 +987,8 @@ } void gsm_abis_mo_reset(struct gsm_abis_mo *mo); +void gsm_mo_init(struct gsm_abis_mo *mo, struct gsm_bts *bts, + uint8_t obj_class, uint8_t p1, uint8_t p2, uint8_t p3); struct gsm_nm_state * gsm_objclass2nmstate(struct gsm_bts *bts, uint8_t obj_class, @@ -1342,9 +997,6 @@ gsm_objclass2obj(struct gsm_bts *bts, uint8_t obj_class, const struct abis_om_obj_inst *obj_inst); -/* reset the state of all MO in the BTS */ -void gsm_bts_mo_reset(struct gsm_bts *bts); - uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan, uint8_t ts_nr, uint8_t lchan_nr); uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan); @@ -1355,16 +1007,7 @@ const struct gsm_lchan *lchan); void gsm48_lchan2chan_desc_as_configured(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan); -/* return the gsm_lchan for the CBCH (if it exists at all) */ -struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts); - -static inline uint8_t gsm_ts_tsc(const struct gsm_bts_trx_ts *ts) -{ - if (ts->tsc != -1) - return ts->tsc; - else - return ts->trx->bts->bsic & 7; -} +uint8_t gsm_ts_tsc(const struct gsm_bts_trx_ts *ts); struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr, int *rc); @@ -1374,164 +1017,11 @@ bool ts_is_tch(struct gsm_bts_trx_ts *ts); -static inline struct gsm_bts *conn_get_bts(struct gsm_subscriber_connection *conn) { - if (!conn || !conn->lchan) - return NULL; - return conn->lchan->ts->trx->bts; -} +struct gsm_bts *conn_get_bts(struct gsm_subscriber_connection *conn); void conn_update_ms_power_class(struct gsm_subscriber_connection *conn, uint8_t power_class); void lchan_update_ms_power_ctrl_level(struct gsm_lchan *lchan, int ms_power_dbm); -enum bts_counter_id { - BTS_CTR_CHREQ_TOTAL, - BTS_CTR_CHREQ_SUCCESSFUL, - BTS_CTR_CHREQ_NO_CHANNEL, - BTS_CTR_CHAN_RF_FAIL, - BTS_CTR_CHAN_RLL_ERR, - BTS_CTR_BTS_OML_FAIL, - BTS_CTR_BTS_RSL_FAIL, - BTS_CTR_CODEC_AMR_F, - BTS_CTR_CODEC_AMR_H, - BTS_CTR_CODEC_EFR, - BTS_CTR_CODEC_V1_FR, - BTS_CTR_CODEC_V1_HR, - BTS_CTR_PAGING_ATTEMPTED, - BTS_CTR_PAGING_ALREADY, - BTS_CTR_PAGING_RESPONDED, - BTS_CTR_PAGING_EXPIRED, - BTS_CTR_PAGING_NO_ACTIVE_PAGING, - BTS_CTR_PAGING_MSC_FLUSH, - BTS_CTR_CHAN_ACT_TOTAL, - BTS_CTR_CHAN_ACT_NACK, - BTS_CTR_RSL_UNKNOWN, - BTS_CTR_RSL_IPA_NACK, - BTS_CTR_RSL_DELETE_IND, - BTS_CTR_MODE_MODIFY_NACK, - BTS_CTR_LCHAN_BORKEN_FROM_UNUSED, - BTS_CTR_LCHAN_BORKEN_FROM_WAIT_ACTIV_ACK, - BTS_CTR_LCHAN_BORKEN_FROM_WAIT_RF_RELEASE_ACK, - BTS_CTR_LCHAN_BORKEN_FROM_BORKEN, - BTS_CTR_LCHAN_BORKEN_FROM_UNKNOWN, - BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_ACK, - BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_NACK, - BTS_CTR_LCHAN_BORKEN_EV_RF_CHAN_REL_ACK, - BTS_CTR_LCHAN_BORKEN_EV_VTY, - BTS_CTR_LCHAN_BORKEN_EV_TEARDOWN, - BTS_CTR_TS_BORKEN_FROM_NOT_INITIALIZED, - BTS_CTR_TS_BORKEN_FROM_UNUSED, - BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_ACT, - BTS_CTR_TS_BORKEN_FROM_PDCH, - BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_DEACT, - BTS_CTR_TS_BORKEN_FROM_IN_USE, - BTS_CTR_TS_BORKEN_FROM_BORKEN, - BTS_CTR_TS_BORKEN_FROM_UNKNOWN, - BTS_CTR_TS_BORKEN_EV_PDCH_ACT_ACK_NACK, - BTS_CTR_TS_BORKEN_EV_PDCH_DEACT_ACK_NACK, - BTS_CTR_TS_BORKEN_EV_TEARDOWN, - BTS_CTR_ASSIGNMENT_ATTEMPTED, - BTS_CTR_ASSIGNMENT_COMPLETED, - BTS_CTR_ASSIGNMENT_STOPPED, - BTS_CTR_ASSIGNMENT_NO_CHANNEL, - BTS_CTR_ASSIGNMENT_TIMEOUT, - BTS_CTR_ASSIGNMENT_FAILED, - BTS_CTR_ASSIGNMENT_ERROR, -}; - -static const struct rate_ctr_desc bts_ctr_description[] = { - [BTS_CTR_CHREQ_TOTAL] = {"chreq:total", "Received channel requests"}, - [BTS_CTR_CHREQ_SUCCESSFUL] = {"chreq:successful", "Successful channel requests (immediate assign sent)"}, - [BTS_CTR_CHREQ_NO_CHANNEL] = {"chreq:no_channel", "Sent to MS no channel available"}, - [BTS_CTR_CHAN_RF_FAIL] = {"chan:rf_fail", "Received a RF failure indication from BTS"}, - [BTS_CTR_CHAN_RLL_ERR] = {"chan:rll_err", "Received a RLL failure with T200 cause from BTS"}, - [BTS_CTR_BTS_OML_FAIL] = {"oml_fail", "Received a TEI down on a OML link"}, - [BTS_CTR_BTS_RSL_FAIL] = {"rsl_fail", "Received a TEI down on a OML link"}, - [BTS_CTR_CODEC_AMR_F] = {"codec:amr_f", "Count the usage of AMR/F codec by channel mode requested"}, - [BTS_CTR_CODEC_AMR_H] = {"codec:amr_h", "Count the usage of AMR/H codec by channel mode requested"}, - [BTS_CTR_CODEC_EFR] = {"codec:efr", "Count the usage of EFR codec by channel mode requested"}, - [BTS_CTR_CODEC_V1_FR] = {"codec:fr", "Count the usage of FR codec by channel mode requested"}, - [BTS_CTR_CODEC_V1_HR] = {"codec:hr", "Count the usage of HR codec by channel mode requested"}, - - [BTS_CTR_PAGING_ATTEMPTED] = {"paging:attempted", "Paging attempts for a subscriber"}, - [BTS_CTR_PAGING_ALREADY] = {"paging:already", "Paging attempts ignored as subscriber was already being paged"}, - [BTS_CTR_PAGING_RESPONDED] = {"paging:responded", "Paging attempts with successful paging response"}, - [BTS_CTR_PAGING_EXPIRED] = {"paging:expired", "Paging Request expired because of timeout T3113"}, - [BTS_CTR_PAGING_NO_ACTIVE_PAGING] = {"paging:no_active_paging", "Paging response without an active paging request (arrived after paging expiration?)"}, - [BTS_CTR_PAGING_MSC_FLUSH] = {"paging:msc_flush", "Paging flushed due to MSC Reset BSSMAP message"}, - [BTS_CTR_CHAN_ACT_TOTAL] = {"chan_act:total", "Total number of Channel Activations"}, - [BTS_CTR_CHAN_ACT_NACK] = {"chan_act:nack", "Number of Channel Activations that the BTS NACKed"}, - [BTS_CTR_RSL_UNKNOWN] = {"rsl:unknown", "Number of unknown/unsupported RSL messages received from BTS"}, - [BTS_CTR_RSL_IPA_NACK] = {"rsl:ipa_nack", "Number of IPA (RTP/dyn-PDCH) related NACKs received from BTS"}, - [BTS_CTR_RSL_DELETE_IND] = {"rsl:delete_ind", "Number of RSL DELETE INDICATION (DL CCCH overload)"}, - [BTS_CTR_MODE_MODIFY_NACK] = {"chan:mode_modify_nack", "Number of Channel Mode Modify NACKs received from BTS"}, - - /* lchan/TS BORKEN state counters */ - [BTS_CTR_LCHAN_BORKEN_FROM_UNUSED] = {"lchan_borken:from_state:unused", "Transitions from lchan UNUSED state to BORKEN state"}, - [BTS_CTR_LCHAN_BORKEN_FROM_WAIT_ACTIV_ACK] = {"lchan_borken:from_state:wait_activ_ack", "Transitions from lchan WAIT_ACTIV_ACK state to BORKEN state"}, - [BTS_CTR_LCHAN_BORKEN_FROM_WAIT_RF_RELEASE_ACK] = {"lchan_borken:from_state:wait_rf_release_ack", "Transitions from lchan WAIT_RF_RELEASE_ACK state to BORKEN state"}, - [BTS_CTR_LCHAN_BORKEN_FROM_BORKEN] = {"lchan_borken:from_state:borken", "Transitions from lchan BORKEN state to BORKEN state"}, - [BTS_CTR_LCHAN_BORKEN_FROM_UNKNOWN] = {"lchan_borken:from_state:unknown", "Transitions from an unknown lchan state to BORKEN state"}, - [BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_ACK] = {"lchan_borken:event:chan_activ_ack", "CHAN_ACTIV_ACK received in the lchan BORKEN state"}, - [BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_NACK] = {"lchan_borken:event:chan_activ_nack", "CHAN_ACTIV_NACK received in the lchan BORKEN state"}, - [BTS_CTR_LCHAN_BORKEN_EV_RF_CHAN_REL_ACK] = {"lchan_borken:event:rf_chan_rel_ack", "RF_CHAN_REL_ACK received in the lchan BORKEN state"}, - [BTS_CTR_LCHAN_BORKEN_EV_VTY] = {"lchan_borken:event:vty", "VTY commands received in the lchan BORKEN state"}, - [BTS_CTR_LCHAN_BORKEN_EV_TEARDOWN] = {"lchan_borken:event:teardown", "lchan in a BORKEN state is shutting down (BTS disconnected?)"}, - [BTS_CTR_TS_BORKEN_FROM_NOT_INITIALIZED] = {"ts_borken:from_state:not_initialized", "Transitions from TS NOT_INITIALIZED state to BORKEN state"}, - [BTS_CTR_TS_BORKEN_FROM_UNUSED] = {"ts_borken:from_state:unused", "Transitions from TS UNUSED state to BORKEN state"}, - [BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_ACT] = {"ts_borken:from_state:wait_pdch_act", "Transitions from TS WAIT_PDCH_ACT state to BORKEN state"}, - [BTS_CTR_TS_BORKEN_FROM_PDCH] = {"ts_borken:from_state:pdch", "Transitions from TS PDCH state to BORKEN state"}, - [BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_DEACT] = {"ts_borken:from_state:wait_pdch_deact", "Transitions from TS WAIT_PDCH_DEACT state to BORKEN state"}, - [BTS_CTR_TS_BORKEN_FROM_IN_USE] = {"ts_borken:from_state:in_use", "Transitions from TS IN_USE state to BORKEN state"}, - [BTS_CTR_TS_BORKEN_FROM_BORKEN] = {"ts_borken:from_state:borken", "Transitions from TS BORKEN state to BORKEN state"}, - [BTS_CTR_TS_BORKEN_FROM_UNKNOWN] = {"ts_borken:from_state:unknown", "Transitions from an unknown TS state to BORKEN state"}, - [BTS_CTR_TS_BORKEN_EV_PDCH_ACT_ACK_NACK] = {"ts_borken:event:pdch_act_ack_nack", "PDCH_ACT_ACK/NACK received in the TS BORKEN state"}, - [BTS_CTR_TS_BORKEN_EV_PDCH_DEACT_ACK_NACK] = {"ts_borken:event:pdch_deact_ack_nack", "PDCH_DEACT_ACK/NACK received in the TS BORKEN state"}, - [BTS_CTR_TS_BORKEN_EV_TEARDOWN] = {"ts_borken:event:teardown", "TS in a BORKEN state is shutting down (BTS disconnected?)"}, - [BTS_CTR_ASSIGNMENT_ATTEMPTED] = {"assignment:attempted", "Assignment attempts"}, - [BTS_CTR_ASSIGNMENT_COMPLETED] = {"assignment:completed", "Assignment completed"}, - [BTS_CTR_ASSIGNMENT_STOPPED] = {"assignment:stopped", "Connection ended during Assignment"}, - [BTS_CTR_ASSIGNMENT_NO_CHANNEL] = {"assignment:no_channel", "Failure to allocate lchan for Assignment"}, - [BTS_CTR_ASSIGNMENT_TIMEOUT] = {"assignment:timeout", "Assignment timed out"}, - [BTS_CTR_ASSIGNMENT_FAILED] = {"assignment:failed", "Received Assignment Failure message"}, - [BTS_CTR_ASSIGNMENT_ERROR] = {"assignment:error", "Assignment failed for other reason"}, - -}; - -static const struct rate_ctr_group_desc bts_ctrg_desc = { - "bts", - "base transceiver station", - OSMO_STATS_CLASS_GLOBAL, - ARRAY_SIZE(bts_ctr_description), - bts_ctr_description, -}; - -enum { - BTS_STAT_CHAN_LOAD_AVERAGE, - BTS_STAT_CHAN_CCCH_SDCCH4_USED, - BTS_STAT_CHAN_CCCH_SDCCH4_TOTAL, - BTS_STAT_CHAN_TCH_F_USED, - BTS_STAT_CHAN_TCH_F_TOTAL, - BTS_STAT_CHAN_TCH_H_USED, - BTS_STAT_CHAN_TCH_H_TOTAL, - BTS_STAT_CHAN_SDCCH8_USED, - BTS_STAT_CHAN_SDCCH8_TOTAL, - BTS_STAT_CHAN_TCH_F_PDCH_USED, - BTS_STAT_CHAN_TCH_F_PDCH_TOTAL, - BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_USED, - BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_TOTAL, - BTS_STAT_CHAN_SDCCH8_CBCH_USED, - BTS_STAT_CHAN_SDCCH8_CBCH_TOTAL, - BTS_STAT_CHAN_TCH_F_TCH_H_PDCH_USED, - BTS_STAT_CHAN_TCH_F_TCH_H_PDCH_TOTAL, - BTS_STAT_T3122, - BTS_STAT_RACH_BUSY, - BTS_STAT_RACH_ACCESS, - BTS_STAT_OML_CONNECTED, - BTS_STAT_RSL_CONNECTED, - BTS_STAT_LCHAN_BORKEN, - BTS_STAT_TS_BORKEN, -}; - enum { BSC_CTR_ASSIGNMENT_ATTEMPTED, BSC_CTR_ASSIGNMENT_COMPLETED, @@ -1742,20 +1232,8 @@ ver : 7; }; -static inline const struct osmo_location_area_id *bts_lai(struct gsm_bts *bts) -{ - static struct osmo_location_area_id lai; - lai = (struct osmo_location_area_id){ - .plmn = bts->network->plmn, - .lac = bts->location_area_code, - }; - return &lai; -} - extern void talloc_ctx_init(void *ctx_root); -int gsm_set_bts_type(struct gsm_bts *bts, enum gsm_bts_type type); - enum gsm_bts_type parse_btstype(const char *arg); const char *btstype2str(enum gsm_bts_type type); struct gsm_bts *gsm_bts_by_lac(struct gsm_network *net, unsigned int lac, @@ -1763,91 +1241,14 @@ extern void *tall_bsc_ctx; -/* this actually refers to the IPA transport, not the BTS model */ -static inline int is_ipaccess_bts(const struct gsm_bts *bts) -{ - switch (bts->type) { - case GSM_BTS_TYPE_NANOBTS: - case GSM_BTS_TYPE_OSMOBTS: - return 1; - default: - break; - } - return 0; -} - -static inline int is_sysmobts_v2(const struct gsm_bts *bts) -{ - switch (bts->type) { - case GSM_BTS_TYPE_OSMOBTS: - return 1; - default: - break; - } - return 0; -} - -static inline int is_siemens_bts(const struct gsm_bts *bts) -{ - switch (bts->type) { - case GSM_BTS_TYPE_BS11: - return 1; - default: - break; - } - - return 0; -} - -static inline int is_nokia_bts(const struct gsm_bts *bts) -{ - switch (bts->type) { - case GSM_BTS_TYPE_NOKIA_SITE: - return 1; - default: - break; - } - - return 0; -} - -static inline int is_ericsson_bts(const struct gsm_bts *bts) -{ - switch (bts->type) { - case GSM_BTS_TYPE_RBS2000: - return 1; - default: - break; - } - - return 0; -} - -static inline int is_e1_bts(const struct gsm_bts *bts) -{ - switch (bts->type) { - case GSM_BTS_TYPE_BS11: - case GSM_BTS_TYPE_RBS2000: - case GSM_BTS_TYPE_NOKIA_SITE: - return 1; - default: - break; - } - - return 0; -} - extern struct gsm_network *bsc_gsmnet; enum bts_gprs_mode bts_gprs_mode_parse(const char *arg, int *valid); const char *bts_gprs_mode_name(enum bts_gprs_mode mode); -int bts_gprs_mode_is_compat(struct gsm_bts *bts, enum bts_gprs_mode mode); void gsm48_ra_id_by_bts(struct gsm48_ra_id *buf, struct gsm_bts *bts); void gprs_ra_id_by_bts(struct gprs_ra_id *raid, struct gsm_bts *bts); -int gsm_bts_model_register(struct gsm_bts_model *model); - struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *network); struct gsm_bts *gsm_bts_alloc_register(struct gsm_network *net, enum gsm_bts_type type, uint8_t bsic); @@ -1857,42 +1258,23 @@ uint8_t e1_ts, uint8_t e1_ts_ss); void gsm_trx_lock_rf(struct gsm_bts_trx *trx, bool locked, const char *reason); -struct gsm_bts_trx *gsm_bts_trx_by_nr(struct gsm_bts *bts, int nr); int gsm_bts_trx_set_system_infos(struct gsm_bts_trx *trx); int gsm_bts_set_system_infos(struct gsm_bts *bts); /* generic E1 line operations for all ISDN-based BTS. */ extern struct e1inp_line_ops bts_isdn_e1inp_line_ops; -extern const struct value_string bts_type_names[_NUM_GSM_BTS_TYPE+1]; -extern const struct value_string bts_type_descs[_NUM_GSM_BTS_TYPE+1]; - -char *get_model_oml_status(const struct gsm_bts *bts); - -unsigned long long bts_uptime(const struct gsm_bts *bts); - /* control interface handling */ int bsc_base_ctrl_cmds_install(void); -/* dependency handling */ -void bts_depend_mark(struct gsm_bts *bts, int dep); -void bts_depend_clear(struct gsm_bts *bts, int dep); -int bts_depend_check(struct gsm_bts *bts); -int bts_depend_is_depedency(struct gsm_bts *base, struct gsm_bts *other); - -int gsm_bts_get_radio_link_timeout(const struct gsm_bts *bts); -void gsm_bts_set_radio_link_timeout(struct gsm_bts *bts, int value); - bool trx_is_usable(const struct gsm_bts_trx *trx); bool ts_is_usable(const struct gsm_bts_trx_ts *ts); int gsm_lchan_type_by_pchan(enum gsm_phys_chan_config pchan); enum gsm_phys_chan_config gsm_pchan_by_lchan_type(enum gsm_chan_t type); -void gsm_bts_all_ts_dispatch(struct gsm_bts *bts, uint32_t ts_ev, void *data); void gsm_trx_all_ts_dispatch(struct gsm_bts_trx *trx, uint32_t ts_ev, void *data); - -int bts_count_free_ts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan); +int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan); bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx); diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am index 145ea39..273530c 100644 --- a/src/ipaccess/Makefile.am +++ b/src/ipaccess/Makefile.am @@ -46,6 +46,7 @@ # FIXME: resolve the bogus dependencies patched around here: ipaccess_config_LDADD = \ + $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ @@ -57,9 +58,10 @@ ipaccess_proxy_SOURCES = \ ipaccess-proxy.c \ stubs.c \ - $(top_srcdir)/src/osmo-bsc/gsm_data.c \ $(NULL) ipaccess_proxy_LDADD = \ + $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(OSMO_LIBS) \ $(NULL) diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index f7d7332..34ad57f 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -56,6 +56,7 @@ #include #include #include +#include struct gsm_network *bsc_gsmnet; diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am index 0665af6..f66421a 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -43,6 +43,7 @@ bsc_subscr_conn_fsm.c \ bsc_subscriber.c \ bsc_vty.c \ + bts.c \ bts_ericsson_rbs2000.c \ bts_init.c \ bts_ipaccess_nanobts.c \ diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 8dde8de..4ce27f3 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -48,6 +48,7 @@ #include #include #include +#include #include #define OM_ALLOC_SIZE 1024 @@ -853,14 +854,6 @@ return true; } -char *get_model_oml_status(const struct gsm_bts *bts) -{ - if (bts->model->oml_status) - return bts->model->oml_status(bts); - - return "unknown"; -} - void abis_nm_queue_send_next(struct gsm_bts *bts) { int wait = 0; diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index 0aea684..1e4ef97 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -44,6 +44,7 @@ #include #include #include +#include #include /* FIXME: move to libosmocore */ diff --git a/src/osmo-bsc/abis_om2000_vty.c b/src/osmo-bsc/abis_om2000_vty.c index 222546f..b00c7dd 100644 --- a/src/osmo-bsc/abis_om2000_vty.c +++ b/src/osmo-bsc/abis_om2000_vty.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index f6e564b..1ffdd06 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -54,7 +54,7 @@ #include #include #include - +#include #define RSL_ALLOC_SIZE 1024 #define RSL_ALLOC_HEADROOM 128 diff --git a/src/osmo-bsc/acc_ramp.c b/src/osmo-bsc/acc_ramp.c index b79c0c2..761ab09 100644 --- a/src/osmo-bsc/acc_ramp.c +++ b/src/osmo-bsc/acc_ramp.c @@ -29,6 +29,7 @@ #include #include #include +#include /* * Check if an ACC has been permanently barred for a BTS, diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index cd5abc8..ca29daa 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -34,6 +34,7 @@ #include #include #include +#include #include diff --git a/src/osmo-bsc/bsc_ctrl_commands.c b/src/osmo-bsc/bsc_ctrl_commands.c index 774ded2..9383167 100644 --- a/src/osmo-bsc/bsc_ctrl_commands.c +++ b/src/osmo-bsc/bsc_ctrl_commands.c @@ -30,6 +30,7 @@ #include #include #include +#include CTRL_CMD_DEFINE(net_mcc, "mcc"); static int get_net_mcc(struct ctrl_cmd *cmd, void *_data) diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c index 7333533..4fc0ab1 100644 --- a/src/osmo-bsc/bsc_init.c +++ b/src/osmo-bsc/bsc_init.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -68,24 +69,6 @@ return 0; } -unsigned long long bts_uptime(const struct gsm_bts *bts) -{ - struct timespec tp; - - if (!bts->uptime || !bts->oml_link) { - LOGP(DNM, LOGL_ERROR, "BTS %u OML link uptime unavailable\n", bts->nr); - return 0; - } - - if (clock_gettime(CLOCK_MONOTONIC, &tp) != 0) { - LOGP(DNM, LOGL_ERROR, "BTS %u uptime computation failure: %s\n", bts->nr, strerror(errno)); - return 0; - } - - /* monotonic clock helps to ensure that the conversion is valid */ - return difftime(tp.tv_sec, bts->uptime); -} - static int rsl_si(struct gsm_bts_trx *trx, enum osmo_sysinfo_type i, int si_len) { struct gsm_bts *bts = trx->bts; diff --git a/src/osmo-bsc/bsc_rf_ctrl.c b/src/osmo-bsc/bsc_rf_ctrl.c index c72154a..1e04f21 100644 --- a/src/osmo-bsc/bsc_rf_ctrl.c +++ b/src/osmo-bsc/bsc_rf_ctrl.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 36b16a2..aa08e8b 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -73,6 +73,7 @@ #include #include #include +#include #include #include diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c new file mode 100644 index 0000000..9aae1d5 --- /dev/null +++ b/src/osmo-bsc/bts.c @@ -0,0 +1,736 @@ +/* (C) 2008-2018 by Harald Welte + * (C) 2020 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include + +#include +#include +#include + +const struct value_string bts_attribute_names[] = { + OSMO_VALUE_STRING(BTS_TYPE_VARIANT), + OSMO_VALUE_STRING(BTS_SUB_MODEL), + OSMO_VALUE_STRING(TRX_PHY_VERSION), + { 0, NULL } +}; + +enum bts_attribute str2btsattr(const char *s) +{ + return get_string_value(bts_attribute_names, s); +} + +const char *btsatttr2str(enum bts_attribute v) +{ + return get_value_string(bts_attribute_names, v); +} + +const struct value_string osmo_bts_variant_names[_NUM_BTS_VARIANT + 1] = { + { BTS_UNKNOWN, "unknown" }, + { BTS_OSMO_LITECELL15, "osmo-bts-lc15" }, + { BTS_OSMO_OCTPHY, "osmo-bts-octphy" }, + { BTS_OSMO_SYSMO, "osmo-bts-sysmo" }, + { BTS_OSMO_TRX, "omso-bts-trx" }, + { 0, NULL } +}; + +enum gsm_bts_type_variant str2btsvariant(const char *arg) +{ + return get_string_value(osmo_bts_variant_names, arg); +} + +const char *btsvariant2str(enum gsm_bts_type_variant v) +{ + return get_value_string(osmo_bts_variant_names, v); +} + +const struct value_string bts_type_names[_NUM_GSM_BTS_TYPE + 1] = { + { GSM_BTS_TYPE_UNKNOWN, "unknown" }, + { GSM_BTS_TYPE_BS11, "bs11" }, + { GSM_BTS_TYPE_NANOBTS, "nanobts" }, + { GSM_BTS_TYPE_RBS2000, "rbs2000" }, + { GSM_BTS_TYPE_NOKIA_SITE, "nokia_site" }, + { GSM_BTS_TYPE_OSMOBTS, "sysmobts" }, + { 0, NULL } +}; + +const struct value_string bts_type_descs[_NUM_GSM_BTS_TYPE+1] = { + { GSM_BTS_TYPE_UNKNOWN, "Unknown BTS Type" }, + { GSM_BTS_TYPE_BS11, "Siemens BTS (BS-11 or compatible)" }, + { GSM_BTS_TYPE_NANOBTS, "ip.access nanoBTS or compatible" }, + { GSM_BTS_TYPE_RBS2000, "Ericsson RBS2000 Series" }, + { GSM_BTS_TYPE_NOKIA_SITE, "Nokia {Metro,Ultra,In}Site" }, + { GSM_BTS_TYPE_OSMOBTS, "sysmocom sysmoBTS" }, + { 0, NULL } +}; + +enum gsm_bts_type str2btstype(const char *arg) +{ + return get_string_value(bts_type_names, arg); +} + +const char *btstype2str(enum gsm_bts_type type) +{ + return get_value_string(bts_type_names, type); +} + +static void bts_init_cbch_state(struct bts_smscb_chan_state *cstate, struct gsm_bts *bts) +{ + cstate->bts = bts; + INIT_LLIST_HEAD(&cstate->messages); +} + +static LLIST_HEAD(bts_models); + +struct gsm_bts_model *bts_model_find(enum gsm_bts_type type) +{ + struct gsm_bts_model *model; + + llist_for_each_entry(model, &bts_models, list) { + if (model->type == type) + return model; + } + + return NULL; +} + +int gsm_bts_model_register(struct gsm_bts_model *model) +{ + if (bts_model_find(model->type)) + return -EEXIST; + + tlv_def_patch(&model->nm_att_tlvdef, &abis_nm_att_tlvdef); + llist_add_tail(&model->list, &bts_models); + return 0; +} + +static const struct osmo_stat_item_desc bts_stat_desc[] = { + [BTS_STAT_CHAN_LOAD_AVERAGE] = { "chanloadavg", "Channel load average", "%", 16, 0 }, + [BTS_STAT_CHAN_CCCH_SDCCH4_USED] = { "chan_ccch_sdcch4:used", + "Number of CCCH+SDCCH4 channels used", "", 16, 0 }, + [BTS_STAT_CHAN_CCCH_SDCCH4_TOTAL] = { "chan_ccch_sdcch4:total", + "Number of CCCH+SDCCH4 channels total", "", 16, 0 }, + [BTS_STAT_CHAN_TCH_F_USED] = { "chan_tch_f:used", + "Number of TCH/F channels used", "", 16, 0 }, + [BTS_STAT_CHAN_TCH_F_TOTAL] = { "chan_tch_f:total", + "Number of TCH/F channels total", "", 16, 0 }, + [BTS_STAT_CHAN_TCH_H_USED] = { "chan_tch_h:used", + "Number of TCH/H channels used", "", 16, 0 }, + [BTS_STAT_CHAN_TCH_H_TOTAL] = { "chan_tch_h:total", + "Number of TCH/H channels total", "", 16, 0 }, + [BTS_STAT_CHAN_SDCCH8_USED] = { "chan_sdcch8:used", + "Number of SDCCH8 channels used", "", 16, 0 }, + [BTS_STAT_CHAN_SDCCH8_TOTAL] = { "chan_sdcch8:total", + "Number of SDCCH8 channels total", "", 16, 0 }, + [BTS_STAT_CHAN_TCH_F_PDCH_USED] = { "chan_tch_f_pdch:used", + "Number of TCH/F_PDCH channels used", "", 16, 0 }, + [BTS_STAT_CHAN_TCH_F_PDCH_TOTAL] = { "chan_tch_f_pdch:total", + "Number of TCH/F_PDCH channels total", "", 16, 0 }, + [BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_USED] = { "chan_ccch_sdcch4_cbch:used", + "Number of CCCH+SDCCH4+CBCH channels used", "", 16, 0 }, + [BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_TOTAL] = { "chan_ccch_sdcch4_cbch:total", + "Number of CCCH+SDCCH4+CBCH channels total", "", 16, 0 }, + [BTS_STAT_CHAN_SDCCH8_CBCH_USED] = { "chan_sdcch8_cbch:used", + "Number of SDCCH8+CBCH channels used", "", 16, 0 }, + [BTS_STAT_CHAN_SDCCH8_CBCH_TOTAL] = { "chan_sdcch8_cbch:total", + "Number of SDCCH8+CBCH channels total", "", 16, 0 }, + [BTS_STAT_CHAN_TCH_F_TCH_H_PDCH_USED] = { "chan_tch_f_tch_h_pdch:used", + "Number of TCH/F_TCH/H_PDCH channels used", "", 16, 0 }, + [BTS_STAT_CHAN_TCH_F_TCH_H_PDCH_TOTAL] = { "chan_tch_f_tch_h_pdch:total", + "Number of TCH/F_TCH/H_PDCH channels total", "", 16, 0 }, + [BTS_STAT_T3122] = { "T3122", "T3122 IMMEDIATE ASSIGNMENT REJECT wait indicator", + "s", 16, GSM_T3122_DEFAULT }, + [BTS_STAT_RACH_BUSY] = { "rach_busy", + "RACH slots with signal above threshold", "%", 16, 0 }, + [BTS_STAT_RACH_ACCESS] = { "rach_access", + "RACH slots with access bursts in them", "%", 16, 0 }, + [BTS_STAT_OML_CONNECTED] = { "oml_connected", "Number of OML links connected", "", 16, 0 }, + [BTS_STAT_RSL_CONNECTED] = { "rsl_connected", "Number of RSL links connected", "", 16, 0 }, + [BTS_STAT_LCHAN_BORKEN] = { "lchan_borken", + "Number of lchans in the BORKEN state", "", 16, 0 }, + [BTS_STAT_TS_BORKEN] = { "ts_borken", + "Number of timeslots in the BORKEN state", "", 16, 0 }, +}; + +static const struct osmo_stat_item_group_desc bts_statg_desc = { + .group_name_prefix = "bts", + .group_description = "base transceiver station", + .class_id = OSMO_STATS_CLASS_GLOBAL, + .num_items = ARRAY_SIZE(bts_stat_desc), + .item_desc = bts_stat_desc, +}; + +static const uint8_t bts_nse_timer_default[] = { 3, 3, 3, 3, 30, 3, 10 }; +static const uint8_t bts_cell_timer_default[] = + { 3, 3, 3, 3, 3, 10, 3, 10, 3, 10, 3 }; +static const struct gprs_rlc_cfg rlc_cfg_default = { + .parameter = { + [RLC_T3142] = 20, + [RLC_T3169] = 5, + [RLC_T3191] = 5, + [RLC_T3193] = 160, /* 10ms */ + [RLC_T3195] = 5, + [RLC_N3101] = 10, + [RLC_N3103] = 4, + [RLC_N3105] = 8, + [CV_COUNTDOWN] = 15, + [T_DL_TBF_EXT] = 250 * 10, /* ms */ + [T_UL_TBF_EXT] = 250 * 10, /* ms */ + }, + .paging = { + .repeat_time = 5 * 50, /* ms */ + .repeat_count = 3, + }, + .cs_mask = 0x1fff, + .initial_cs = 2, + .initial_mcs = 6, +}; + +/* Initialize those parts that don't require osmo-bsc specific dependencies. + * This part is shared among the thin programs in osmo-bsc/src/utils/. + * osmo-bsc requires further initialization that pulls in more dependencies (see + * bsc_bts_alloc_register()). */ +struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, uint8_t bts_num) +{ + struct gsm_bts *bts = talloc_zero(net, struct gsm_bts); + struct gsm48_multi_rate_conf mr_cfg; + int i; + + if (!bts) + return NULL; + + bts->nr = bts_num; + bts->num_trx = 0; + INIT_LLIST_HEAD(&bts->trx_list); + bts->network = net; + + bts->ms_max_power = 15; /* dBm */ + + gsm_mo_init(&bts->mo, bts, NM_OC_BTS, + bts->nr, 0xff, 0xff); + gsm_mo_init(&bts->site_mgr.mo, bts, NM_OC_SITE_MANAGER, + 0xff, 0xff, 0xff); + + for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++) { + bts->gprs.nsvc[i].bts = bts; + bts->gprs.nsvc[i].id = i; + gsm_mo_init(&bts->gprs.nsvc[i].mo, bts, NM_OC_GPRS_NSVC, + bts->nr, i, 0xff); + } + memcpy(&bts->gprs.nse.timer, bts_nse_timer_default, + sizeof(bts->gprs.nse.timer)); + gsm_mo_init(&bts->gprs.nse.mo, bts, NM_OC_GPRS_NSE, + bts->nr, 0xff, 0xff); + memcpy(&bts->gprs.cell.timer, bts_cell_timer_default, + sizeof(bts->gprs.cell.timer)); + gsm_mo_init(&bts->gprs.cell.mo, bts, NM_OC_GPRS_CELL, + bts->nr, 0xff, 0xff); + memcpy(&bts->gprs.cell.rlc_cfg, &rlc_cfg_default, + sizeof(bts->gprs.cell.rlc_cfg)); + + /* 3GPP TS 08.18, chapter 5.4.1: 0 is reserved for signalling */ + bts->gprs.cell.bvci = 2; + + /* init statistics */ + bts->bts_ctrs = rate_ctr_group_alloc(bts, &bts_ctrg_desc, bts->nr); + if (!bts->bts_ctrs) { + talloc_free(bts); + return NULL; + } + bts->bts_statg = osmo_stat_item_group_alloc(bts, &bts_statg_desc, bts->nr); + + /* create our primary TRX */ + bts->c0 = gsm_bts_trx_alloc(bts); + if (!bts->c0) { + rate_ctr_group_free(bts->bts_ctrs); + osmo_stat_item_group_free(bts->bts_statg); + talloc_free(bts); + return NULL; + } + bts->c0->ts[0].pchan_from_config = GSM_PCHAN_CCCH_SDCCH4; /* TODO: really?? */ + + bts->ccch_load_ind_thresh = 10; /* 10% of Load: Start sending CCCH LOAD IND */ + bts->rach_b_thresh = -1; + bts->rach_ldavg_slots = -1; + + bts->paging.free_chans_need = -1; + INIT_LLIST_HEAD(&bts->paging.pending_requests); + + bts->features.data = &bts->_features_data[0]; + bts->features.data_len = sizeof(bts->_features_data); + + /* si handling */ + bts->bcch_change_mark = 1; + bts->chan_load_avg = 0; + + /* timer overrides */ + bts->T3122 = 0; /* not overridden by default */ + bts->T3113_dynamic = true; /* dynamic by default */ + + bts->dtxu = GSM48_DTX_SHALL_NOT_BE_USED; + bts->dtxd = false; + bts->gprs.ctrl_ack_type_use_block = true; /* use RLC/MAC control block */ + bts->neigh_list_manual_mode = NL_MODE_AUTOMATIC; + bts->early_classmark_allowed_3g = true; /* 3g Early Classmark Sending controlled by bts->early_classmark_allowed param */ + bts->si_unused_send_empty = true; + bts->si_common.cell_sel_par.cell_resel_hyst = 2; /* 4 dB */ + bts->si_common.cell_sel_par.rxlev_acc_min = 0; + bts->si_common.si2quater_neigh_list.arfcn = bts->si_common.data.earfcn_list; + bts->si_common.si2quater_neigh_list.meas_bw = bts->si_common.data.meas_bw_list; + bts->si_common.si2quater_neigh_list.length = MAX_EARFCN_LIST; + bts->si_common.si2quater_neigh_list.thresh_hi = 0; + osmo_earfcn_init(&bts->si_common.si2quater_neigh_list); + bts->si_common.neigh_list.data = bts->si_common.data.neigh_list; + bts->si_common.neigh_list.data_len = + sizeof(bts->si_common.data.neigh_list); + bts->si_common.si5_neigh_list.data = bts->si_common.data.si5_neigh_list; + bts->si_common.si5_neigh_list.data_len = + sizeof(bts->si_common.data.si5_neigh_list); + bts->si_common.cell_alloc.data = bts->si_common.data.cell_alloc; + bts->si_common.cell_alloc.data_len = + sizeof(bts->si_common.data.cell_alloc); + bts->si_common.rach_control.re = 1; /* no re-establishment */ + bts->si_common.rach_control.tx_integer = 9; /* 12 slots spread - 217/115 slots delay */ + bts->si_common.rach_control.max_trans = 3; /* 7 retransmissions */ + bts->si_common.rach_control.t2 = 4; /* no emergency calls */ + bts->si_common.chan_desc.att = 1; /* attachment required */ + bts->si_common.chan_desc.bs_pa_mfrms = RSL_BS_PA_MFRMS_5; /* paging frames */ + bts->si_common.chan_desc.bs_ag_blks_res = 1; /* reserved AGCH blocks */ + bts->si_common.chan_desc.t3212 = osmo_tdef_get(net->T_defs, 3212, OSMO_TDEF_CUSTOM, -1); + gsm_bts_set_radio_link_timeout(bts, 32); /* Use RADIO LINK TIMEOUT of 32 */ + + INIT_LLIST_HEAD(&bts->abis_queue); + INIT_LLIST_HEAD(&bts->loc_list); + INIT_LLIST_HEAD(&bts->local_neighbors); + INIT_LLIST_HEAD(&bts->oml_fail_rep); + + /* Enable all codecs by default. These get reset to a more fine grained selection IF a + * 'codec-support' config appears in the config file (see bsc_vty.c). */ + bts->codec = (struct bts_codec_conf){ + .hr = 1, + .efr = 1, + .amr = 1, + }; + + /* Set reasonable defaults for AMR-FR and AMR-HR rate configuration. + * (see also 3GPP TS 28.062, Table 7.11.3.1.3-2) */ + mr_cfg = (struct gsm48_multi_rate_conf) { + .m4_75 = 1, + .m5_15 = 0, + .m5_90 = 1, + .m6_70 = 0, + .m7_40 = 1, + .m7_95 = 0, + .m10_2 = 0, + .m12_2 = 1 + }; + memcpy(bts->mr_full.gsm48_ie, &mr_cfg, sizeof(bts->mr_full.gsm48_ie)); + bts->mr_full.ms_mode[0].mode = 0; + bts->mr_full.ms_mode[1].mode = 2; + bts->mr_full.ms_mode[2].mode = 4; + bts->mr_full.ms_mode[3].mode = 7; + bts->mr_full.bts_mode[0].mode = 0; + bts->mr_full.bts_mode[1].mode = 2; + bts->mr_full.bts_mode[2].mode = 4; + bts->mr_full.bts_mode[3].mode = 7; + for (i = 0; i < 3; i++) { + bts->mr_full.ms_mode[i].hysteresis = 8; + bts->mr_full.ms_mode[i].threshold = 32; + bts->mr_full.bts_mode[i].hysteresis = 8; + bts->mr_full.bts_mode[i].threshold = 32; + } + bts->mr_full.num_modes = 4; + + mr_cfg = (struct gsm48_multi_rate_conf) { + .m4_75 = 1, + .m5_15 = 0, + .m5_90 = 1, + .m6_70 = 0, + .m7_40 = 1, + .m7_95 = 0, + .m10_2 = 0, + .m12_2 = 0 + }; + memcpy(bts->mr_half.gsm48_ie, &mr_cfg, sizeof(bts->mr_half.gsm48_ie)); + bts->mr_half.ms_mode[0].mode = 0; + bts->mr_half.ms_mode[1].mode = 2; + bts->mr_half.ms_mode[2].mode = 4; + bts->mr_half.ms_mode[3].mode = 7; + bts->mr_half.bts_mode[0].mode = 0; + bts->mr_half.bts_mode[1].mode = 2; + bts->mr_half.bts_mode[2].mode = 4; + bts->mr_half.bts_mode[3].mode = 7; + for (i = 0; i < 3; i++) { + bts->mr_half.ms_mode[i].hysteresis = 8; + bts->mr_half.ms_mode[i].threshold = 32; + bts->mr_half.bts_mode[i].hysteresis = 8; + bts->mr_half.bts_mode[i].threshold = 32; + } + bts->mr_half.num_modes = 3; + + bts_init_cbch_state(&bts->cbch_basic, bts); + bts_init_cbch_state(&bts->cbch_extended, bts); + + return bts; +} + +bool gsm_bts_matches_lai(const struct gsm_bts *bts, const struct osmo_location_area_id *lai) +{ + return osmo_plmn_cmp(&lai->plmn, &bts->network->plmn) == 0 + && lai->lac == bts->location_area_code; +} + +bool gsm_bts_matches_cell_id(const struct gsm_bts *bts, const struct gsm0808_cell_id *cell_id) +{ + const union gsm0808_cell_id_u *id = &cell_id->id; + if (!bts || !cell_id) + return false; + + switch (cell_id->id_discr) { + case CELL_IDENT_WHOLE_GLOBAL: + return gsm_bts_matches_lai(bts, &id->global.lai) + && id->global.cell_identity == bts->cell_identity; + case CELL_IDENT_LAC_AND_CI: + return id->lac_and_ci.lac == bts->location_area_code + && id->lac_and_ci.ci == bts->cell_identity; + case CELL_IDENT_CI: + return id->ci == bts->cell_identity; + case CELL_IDENT_NO_CELL: + return false; + case CELL_IDENT_LAI_AND_LAC: + return gsm_bts_matches_lai(bts, &id->lai_and_lac); + case CELL_IDENT_LAC: + return id->lac == bts->location_area_code; + case CELL_IDENT_BSS: + return true; + case CELL_IDENT_UTRAN_PLMN_LAC_RNC: + case CELL_IDENT_UTRAN_RNC: + case CELL_IDENT_UTRAN_LAC_RNC: + return false; + default: + OSMO_ASSERT(false); + } +} + +static struct gsm_bts_ref *gsm_bts_ref_find(const struct llist_head *list, const struct gsm_bts *bts) +{ + struct gsm_bts_ref *ref; + if (!bts) + return NULL; + llist_for_each_entry(ref, list, entry) { + if (ref->bts == bts) + return ref; + } + return NULL; +} + +/* Add a BTS reference to the local_neighbors list. + * Return 1 if added, 0 if such an entry already existed, and negative on errors. */ +int gsm_bts_local_neighbor_add(struct gsm_bts *bts, struct gsm_bts *neighbor) +{ + struct gsm_bts_ref *ref; + if (!bts || !neighbor) + return -ENOMEM; + + if (bts == neighbor) + return -EINVAL; + + /* Already got this entry? */ + ref = gsm_bts_ref_find(&bts->local_neighbors, neighbor); + if (ref) + return 0; + + ref = talloc_zero(bts, struct gsm_bts_ref); + if (!ref) + return -ENOMEM; + ref->bts = neighbor; + llist_add_tail(&ref->entry, &bts->local_neighbors); + return 1; +} + +/* Remove a BTS reference from the local_neighbors list. + * Return 1 if removed, 0 if no such entry existed, and negative on errors. */ +int gsm_bts_local_neighbor_del(struct gsm_bts *bts, const struct gsm_bts *neighbor) +{ + struct gsm_bts_ref *ref; + if (!bts || !neighbor) + return -ENOMEM; + + ref = gsm_bts_ref_find(&bts->local_neighbors, neighbor); + if (!ref) + return 0; + + llist_del(&ref->entry); + talloc_free(ref); + return 1; +} + +/* return the gsm_lchan for the CBCH (if it exists at all) */ +struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts) +{ + struct gsm_lchan *lchan = NULL; + struct gsm_bts_trx *trx = bts->c0; + + if (trx->ts[0].pchan_from_config == GSM_PCHAN_CCCH_SDCCH4_CBCH) + lchan = &trx->ts[0].lchan[2]; + else { + int i; + for (i = 0; i < 8; i++) { + if (trx->ts[i].pchan_from_config == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) { + lchan = &trx->ts[i].lchan[2]; + break; + } + } + } + + return lchan; +} + +int gsm_set_bts_type(struct gsm_bts *bts, enum gsm_bts_type type) +{ + struct gsm_bts_model *model; + + model = bts_model_find(type); + if (!model) + return -EINVAL; + + bts->type = type; + bts->model = model; + + if (model->start && !model->started) { + int ret = model->start(bts->network); + if (ret < 0) + return ret; + + model->started = true; + } + + switch (bts->type) { + case GSM_BTS_TYPE_NANOBTS: + case GSM_BTS_TYPE_OSMOBTS: + /* Set the default OML Stream ID to 0xff */ + bts->oml_tei = 0xff; + bts->c0->nominal_power = 23; + break; + case GSM_BTS_TYPE_RBS2000: + INIT_LLIST_HEAD(&bts->rbs2000.is.conn_groups); + INIT_LLIST_HEAD(&bts->rbs2000.con.conn_groups); + break; + case GSM_BTS_TYPE_BS11: + case GSM_BTS_TYPE_UNKNOWN: + case GSM_BTS_TYPE_NOKIA_SITE: + /* Set default BTS reset timer */ + bts->nokia.bts_reset_timer_cnf = 15; + case _NUM_GSM_BTS_TYPE: + break; + } + + return 0; +} + +int bts_gprs_mode_is_compat(struct gsm_bts *bts, enum bts_gprs_mode mode) +{ + if (mode != BTS_GPRS_NONE && + !osmo_bts_has_feature(&bts->model->features, BTS_FEAT_GPRS)) { + return 0; + } + if (mode == BTS_GPRS_EGPRS && + !osmo_bts_has_feature(&bts->model->features, BTS_FEAT_EGPRS)) { + return 0; + } + + return 1; +} + +struct gsm_bts_trx *gsm_bts_trx_by_nr(struct gsm_bts *bts, int nr) +{ + struct gsm_bts_trx *trx; + + llist_for_each_entry(trx, &bts->trx_list, list) { + if (trx->nr == nr) + return trx; + } + return NULL; +} + +unsigned long long bts_uptime(const struct gsm_bts *bts) +{ + struct timespec tp; + + if (!bts->uptime || !bts->oml_link) { + LOGP(DNM, LOGL_ERROR, "BTS %u OML link uptime unavailable\n", bts->nr); + return 0; + } + + if (clock_gettime(CLOCK_MONOTONIC, &tp) != 0) { + LOGP(DNM, LOGL_ERROR, "BTS %u uptime computation failure: %s\n", bts->nr, strerror(errno)); + return 0; + } + + /* monotonic clock helps to ensure that the conversion is valid */ + return difftime(tp.tv_sec, bts->uptime); +} + +char *get_model_oml_status(const struct gsm_bts *bts) +{ + if (bts->model->oml_status) + return bts->model->oml_status(bts); + + return "unknown"; +} + +/* reset the state of all MO in the BTS */ +void gsm_bts_mo_reset(struct gsm_bts *bts) +{ + struct gsm_bts_trx *trx; + unsigned int i; + + gsm_abis_mo_reset(&bts->mo); + gsm_abis_mo_reset(&bts->site_mgr.mo); + for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++) + gsm_abis_mo_reset(&bts->gprs.nsvc[i].mo); + gsm_abis_mo_reset(&bts->gprs.nse.mo); + gsm_abis_mo_reset(&bts->gprs.cell.mo); + + llist_for_each_entry(trx, &bts->trx_list, list) { + gsm_abis_mo_reset(&trx->mo); + gsm_abis_mo_reset(&trx->bb_transc.mo); + + for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + gsm_abis_mo_reset(&ts->mo); + } + } +} + +/* Assume there are only 256 possible bts */ +osmo_static_assert(sizeof(((struct gsm_bts *) 0)->nr) == 1, _bts_nr_is_256); +static void depends_calc_index_bit(int bts_nr, int *idx, int *bit) +{ + *idx = bts_nr / (8 * 4); + *bit = bts_nr % (8 * 4); +} + +void bts_depend_mark(struct gsm_bts *bts, int dep) +{ + int idx, bit; + depends_calc_index_bit(dep, &idx, &bit); + + bts->depends_on[idx] |= 1 << bit; +} + +void bts_depend_clear(struct gsm_bts *bts, int dep) +{ + int idx, bit; + depends_calc_index_bit(dep, &idx, &bit); + + bts->depends_on[idx] &= ~(1 << bit); +} + +int bts_depend_is_depedency(struct gsm_bts *base, struct gsm_bts *other) +{ + int idx, bit; + depends_calc_index_bit(other->nr, &idx, &bit); + + /* Check if there is a depends bit */ + return (base->depends_on[idx] & (1 << bit)) > 0; +} + +static int bts_is_online(struct gsm_bts *bts) +{ + /* TODO: support E1 BTS too */ + if (!is_ipaccess_bts(bts)) + return 1; + + if (!bts->oml_link) + return 0; + + return bts->mo.nm_state.operational == NM_OPSTATE_ENABLED; +} + +int bts_depend_check(struct gsm_bts *bts) +{ + struct gsm_bts *other_bts; + + llist_for_each_entry(other_bts, &bts->network->bts_list, list) { + if (!bts_depend_is_depedency(bts, other_bts)) + continue; + if (bts_is_online(other_bts)) + continue; + return 0; + } + return 1; +} + +/* get the radio link timeout (based on SACCH decode errors, according + * to algorithm specified in TS 05.08 section 5.2. A value of -1 + * indicates we should use an infinitely long timeout, which only works + * with OsmoBTS as the BTS implementation */ +int gsm_bts_get_radio_link_timeout(const struct gsm_bts *bts) +{ + const struct gsm48_cell_options *cell_options = &bts->si_common.cell_options; + + if (bts->infinite_radio_link_timeout) + return -1; + else { + /* Encoding as per Table 10.5.21 of TS 04.08 */ + return (cell_options->radio_link_timeout + 1) << 2; + } +} + +/* set the radio link timeout (based on SACCH decode errors, according + * to algorithm specified in TS 05.08 Section 5.2. A value of -1 + * indicates we should use an infinitely long timeout, which only works + * with OsmoBTS as the BTS implementation */ +void gsm_bts_set_radio_link_timeout(struct gsm_bts *bts, int value) +{ + struct gsm48_cell_options *cell_options = &bts->si_common.cell_options; + + if (value < 0) + bts->infinite_radio_link_timeout = true; + else { + bts->infinite_radio_link_timeout = false; + /* Encoding as per Table 10.5.21 of TS 04.08 */ + if (value < 4) + value = 4; + if (value > 64) + value = 64; + cell_options->radio_link_timeout = (value >> 2) - 1; + } +} + +void gsm_bts_all_ts_dispatch(struct gsm_bts *bts, uint32_t ts_ev, void *data) +{ + struct gsm_bts_trx *trx; + llist_for_each_entry(trx, &bts->trx_list, list) + gsm_trx_all_ts_dispatch(trx, ts_ev, data); +} + + +/* Count number of free TS of given pchan type */ +int bts_count_free_ts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan) +{ + struct gsm_bts_trx *trx; + int count = 0; + + llist_for_each_entry(trx, &bts->trx_list, list) + count += trx_count_free_ts(trx, pchan); + + return count; +} diff --git a/src/osmo-bsc/bts_ericsson_rbs2000.c b/src/osmo-bsc/bts_ericsson_rbs2000.c index 02ef463..1297b30 100644 --- a/src/osmo-bsc/bts_ericsson_rbs2000.c +++ b/src/osmo-bsc/bts_ericsson_rbs2000.c @@ -29,6 +29,7 @@ #include #include #include +#include #include diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index b21678b..92283ca 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -45,6 +45,7 @@ #include #include #include +#include static int bts_model_nanobts_start(struct gsm_network *net); static void bts_model_nanobts_e1line_bind_ops(struct e1inp_line *line); diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c index be823ae..b979cc7 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c @@ -23,7 +23,7 @@ #include #include #include - +#include struct msgb *nanobts_attr_bts_get(struct gsm_bts *bts) { diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c index 523c9ed..2b6f918 100644 --- a/src/osmo-bsc/bts_nokia_site.c +++ b/src/osmo-bsc/bts_nokia_site.c @@ -37,6 +37,7 @@ #include #include #include +#include #include diff --git a/src/osmo-bsc/bts_siemens_bs11.c b/src/osmo-bsc/bts_siemens_bs11.c index 057a0e1..c808421 100644 --- a/src/osmo-bsc/bts_siemens_bs11.c +++ b/src/osmo-bsc/bts_siemens_bs11.c @@ -30,6 +30,7 @@ #include #include #include +#include static int bts_model_bs11_start(struct gsm_network *net); diff --git a/src/osmo-bsc/bts_sysmobts.c b/src/osmo-bsc/bts_sysmobts.c index 6f9dc77..df43d76 100644 --- a/src/osmo-bsc/bts_sysmobts.c +++ b/src/osmo-bsc/bts_sysmobts.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include diff --git a/src/osmo-bsc/bts_unknown.c b/src/osmo-bsc/bts_unknown.c index b6b56a8..b5471ce 100644 --- a/src/osmo-bsc/bts_unknown.c +++ b/src/osmo-bsc/bts_unknown.c @@ -21,6 +21,7 @@ #include +#include #include #include diff --git a/src/osmo-bsc/cbch_scheduler.c b/src/osmo-bsc/cbch_scheduler.c index ef93b7a..8021804 100644 --- a/src/osmo-bsc/cbch_scheduler.c +++ b/src/osmo-bsc/cbch_scheduler.c @@ -28,6 +28,7 @@ #include #include #include +#include /* add all pages of given SMSCB so they appear as soon as possible *after* (included) base_idx. */ static int bts_smscb_sched_add_after(struct bts_smscb_page **sched_arr, int sched_arr_size, diff --git a/src/osmo-bsc/chan_alloc.c b/src/osmo-bsc/chan_alloc.c index 9b80df3..6829251 100644 --- a/src/osmo-bsc/chan_alloc.c +++ b/src/osmo-bsc/chan_alloc.c @@ -34,6 +34,7 @@ #include #include #include +#include #include diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index 6ec6d05..58a7867 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -27,6 +27,7 @@ #include #include #include +#include /* Determine whether a permitted speech value is specifies a half rate or full * rate codec */ diff --git a/src/osmo-bsc/e1_config.c b/src/osmo-bsc/e1_config.c index 4389f66..9ccbbfd 100644 --- a/src/osmo-bsc/e1_config.c +++ b/src/osmo-bsc/e1_config.c @@ -30,6 +30,7 @@ #include #include #include +#include #define SAPI_L2ML 0 #define SAPI_OML 62 diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index f47c31f..dc11980 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -44,6 +44,7 @@ #include #include #include +#include int gsm48_sendmsg(struct msgb *msg) diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 2829b67..d5915f4 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -36,6 +36,7 @@ #include #include +#include #define LOG_COMPL_L3(pdisc, mtype, loglevel, format, args...) \ LOGP(DRSL, loglevel, "%s %s: " format, gsm48_pdisc_name(pdisc), gsm48_pdisc_msgtype_name(pdisc, mtype), ##args) diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index f790b90..f3134ac 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -44,11 +44,10 @@ #include #include #include +#include void *tall_bsc_ctx = NULL; -static LLIST_HEAD(bts_models); - void set_ts_e1link(struct gsm_bts_trx_ts *ts, uint8_t e1_nr, uint8_t e1_ts, uint8_t e1_ts_ss) { @@ -57,49 +56,6 @@ ts->e1_link.e1_ts_ss = e1_ts_ss; } -static struct gsm_bts_model *bts_model_find(enum gsm_bts_type type) -{ - struct gsm_bts_model *model; - - llist_for_each_entry(model, &bts_models, list) { - if (model->type == type) - return model; - } - - return NULL; -} - -int gsm_bts_model_register(struct gsm_bts_model *model) -{ - if (bts_model_find(model->type)) - return -EEXIST; - - tlv_def_patch(&model->nm_att_tlvdef, &abis_nm_att_tlvdef); - llist_add_tail(&model->list, &bts_models); - return 0; -} - -const struct value_string bts_type_descs[_NUM_GSM_BTS_TYPE+1] = { - { GSM_BTS_TYPE_UNKNOWN, "Unknown BTS Type" }, - { GSM_BTS_TYPE_BS11, "Siemens BTS (BS-11 or compatible)" }, - { GSM_BTS_TYPE_NANOBTS, "ip.access nanoBTS or compatible" }, - { GSM_BTS_TYPE_RBS2000, "Ericsson RBS2000 Series" }, - { GSM_BTS_TYPE_NOKIA_SITE, "Nokia {Metro,Ultra,In}Site" }, - { GSM_BTS_TYPE_OSMOBTS, "sysmocom sysmoBTS" }, - { 0, NULL } -}; - -struct gsm_bts_trx *gsm_bts_trx_by_nr(struct gsm_bts *bts, int nr) -{ - struct gsm_bts_trx *trx; - - llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->nr == nr) - return trx; - } - return NULL; -} - /* Search for a BTS in the given Location Area; optionally start searching * with start_bts (for continuing to search after the first result) */ struct gsm_bts *gsm_bts_by_lac(struct gsm_network *net, unsigned int lac, @@ -149,62 +105,6 @@ return get_value_string(bts_gprs_mode_names, mode); } -int bts_gprs_mode_is_compat(struct gsm_bts *bts, enum bts_gprs_mode mode) -{ - if (mode != BTS_GPRS_NONE && - !osmo_bts_has_feature(&bts->model->features, BTS_FEAT_GPRS)) { - return 0; - } - if (mode == BTS_GPRS_EGPRS && - !osmo_bts_has_feature(&bts->model->features, BTS_FEAT_EGPRS)) { - return 0; - } - - return 1; -} - -int gsm_set_bts_type(struct gsm_bts *bts, enum gsm_bts_type type) -{ - struct gsm_bts_model *model; - - model = bts_model_find(type); - if (!model) - return -EINVAL; - - bts->type = type; - bts->model = model; - - if (model->start && !model->started) { - int ret = model->start(bts->network); - if (ret < 0) - return ret; - - model->started = true; - } - - switch (bts->type) { - case GSM_BTS_TYPE_NANOBTS: - case GSM_BTS_TYPE_OSMOBTS: - /* Set the default OML Stream ID to 0xff */ - bts->oml_tei = 0xff; - bts->c0->nominal_power = 23; - break; - case GSM_BTS_TYPE_RBS2000: - INIT_LLIST_HEAD(&bts->rbs2000.is.conn_groups); - INIT_LLIST_HEAD(&bts->rbs2000.con.conn_groups); - break; - case GSM_BTS_TYPE_BS11: - case GSM_BTS_TYPE_UNKNOWN: - case GSM_BTS_TYPE_NOKIA_SITE: - /* Set default BTS reset timer */ - bts->nokia.bts_reset_timer_cnf = 15; - case _NUM_GSM_BTS_TYPE: - break; - } - - return 0; -} - struct gsm_bts *gsm_bts_alloc_register(struct gsm_network *net, enum gsm_bts_type type, uint8_t bsic) { @@ -248,166 +148,14 @@ gsm48_encode_ra(buf, &raid); } -/* Assume there are only 256 possible bts */ -osmo_static_assert(sizeof(((struct gsm_bts *) 0)->nr) == 1, _bts_nr_is_256); -static void depends_calc_index_bit(int bts_nr, int *idx, int *bit) -{ - *idx = bts_nr / (8 * 4); - *bit = bts_nr % (8 * 4); -} - -void bts_depend_mark(struct gsm_bts *bts, int dep) -{ - int idx, bit; - depends_calc_index_bit(dep, &idx, &bit); - - bts->depends_on[idx] |= 1 << bit; -} - -void bts_depend_clear(struct gsm_bts *bts, int dep) -{ - int idx, bit; - depends_calc_index_bit(dep, &idx, &bit); - - bts->depends_on[idx] &= ~(1 << bit); -} - -int bts_depend_is_depedency(struct gsm_bts *base, struct gsm_bts *other) -{ - int idx, bit; - depends_calc_index_bit(other->nr, &idx, &bit); - - /* Check if there is a depends bit */ - return (base->depends_on[idx] & (1 << bit)) > 0; -} - -static int bts_is_online(struct gsm_bts *bts) -{ - /* TODO: support E1 BTS too */ - if (!is_ipaccess_bts(bts)) - return 1; - - if (!bts->oml_link) - return 0; - - return bts->mo.nm_state.operational == NM_OPSTATE_ENABLED; -} - -int bts_depend_check(struct gsm_bts *bts) -{ - struct gsm_bts *other_bts; - - llist_for_each_entry(other_bts, &bts->network->bts_list, list) { - if (!bts_depend_is_depedency(bts, other_bts)) - continue; - if (bts_is_online(other_bts)) - continue; - return 0; - } - return 1; -} - -/* get the radio link timeout (based on SACCH decode errors, according - * to algorithm specified in TS 05.08 section 5.2. A value of -1 - * indicates we should use an infinitely long timeout, which only works - * with OsmoBTS as the BTS implementation */ -int gsm_bts_get_radio_link_timeout(const struct gsm_bts *bts) -{ - const struct gsm48_cell_options *cell_options = &bts->si_common.cell_options; - - if (bts->infinite_radio_link_timeout) - return -1; - else { - /* Encoding as per Table 10.5.21 of TS 04.08 */ - return (cell_options->radio_link_timeout + 1) << 2; - } -} - -/* set the radio link timeout (based on SACCH decode errors, according - * to algorithm specified in TS 05.08 Section 5.2. A value of -1 - * indicates we should use an infinitely long timeout, which only works - * with OsmoBTS as the BTS implementation */ -void gsm_bts_set_radio_link_timeout(struct gsm_bts *bts, int value) -{ - struct gsm48_cell_options *cell_options = &bts->si_common.cell_options; - - if (value < 0) - bts->infinite_radio_link_timeout = true; - else { - bts->infinite_radio_link_timeout = false; - /* Encoding as per Table 10.5.21 of TS 04.08 */ - if (value < 4) - value = 4; - if (value > 64) - value = 64; - cell_options->radio_link_timeout = (value >> 2) - 1; - } -} - -static const struct osmo_stat_item_desc bts_stat_desc[] = { - [BTS_STAT_CHAN_LOAD_AVERAGE] = { "chanloadavg", "Channel load average", "%", 16, 0 }, - [BTS_STAT_CHAN_CCCH_SDCCH4_USED] = { "chan_ccch_sdcch4:used", - "Number of CCCH+SDCCH4 channels used", "", 16, 0 }, - [BTS_STAT_CHAN_CCCH_SDCCH4_TOTAL] = { "chan_ccch_sdcch4:total", - "Number of CCCH+SDCCH4 channels total", "", 16, 0 }, - [BTS_STAT_CHAN_TCH_F_USED] = { "chan_tch_f:used", - "Number of TCH/F channels used", "", 16, 0 }, - [BTS_STAT_CHAN_TCH_F_TOTAL] = { "chan_tch_f:total", - "Number of TCH/F channels total", "", 16, 0 }, - [BTS_STAT_CHAN_TCH_H_USED] = { "chan_tch_h:used", - "Number of TCH/H channels used", "", 16, 0 }, - [BTS_STAT_CHAN_TCH_H_TOTAL] = { "chan_tch_h:total", - "Number of TCH/H channels total", "", 16, 0 }, - [BTS_STAT_CHAN_SDCCH8_USED] = { "chan_sdcch8:used", - "Number of SDCCH8 channels used", "", 16, 0 }, - [BTS_STAT_CHAN_SDCCH8_TOTAL] = { "chan_sdcch8:total", - "Number of SDCCH8 channels total", "", 16, 0 }, - [BTS_STAT_CHAN_TCH_F_PDCH_USED] = { "chan_tch_f_pdch:used", - "Number of TCH/F_PDCH channels used", "", 16, 0 }, - [BTS_STAT_CHAN_TCH_F_PDCH_TOTAL] = { "chan_tch_f_pdch:total", - "Number of TCH/F_PDCH channels total", "", 16, 0 }, - [BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_USED] = { "chan_ccch_sdcch4_cbch:used", - "Number of CCCH+SDCCH4+CBCH channels used", "", 16, 0 }, - [BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_TOTAL] = { "chan_ccch_sdcch4_cbch:total", - "Number of CCCH+SDCCH4+CBCH channels total", "", 16, 0 }, - [BTS_STAT_CHAN_SDCCH8_CBCH_USED] = { "chan_sdcch8_cbch:used", - "Number of SDCCH8+CBCH channels used", "", 16, 0 }, - [BTS_STAT_CHAN_SDCCH8_CBCH_TOTAL] = { "chan_sdcch8_cbch:total", - "Number of SDCCH8+CBCH channels total", "", 16, 0 }, - [BTS_STAT_CHAN_TCH_F_TCH_H_PDCH_USED] = { "chan_tch_f_tch_h_pdch:used", - "Number of TCH/F_TCH/H_PDCH channels used", "", 16, 0 }, - [BTS_STAT_CHAN_TCH_F_TCH_H_PDCH_TOTAL] = { "chan_tch_f_tch_h_pdch:total", - "Number of TCH/F_TCH/H_PDCH channels total", "", 16, 0 }, - [BTS_STAT_T3122] = { "T3122", "T3122 IMMEDIATE ASSIGNMENT REJECT wait indicator", - "s", 16, GSM_T3122_DEFAULT }, - [BTS_STAT_RACH_BUSY] = { "rach_busy", - "RACH slots with signal above threshold", "%", 16, 0 }, - [BTS_STAT_RACH_ACCESS] = { "rach_access", - "RACH slots with access bursts in them", "%", 16, 0 }, - [BTS_STAT_OML_CONNECTED] = { "oml_connected", "Number of OML links connected", "", 16, 0 }, - [BTS_STAT_RSL_CONNECTED] = { "rsl_connected", "Number of RSL links connected", "", 16, 0 }, - [BTS_STAT_LCHAN_BORKEN] = { "lchan_borken", - "Number of lchans in the BORKEN state", "", 16, 0 }, - [BTS_STAT_TS_BORKEN] = { "ts_borken", - "Number of timeslots in the BORKEN state", "", 16, 0 }, -}; - -static const struct osmo_stat_item_group_desc bts_statg_desc = { - .group_name_prefix = "bts", - .group_description = "base transceiver station", - .class_id = OSMO_STATS_CLASS_GLOBAL, - .num_items = ARRAY_SIZE(bts_stat_desc), - .item_desc = bts_stat_desc, -}; - void gsm_abis_mo_reset(struct gsm_abis_mo *mo) { mo->nm_state.operational = NM_OPSTATE_NULL; mo->nm_state.availability = NM_AVSTATE_POWER_OFF; } -static void gsm_mo_init(struct gsm_abis_mo *mo, struct gsm_bts *bts, - uint8_t obj_class, uint8_t p1, uint8_t p2, uint8_t p3) +void gsm_mo_init(struct gsm_abis_mo *mo, struct gsm_bts *bts, + uint8_t obj_class, uint8_t p1, uint8_t p2, uint8_t p3) { mo->bts = bts; mo->obj_class = obj_class; @@ -417,62 +165,6 @@ gsm_abis_mo_reset(mo); } -const struct value_string bts_attribute_names[] = { - OSMO_VALUE_STRING(BTS_TYPE_VARIANT), - OSMO_VALUE_STRING(BTS_SUB_MODEL), - OSMO_VALUE_STRING(TRX_PHY_VERSION), - { 0, NULL } -}; - -enum bts_attribute str2btsattr(const char *s) -{ - return get_string_value(bts_attribute_names, s); -} - -const char *btsatttr2str(enum bts_attribute v) -{ - return get_value_string(bts_attribute_names, v); -} - -const struct value_string osmo_bts_variant_names[_NUM_BTS_VARIANT + 1] = { - { BTS_UNKNOWN, "unknown" }, - { BTS_OSMO_LITECELL15, "osmo-bts-lc15" }, - { BTS_OSMO_OCTPHY, "osmo-bts-octphy" }, - { BTS_OSMO_SYSMO, "osmo-bts-sysmo" }, - { BTS_OSMO_TRX, "omso-bts-trx" }, - { 0, NULL } -}; - -enum gsm_bts_type_variant str2btsvariant(const char *arg) -{ - return get_string_value(osmo_bts_variant_names, arg); -} - -const char *btsvariant2str(enum gsm_bts_type_variant v) -{ - return get_value_string(osmo_bts_variant_names, v); -} - -const struct value_string bts_type_names[_NUM_GSM_BTS_TYPE + 1] = { - { GSM_BTS_TYPE_UNKNOWN, "unknown" }, - { GSM_BTS_TYPE_BS11, "bs11" }, - { GSM_BTS_TYPE_NANOBTS, "nanobts" }, - { GSM_BTS_TYPE_RBS2000, "rbs2000" }, - { GSM_BTS_TYPE_NOKIA_SITE, "nokia_site" }, - { GSM_BTS_TYPE_OSMOBTS, "sysmobts" }, - { 0, NULL } -}; - -enum gsm_bts_type str2btstype(const char *arg) -{ - return get_string_value(bts_type_names, arg); -} - -const char *btstype2str(enum gsm_bts_type type) -{ - return get_value_string(bts_type_names, type); -} - const struct value_string gsm_chreq_descs[] = { { GSM_CHREQ_REASON_EMERG, "emergency call" }, { GSM_CHREQ_REASON_PAG, "answer to paging" }, @@ -577,44 +269,6 @@ return NULL; } -bool gsm_bts_matches_lai(const struct gsm_bts *bts, const struct osmo_location_area_id *lai) -{ - return osmo_plmn_cmp(&lai->plmn, &bts->network->plmn) == 0 - && lai->lac == bts->location_area_code; -} - -bool gsm_bts_matches_cell_id(const struct gsm_bts *bts, const struct gsm0808_cell_id *cell_id) -{ - const union gsm0808_cell_id_u *id = &cell_id->id; - if (!bts || !cell_id) - return false; - - switch (cell_id->id_discr) { - case CELL_IDENT_WHOLE_GLOBAL: - return gsm_bts_matches_lai(bts, &id->global.lai) - && id->global.cell_identity == bts->cell_identity; - case CELL_IDENT_LAC_AND_CI: - return id->lac_and_ci.lac == bts->location_area_code - && id->lac_and_ci.ci == bts->cell_identity; - case CELL_IDENT_CI: - return id->ci == bts->cell_identity; - case CELL_IDENT_NO_CELL: - return false; - case CELL_IDENT_LAI_AND_LAC: - return gsm_bts_matches_lai(bts, &id->lai_and_lac); - case CELL_IDENT_LAC: - return id->lac == bts->location_area_code; - case CELL_IDENT_BSS: - return true; - case CELL_IDENT_UTRAN_PLMN_LAC_RNC: - case CELL_IDENT_UTRAN_RNC: - case CELL_IDENT_UTRAN_LAC_RNC: - return false; - default: - OSMO_ASSERT(false); - } -} - /* From a list of local BTSes that match the cell_id, return the Nth one, or NULL if there is no such * match. */ struct gsm_bts *gsm_bts_by_cell_id(const struct gsm_network *net, @@ -636,59 +290,6 @@ return NULL; } -struct gsm_bts_ref *gsm_bts_ref_find(const struct llist_head *list, const struct gsm_bts *bts) -{ - struct gsm_bts_ref *ref; - if (!bts) - return NULL; - llist_for_each_entry(ref, list, entry) { - if (ref->bts == bts) - return ref; - } - return NULL; -} - -/* Add a BTS reference to the local_neighbors list. - * Return 1 if added, 0 if such an entry already existed, and negative on errors. */ -int gsm_bts_local_neighbor_add(struct gsm_bts *bts, struct gsm_bts *neighbor) -{ - struct gsm_bts_ref *ref; - if (!bts || !neighbor) - return -ENOMEM; - - if (bts == neighbor) - return -EINVAL; - - /* Already got this entry? */ - ref = gsm_bts_ref_find(&bts->local_neighbors, neighbor); - if (ref) - return 0; - - ref = talloc_zero(bts, struct gsm_bts_ref); - if (!ref) - return -ENOMEM; - ref->bts = neighbor; - llist_add_tail(&ref->entry, &bts->local_neighbors); - return 1; -} - -/* Remove a BTS reference from the local_neighbors list. - * Return 1 if removed, 0 if no such entry existed, and negative on errors. */ -int gsm_bts_local_neighbor_del(struct gsm_bts *bts, const struct gsm_bts *neighbor) -{ - struct gsm_bts_ref *ref; - if (!bts || !neighbor) - return -ENOMEM; - - ref = gsm_bts_ref_find(&bts->local_neighbors, neighbor); - if (!ref) - return 0; - - llist_del(&ref->entry); - talloc_free(ref); - return 1; -} - struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts) { struct gsm_bts_trx *trx = talloc_zero(bts, struct gsm_bts_trx); @@ -748,251 +349,6 @@ return trx; } - -static const uint8_t bts_nse_timer_default[] = { 3, 3, 3, 3, 30, 3, 10 }; -static const uint8_t bts_cell_timer_default[] = - { 3, 3, 3, 3, 3, 10, 3, 10, 3, 10, 3 }; -static const struct gprs_rlc_cfg rlc_cfg_default = { - .parameter = { - [RLC_T3142] = 20, - [RLC_T3169] = 5, - [RLC_T3191] = 5, - [RLC_T3193] = 160, /* 10ms */ - [RLC_T3195] = 5, - [RLC_N3101] = 10, - [RLC_N3103] = 4, - [RLC_N3105] = 8, - [CV_COUNTDOWN] = 15, - [T_DL_TBF_EXT] = 250 * 10, /* ms */ - [T_UL_TBF_EXT] = 250 * 10, /* ms */ - }, - .paging = { - .repeat_time = 5 * 50, /* ms */ - .repeat_count = 3, - }, - .cs_mask = 0x1fff, - .initial_cs = 2, - .initial_mcs = 6, -}; - -static void bts_init_cbch_state(struct bts_smscb_chan_state *cstate, struct gsm_bts *bts) -{ - cstate->bts = bts; - INIT_LLIST_HEAD(&cstate->messages); -} - -/* Initialize those parts that don't require osmo-bsc specific dependencies. - * This part is shared among the thin programs in osmo-bsc/src/utils/. - * osmo-bsc requires further initialization that pulls in more dependencies (see - * bsc_bts_alloc_register()). */ -struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, uint8_t bts_num) -{ - struct gsm_bts *bts = talloc_zero(net, struct gsm_bts); - struct gsm48_multi_rate_conf mr_cfg; - int i; - - if (!bts) - return NULL; - - bts->nr = bts_num; - bts->num_trx = 0; - INIT_LLIST_HEAD(&bts->trx_list); - bts->network = net; - - bts->ms_max_power = 15; /* dBm */ - - gsm_mo_init(&bts->mo, bts, NM_OC_BTS, - bts->nr, 0xff, 0xff); - gsm_mo_init(&bts->site_mgr.mo, bts, NM_OC_SITE_MANAGER, - 0xff, 0xff, 0xff); - - for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++) { - bts->gprs.nsvc[i].bts = bts; - bts->gprs.nsvc[i].id = i; - gsm_mo_init(&bts->gprs.nsvc[i].mo, bts, NM_OC_GPRS_NSVC, - bts->nr, i, 0xff); - } - memcpy(&bts->gprs.nse.timer, bts_nse_timer_default, - sizeof(bts->gprs.nse.timer)); - gsm_mo_init(&bts->gprs.nse.mo, bts, NM_OC_GPRS_NSE, - bts->nr, 0xff, 0xff); - memcpy(&bts->gprs.cell.timer, bts_cell_timer_default, - sizeof(bts->gprs.cell.timer)); - gsm_mo_init(&bts->gprs.cell.mo, bts, NM_OC_GPRS_CELL, - bts->nr, 0xff, 0xff); - memcpy(&bts->gprs.cell.rlc_cfg, &rlc_cfg_default, - sizeof(bts->gprs.cell.rlc_cfg)); - - /* 3GPP TS 08.18, chapter 5.4.1: 0 is reserved for signalling */ - bts->gprs.cell.bvci = 2; - - /* init statistics */ - bts->bts_ctrs = rate_ctr_group_alloc(bts, &bts_ctrg_desc, bts->nr); - if (!bts->bts_ctrs) { - talloc_free(bts); - return NULL; - } - bts->bts_statg = osmo_stat_item_group_alloc(bts, &bts_statg_desc, bts->nr); - - /* create our primary TRX */ - bts->c0 = gsm_bts_trx_alloc(bts); - if (!bts->c0) { - rate_ctr_group_free(bts->bts_ctrs); - osmo_stat_item_group_free(bts->bts_statg); - talloc_free(bts); - return NULL; - } - bts->c0->ts[0].pchan_from_config = GSM_PCHAN_CCCH_SDCCH4; /* TODO: really?? */ - - bts->ccch_load_ind_thresh = 10; /* 10% of Load: Start sending CCCH LOAD IND */ - bts->rach_b_thresh = -1; - bts->rach_ldavg_slots = -1; - - bts->paging.free_chans_need = -1; - INIT_LLIST_HEAD(&bts->paging.pending_requests); - - bts->features.data = &bts->_features_data[0]; - bts->features.data_len = sizeof(bts->_features_data); - - /* si handling */ - bts->bcch_change_mark = 1; - bts->chan_load_avg = 0; - - /* timer overrides */ - bts->T3122 = 0; /* not overridden by default */ - bts->T3113_dynamic = true; /* dynamic by default */ - - bts->dtxu = GSM48_DTX_SHALL_NOT_BE_USED; - bts->dtxd = false; - bts->gprs.ctrl_ack_type_use_block = true; /* use RLC/MAC control block */ - bts->neigh_list_manual_mode = NL_MODE_AUTOMATIC; - bts->early_classmark_allowed_3g = true; /* 3g Early Classmark Sending controlled by bts->early_classmark_allowed param */ - bts->si_unused_send_empty = true; - bts->si_common.cell_sel_par.cell_resel_hyst = 2; /* 4 dB */ - bts->si_common.cell_sel_par.rxlev_acc_min = 0; - bts->si_common.si2quater_neigh_list.arfcn = bts->si_common.data.earfcn_list; - bts->si_common.si2quater_neigh_list.meas_bw = bts->si_common.data.meas_bw_list; - bts->si_common.si2quater_neigh_list.length = MAX_EARFCN_LIST; - bts->si_common.si2quater_neigh_list.thresh_hi = 0; - osmo_earfcn_init(&bts->si_common.si2quater_neigh_list); - bts->si_common.neigh_list.data = bts->si_common.data.neigh_list; - bts->si_common.neigh_list.data_len = - sizeof(bts->si_common.data.neigh_list); - bts->si_common.si5_neigh_list.data = bts->si_common.data.si5_neigh_list; - bts->si_common.si5_neigh_list.data_len = - sizeof(bts->si_common.data.si5_neigh_list); - bts->si_common.cell_alloc.data = bts->si_common.data.cell_alloc; - bts->si_common.cell_alloc.data_len = - sizeof(bts->si_common.data.cell_alloc); - bts->si_common.rach_control.re = 1; /* no re-establishment */ - bts->si_common.rach_control.tx_integer = 9; /* 12 slots spread - 217/115 slots delay */ - bts->si_common.rach_control.max_trans = 3; /* 7 retransmissions */ - bts->si_common.rach_control.t2 = 4; /* no emergency calls */ - bts->si_common.chan_desc.att = 1; /* attachment required */ - bts->si_common.chan_desc.bs_pa_mfrms = RSL_BS_PA_MFRMS_5; /* paging frames */ - bts->si_common.chan_desc.bs_ag_blks_res = 1; /* reserved AGCH blocks */ - bts->si_common.chan_desc.t3212 = osmo_tdef_get(net->T_defs, 3212, OSMO_TDEF_CUSTOM, -1); - gsm_bts_set_radio_link_timeout(bts, 32); /* Use RADIO LINK TIMEOUT of 32 */ - - INIT_LLIST_HEAD(&bts->abis_queue); - INIT_LLIST_HEAD(&bts->loc_list); - INIT_LLIST_HEAD(&bts->local_neighbors); - INIT_LLIST_HEAD(&bts->oml_fail_rep); - - /* Enable all codecs by default. These get reset to a more fine grained selection IF a - * 'codec-support' config appears in the config file (see bsc_vty.c). */ - bts->codec = (struct bts_codec_conf){ - .hr = 1, - .efr = 1, - .amr = 1, - }; - - /* Set reasonable defaults for AMR-FR and AMR-HR rate configuration. - * (see also 3GPP TS 28.062, Table 7.11.3.1.3-2) */ - mr_cfg = (struct gsm48_multi_rate_conf) { - .m4_75 = 1, - .m5_15 = 0, - .m5_90 = 1, - .m6_70 = 0, - .m7_40 = 1, - .m7_95 = 0, - .m10_2 = 0, - .m12_2 = 1 - }; - memcpy(bts->mr_full.gsm48_ie, &mr_cfg, sizeof(bts->mr_full.gsm48_ie)); - bts->mr_full.ms_mode[0].mode = 0; - bts->mr_full.ms_mode[1].mode = 2; - bts->mr_full.ms_mode[2].mode = 4; - bts->mr_full.ms_mode[3].mode = 7; - bts->mr_full.bts_mode[0].mode = 0; - bts->mr_full.bts_mode[1].mode = 2; - bts->mr_full.bts_mode[2].mode = 4; - bts->mr_full.bts_mode[3].mode = 7; - for (i = 0; i < 3; i++) { - bts->mr_full.ms_mode[i].hysteresis = 8; - bts->mr_full.ms_mode[i].threshold = 32; - bts->mr_full.bts_mode[i].hysteresis = 8; - bts->mr_full.bts_mode[i].threshold = 32; - } - bts->mr_full.num_modes = 4; - - mr_cfg = (struct gsm48_multi_rate_conf) { - .m4_75 = 1, - .m5_15 = 0, - .m5_90 = 1, - .m6_70 = 0, - .m7_40 = 1, - .m7_95 = 0, - .m10_2 = 0, - .m12_2 = 0 - }; - memcpy(bts->mr_half.gsm48_ie, &mr_cfg, sizeof(bts->mr_half.gsm48_ie)); - bts->mr_half.ms_mode[0].mode = 0; - bts->mr_half.ms_mode[1].mode = 2; - bts->mr_half.ms_mode[2].mode = 4; - bts->mr_half.ms_mode[3].mode = 7; - bts->mr_half.bts_mode[0].mode = 0; - bts->mr_half.bts_mode[1].mode = 2; - bts->mr_half.bts_mode[2].mode = 4; - bts->mr_half.bts_mode[3].mode = 7; - for (i = 0; i < 3; i++) { - bts->mr_half.ms_mode[i].hysteresis = 8; - bts->mr_half.ms_mode[i].threshold = 32; - bts->mr_half.bts_mode[i].hysteresis = 8; - bts->mr_half.bts_mode[i].threshold = 32; - } - bts->mr_half.num_modes = 3; - - bts_init_cbch_state(&bts->cbch_basic, bts); - bts_init_cbch_state(&bts->cbch_extended, bts); - - return bts; -} - -/* reset the state of all MO in the BTS */ -void gsm_bts_mo_reset(struct gsm_bts *bts) -{ - struct gsm_bts_trx *trx; - unsigned int i; - - gsm_abis_mo_reset(&bts->mo); - gsm_abis_mo_reset(&bts->site_mgr.mo); - for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++) - gsm_abis_mo_reset(&bts->gprs.nsvc[i].mo); - gsm_abis_mo_reset(&bts->gprs.nse.mo); - gsm_abis_mo_reset(&bts->gprs.cell.mo); - - llist_for_each_entry(trx, &bts->trx_list, list) { - gsm_abis_mo_reset(&trx->mo); - gsm_abis_mo_reset(&trx->bb_transc.mo); - - for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { - struct gsm_bts_trx_ts *ts = &trx->ts[i]; - gsm_abis_mo_reset(&ts->mo); - } - } -} - struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num) { struct gsm_bts_trx *trx; @@ -1289,27 +645,6 @@ return gsm_pchan2chan_nr(lchan->ts->pchan_is, lchan->ts->nr, lchan->nr); } -/* return the gsm_lchan for the CBCH (if it exists at all) */ -struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts) -{ - struct gsm_lchan *lchan = NULL; - struct gsm_bts_trx *trx = bts->c0; - - if (trx->ts[0].pchan_from_config == GSM_PCHAN_CCCH_SDCCH4_CBCH) - lchan = &trx->ts[0].lchan[2]; - else { - int i; - for (i = 0; i < 8; i++) { - if (trx->ts[i].pchan_from_config == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) { - lchan = &trx->ts[i].lchan[2]; - break; - } - } - } - - return lchan; -} - /* determine logical channel based on TRX and channel number IE */ struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr, int *rc) @@ -1392,6 +727,12 @@ return pchan_is_tch(ts->pchan_is); } +struct gsm_bts *conn_get_bts(struct gsm_subscriber_connection *conn) { + if (!conn || !conn->lchan) + return NULL; + return conn->lchan->ts->trx->bts; +} + bool trx_is_usable(const struct gsm_bts_trx *trx) { /* FIXME: How does this behave for BS-11 ? */ @@ -1417,13 +758,6 @@ } } -void gsm_bts_all_ts_dispatch(struct gsm_bts *bts, uint32_t ts_ev, void *data) -{ - struct gsm_bts_trx *trx; - llist_for_each_entry(trx, &bts->trx_list, list) - gsm_trx_all_ts_dispatch(trx, ts_ev, data); -} - static void _chan_desc_fill_tail(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan) { if (!lchan->ts->hopping.enabled) { @@ -1458,6 +792,14 @@ _chan_desc_fill_tail(cd, lchan); } +uint8_t gsm_ts_tsc(const struct gsm_bts_trx_ts *ts) +{ + if (ts->tsc != -1) + return ts->tsc; + else + return ts->trx->bts->bsic & 7; +} + bool nm_is_running(const struct gsm_nm_state *s) { if (s->operational != NM_OPSTATE_ENABLED) return false; @@ -1633,7 +975,7 @@ } } -static int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan) +int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan) { struct gsm_bts_trx_ts *ts; struct gsm_lchan *lchan; @@ -1681,18 +1023,6 @@ return count; } -/* Count number of free TS of given pchan type */ -int bts_count_free_ts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan) -{ - struct gsm_bts_trx *trx; - int count = 0; - - llist_for_each_entry(trx, &bts->trx_list, list) - count += trx_count_free_ts(trx, pchan); - - return count; -} - bool ts_is_usable(const struct gsm_bts_trx_ts *ts) { if (!trx_is_usable(ts->trx)) { diff --git a/src/osmo-bsc/handover_decision.c b/src/osmo-bsc/handover_decision.c index 5338400..7eb8f31 100644 --- a/src/osmo-bsc/handover_decision.c +++ b/src/osmo-bsc/handover_decision.c @@ -34,6 +34,7 @@ #include #include +#include /* did we get a RXLEV for a given cell in the given report? */ static int rxlev_for_cell_in_rep(struct gsm_meas_rep *mr, diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index ab507e8..8caa2e3 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -37,6 +37,7 @@ #include #include #include +#include #define LOGPHOBTS(bts, level, fmt, args...) \ LOGP(DHODEC, level, "(BTS %u) " fmt, bts->nr, ## args) diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 0b88b27..8ed5945 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -43,6 +43,7 @@ #include #include #include +#include #define LOG_FMT_BTS "bts %u lac-ci %u-%u arfcn-bsic %d-%d" #define LOG_ARGS_BTS(bts) \ diff --git a/src/osmo-bsc/handover_logic.c b/src/osmo-bsc/handover_logic.c index 5be8383..071228e 100644 --- a/src/osmo-bsc/handover_logic.c +++ b/src/osmo-bsc/handover_logic.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include diff --git a/src/osmo-bsc/handover_vty.c b/src/osmo-bsc/handover_vty.c index a418aa7..81313e2 100644 --- a/src/osmo-bsc/handover_vty.c +++ b/src/osmo-bsc/handover_vty.c @@ -27,6 +27,7 @@ #include #include #include +#include static struct handover_cfg *ho_cfg_from_vty(struct vty *vty) { diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 68eef4b..627ab93 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -39,7 +39,7 @@ #include #include #include - +#include static struct osmo_fsm lchan_fsm; diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 4be9790..2def2f5 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -30,6 +30,7 @@ #include #include #include +#include static struct osmo_fsm lchan_rtp_fsm; diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c index d63db22..d2dba1b 100644 --- a/src/osmo-bsc/lchan_select.c +++ b/src/osmo-bsc/lchan_select.c @@ -28,6 +28,7 @@ #include #include +#include static struct gsm_lchan * _lc_find_trx(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan, diff --git a/src/osmo-bsc/meas_feed.c b/src/osmo-bsc/meas_feed.c index f9a3626..889f6ef 100644 --- a/src/osmo-bsc/meas_feed.c +++ b/src/osmo-bsc/meas_feed.c @@ -19,6 +19,7 @@ #include #include #include +#include struct meas_feed_state { struct osmo_wqueue wqueue; diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index 54d6944..7feed2a 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -30,6 +30,7 @@ #include #include #include +#include static struct gsm_network *g_net = NULL; static struct neighbor_ident_list *g_neighbor_cells = NULL; diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 2deb7f4..f383c2f 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include diff --git a/src/osmo-bsc/osmo_bsc_ctrl.c b/src/osmo-bsc/osmo_bsc_ctrl.c index b94a749..5ebe597 100644 --- a/src/osmo-bsc/osmo_bsc_ctrl.c +++ b/src/osmo-bsc/osmo_bsc_ctrl.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include diff --git a/src/osmo-bsc/osmo_bsc_filter.c b/src/osmo-bsc/osmo_bsc_filter.c index 08c3a50..f664231 100644 --- a/src/osmo-bsc/osmo_bsc_filter.c +++ b/src/osmo-bsc/osmo_bsc_filter.c @@ -26,6 +26,7 @@ #include #include #include +#include #include diff --git a/src/osmo-bsc/osmo_bsc_grace.c b/src/osmo-bsc/osmo_bsc_grace.c index 56edee5..a26a716 100644 --- a/src/osmo-bsc/osmo_bsc_grace.c +++ b/src/osmo-bsc/osmo_bsc_grace.c @@ -25,6 +25,7 @@ #include #include #include +#include int bsc_grace_allow_new_connection(struct gsm_network *network, struct gsm_bts *bts) { diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index ada6047..84b44f7 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -64,6 +64,7 @@ #include #include #include +#include #include diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index f2a1e5b..5e02b4a 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index afc6c8d..de4be26 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -34,6 +34,7 @@ #include #include #include +#include #include /* A pointer to a list with all involved MSCs diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 7859c69..521598f 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -53,6 +53,7 @@ #include #include #include +#include void *tall_paging_ctx = NULL; diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 3e0b7bf..ae4ac8a 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -44,6 +44,7 @@ #include #include #include +#include static int pcu_sock_send(struct gsm_bts *bts, struct msgb *msg); uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx); diff --git a/src/osmo-bsc/rest_octets.c b/src/osmo-bsc/rest_octets.c index 0d806f3..7307cb8 100644 --- a/src/osmo-bsc/rest_octets.c +++ b/src/osmo-bsc/rest_octets.c @@ -33,6 +33,7 @@ #include #include #include +#include /* generate SI1 rest octets */ int rest_octets_si1(uint8_t *data, uint8_t *nch_pos, int is1800_net) diff --git a/src/osmo-bsc/smscb.c b/src/osmo-bsc/smscb.c index 8d48af9..436826a 100644 --- a/src/osmo-bsc/smscb.c +++ b/src/osmo-bsc/smscb.c @@ -41,6 +41,7 @@ #include #include #include +#include /********************************************************************************* * Helper Functions diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index b17a909..13d0f46 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -41,6 +41,7 @@ #include #include #include +#include struct gsm0808_cell_id_list2; diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 4816daf..0aecfae 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -28,6 +28,7 @@ #include #include #include +#include static struct osmo_fsm ts_fsm; diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index e585e0d..6696679 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -48,6 +48,7 @@ bs11_config_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_siemens_bs11.o \ $(top_builddir)/src/osmo-bsc/e1_config.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ @@ -117,6 +118,7 @@ $(NULL) meas_json_LDADD = \ + $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/src/utils/bs11_config.c b/src/utils/bs11_config.c index 1156233..c43c008 100644 --- a/src/utils/bs11_config.c +++ b/src/utils/bs11_config.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am index 60054d9..a01f56a 100644 --- a/tests/abis/Makefile.am +++ b/tests/abis/Makefile.am @@ -26,6 +26,7 @@ abis_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(top_builddir)/src/osmo-bsc/net_init.o \ $(LIBOSMOCORE_LIBS) \ diff --git a/tests/abis/abis_test.c b/tests/abis/abis_test.c index 43934f3..767a9fb 100644 --- a/tests/abis/abis_test.c +++ b/tests/abis/abis_test.c @@ -26,6 +26,7 @@ #include #include +#include #include #include diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am index b301f9e..7ea002e 100644 --- a/tests/bsc/Makefile.am +++ b/tests/bsc/Makefile.am @@ -37,6 +37,7 @@ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ $(top_builddir)/src/osmo-bsc/osmo_bsc_filter.o \ $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \ + $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(top_builddir)/src/osmo-bsc/handover_cfg.o \ $(top_builddir)/src/osmo-bsc/handover_logic.o \ diff --git a/tests/codec_pref/codec_pref_test.c b/tests/codec_pref/codec_pref_test.c index f163f35..5f4c831 100644 --- a/tests/codec_pref/codec_pref_test.c +++ b/tests/codec_pref/codec_pref_test.c @@ -20,6 +20,7 @@ */ #include +#include #include #include #include diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am index aff7c7d..21b7873 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -25,6 +25,7 @@ gsm0408_test_LDADD = \ $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ + $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(top_builddir)/src/osmo-bsc/net_init.o \ $(top_builddir)/src/osmo-bsc/rest_octets.o \ diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 5ff9491..b3e8b11 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am index 736b444..571b7a9 100644 --- a/tests/handover/Makefile.am +++ b/tests/handover/Makefile.am @@ -57,6 +57,7 @@ $(top_builddir)/src/osmo-bsc/bsc_subscr_conn_fsm.o \ $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \ $(top_builddir)/src/osmo-bsc/bsc_vty.o \ + $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ $(top_builddir)/src/osmo-bsc/bts_unknown.o \ diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 1a756cd..edc3219 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -47,6 +47,7 @@ #include #include #include +#include void *ctx; diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am index aa7045e..93fdbe8 100644 --- a/tests/nanobts_omlattr/Makefile.am +++ b/tests/nanobts_omlattr/Makefile.am @@ -25,6 +25,7 @@ nanobts_omlattr_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ + $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c index a3ba8e0..4180f4a 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.c +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I00c15f5285b5c1a0109279b7ab192d5467a04ece Gerrit-Change-Number: 19287 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:08:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 19:08:23 +0000 Subject: Change in osmo-bsc[master]: Move struct gsm_bts: gsm_data.* => bts.* In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19287 ) Change subject: Move struct gsm_bts: gsm_data.* => bts.* ...................................................................... Patch Set 1: So I was starting to add new ACC barring/ramping code and I already run into hell when moving some bits from another file into gsm_bts_alloc() which is inside gsm_data.c and then I had to add gsm_data.o in Makefile to some files which in turn wanted to pull basically the whole project in... so this time (unlike previously with osmo-bts) I did this movement upfront to already help with the dependency hell created by having all in gsm_data making it difficult to put stuff there since all the model is a big fat block. I'm explaining this before anyone wants to start arguing whether this is really necessary or it helps... It Does. We do it for other objects, so more reason to do it for such an important one. I'm adding a lot of new includes: Yes, we already have plenty of them for other objects. Let's please go ahead and merge this, get code in a more maintainable fashion making it easier to add stuff into the data model by properly isolating objects instead of adding more churn to the big fat block. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I00c15f5285b5c1a0109279b7ab192d5467a04ece Gerrit-Change-Number: 19287 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jul 2020 19:08:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:11:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 19:11:49 +0000 Subject: Change in osmo-bsc[master]: Move struct gsm_bts: gsm_data.* => bts.* In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19287 ) Change subject: Move struct gsm_bts: gsm_data.* => bts.* ...................................................................... Patch Set 1: BTW, regarding possible discussion about moving to gsm_bts.* instead: All files containing bts type speceific code are are already named bts_*, similarly we have bsc_*.c, network_*.*, etc. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I00c15f5285b5c1a0109279b7ab192d5467a04ece Gerrit-Change-Number: 19287 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jul 2020 19:11:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:48:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 19:48:45 +0000 Subject: Change in ...osmo-python-tests[master]: remove_tmpdir(): Support recursion / sub-directories In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/19267 ) Change subject: remove_tmpdir(): Support recursion / sub-directories ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/19267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I896b99032d94ba0cdd340a8eed7c7b625661ad69 Gerrit-Change-Number: 19267 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jul 2020 19:48:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:48:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 19:48:47 +0000 Subject: Change in ...osmo-python-tests[master]: remove_tmpdir(): Support recursion / sub-directories In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/19267 ) Change subject: remove_tmpdir(): Support recursion / sub-directories ...................................................................... remove_tmpdir(): Support recursion / sub-directories The existing code assumed that tmpdir only contained regular files, not an entire hierarchy of files with sub-directories or the like. In case sub-directories exist, the current code fails as follows: line 176, in test_all_apps remove_tmpdir(tmpdir) File "/usr/local/lib/python3.5/dist-packages/osmopython-0.2.0-py3.5.egg/EGG-INFO/scripts/osmotestconfig.py", line 142, in remove_tmpdir os.unlink(os.path.join(tmpdir, f)) IsADirectoryError: [Errno 21] Is a directory: 'writtenconfig/ericsson' Change-Id: I896b99032d94ba0cdd340a8eed7c7b625661ad69 --- M scripts/osmotestconfig.py 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/scripts/osmotestconfig.py b/scripts/osmotestconfig.py index 3c96ca6..8b3bb84 100755 --- a/scripts/osmotestconfig.py +++ b/scripts/osmotestconfig.py @@ -15,6 +15,7 @@ # along with this program. If not, see . import os import os.path +import shutil import time import sys, shutil, stat import tempfile @@ -137,10 +138,7 @@ def remove_tmpdir(tmpdir): - files = os.listdir(tmpdir) - for f in files: - os.unlink(os.path.join(tmpdir, f)) - os.rmdir(tmpdir) + shutil.rmtree(tmpdir) def check_configs_tested(basedir, app_configs, ignore_configs): -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/19267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I896b99032d94ba0cdd340a8eed7c7b625661ad69 Gerrit-Change-Number: 19267 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:49:32 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 19:49:32 +0000 Subject: Change in osmo-bsc[master]: doc/examples: remove deprecated 'dyn_ts_allow_tch_f' References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19288 ) Change subject: doc/examples: remove deprecated 'dyn_ts_allow_tch_f' ...................................................................... doc/examples: remove deprecated 'dyn_ts_allow_tch_f' Change-Id: Icc82f6178d18dccc7207485b25dc3bdad91a0052 Related: SYS#5014 --- M doc/examples/osmo-bsc/osmo-bsc.cfg M doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/88/19288/1 diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg index 57000ae..828875d 100644 --- a/doc/examples/osmo-bsc/osmo-bsc.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc.cfg @@ -17,7 +17,6 @@ handover1 power budget interval 6 handover1 power budget hysteresis 3 handover1 maximum distance 9999 - dyn_ts_allow_tch_f 0 periodic location update 30 bts 0 type sysmobts diff --git a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg index c250fac..0ecb5fc 100644 --- a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg @@ -16,7 +16,6 @@ handover1 power budget interval 6 handover1 power budget hysteresis 3 handover1 maximum distance 9999 - dyn_ts_allow_tch_f 0 periodic location update 30 bts 0 type sysmobts -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icc82f6178d18dccc7207485b25dc3bdad91a0052 Gerrit-Change-Number: 19288 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:49:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 19:49:56 +0000 Subject: Change in libosmo-abis[master]: e1_input: Use osmo_use_count in e1inp_line In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19256 ) Change subject: e1_input: Use osmo_use_count in e1inp_line ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0658b2e9c452598025cc0f1d0b060076171767cc Gerrit-Change-Number: 19256 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 15 Jul 2020 19:49:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:50:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 19:50:11 +0000 Subject: Change in libosmo-abis[master]: ipacces: Fix e1inp_line reference put in ipaccess_close In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19258 ) Change subject: ipacces: Fix e1inp_line reference put in ipaccess_close ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If23cc722106a9f70c998e591369a4acafa52c519 Gerrit-Change-Number: 19258 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 15 Jul 2020 19:50:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:50:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 19:50:23 +0000 Subject: Change in libosmo-abis[master]: ipaccess_recvmsg: Assert the new bfd from new line differs from the o... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19261 ) Change subject: ipaccess_recvmsg: Assert the new bfd from new line differs from the old one ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I45818e04af0da7b1109d909642a1ea378a85a636 Gerrit-Change-Number: 19261 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 19:50:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:50:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 19:50:42 +0000 Subject: Change in libosmo-abis[master]: ipaccess_recvmsg: Untangle code updating line In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19262 ) Change subject: ipaccess_recvmsg: Untangle code updating line ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I947f64f8fa20f87fdc84538402623a6bcf35fdf9 Gerrit-Change-Number: 19262 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 19:50:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:50:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 19:50:49 +0000 Subject: Change in libosmo-abis[master]: cosmetic: lapd: Fix trailing whitespace In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19280 ) Change subject: cosmetic: lapd: Fix trailing whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7a6af2f417f6f924a3f27cfa12462158f2c2a1c6 Gerrit-Change-Number: 19280 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 19:50:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:51:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 19:51:02 +0000 Subject: Change in libosmo-abis[master]: lapd: Use lapd_dl_init2 instead of deprecated lapd_dl_init In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19281 ) Change subject: lapd: Use lapd_dl_init2 instead of deprecated lapd_dl_init ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If25957d10bf9e32d2fe601111a9c1311aee21094 Gerrit-Change-Number: 19281 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 19:51:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:51:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 19:51:08 +0000 Subject: Change in libosmo-abis[master]: tests: Use API e1inp_line_put2 instead of deprecated e1inp_line_put In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19282 ) Change subject: tests: Use API e1inp_line_put2 instead of deprecated e1inp_line_put ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19282 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If3fb68fda1c109f6aa15aa68c5bce285054efda7 Gerrit-Change-Number: 19282 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 19:51:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:51:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 19:51:20 +0000 Subject: Change in libosmocore[master]: use_count.h: Fix API doc example In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19279 ) Change subject: use_count.h: Fix API doc example ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib28ea88c8e8e9b33d70d58156d03af9a41e9e012 Gerrit-Change-Number: 19279 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jul 2020 19:51:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:51:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 19:51:22 +0000 Subject: Change in libosmocore[master]: use_count.h: Fix API doc example In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19279 ) Change subject: use_count.h: Fix API doc example ...................................................................... use_count.h: Fix API doc example Change-Id: Ib28ea88c8e8e9b33d70d58156d03af9a41e9e012 --- M include/osmocom/core/use_count.h 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/use_count.h b/include/osmocom/core/use_count.h index 6a4bf1f..a019525 100644 --- a/include/osmocom/core/use_count.h +++ b/include/osmocom/core/use_count.h @@ -130,8 +130,9 @@ * int foo_use_cb(struct osmo_use_count_entry *use_count_entry, int32_t old_use_count, const char *file, int line) * { * struct foo *foo = use_count_entry->use_count->talloc_object; - * if (osmo_use_count_total(&use_count_entry->use_count) == 0) + * if (osmo_use_count_total(use_count_entry->use_count) == 0) * talloc_free(foo); + * return 0; * } * * // The function name is a convenient use token: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib28ea88c8e8e9b33d70d58156d03af9a41e9e012 Gerrit-Change-Number: 19279 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:51:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 19:51:34 +0000 Subject: Change in osmo-bsc[master]: Use OSMO_FD_* instead of deprecated BSC_FD_* In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19284 ) Change subject: Use OSMO_FD_* instead of deprecated BSC_FD_* ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia5a656567d212fa265aef1375d714d0c5fee5dd6 Gerrit-Change-Number: 19284 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 19:51:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:51:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 19:51:43 +0000 Subject: Change in osmo-bsc[master]: gsm_data.h: Drop duplicated include stdint.h In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19285 ) Change subject: gsm_data.h: Drop duplicated include stdint.h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7610cffc3a641975e05ba4ea9f469e12c99e407f Gerrit-Change-Number: 19285 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 19:51:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:51:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 19:51:45 +0000 Subject: Change in osmo-bsc[master]: Use OSMO_FD_* instead of deprecated BSC_FD_* In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19284 ) Change subject: Use OSMO_FD_* instead of deprecated BSC_FD_* ...................................................................... Use OSMO_FD_* instead of deprecated BSC_FD_* New define is available since libosmocore 1.1.0, and we already require 1.3.0, so no need to update dependenices. Let's change it to avoid people re-using old BSC_FD_* symbols when copy-pasting somewhere else. Change-Id: Ia5a656567d212fa265aef1375d714d0c5fee5dd6 --- M src/ipaccess/abisip-find.c M src/ipaccess/ipaccess-config.c M src/ipaccess/ipaccess-proxy.c M src/osmo-bsc/bsc_rf_ctrl.c M src/osmo-bsc/meas_feed.c M src/osmo-bsc/osmo_bsc_mgcp.c M src/osmo-bsc/osmo_bsc_msc.c M src/osmo-bsc/pcu_sock.c M src/utils/meas_json.c M src/utils/meas_udp2db.c M src/utils/meas_vis.c 11 files changed, 35 insertions(+), 35 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/ipaccess/abisip-find.c b/src/ipaccess/abisip-find.c index 21ed50e..11b2851 100644 --- a/src/ipaccess/abisip-find.c +++ b/src/ipaccess/abisip-find.c @@ -403,10 +403,10 @@ static int bfd_cb(struct osmo_fd *bfd, unsigned int flags) { - if (flags & BSC_FD_READ) + if (flags & OSMO_FD_READ) return read_response(bfd->fd); - if (flags & BSC_FD_WRITE) { - bfd->when &= ~BSC_FD_WRITE; + if (flags & OSMO_FD_WRITE) { + bfd->when &= ~OSMO_FD_WRITE; return bcast_find(bfd->fd); } return 0; @@ -418,7 +418,7 @@ { struct osmo_fd *bfd = _data; - bfd->when |= BSC_FD_WRITE; + bfd->when |= OSMO_FD_WRITE; base_stations_bump(false); @@ -447,7 +447,7 @@ fprintf(stdout, "\nWARNING: the --timeout should be larger than --interval.\n\n"); bfd.cb = bfd_cb; - bfd.when = BSC_FD_READ | BSC_FD_WRITE; + bfd.when = OSMO_FD_READ | OSMO_FD_WRITE; bfd.fd = udp_sock(cmdline_opts.ifname, cmdline_opts.bind_ip); if (bfd.fd < 0) { perror("Cannot create local socket for broadcast udp"); diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 306cc87..f7d7332 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -92,7 +92,7 @@ bfd->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); bfd->cb = ipaccess_fd_cb; - bfd->when = BSC_FD_READ | BSC_FD_WRITE; + bfd->when = OSMO_FD_READ | OSMO_FD_WRITE; bfd->data = line; bfd->priv_nr = E1INP_SIGN_OML; diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index f4d620b..05a6f63 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -283,7 +283,7 @@ if (other_conn) { /* enqueue the message for TX on the respective FD */ msgb_enqueue(&other_conn->tx_queue, msg); - other_conn->fd.when |= BSC_FD_WRITE; + other_conn->fd.when |= OSMO_FD_WRITE; } else msgb_free(msg); @@ -293,7 +293,7 @@ static int handle_udp_write(struct osmo_fd *bfd) { /* not implemented yet */ - bfd->when &= ~BSC_FD_WRITE; + bfd->when &= ~OSMO_FD_WRITE; return -EIO; } @@ -303,9 +303,9 @@ { int rc = 0; - if (what & BSC_FD_READ) + if (what & OSMO_FD_READ) rc = handle_udp_read(bfd); - if (what & BSC_FD_WRITE) + if (what & OSMO_FD_WRITE) rc = handle_udp_write(bfd); return rc; @@ -840,7 +840,7 @@ /* enqueue packet towards BSC */ msgb_enqueue(&bsc_conn->tx_queue, msg); /* mark respective filedescriptor as 'we want to write' */ - bsc_conn->fd.when |= BSC_FD_WRITE; + bsc_conn->fd.when |= OSMO_FD_WRITE; } else { logp_ipbc_uid(DLINP, LOGL_INFO, ipbc, bfd->priv_nr >> 8); LOGPC(DLINP, LOGL_INFO, "Dropping packet from %s, " @@ -869,7 +869,7 @@ /* get the next msg for this timeslot */ if (llist_empty(&ipc->tx_queue)) { - bfd->when &= ~BSC_FD_WRITE; + bfd->when &= ~OSMO_FD_WRITE; return 0; } lh = ipc->tx_queue.next; @@ -897,12 +897,12 @@ { int rc = 0; - if (what & BSC_FD_READ) { + if (what & OSMO_FD_READ) { rc = handle_tcp_read(bfd); if (rc < 0) return rc; } - if (what & BSC_FD_WRITE) + if (what & OSMO_FD_WRITE) rc = handle_tcp_write(bfd); return rc; @@ -917,7 +917,7 @@ struct sockaddr_in sa; socklen_t sa_len = sizeof(sa); - if (!(what & BSC_FD_READ)) + if (!(what & OSMO_FD_READ)) return 0; ret = accept(listen_bfd->fd, (struct sockaddr *) &sa, &sa_len); @@ -940,7 +940,7 @@ bfd->data = ipc; bfd->priv_nr = listen_bfd->priv_nr; bfd->cb = proxy_ipaccess_fd_cb; - bfd->when = BSC_FD_READ; + bfd->when = OSMO_FD_READ; ret = osmo_fd_register(bfd); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "could not register FD\n"); @@ -1019,7 +1019,7 @@ bfd = &ipc->fd; bfd->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); bfd->cb = ipaccess_fd_cb; - bfd->when = BSC_FD_READ | BSC_FD_WRITE; + bfd->when = OSMO_FD_READ | OSMO_FD_WRITE; bfd->data = ipc; bfd->priv_nr = priv_nr; diff --git a/src/osmo-bsc/bsc_rf_ctrl.c b/src/osmo-bsc/bsc_rf_ctrl.c index 11cd224..c72154a 100644 --- a/src/osmo-bsc/bsc_rf_ctrl.c +++ b/src/osmo-bsc/bsc_rf_ctrl.c @@ -373,7 +373,7 @@ osmo_wqueue_init(&conn->queue, 10); conn->queue.bfd.data = conn; conn->queue.bfd.fd = fd; - conn->queue.bfd.when = BSC_FD_READ | BSC_FD_WRITE; + conn->queue.bfd.when = OSMO_FD_READ | OSMO_FD_WRITE; conn->queue.read_cb = rf_read_cmd; conn->queue.write_cb = rf_write_cmd; conn->rf = rf; @@ -483,7 +483,7 @@ return -1; } - bfd->when = BSC_FD_READ; + bfd->when = OSMO_FD_READ; bfd->cb = rf_ctrl_accept; bfd->data = rf; diff --git a/src/osmo-bsc/meas_feed.c b/src/osmo-bsc/meas_feed.c index 8450f69..f9a3626 100644 --- a/src/osmo-bsc/meas_feed.c +++ b/src/osmo-bsc/meas_feed.c @@ -118,7 +118,7 @@ char buf[256]; rc = read(ofd->fd, buf, sizeof(buf)); - ofd->fd &= ~BSC_FD_READ; + ofd->fd &= ~OSMO_FD_READ; return rc; } @@ -158,7 +158,7 @@ if (rc < 0) return rc; - g_mfs.wqueue.bfd.when &= ~BSC_FD_READ; + g_mfs.wqueue.bfd.when &= ~OSMO_FD_READ; if (g_mfs.dst_host) talloc_free(g_mfs.dst_host); diff --git a/src/osmo-bsc/osmo_bsc_mgcp.c b/src/osmo-bsc/osmo_bsc_mgcp.c index bec7930..90a73e5 100644 --- a/src/osmo-bsc/osmo_bsc_mgcp.c +++ b/src/osmo-bsc/osmo_bsc_mgcp.c @@ -71,7 +71,7 @@ struct msgb *msg; int rc; - if (!(what & BSC_FD_READ)) + if (!(what & OSMO_FD_READ)) return 0; msg = msgb_alloc_headroom(1024, 16, "MGCP->IPA"); diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index f969146..f2a1e5b 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -253,7 +253,7 @@ msc_data->audio_support[4]->ver = 3; msc_data->audio_support[4]->hr = 1; - osmo_fd_setup(&msc_data->mgcp_ipa.ofd, -1, BSC_FD_READ, &bsc_sccplite_mgcp_proxy_cb, msc_data, 0); + osmo_fd_setup(&msc_data->mgcp_ipa.ofd, -1, OSMO_FD_READ, &bsc_sccplite_mgcp_proxy_cb, msc_data, 0); msc_data->mgcp_ipa.local_addr = talloc_strdup(msc_data, "0.0.0.0"); msc_data->mgcp_ipa.local_port = 0; /* dynamic */ diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index bb18746..e75c2d4 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -458,7 +458,7 @@ return -EIO; } msgb_enqueue(&state->upqueue, msg); - conn_bfd->when |= BSC_FD_WRITE; + conn_bfd->when |= OSMO_FD_WRITE; return 0; } @@ -481,7 +481,7 @@ osmo_fd_unregister(bfd); /* re-enable the generation of ACCEPT for new connections */ - state->listen_bfd.when |= BSC_FD_READ; + state->listen_bfd.when |= OSMO_FD_READ; #if 0 /* remove si13, ... */ @@ -560,7 +560,7 @@ msg = llist_entry(state->upqueue.next, struct msgb, list); pcu_prim = (struct gsm_pcu_if *)msg->data; - bfd->when &= ~BSC_FD_WRITE; + bfd->when &= ~OSMO_FD_WRITE; /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */ if (!msgb_length(msg)) { @@ -575,7 +575,7 @@ goto close; if (rc < 0) { if (errno == EAGAIN) { - bfd->when |= BSC_FD_WRITE; + bfd->when |= OSMO_FD_WRITE; break; } goto close; @@ -599,12 +599,12 @@ { int rc = 0; - if (flags & BSC_FD_READ) + if (flags & OSMO_FD_READ) rc = pcu_sock_read(bfd); if (rc < 0) return rc; - if (flags & BSC_FD_WRITE) + if (flags & OSMO_FD_WRITE) rc = pcu_sock_write(bfd); return rc; @@ -630,13 +630,13 @@ LOGP(DPCU, LOGL_NOTICE, "PCU connects but we already have " "another active connection ?!?\n"); /* We already have one PCU connected, this is all we support */ - state->listen_bfd.when &= ~BSC_FD_READ; + state->listen_bfd.when &= ~OSMO_FD_READ; close(rc); return 0; } conn_bfd->fd = rc; - conn_bfd->when = BSC_FD_READ; + conn_bfd->when = OSMO_FD_READ; conn_bfd->cb = pcu_sock_cb; conn_bfd->data = state; @@ -679,7 +679,7 @@ return -1; } - bfd->when = BSC_FD_READ; + bfd->when = OSMO_FD_READ; bfd->cb = pcu_sock_accept; bfd->data = state; diff --git a/src/utils/meas_json.c b/src/utils/meas_json.c index 6aa531a..0fd99c0 100644 --- a/src/utils/meas_json.c +++ b/src/utils/meas_json.c @@ -158,7 +158,7 @@ { int rc; - if (what & BSC_FD_READ) { + if (what & OSMO_FD_READ) { struct msgb *msg = msgb_alloc(1024, "UDP Rx"); rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg)); diff --git a/src/utils/meas_udp2db.c b/src/utils/meas_udp2db.c index 34f8385..07023c3 100644 --- a/src/utils/meas_udp2db.c +++ b/src/utils/meas_udp2db.c @@ -71,7 +71,7 @@ { int rc; - if (what & BSC_FD_READ) { + if (what & OSMO_FD_READ) { struct msgb *msg = msgb_alloc(1024, "UDP Rx"); rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg)); diff --git a/src/utils/meas_vis.c b/src/utils/meas_vis.c index 01be986..73ccfc4 100644 --- a/src/utils/meas_vis.c +++ b/src/utils/meas_vis.c @@ -125,7 +125,7 @@ { int rc; - if (what & BSC_FD_READ) { + if (what & OSMO_FD_READ) { struct msgb *msg = msgb_alloc(1024, "UDP Rx"); rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia5a656567d212fa265aef1375d714d0c5fee5dd6 Gerrit-Change-Number: 19284 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:51:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 19:51:45 +0000 Subject: Change in osmo-bsc[master]: gsm_data.h: Drop duplicated include stdint.h In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19285 ) Change subject: gsm_data.h: Drop duplicated include stdint.h ...................................................................... gsm_data.h: Drop duplicated include stdint.h Change-Id: I7610cffc3a641975e05ba4ea9f469e12c99e407f --- M include/osmocom/bsc/gsm_data.h 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 0f5fc54..5336ebe 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -4,7 +4,6 @@ #include #include #include -#include #include #include -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7610cffc3a641975e05ba4ea9f469e12c99e407f Gerrit-Change-Number: 19285 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:51:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 19:51:57 +0000 Subject: Change in osmo-bsc[master]: Fix trailing whitespace in several files In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19286 ) Change subject: Fix trailing whitespace in several files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ide9921dfce3b6d7c580edaa612a3063c94319a02 Gerrit-Change-Number: 19286 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 19:51:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:52:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 19:52:00 +0000 Subject: Change in osmo-bsc[master]: Fix trailing whitespace in several files In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19286 ) Change subject: Fix trailing whitespace in several files ...................................................................... Fix trailing whitespace in several files Change-Id: Ide9921dfce3b6d7c580edaa612a3063c94319a02 --- M include/osmocom/bsc/abis_nm.h M src/osmo-bsc/bts_nokia_site.c M src/osmo-bsc/bts_siemens_bs11.c M src/osmo-bsc/codec_pref.c M src/osmo-bsc/handover_vty.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/pcu_sock.c 7 files changed, 9 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/bsc/abis_nm.h b/include/osmocom/bsc/abis_nm.h index 83bc2f8..3a0cb0e 100644 --- a/include/osmocom/bsc/abis_nm.h +++ b/include/osmocom/bsc/abis_nm.h @@ -1,4 +1,4 @@ -/* GSM Network Management messages on the A-bis interface +/* GSM Network Management messages on the A-bis interface * 3GPP TS 12.21 version 8.0.0 Release 1999 / ETSI TS 100 623 V8.0.0 */ /* (C) 2008-2009 by Harald Welte @@ -151,7 +151,7 @@ int abis_nm_ipaccess_set_attr(struct gsm_bts *bts, uint8_t obj_class, uint8_t bts_nr, uint8_t trx_nr, uint8_t ts_nr, uint8_t *attr, uint8_t attr_len); -int abis_nm_ipaccess_rsl_connect(struct gsm_bts_trx *trx, +int abis_nm_ipaccess_rsl_connect(struct gsm_bts_trx *trx, uint32_t ip, uint16_t port, uint8_t stream); void abis_nm_ipaccess_cgi(uint8_t *buf, struct gsm_bts *bts); int ipac_parse_bcch_info(struct ipac_bcch_info *binf, uint8_t *buf); diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c index 51710b8..523c9ed 100644 --- a/src/osmo-bsc/bts_nokia_site.c +++ b/src/osmo-bsc/bts_nokia_site.c @@ -1533,7 +1533,7 @@ - receive ACK, start RSL link(s) ACK some other messages received from the BTS. - Probably its also possible to configure the BTS without a reset, this + Probably its also possible to configure the BTS without a reset, this has not been tested yet. */ @@ -1608,8 +1608,8 @@ if (!bts->nokia.did_reset) { bts->nokia.did_reset = 1; - /* - TODO: For the InSite processing the received data is + /* + TODO: For the InSite processing the received data is blocked in the driver during reset. Otherwise the LAPD module might assert because the InSite sends garbage on the E1 line during reset. diff --git a/src/osmo-bsc/bts_siemens_bs11.c b/src/osmo-bsc/bts_siemens_bs11.c index 2750f8c..057a0e1 100644 --- a/src/osmo-bsc/bts_siemens_bs11.c +++ b/src/osmo-bsc/bts_siemens_bs11.c @@ -61,7 +61,7 @@ [NM_ATT_BS11_L1_PROT_TYPE] = { TLV_TYPE_TV }, [NM_ATT_BS11_BIT_ERR_THESH] = { TLV_TYPE_FIXED, 2 }, [NM_ATT_BS11_DIVERSITY] = { TLV_TYPE_TLV }, - [NM_ATT_BS11_LMT_LOGON_SESSION]={ TLV_TYPE_TLV }, + [NM_ATT_BS11_LMT_LOGON_SESSION]={ TLV_TYPE_TLV }, [NM_ATT_BS11_LMT_LOGIN_TIME] = { TLV_TYPE_TLV }, [NM_ATT_BS11_LMT_USER_ACC_LEV] ={ TLV_TYPE_TLV }, [NM_ATT_BS11_LMT_USER_NAME] = { TLV_TYPE_TLV }, diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index be442b5..6ec6d05 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -270,7 +270,7 @@ static int match_amr_s15_s0(struct channel_mode_and_rate *ch_mode_rate, const struct bsc_msc_data *msc, const struct gsm_bts *bts, const struct gsm0808_speech_codec *sc_match, uint8_t perm_spch) { uint16_t amr_s15_s0_supported; - + /* Normally the MSC should never try to advertise an AMR codec * configuration that we did not previously advertised as supported. * However, to ensure that no unsupported AMR codec configuration @@ -278,7 +278,7 @@ * and generate an intersection. All further processing is then done * with this intersection result. At the same time we will make sure * that the intersection contains at least one rate setting. */ - + amr_s15_s0_supported = gen_bss_supported_amr_s15_s0(msc, bts, (perm_spch == GSM0808_PERM_HR3)); /* NOTE: The sc_match pointer points to a speech codec from the speech diff --git a/src/osmo-bsc/handover_vty.c b/src/osmo-bsc/handover_vty.c index e9333ec..a418aa7 100644 --- a/src/osmo-bsc/handover_vty.c +++ b/src/osmo-bsc/handover_vty.c @@ -175,4 +175,3 @@ ho_vty_init_cmds(BTS_NODE); } - diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index a1bf857..68eef4b 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1015,7 +1015,7 @@ * TODO: that's how the code was before lchan FSM, is this correct/useful? */ handle_rll_rel_ind_or_conf(fi, event, data); break; - + case LCHAN_EV_RTP_RELEASED: case LCHAN_EV_RTP_ERROR: break; diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index e75c2d4..3e0b7bf 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -716,4 +716,3 @@ talloc_free(state); bts->pcu_state = NULL; } - -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ide9921dfce3b6d7c580edaa612a3063c94319a02 Gerrit-Change-Number: 19286 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 19:57:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 15 Jul 2020 19:57:59 +0000 Subject: Change in osmo-bsc[master]: doc/examples: remove deprecated 'dyn_ts_allow_tch_f' In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19288 ) Change subject: doc/examples: remove deprecated 'dyn_ts_allow_tch_f' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icc82f6178d18dccc7207485b25dc3bdad91a0052 Gerrit-Change-Number: 19288 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 15 Jul 2020 19:57:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 20:05:11 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 20:05:11 +0000 Subject: Change in osmo-bsc[master]: doc/examples: remove deprecated 'dyn_ts_allow_tch_f' In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19288 to look at the new patch set (#2). Change subject: doc/examples: remove deprecated 'dyn_ts_allow_tch_f' ...................................................................... doc/examples: remove deprecated 'dyn_ts_allow_tch_f' This option has been deprecated back in 2018 [1], but for some reason we still have it in the configuration examples, so it prevents osmo-bsc to allocate TCH/F on dynamic timeslots. [1] Ib2335d02ea545aff837aadd49f15b2fdb418c46e Change-Id: Icc82f6178d18dccc7207485b25dc3bdad91a0052 Related: SYS#5014 --- M doc/examples/osmo-bsc/osmo-bsc.cfg M doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/88/19288/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icc82f6178d18dccc7207485b25dc3bdad91a0052 Gerrit-Change-Number: 19288 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 20:05:31 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 20:05:31 +0000 Subject: Change in osmo-bsc[master]: doc/examples: remove deprecated 'dyn_ts_allow_tch_f' In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19288 ) Change subject: doc/examples: remove deprecated 'dyn_ts_allow_tch_f' ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icc82f6178d18dccc7207485b25dc3bdad91a0052 Gerrit-Change-Number: 19288 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 15 Jul 2020 20:05:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 20:05:35 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 15 Jul 2020 20:05:35 +0000 Subject: Change in osmo-bsc[master]: doc/examples: remove deprecated 'dyn_ts_allow_tch_f' In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19288 ) Change subject: doc/examples: remove deprecated 'dyn_ts_allow_tch_f' ...................................................................... doc/examples: remove deprecated 'dyn_ts_allow_tch_f' This option has been deprecated back in 2018 [1], but for some reason we still have it in the configuration examples, so it prevents osmo-bsc to allocate TCH/F on dynamic timeslots. [1] Ib2335d02ea545aff837aadd49f15b2fdb418c46e Change-Id: Icc82f6178d18dccc7207485b25dc3bdad91a0052 Related: SYS#5014 --- M doc/examples/osmo-bsc/osmo-bsc.cfg M doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg index 57000ae..828875d 100644 --- a/doc/examples/osmo-bsc/osmo-bsc.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc.cfg @@ -17,7 +17,6 @@ handover1 power budget interval 6 handover1 power budget hysteresis 3 handover1 maximum distance 9999 - dyn_ts_allow_tch_f 0 periodic location update 30 bts 0 type sysmobts diff --git a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg index c250fac..0ecb5fc 100644 --- a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg @@ -16,7 +16,6 @@ handover1 power budget interval 6 handover1 power budget hysteresis 3 handover1 maximum distance 9999 - dyn_ts_allow_tch_f 0 periodic location update 30 bts 0 type sysmobts -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icc82f6178d18dccc7207485b25dc3bdad91a0052 Gerrit-Change-Number: 19288 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 15 20:42:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 15 Jul 2020 20:42:35 +0000 Subject: Change in libosmo-abis[master]: cosmetic: e1_input.h: Fix trailing whitespace In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19278 ) Change subject: cosmetic: e1_input.h: Fix trailing whitespace ...................................................................... cosmetic: e1_input.h: Fix trailing whitespace Change-Id: Ie323a28409a44aeeef6646b247f244d278758f66 --- M include/osmocom/abis/e1_input.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index 8230e44..ee33ae6 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -49,7 +49,7 @@ enum e1inp_sign_type type; - /* trx for msg->trx of received msgs */ + /* trx for msg->trx of received msgs */ struct gsm_bts_trx *trx; /* msgb queue of to-be-transmitted msgs */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie323a28409a44aeeef6646b247f244d278758f66 Gerrit-Change-Number: 19278 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jul 16 02:34:27 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Jul 2020 02:34:27 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0fbcd388526_32942b26effd85f410127b9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 77s] dh_auto_configure -O--buildsystem=meson [ 77s] install -d obj-x86_64-linux-gnu [ 77s] cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu [ 77s] Traceback (most recent call last): [ 77s] File "/usr/bin/meson", line 17, in [ 77s] from mesonbuild import mesonmain [ 77s] File "/usr/lib/python3/dist-packages/mesonbuild/mesonmain.py", line 25, in [ 77s] from . import mconf, mdist, minit, minstall, mintro, msetup, mtest, rewriter, msubprojects, munstable_coredata, mcompile [ 77s] File "/usr/lib/python3/dist-packages/mesonbuild/mconf.py", line 16, in [ 77s] from . import coredata, environment, mesonlib, build, mintro, mlog [ 77s] File "/usr/lib/python3/dist-packages/mesonbuild/build.py", line 26, in [ 77s] from . import dependencies [ 77s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/__init__.py", line 15, in [ 77s] from .boost import BoostDependency [ 77s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/boost.py", line 25, in [ 77s] from .base import DependencyException, ExternalDependency, PkgConfigDependency [ 77s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/base.py", line 32, in [ 77s] import pkg_resources [ 77s] ModuleNotFoundError: No module named 'pkg_resources' [ 77s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 77s] make: *** [debian/rules:11: binary] Error 2 [ 77s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 77s] ### VM INTERACTION START ### [ 80s] [ 69.607640] sysrq: SysRq : Power Off [ 80s] [ 69.610154] reboot: Power down [ 80s] ### VM INTERACTION END ### [ 80s] [ 80s] build78 failed "build open5gs_1.3.0.20200716.dsc" at Thu Jul 16 02:34:13 UTC 2020. [ 80s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 16 03:29:19 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Jul 2020 03:29:19 +0000 Subject: Build failure of network:osmocom:nightly/yder in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0fc999f318d_32942b26effd85f410301d7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/yder/Debian_Unstable/x86_64 Package network:osmocom:nightly/yder failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly yder Last lines of build log: [ 88s] dpkg-source -b . [ 88s] dpkg-source: info: using source format '3.0 (quilt)' [ 88s] dpkg-source: info: building yder using existing ./yder_1.4.4.orig.tar.gz [ 88s] dpkg-source: info: using patch list from debian/patches/series [ 88s] dpkg-source: info: building yder in yder_1.4.4-4.1.debian.tar.xz [ 88s] dpkg-source: info: building yder in yder_1.4.4-4.1.dsc [ 88s] debian/rules build [ 88s] dh build --buildsystem=cmake --builddirectory=build [ 88s] dh_update_autotools_config -O--buildsystem=cmake -O--builddirectory=build [ 88s] dh_autoreconf -O--buildsystem=cmake -O--builddirectory=build [ 88s] debian/rules override_dh_auto_configure [ 88s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 88s] dh_auto_configure -- -DWITH_JOURNALD=ON -DBUILD_YDER_TESTING=ON \ [ 88s] -DINSTALL_HEADER=ON \ [ 88s] --no-warn-unused-cli [ 88s] cd build && cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_INSTALL_RUNSTATEDIR=/run "-GUnix Makefiles" -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_LIBDIR=lib/x86_64-linux-gnu -DWITH_JOURNALD=ON -DBUILD_YDER_TESTING=ON -DINSTALL_HEADER=ON --no-warn-unused-cli .. [ 88s] cmake: error while loading shared libraries: libhogweed.so.6: cannot open shared object file: No such file or directory [ 88s] dh_auto_configure: error: cd build && cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_INSTALL_RUNSTATEDIR=/run "-GUnix Makefiles" -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_LIBDIR=lib/x86_64-linux-gnu -DWITH_JOURNALD=ON -DBUILD_YDER_TESTING=ON -DINSTALL_HEADER=ON --no-warn-unused-cli .. returned exit code 127 [ 88s] make[1]: *** [debian/rules:31: override_dh_auto_configure] Error 2 [ 88s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 88s] make: *** [debian/rules:25: build] Error 2 [ 88s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 88s] ### VM INTERACTION START ### [ 91s] [ 80.910261] sysrq: SysRq : Power Off [ 91s] [ 80.914581] reboot: Power down [ 91s] ### VM INTERACTION END ### [ 91s] [ 91s] sheep87 failed "build yder_1.4.4-4.1.dsc" at Thu Jul 16 03:29:06 UTC 2020. [ 91s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 16 03:34:28 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Jul 2020 03:34:28 +0000 Subject: Build failure of network:osmocom:nightly/limesuite-debian10 in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0fcae67c274_32942b26effd85f4103078c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite-debian10/Debian_Unstable/x86_64 Package network:osmocom:nightly/limesuite-debian10 failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly limesuite-debian10 Last lines of build log: [ 222s] LINE: -- Lime Microsystems Thu, 28 Feb 2020 15:00:00 +0300 [ 223s] dpkg-parsechangelog: warning: debian/changelog(l5): badly formatted trailer line [ 223s] LINE: -- Lime Microsystems Thu, 28 Feb 2020 15:00:00 +0300 [ 223s] dpkg-parsechangelog: warning: debian/changelog(l5): badly formatted trailer line [ 223s] LINE: -- Lime Microsystems Thu, 28 Feb 2020 15:00:00 +0300 [ 223s] sed 's/@RELEASE_NUM@/20.01/g' debian/limesuite-images.dirs.in > debian/limesuite-images20.01.dirs [ 223s] sed 's/@RELEASE_NUM@/20.01/g' debian/limesuite-images.postinst.in > debian/limesuite-images20.01.postinst [ 223s] sed 's/@RELEASE_NUM@/20.01/g' debian/limesuite-images.prerm.in > debian/limesuite-images20.01.prerm [ 223s] dh_auto_configure -- \ [ 223s] -DBUILD_SHARED_LIBS=ON \ [ 223s] -DCMAKE_AUTOSET_INSTALL_RPATH=FALSE \ [ 223s] -DUDEV_RULES_PATH=/lib/udev/rules.d \ [ 223s] -DLIB_SUFFIX="/x86_64-linux-gnu" \ [ 223s] -DLIME_SUITE_EXTVER="1" [ 223s] dh_auto_configure: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 223s] cd obj-x86_64-linux-gnu && cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON "-GUnix Makefiles" -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_LIBDIR=lib/x86_64-linux-gnu -DBUILD_SHARED_LIBS=ON -DCMAKE_AUTOSET_INSTALL_RPATH=FALSE -DUDEV_RULES_PATH=/lib/udev/rules.d -DLIB_SUFFIX=/x86_64-linux-gnu -DLIME_SUITE_EXTVER=1 .. [ 223s] cmake: error while loading shared libraries: libhogweed.so.6: cannot open shared object file: No such file or directory [ 223s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON "-GUnix Makefiles" -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_LIBDIR=lib/x86_64-linux-gnu -DBUILD_SHARED_LIBS=ON -DCMAKE_AUTOSET_INSTALL_RPATH=FALSE -DUDEV_RULES_PATH=/lib/udev/rules.d -DLIB_SUFFIX=/x86_64-linux-gnu -DLIME_SUITE_EXTVER=1 .. returned exit code 127 [ 223s] make[1]: *** [debian/rules:31: override_dh_auto_configure] Error 2 [ 223s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 223s] make: *** [debian/rules:28: binary] Error 2 [ 223s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 223s] ### VM INTERACTION START ### [ 224s] Powering off. [ 224s] [ 202.695744] reboot: Power down [ 224s] ### VM INTERACTION END ### [ 224s] [ 224s] lamb23 failed "build limesuite_20.01.0-1.dsc" at Thu Jul 16 03:34:21 UTC 2020. [ 224s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 16 03:39:02 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Jul 2020 03:39:02 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0fcbf3baf55_32942b26effd85f41031926@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 134s] dh_auto_configure -O--buildsystem=meson [ 134s] install -d obj-x86_64-linux-gnu [ 134s] cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu [ 134s] Traceback (most recent call last): [ 134s] File "/usr/bin/meson", line 17, in [ 134s] from mesonbuild import mesonmain [ 134s] File "/usr/lib/python3/dist-packages/mesonbuild/mesonmain.py", line 25, in [ 134s] from . import mconf, mdist, minit, minstall, mintro, msetup, mtest, rewriter, msubprojects, munstable_coredata, mcompile [ 134s] File "/usr/lib/python3/dist-packages/mesonbuild/mconf.py", line 16, in [ 134s] from . import coredata, environment, mesonlib, build, mintro, mlog [ 134s] File "/usr/lib/python3/dist-packages/mesonbuild/build.py", line 26, in [ 134s] from . import dependencies [ 134s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/__init__.py", line 15, in [ 134s] from .boost import BoostDependency [ 134s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/boost.py", line 25, in [ 134s] from .base import DependencyException, ExternalDependency, PkgConfigDependency [ 134s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/base.py", line 32, in [ 134s] import pkg_resources [ 134s] ModuleNotFoundError: No module named 'pkg_resources' [ 134s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 134s] make: *** [debian/rules:11: binary] Error 2 [ 134s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 135s] ### VM INTERACTION START ### [ 138s] [ 123.582242] sysrq: SysRq : Power Off [ 138s] [ 123.587981] reboot: Power down [ 138s] ### VM INTERACTION END ### [ 138s] [ 138s] lamb17 failed "build open5gs_1.3.0.20200716.dsc" at Thu Jul 16 03:38:52 UTC 2020. [ 138s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 16 03:51:41 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Jul 2020 03:51:41 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f0fcee17a501_32942b26effd85f410369d5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 153s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 153s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 153s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 153s] | | [ 153s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 153s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 153s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 153s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 153s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 153s] 2425 | MHD_start_daemon (unsigned int flags, [ 153s] | ^~~~~~~~~~~~~~~~ [ 153s] cc1: all warnings being treated as errors [ 153s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 153s] make[3]: *** Waiting for unfinished jobs.... [ 153s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 153s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 153s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 153s] make[1]: *** [Makefile:166: all] Error 2 [ 153s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 153s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 153s] make: *** [debian/rules:9: build] Error 25 [ 153s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 153s] ### VM INTERACTION START ### [ 157s] [ 141.978270] sysrq: SysRq : Power Off [ 157s] [ 141.984630] reboot: Power down [ 157s] ### VM INTERACTION END ### [ 157s] [ 157s] lamb56 failed "build ulfius_2.5.2-4.1.dsc" at Thu Jul 16 03:51:30 UTC 2020. [ 157s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jul 16 06:53:53 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 16 Jul 2020 06:53:53 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: remove shebang from non-executable scripts References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19289 ) Change subject: trx_toolkit: remove shebang from non-executable scripts ...................................................................... trx_toolkit: remove shebang from non-executable scripts Change-Id: I5ddc531a4e98d4d6f8672d6ef14034fce605ba3d --- M src/target/trx_toolkit/app_common.py M src/target/trx_toolkit/burst_fwd.py M src/target/trx_toolkit/ctrl_if.py M src/target/trx_toolkit/ctrl_if_trx.py M src/target/trx_toolkit/data_dump.py M src/target/trx_toolkit/data_if.py M src/target/trx_toolkit/data_msg.py M src/target/trx_toolkit/fake_pm.py M src/target/trx_toolkit/gsm_shared.py M src/target/trx_toolkit/transceiver.py M src/target/trx_toolkit/trx_list.py M src/target/trx_toolkit/udp_link.py 12 files changed, 0 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/89/19289/1 diff --git a/src/target/trx_toolkit/app_common.py b/src/target/trx_toolkit/app_common.py index 64baa6d..7f2f03c 100644 --- a/src/target/trx_toolkit/app_common.py +++ b/src/target/trx_toolkit/app_common.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index 574c97e..dbaded6 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/ctrl_if.py b/src/target/trx_toolkit/ctrl_if.py index 7333501..4f44080 100644 --- a/src/target/trx_toolkit/ctrl_if.py +++ b/src/target/trx_toolkit/ctrl_if.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/ctrl_if_trx.py b/src/target/trx_toolkit/ctrl_if_trx.py index e841975..0e5106a 100644 --- a/src/target/trx_toolkit/ctrl_if_trx.py +++ b/src/target/trx_toolkit/ctrl_if_trx.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/data_dump.py b/src/target/trx_toolkit/data_dump.py index 52768a9..fb3dca5 100644 --- a/src/target/trx_toolkit/data_dump.py +++ b/src/target/trx_toolkit/data_dump.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py index 418c3f8..18e53ed 100644 --- a/src/target/trx_toolkit/data_if.py +++ b/src/target/trx_toolkit/data_if.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index 55fb796..88376ed 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/fake_pm.py b/src/target/trx_toolkit/fake_pm.py index 0d66099..9331212 100644 --- a/src/target/trx_toolkit/fake_pm.py +++ b/src/target/trx_toolkit/fake_pm.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/gsm_shared.py b/src/target/trx_toolkit/gsm_shared.py index c8c6b8f..aac152e 100644 --- a/src/target/trx_toolkit/gsm_shared.py +++ b/src/target/trx_toolkit/gsm_shared.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 3c1ddc8..03c60fb 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/trx_list.py b/src/target/trx_toolkit/trx_list.py index 3206d74..0a55cc6 100644 --- a/src/target/trx_toolkit/trx_list.py +++ b/src/target/trx_toolkit/trx_list.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/udp_link.py b/src/target/trx_toolkit/udp_link.py index 8da15db..0602694 100644 --- a/src/target/trx_toolkit/udp_link.py +++ b/src/target/trx_toolkit/udp_link.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5ddc531a4e98d4d6f8672d6ef14034fce605ba3d Gerrit-Change-Number: 19289 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 06:53:54 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 16 Jul 2020 06:53:54 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: use python3 in shebang of executable scripts References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19290 ) Change subject: trx_toolkit: use python3 in shebang of executable scripts ...................................................................... trx_toolkit: use python3 in shebang of executable scripts TRX Toolkit is still backwards compatible with Python2, but Python3 does much better in terms of performance. Also, on Debian Stretch that is used as a base for our Docker images, Python 2.7 is still the default. Let's require Python3 in shebang. Change-Id: I8a1d7c59d3b5d49ec2ed94a7c77905e02134f216 --- M src/target/trx_toolkit/burst_gen.py M src/target/trx_toolkit/burst_send.py M src/target/trx_toolkit/clck_gen.py M src/target/trx_toolkit/ctrl_cmd.py M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/rand_burst_gen.py 6 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/90/19290/1 diff --git a/src/target/trx_toolkit/burst_gen.py b/src/target/trx_toolkit/burst_gen.py index a777246..7028c24 100755 --- a/src/target/trx_toolkit/burst_gen.py +++ b/src/target/trx_toolkit/burst_gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/burst_send.py b/src/target/trx_toolkit/burst_send.py index 368031c..717414d 100755 --- a/src/target/trx_toolkit/burst_send.py +++ b/src/target/trx_toolkit/burst_send.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index 6c09316..e5c7b0d 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/ctrl_cmd.py b/src/target/trx_toolkit/ctrl_cmd.py index 982cf31..7a2bfac 100755 --- a/src/target/trx_toolkit/ctrl_cmd.py +++ b/src/target/trx_toolkit/ctrl_cmd.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index b487a93..da611e8 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/rand_burst_gen.py b/src/target/trx_toolkit/rand_burst_gen.py index 9ac6943..0eb2e8f 100644 --- a/src/target/trx_toolkit/rand_burst_gen.py +++ b/src/target/trx_toolkit/rand_burst_gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # TRX Toolkit -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8a1d7c59d3b5d49ec2ed94a7c77905e02134f216 Gerrit-Change-Number: 19290 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 06:58:47 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 16 Jul 2020 06:58:47 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: get rid of Python2 specific workarounds References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19291 ) Change subject: trx_toolkit: get rid of Python2 specific workarounds ...................................................................... trx_toolkit: get rid of Python2 specific workarounds Change-Id: I16c63205c9133d964048588c25867ac7c310f951 --- M src/target/trx_toolkit/data_dump.py M src/target/trx_toolkit/transceiver.py 2 files changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/91/19291/1 diff --git a/src/target/trx_toolkit/data_dump.py b/src/target/trx_toolkit/data_dump.py index fb3dca5..9a68556 100644 --- a/src/target/trx_toolkit/data_dump.py +++ b/src/target/trx_toolkit/data_dump.py @@ -83,8 +83,6 @@ self.f = capture def __del__(self): - # FIXME: this causes an Exception in Python 2 (but not in Python 3) - # AttributeError: 'NoneType' object has no attribute 'info' log.info("Closing the capture file") self.f.close() diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 03c60fb..9fc2948 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -326,8 +326,7 @@ def tx_queue_clear(self): with self._tx_queue_lock: - # TODO: Python3: self._tx_queue.clear() - del self._tx_queue[:] + self._tx_queue.clear() def clck_tick(self, fwd, fn): if not self.running: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I16c63205c9133d964048588c25867ac7c310f951 Gerrit-Change-Number: 19291 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 07:16:46 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 16 Jul 2020 07:16:46 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: remove unused import of 'time' module References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19292 ) Change subject: trx_toolkit/clck_gen.py: remove unused import of 'time' module ...................................................................... trx_toolkit/clck_gen.py: remove unused import of 'time' module Change-Id: I40628d32409543c9f4b40b7268a4538b4671102d --- M src/target/trx_toolkit/clck_gen.py 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/92/19292/1 diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index e5c7b0d..7232f74 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -27,7 +27,6 @@ import logging as log import threading import signal -import time from app_common import ApplicationBase from udp_link import UDPLink -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I40628d32409543c9f4b40b7268a4538b4671102d Gerrit-Change-Number: 19292 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 08:48:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 16 Jul 2020 08:48:40 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp-client: mgcp_client_tx(): return rc on error References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19293 ) Change subject: libosmo-mgcp-client: mgcp_client_tx(): return rc on error ...................................................................... libosmo-mgcp-client: mgcp_client_tx(): return rc on error Change-Id: Ic2080241ceb9e00109a5222b78c35b7971320c21 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/93/19293/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index bc9ac55..bb55077 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -975,12 +975,12 @@ mgcp_tx_error: if (!pending) - return -1; + return rc; /* Dequeue pending response, it's going to be free()d */ llist_del(&pending->entry); /* Pass NULL to response cb to indicate an error */ mgcp_client_handle_response(mgcp, pending, NULL); - return -1; + return rc; } /*! Cancel a pending transaction. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic2080241ceb9e00109a5222b78c35b7971320c21 Gerrit-Change-Number: 19293 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 08:52:43 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 16 Jul 2020 08:52:43 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp-client: fix memleak in case if no response is received In-Reply-To: References: Message-ID: fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18881 ) Change subject: libosmo-mgcp-client: fix memleak in case if no response is received ...................................................................... Abandoned See https://gerrit.osmocom.org/c/osmo-mgw/+/19271. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18881 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia2e89f31685a0822e5cb147a06cc1fc68efc1ec4 Gerrit-Change-Number: 18881 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 08:53:39 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 16 Jul 2020 08:53:39 +0000 Subject: Change in osmo-iuh[master]: tests/hnb-test: remove some unused variables reported by GCC In-Reply-To: References: Message-ID: fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/17749 ) Change subject: tests/hnb-test: remove some unused variables reported by GCC ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/17749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ifcbc97633e60217494c2106d0de60480d656fae0 Gerrit-Change-Number: 17749 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 10:44:13 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 10:44:13 +0000 Subject: Change in libosmocore[master]: rate_ctr: Add functions to reset rate counter (groups) References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19294 ) Change subject: rate_ctr: Add functions to reset rate counter (groups) ...................................................................... rate_ctr: Add functions to reset rate counter (groups) Change-Id: If2f806d044cd0fb6929dac44ef8f8a15941ffe9b Related: SYS#4877 --- M TODO-RELEASE M include/osmocom/core/rate_ctr.h M src/rate_ctr.c 3 files changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/94/19294/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index e2fd830..61fd1cf 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -15,3 +15,4 @@ gsm API/ABI change add new member to lapd_datalink gsm new API new gsm0808_create_common_id() gb new API new bssgp_tx_bvc_reset2() +core net API new rate_ctr_reset_{ctr,group}() diff --git a/include/osmocom/core/rate_ctr.h b/include/osmocom/core/rate_ctr.h index f7e6e22..2f89ed2 100644 --- a/include/osmocom/core/rate_ctr.h +++ b/include/osmocom/core/rate_ctr.h @@ -116,4 +116,7 @@ int rate_ctr_for_each_group(rate_ctr_group_handler_t handle_group, void *data); +void rate_ctr_reset_ctr(struct rate_ctr *ctr); +void rate_ctr_reset_group(struct rate_ctr_group *ctrg); + /*! @} */ diff --git a/src/rate_ctr.c b/src/rate_ctr.c index 026670b..13c366f 100644 --- a/src/rate_ctr.c +++ b/src/rate_ctr.c @@ -426,4 +426,26 @@ return rc; } +/*! Reset a rate counter back to zero + * \param[in] ctr counter to reset + */ +void rate_ctr_reset_ctr(struct rate_ctr *ctr) +{ + memset(ctr, 0, sizeof(*ctr)); +} + +static int reset_rate_ctr_handler(struct rate_ctr_group *ctrg_, struct rate_ctr *ctr, const struct rate_ctr_desc *desc_, void *sctx_) +{ + rate_ctr_reset_ctr(ctr); + return 0; +} + +/*! Reset all counters in a groupV + * \param[in] ctrg counter group to reset + */ +void rate_ctr_reset_ctr_group(struct rate_ctr_group *ctrg) +{ + rate_ctr_for_each_counter(ctrg, reset_rate_ctr_handler, NULL); +} + /*! @} */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If2f806d044cd0fb6929dac44ef8f8a15941ffe9b Gerrit-Change-Number: 19294 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 10:44:14 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 10:44:14 +0000 Subject: Change in libosmocore[master]: stat_item: Add function to reset stat items and groups References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19295 ) Change subject: stat_item: Add function to reset stat items and groups ...................................................................... stat_item: Add function to reset stat items and groups Change-Id: I80fc0ea8865ec4efdcd4c982e69d863275fd9919 Related: SYS#4877 --- M TODO-RELEASE M include/osmocom/core/stat_item.h M src/stat_item.c 3 files changed, 37 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/95/19295/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 61fd1cf..9700f58 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -15,4 +15,5 @@ gsm API/ABI change add new member to lapd_datalink gsm new API new gsm0808_create_common_id() gb new API new bssgp_tx_bvc_reset2() -core net API new rate_ctr_reset_{ctr,group}() +core new API new rate_ctr_reset_{ctr,group}() +core new API new osmo_stat_item_reset_{item,group}() diff --git a/include/osmocom/core/stat_item.h b/include/osmocom/core/stat_item.h index 806173a..9858ca1 100644 --- a/include/osmocom/core/stat_item.h +++ b/include/osmocom/core/stat_item.h @@ -114,4 +114,8 @@ { return item->values[item->last_offs].value; } + +void osmo_stat_item_reset_item(struct osmo_stat_item *item); +void osmo_stat_item_reset_group(struct osmo_stat_item_group *statg); + /*! @} */ diff --git a/src/stat_item.c b/src/stat_item.c index 6716575..660abfb 100644 --- a/src/stat_item.c +++ b/src/stat_item.c @@ -356,4 +356,35 @@ return rc; } + +/*! Remove all values of a stat item + * \param[in] item stat item to reset + */ +void osmo_stat_item_reset_item(struct osmo_stat_item *item) +{ + unsigned int i; + + item->last_offs = item->desc->num_values - 1; + item->last_value_index = -1; + + for (i = 0; i <= item->last_offs; i++) { + item->values[i].value = item->desc->default_value; + item->values[i].id = OSMO_STAT_ITEM_NOVALUE_ID; + } +} + +static int reset_osmo_stat_item_handler( + struct osmo_stat_item_group *statg_, struct osmo_stat_item *item, void *sctx_) +{ + osmo_stat_item_reset_item(item); + return 0; +} + +/*! Reset all osmo stat items in a group + * \param[in] statg stat item group to reset + */ +void osmo_stat_item_reset_group(struct osmo_stat_item_group *statg) +{ + osmo_stat_item_for_each_item(statg, reset_osmo_stat_item_handler, NULL); +} /*! @} */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I80fc0ea8865ec4efdcd4c982e69d863275fd9919 Gerrit-Change-Number: 19295 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 10:44:15 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 10:44:15 +0000 Subject: Change in libosmocore[master]: stats: Add stats commands related to testing References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19296 ) Change subject: stats: Add stats commands related to testing ...................................................................... stats: Add stats commands related to testing * Allow to set the reporting interval to 0 for manual reporting * stats reset command to reset all statistics * stats report command to manually trigger statistics reporting Change-Id: I9febcb65650abfd538caedfbca77a787e66d517a Related: SYS#4877 --- M src/stats.c M src/vty/stats_vty.c 2 files changed, 53 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/19296/1 diff --git a/src/stats.c b/src/stats.c index a5a4d4b..c91a978 100644 --- a/src/stats.c +++ b/src/stats.c @@ -181,12 +181,21 @@ if (rc < 0) LOGP(DLSTATS, LOGL_ERROR, "Failed to setup the timer with error code %d (fd=%d)\n", rc, osmo_stats_timer.fd); - rc = osmo_timerfd_schedule(&osmo_stats_timer, &ts_first, &ts_interval); - if (rc < 0) - LOGP(DLSTATS, LOGL_ERROR, "Failed to schedule the timer with error code %d (fd=%d, interval %d sec)\n", - rc, osmo_stats_timer.fd, interval); - LOGP(DLSTATS, LOGL_INFO, "Stats timer started with interval %d sec\n", interval); + if (interval == 0) { + rc = osmo_timerfd_disable(&osmo_stats_timer); + if (rc < 0) + LOGP(DLSTATS, LOGL_ERROR, "Failed to disable the timer with error code %d (fd=%d)\n", + rc, osmo_stats_timer.fd); + } else { + + rc = osmo_timerfd_schedule(&osmo_stats_timer, &ts_first, &ts_interval); + if (rc < 0) + LOGP(DLSTATS, LOGL_ERROR, "Failed to schedule the timer with error code %d (fd=%d, interval %d sec)\n", + rc, osmo_stats_timer.fd, interval); + + LOGP(DLSTATS, LOGL_INFO, "Stats timer started with interval %d sec\n", interval); + } return 0; } @@ -361,7 +370,7 @@ * \returns 0 on success; negative on error */ int osmo_stats_set_interval(int interval) { - if (interval <= 0) + if (interval < 0) return -EINVAL; osmo_stats_config->interval = interval; diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c index 4628281..83a8a5f 100644 --- a/src/vty/stats_vty.c +++ b/src/vty/stats_vty.c @@ -43,6 +43,8 @@ #define SHOW_STATS_STR "Show statistical values\n" +#define STATS_STR "Stats related commands\n" + /*! \file stats_vty.c * VTY interface for statsd / statistic items * @@ -351,9 +353,9 @@ } DEFUN(cfg_stats_interval, cfg_stats_interval_cmd, - "stats interval <1-65535>", + "stats interval <0-65535>", CFG_STATS_STR "Set the reporting interval\n" - "Interval in seconds\n") + "Interval in seconds (set to 0 for manual reporting)\n") { int rc; int interval = atoi(argv[0]); @@ -567,6 +569,37 @@ return CMD_SUCCESS; } +DEFUN(stats_report, + stats_report_cmd, + "stats report", + STATS_STR "Report all stats\n") +{ + osmo_stats_report(); + return CMD_SUCCESS; +} + +static int reset_rate_ctr_group_handler(struct rate_ctr_group *ctrg, void *sctx_) +{ + rate_ctr_reset_group(ctrg); + return 0; +} + +static int reset_osmo_stat_item_group_handler(struct osmo_stat_item_group *statg, void *sctx_) +{ + osmo_stat_item_reset_group(statg); + return 0; +} + +DEFUN(stats_reset, + stats_reset_cmd, + "stats reset", + STATS_STR "Reset all stats\n") +{ + rate_ctr_for_each_group(reset_rate_ctr_group_handler, NULL); + osmo_stat_item_for_each_group(reset_osmo_stat_item_group_handler, NULL); + return CMD_SUCCESS; +} + static int config_write_stats_reporter(struct vty *vty, struct osmo_stats_reporter *srep) { if (srep == NULL) @@ -666,4 +699,7 @@ install_element_ve(&show_stats_asciidoc_table_cmd); install_element_ve(&show_rate_counters_cmd); + + install_element(ENABLE_NODE, &stats_report_cmd); + install_element(ENABLE_NODE, &stats_reset_cmd); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9febcb65650abfd538caedfbca77a787e66d517a Gerrit-Change-Number: 19296 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 10:48:58 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 10:48:58 +0000 Subject: Change in libosmocore[master]: rate_ctr: Add functions to reset rate counter (groups) In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19294 to look at the new patch set (#2). Change subject: rate_ctr: Add functions to reset rate counter (groups) ...................................................................... rate_ctr: Add functions to reset rate counter (groups) Change-Id: If2f806d044cd0fb6929dac44ef8f8a15941ffe9b Related: SYS#4877 --- M TODO-RELEASE M include/osmocom/core/rate_ctr.h M src/rate_ctr.c 3 files changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/94/19294/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If2f806d044cd0fb6929dac44ef8f8a15941ffe9b Gerrit-Change-Number: 19294 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 10:48:58 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 10:48:58 +0000 Subject: Change in libosmocore[master]: stat_item: Add function to reset stat items and groups In-Reply-To: References: Message-ID: daniel has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmocore/+/19295 ) Change subject: stat_item: Add function to reset stat items and groups ...................................................................... stat_item: Add function to reset stat items and groups Change-Id: I80fc0ea8865ec4efdcd4c982e69d863275fd9919 Related: SYS#4877 --- M TODO-RELEASE M include/osmocom/core/stat_item.h M src/stat_item.c 3 files changed, 36 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/95/19295/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I80fc0ea8865ec4efdcd4c982e69d863275fd9919 Gerrit-Change-Number: 19295 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 10:48:58 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 10:48:58 +0000 Subject: Change in libosmocore[master]: stats: Add stats commands related to testing In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19296 to look at the new patch set (#2). Change subject: stats: Add stats commands related to testing ...................................................................... stats: Add stats commands related to testing * Allow to set the reporting interval to 0 for manual reporting * stats reset command to reset all statistics * stats report command to manually trigger statistics reporting Change-Id: I9febcb65650abfd538caedfbca77a787e66d517a Related: SYS#4877 --- M src/stats.c M src/vty/stats_vty.c 2 files changed, 53 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/19296/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9febcb65650abfd538caedfbca77a787e66d517a Gerrit-Change-Number: 19296 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 10:52:59 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 10:52:59 +0000 Subject: Change in libosmocore[master]: rate_ctr: Add functions to reset rate counter (groups) In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19294 to look at the new patch set (#3). Change subject: rate_ctr: Add functions to reset rate counter (groups) ...................................................................... rate_ctr: Add functions to reset rate counter (groups) Change-Id: If2f806d044cd0fb6929dac44ef8f8a15941ffe9b Related: SYS#4877 --- M TODO-RELEASE M include/osmocom/core/rate_ctr.h M src/rate_ctr.c 3 files changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/94/19294/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If2f806d044cd0fb6929dac44ef8f8a15941ffe9b Gerrit-Change-Number: 19294 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 10:55:35 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 10:55:35 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: remove unused import of 'time' module In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19292 ) Change subject: trx_toolkit/clck_gen.py: remove unused import of 'time' module ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I40628d32409543c9f4b40b7268a4538b4671102d Gerrit-Change-Number: 19292 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 16 Jul 2020 10:55:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 10:56:51 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 10:56:51 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: get rid of Python2 specific workarounds In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19291 ) Change subject: trx_toolkit: get rid of Python2 specific workarounds ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I16c63205c9133d964048588c25867ac7c310f951 Gerrit-Change-Number: 19291 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 16 Jul 2020 10:56:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 10:58:00 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 10:58:00 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp-client: mgcp_client_tx(): return rc on error In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19293 ) Change subject: libosmo-mgcp-client: mgcp_client_tx(): return rc on error ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic2080241ceb9e00109a5222b78c35b7971320c21 Gerrit-Change-Number: 19293 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 16 Jul 2020 10:58:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 10:59:42 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 10:59:42 +0000 Subject: Change in osmo-bsc[master]: Add example configuration files for E1 BTS In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19266 ) Change subject: Add example configuration files for E1 BTS ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1fe15cc3654025e52fc1110ac3052fb1f7a009a0 Gerrit-Change-Number: 19266 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 16 Jul 2020 10:59:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:01:02 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 11:01:02 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: use python3 in shebang of executable scripts In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19290 ) Change subject: trx_toolkit: use python3 in shebang of executable scripts ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8a1d7c59d3b5d49ec2ed94a7c77905e02134f216 Gerrit-Change-Number: 19290 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 16 Jul 2020 11:01:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:01:06 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 11:01:06 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: remove shebang from non-executable scripts In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19289 ) Change subject: trx_toolkit: remove shebang from non-executable scripts ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5ddc531a4e98d4d6f8672d6ef14034fce605ba3d Gerrit-Change-Number: 19289 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 16 Jul 2020 11:01:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:12:42 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 11:12:42 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: add function to generate e1-endpoint names In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19075 ) Change subject: mgcp_client: add function to generate e1-endpoint names ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iec35b5bae8a7b07ddb3559f7114a24dcd10e8f14 Gerrit-Change-Number: 19075 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:12:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:12:47 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jul 2020 11:12:47 +0000 Subject: Change in libosmocore[master]: stats: Add stats commands related to testing In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19296 ) Change subject: stats: Add stats commands related to testing ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19296/3/src/vty/stats_vty.c File src/vty/stats_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/19296/3/src/vty/stats_vty.c at 598 PS3, Line 598: rate_ctr_for_each_group(reset_rate_ctr_group_handler, NULL); Do we want to reset rate counters during "stats reset"? or should we have another command for that? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9febcb65650abfd538caedfbca77a787e66d517a Gerrit-Change-Number: 19296 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:12:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:14:45 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 11:14:45 +0000 Subject: Change in osmo-trx[master]: Transceiver: Provide initial value for TransceiverState::mFiller in c... In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19273 ) Change subject: Transceiver: Provide initial value for TransceiverState::mFiller in constructor ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ic00cc5939ca46407cb5bf8b6fcbcf3dc677041a2 Gerrit-Change-Number: 19273 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 16 Jul 2020 11:14:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:15:22 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 11:15:22 +0000 Subject: Change in osmo-trx[master]: Transceiver: Use already obtained value from Rx msg structure In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19274 ) Change subject: Transceiver: Use already obtained value from Rx msg structure ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3854f284e6d6a561b3816b467985f59e690a282b Gerrit-Change-Number: 19274 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 16 Jul 2020 11:15:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:18:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jul 2020 11:18:21 +0000 Subject: Change in libosmocore[master]: rate_ctr: Add functions to reset rate counter (groups) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19294 ) Change subject: rate_ctr: Add functions to reset rate counter (groups) ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/19294/3/include/osmocom/core/rate_ctr.h File include/osmocom/core/rate_ctr.h: https://gerrit.osmocom.org/c/libosmocore/+/19294/3/include/osmocom/core/rate_ctr.h at 119 PS3, Line 119: void rate_ctr_reset_ctr(struct rate_ctr *ctr); Since structs are called rate_ctr and rate_ctr_group: rate_ctr_reset() rate_ctr_group_reset() https://gerrit.osmocom.org/c/libosmocore/+/19294/3/src/rate_ctr.c File src/rate_ctr.c: https://gerrit.osmocom.org/c/libosmocore/+/19294/3/src/rate_ctr.c at 448 PS3, Line 448: rate_ctr_for_each_counter(ctrg, reset_rate_ctr_handler, NULL); Since we are inside the implementation here, it may make sense to simply iterate directly to avoid calling function pointers like crazy. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If2f806d044cd0fb6929dac44ef8f8a15941ffe9b Gerrit-Change-Number: 19294 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:18:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:19:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jul 2020 11:19:27 +0000 Subject: Change in libosmocore[master]: stat_item: Add function to reset stat items and groups In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19295 ) Change subject: stat_item: Add function to reset stat items and groups ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/19295/3/include/osmocom/core/stat_item.h File include/osmocom/core/stat_item.h: https://gerrit.osmocom.org/c/libosmocore/+/19295/3/include/osmocom/core/stat_item.h at 119 PS3, Line 119: void osmo_stat_item_reset_group(struct osmo_stat_item_group *statg); Same: osmo_stat_item_reset osmo_stat_item_group_reset https://gerrit.osmocom.org/c/libosmocore/+/19295/3/src/stat_item.c File src/stat_item.c: https://gerrit.osmocom.org/c/libosmocore/+/19295/3/src/stat_item.c at 388 PS3, Line 388: osmo_stat_item_for_each_item(statg, reset_osmo_stat_item_handler, NULL); Same: iteratire directly. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I80fc0ea8865ec4efdcd4c982e69d863275fd9919 Gerrit-Change-Number: 19295 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:19:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:19:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jul 2020 11:19:50 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: remove unused import of 'time' module In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19292 ) Change subject: trx_toolkit/clck_gen.py: remove unused import of 'time' module ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I40628d32409543c9f4b40b7268a4538b4671102d Gerrit-Change-Number: 19292 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:19:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:20:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jul 2020 11:20:14 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: get rid of Python2 specific workarounds In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19291 ) Change subject: trx_toolkit: get rid of Python2 specific workarounds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I16c63205c9133d964048588c25867ac7c310f951 Gerrit-Change-Number: 19291 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:20:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:20:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jul 2020 11:20:36 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: remove shebang from non-executable scripts In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19289 ) Change subject: trx_toolkit: remove shebang from non-executable scripts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5ddc531a4e98d4d6f8672d6ef14034fce605ba3d Gerrit-Change-Number: 19289 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:20:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:21:26 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jul 2020 11:21:26 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp-client: mgcp_client_tx(): return rc on error In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19293 ) Change subject: libosmo-mgcp-client: mgcp_client_tx(): return rc on error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic2080241ceb9e00109a5222b78c35b7971320c21 Gerrit-Change-Number: 19293 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:21:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:22:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jul 2020 11:22:07 +0000 Subject: Change in osmo-bsc[master]: Add example configuration files for E1 BTS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19266 ) Change subject: Add example configuration files for E1 BTS ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/19266/2/doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg File doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg: https://gerrit.osmocom.org/c/osmo-bsc/+/19266/2/doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg at 33 PS2, Line 33: trailing whitespace -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1fe15cc3654025e52fc1110ac3052fb1f7a009a0 Gerrit-Change-Number: 19266 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:22:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:22:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jul 2020 11:22:34 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: use python3 in shebang of executable scripts In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19290 ) Change subject: trx_toolkit: use python3 in shebang of executable scripts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8a1d7c59d3b5d49ec2ed94a7c77905e02134f216 Gerrit-Change-Number: 19290 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:22:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:22:52 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 11:22:52 +0000 Subject: Change in libosmocore[master]: stats: Add stats commands related to testing In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19296 ) Change subject: stats: Add stats commands related to testing ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19296/3/src/vty/stats_vty.c File src/vty/stats_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/19296/3/src/vty/stats_vty.c at 598 PS3, Line 598: rate_ctr_for_each_group(reset_rate_ctr_group_handler, NULL); > Do we want to reset rate counters during "stats reset"? or should we have another command for that? In the config "stats" represents the statistics subsystem as a whole, see "stats interval" and "stats reporter". That's why I chose it here. I don't think we need the distinction between rate counter and stat item when resetting as reporting will also always report both. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9febcb65650abfd538caedfbca77a787e66d517a Gerrit-Change-Number: 19296 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:22:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:22:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jul 2020 11:22:57 +0000 Subject: Change in osmo-trx[master]: Transceiver: Provide initial value for TransceiverState::mFiller in c... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19273 ) Change subject: Transceiver: Provide initial value for TransceiverState::mFiller in constructor ...................................................................... Patch Set 1: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ic00cc5939ca46407cb5bf8b6fcbcf3dc677041a2 Gerrit-Change-Number: 19273 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:22:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:23:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jul 2020 11:23:05 +0000 Subject: Change in osmo-trx[master]: Transceiver: Provide initial value for TransceiverState::mFiller in c... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19273 ) Change subject: Transceiver: Provide initial value for TransceiverState::mFiller in constructor ...................................................................... Transceiver: Provide initial value for TransceiverState::mFiller in constructor Fixes: Coverity CID#211258 Change-Id: Ic00cc5939ca46407cb5bf8b6fcbcf3dc677041a2 --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 5e42178..56da2e2 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -61,7 +61,7 @@ } TransceiverState::TransceiverState() - : mRetrans(false), mNoiseLev(0.0), mNoises(NOISE_CNT), mPower(0.0) + : mFiller(FILLER_ZERO), mRetrans(false), mNoiseLev(0.0), mNoises(NOISE_CNT), mPower(0.0) { for (int i = 0; i < 8; i++) { chanType[i] = Transceiver::NONE; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ic00cc5939ca46407cb5bf8b6fcbcf3dc677041a2 Gerrit-Change-Number: 19273 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:23:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jul 2020 11:23:05 +0000 Subject: Change in osmo-trx[master]: Transceiver: Use already obtained value from Rx msg structure In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19274 ) Change subject: Transceiver: Use already obtained value from Rx msg structure ...................................................................... Transceiver: Use already obtained value from Rx msg structure Change-Id: I3854f284e6d6a561b3816b467985f59e690a282b --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 56da2e2..d750218 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -1062,7 +1062,7 @@ } LOGCHAN(chan, DTRXDDL, DEBUG) << "Rx TRXD message (hdr_ver=" << unsigned(dl->common.version) - << "): fn=" << fn << ", tn=" << unsigned(dl->common.tn) << ", burst_len=" << burstLen; + << "): fn=" << fn << ", tn=" << unsigned(tn) << ", burst_len=" << burstLen; TransceiverState *state = &mStates[chan]; GSM::Time currTime = GSM::Time(fn, tn); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3854f284e6d6a561b3816b467985f59e690a282b Gerrit-Change-Number: 19274 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:23:54 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 11:23:54 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: fix endpoint number configuration In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19121 ) Change subject: mgcp_vty: fix endpoint number configuration ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Gerrit-Change-Number: 19121 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:23:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:51:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:51:50 +0000 Subject: Change in osmo-bsc[master]: Add example configuration files for E1 BTS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19266 ) Change subject: Add example configuration files for E1 BTS ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1fe15cc3654025e52fc1110ac3052fb1f7a009a0 Gerrit-Change-Number: 19266 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:51:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:51:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:51:53 +0000 Subject: Change in osmo-bsc[master]: Add example configuration files for E1 BTS In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19266 ) Change subject: Add example configuration files for E1 BTS ...................................................................... Add example configuration files for E1 BTS This adds osmo-bsc config files for Ericsson RBS2308, Siemens BS-11 and Nokia InSite which were working in July 2020 to get the BTS initialized, recognized by MS and up to signalling. Voice/TRAU support is still missing in OsmoBSC, but should be added relatively soon. Change-Id: I1fe15cc3654025e52fc1110ac3052fb1f7a009a0 Depends: osmo-python-tests I896b99032d94ba0cdd340a8eed7c7b625661ad69 Closes: OS4651 --- A doc/examples/osmo-bsc/ericsson/osmo-bsc.cfg A doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg A doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg A doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg 4 files changed, 343 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.cfg new file mode 100644 index 0000000..f79d457 --- /dev/null +++ b/doc/examples/osmo-bsc/ericsson/osmo-bsc.cfg @@ -0,0 +1,101 @@ +! +! OpenBSC (0.9.11.308-62d46) configuration saved from vty +!! +password foo +! +line vty + no login +! +log stderr + logging level lmi info + logging level linp info + logging level nm debug + logging level rsl debug + logging level llapd notice +log file bsc-rbs2k.log + logging timestamp 1 + logging filter all 1 + logging level lmi info + logging level linp info + logging level nm debug + logging level rsl debug +network + network country code 262 + mobile network code 42 + neci 0 + paging any use tch 0 + handover 0 + handover window rxlev averaging 10 + handover window rxqual averaging 1 + handover window rxlev neighbor averaging 10 + handover power budget interval 6 + handover power budget hysteresis 3 + handover maximum distance 9999 + timer t3101 10 + timer t3105 40 + timer t3109 4 + timer t3113 60 + bts 0 + type rbs2000 + band PCS1900 + cell_identity 0 + location_area_code 1 + training_sequence_code 7 + base_station_id_code 63 + ms max power 33 + cell reselection hysteresis 4 + rxlev access min 0 + channel allocator descending + rach tx integer 9 + rach max transmission 7 + oml e1 line 0 timeslot 1 sub-slot full + oml e1 tei 62 + neighbor-list mode automatic + gprs mode none + is-connection-list add 4 512 12 + is-connection-list add 16 524 12 + is-connection-list add 28 536 12 + is-connection-list add 40 548 12 + trx 0 + rf_locked 0 + arfcn 800 + nominal power 43 + max_power_red 14 + rsl e1 line 0 timeslot 1 sub-slot full + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + e1 line 0 timeslot 1 sub-slot full + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 3 +e1_input + e1_line 0 driver dahdi + e1_line 0 port 1 + pcap 20200703-rbs2k-10.pcap diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg new file mode 100644 index 0000000..f79d457 --- /dev/null +++ b/doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg @@ -0,0 +1,101 @@ +! +! OpenBSC (0.9.11.308-62d46) configuration saved from vty +!! +password foo +! +line vty + no login +! +log stderr + logging level lmi info + logging level linp info + logging level nm debug + logging level rsl debug + logging level llapd notice +log file bsc-rbs2k.log + logging timestamp 1 + logging filter all 1 + logging level lmi info + logging level linp info + logging level nm debug + logging level rsl debug +network + network country code 262 + mobile network code 42 + neci 0 + paging any use tch 0 + handover 0 + handover window rxlev averaging 10 + handover window rxqual averaging 1 + handover window rxlev neighbor averaging 10 + handover power budget interval 6 + handover power budget hysteresis 3 + handover maximum distance 9999 + timer t3101 10 + timer t3105 40 + timer t3109 4 + timer t3113 60 + bts 0 + type rbs2000 + band PCS1900 + cell_identity 0 + location_area_code 1 + training_sequence_code 7 + base_station_id_code 63 + ms max power 33 + cell reselection hysteresis 4 + rxlev access min 0 + channel allocator descending + rach tx integer 9 + rach max transmission 7 + oml e1 line 0 timeslot 1 sub-slot full + oml e1 tei 62 + neighbor-list mode automatic + gprs mode none + is-connection-list add 4 512 12 + is-connection-list add 16 524 12 + is-connection-list add 28 536 12 + is-connection-list add 40 548 12 + trx 0 + rf_locked 0 + arfcn 800 + nominal power 43 + max_power_red 14 + rsl e1 line 0 timeslot 1 sub-slot full + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + e1 line 0 timeslot 1 sub-slot full + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 3 +e1_input + e1_line 0 driver dahdi + e1_line 0 port 1 + pcap 20200703-rbs2k-10.pcap diff --git a/doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg b/doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg new file mode 100644 index 0000000..a8e8e5c --- /dev/null +++ b/doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg @@ -0,0 +1,65 @@ +! +! OpenBSC configuration saved from vty +! ! +password foo +! +line vty + no login +! +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 0 + logging print category 1 + logging print file 1 + logging level llapd notice + logging level nm debug +e1_input + e1_line 0 driver dahdi + e1_line 0 port 3 + pcap 2020004-insite.pcap +network + network country code 1 + mobile network code 1 + timer t3101 10 + timer t3113 60 + bts 0 + type nokia_site + band GSM1900 + cell_identity 1 + location_area_code 1 + base_station_id_code 63 + training_sequence_code 7 + + oml e1 line 0 timeslot 1 sub-slot full + oml e1 tei 1 + + trx 0 + arfcn 810 + max_power_red 0 + rsl e1 line 0 timeslot 1 sub-slot full + rsl e1 tei 1 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + e1 line 0 timeslot 2 sub-slot full + timeslot 1 + phys_chan_config SDCCH8 + e1 line 0 timeslot 2 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + e1 line 0 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + e1 line 0 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 3 diff --git a/doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg b/doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg new file mode 100644 index 0000000..a308db5 --- /dev/null +++ b/doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg @@ -0,0 +1,76 @@ +! +! OpenBSC configuration saved from vty +! ! +password foo +! +line vty + no login +! +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 0 + logging print category 1 + logging timestamp 1 + logging print file 1 + logging level llapd notice + logging level linp notice + logging level lmi notice + logging level lmib info + logging level rsl debug + logging level rll debug + logging level nm debug + logging level mm debug + logging level rr debug +e1_input + e1_line 0 driver dahdi + e1_line 0 port 0 + e1_line 1 driver dahdi + e1_line 1 port 1 + e1_line 2 driver dahdi + e1_line 2 port 2 + pcap 20200714-bs11.pcap +network + network country code 1 + mobile network code 1 + timer t3101 10 + timer t3113 60 + bts 0 + type bs11 + band GSM900 + cell_identity 1 + location_area_code 1 + training_sequence_code 7 + base_station_id_code 63 + oml e1 line 2 timeslot 1 sub-slot full + oml e1 tei 25 + trx 0 + arfcn 121 + max_power_red 00 + rsl e1 line 2 timeslot 1 sub-slot full + rsl e1 tei 1 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + e1 line 2 timeslot 1 sub-slot full + timeslot 1 + phys_chan_config TCH/F + e1 line 2 timeslot 2 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + e1 line 2 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + e1 line 2 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + e1 line 2 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + e1 line 2 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + e1 line 2 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + e1 line 2 timeslot 3 sub-slot 3 + -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1fe15cc3654025e52fc1110ac3052fb1f7a009a0 Gerrit-Change-Number: 19266 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:52:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:52:17 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: remove shebang from non-executable scripts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19289 ) Change subject: trx_toolkit: remove shebang from non-executable scripts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5ddc531a4e98d4d6f8672d6ef14034fce605ba3d Gerrit-Change-Number: 19289 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:52:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:52:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:52:32 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: use python3 in shebang of executable scripts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19290 ) Change subject: trx_toolkit: use python3 in shebang of executable scripts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8a1d7c59d3b5d49ec2ed94a7c77905e02134f216 Gerrit-Change-Number: 19290 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:52:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:52:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:52:57 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: get rid of Python2 specific workarounds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19291 ) Change subject: trx_toolkit: get rid of Python2 specific workarounds ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I16c63205c9133d964048588c25867ac7c310f951 Gerrit-Change-Number: 19291 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:52:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:53:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:53:07 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: remove shebang from non-executable scripts In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19289 ) Change subject: trx_toolkit: remove shebang from non-executable scripts ...................................................................... trx_toolkit: remove shebang from non-executable scripts Change-Id: I5ddc531a4e98d4d6f8672d6ef14034fce605ba3d --- M src/target/trx_toolkit/app_common.py M src/target/trx_toolkit/burst_fwd.py M src/target/trx_toolkit/ctrl_if.py M src/target/trx_toolkit/ctrl_if_trx.py M src/target/trx_toolkit/data_dump.py M src/target/trx_toolkit/data_if.py M src/target/trx_toolkit/data_msg.py M src/target/trx_toolkit/fake_pm.py M src/target/trx_toolkit/gsm_shared.py M src/target/trx_toolkit/transceiver.py M src/target/trx_toolkit/trx_list.py M src/target/trx_toolkit/udp_link.py 12 files changed, 0 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/target/trx_toolkit/app_common.py b/src/target/trx_toolkit/app_common.py index 64baa6d..7f2f03c 100644 --- a/src/target/trx_toolkit/app_common.py +++ b/src/target/trx_toolkit/app_common.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index 574c97e..dbaded6 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/ctrl_if.py b/src/target/trx_toolkit/ctrl_if.py index 7333501..4f44080 100644 --- a/src/target/trx_toolkit/ctrl_if.py +++ b/src/target/trx_toolkit/ctrl_if.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/ctrl_if_trx.py b/src/target/trx_toolkit/ctrl_if_trx.py index e841975..0e5106a 100644 --- a/src/target/trx_toolkit/ctrl_if_trx.py +++ b/src/target/trx_toolkit/ctrl_if_trx.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/data_dump.py b/src/target/trx_toolkit/data_dump.py index 52768a9..fb3dca5 100644 --- a/src/target/trx_toolkit/data_dump.py +++ b/src/target/trx_toolkit/data_dump.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py index 418c3f8..18e53ed 100644 --- a/src/target/trx_toolkit/data_if.py +++ b/src/target/trx_toolkit/data_if.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index 55fb796..88376ed 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/fake_pm.py b/src/target/trx_toolkit/fake_pm.py index 0d66099..9331212 100644 --- a/src/target/trx_toolkit/fake_pm.py +++ b/src/target/trx_toolkit/fake_pm.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/gsm_shared.py b/src/target/trx_toolkit/gsm_shared.py index c8c6b8f..aac152e 100644 --- a/src/target/trx_toolkit/gsm_shared.py +++ b/src/target/trx_toolkit/gsm_shared.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 3c1ddc8..03c60fb 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/trx_list.py b/src/target/trx_toolkit/trx_list.py index 3206d74..0a55cc6 100644 --- a/src/target/trx_toolkit/trx_list.py +++ b/src/target/trx_toolkit/trx_list.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/udp_link.py b/src/target/trx_toolkit/udp_link.py index 8da15db..0602694 100644 --- a/src/target/trx_toolkit/udp_link.py +++ b/src/target/trx_toolkit/udp_link.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # TRX Toolkit -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5ddc531a4e98d4d6f8672d6ef14034fce605ba3d Gerrit-Change-Number: 19289 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:53:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:53:07 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: use python3 in shebang of executable scripts In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19290 ) Change subject: trx_toolkit: use python3 in shebang of executable scripts ...................................................................... trx_toolkit: use python3 in shebang of executable scripts TRX Toolkit is still backwards compatible with Python2, but Python3 does much better in terms of performance. Also, on Debian Stretch that is used as a base for our Docker images, Python 2.7 is still the default. Let's require Python3 in shebang. Change-Id: I8a1d7c59d3b5d49ec2ed94a7c77905e02134f216 --- M src/target/trx_toolkit/burst_gen.py M src/target/trx_toolkit/burst_send.py M src/target/trx_toolkit/clck_gen.py M src/target/trx_toolkit/ctrl_cmd.py M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/rand_burst_gen.py 6 files changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/target/trx_toolkit/burst_gen.py b/src/target/trx_toolkit/burst_gen.py index a777246..7028c24 100755 --- a/src/target/trx_toolkit/burst_gen.py +++ b/src/target/trx_toolkit/burst_gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/burst_send.py b/src/target/trx_toolkit/burst_send.py index 368031c..717414d 100755 --- a/src/target/trx_toolkit/burst_send.py +++ b/src/target/trx_toolkit/burst_send.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index 6c09316..e5c7b0d 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/ctrl_cmd.py b/src/target/trx_toolkit/ctrl_cmd.py index 982cf31..7a2bfac 100755 --- a/src/target/trx_toolkit/ctrl_cmd.py +++ b/src/target/trx_toolkit/ctrl_cmd.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index b487a93..da611e8 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # TRX Toolkit diff --git a/src/target/trx_toolkit/rand_burst_gen.py b/src/target/trx_toolkit/rand_burst_gen.py index 9ac6943..0eb2e8f 100644 --- a/src/target/trx_toolkit/rand_burst_gen.py +++ b/src/target/trx_toolkit/rand_burst_gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # TRX Toolkit -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8a1d7c59d3b5d49ec2ed94a7c77905e02134f216 Gerrit-Change-Number: 19290 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:53:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:53:08 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: get rid of Python2 specific workarounds In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19291 ) Change subject: trx_toolkit: get rid of Python2 specific workarounds ...................................................................... trx_toolkit: get rid of Python2 specific workarounds Change-Id: I16c63205c9133d964048588c25867ac7c310f951 --- M src/target/trx_toolkit/data_dump.py M src/target/trx_toolkit/transceiver.py 2 files changed, 1 insertion(+), 4 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/target/trx_toolkit/data_dump.py b/src/target/trx_toolkit/data_dump.py index fb3dca5..9a68556 100644 --- a/src/target/trx_toolkit/data_dump.py +++ b/src/target/trx_toolkit/data_dump.py @@ -83,8 +83,6 @@ self.f = capture def __del__(self): - # FIXME: this causes an Exception in Python 2 (but not in Python 3) - # AttributeError: 'NoneType' object has no attribute 'info' log.info("Closing the capture file") self.f.close() diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 03c60fb..9fc2948 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -326,8 +326,7 @@ def tx_queue_clear(self): with self._tx_queue_lock: - # TODO: Python3: self._tx_queue.clear() - del self._tx_queue[:] + self._tx_queue.clear() def clck_tick(self, fwd, fn): if not self.running: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I16c63205c9133d964048588c25867ac7c310f951 Gerrit-Change-Number: 19291 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:53:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:53:09 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/clck_gen.py: remove unused import of 'time' module In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19292 ) Change subject: trx_toolkit/clck_gen.py: remove unused import of 'time' module ...................................................................... trx_toolkit/clck_gen.py: remove unused import of 'time' module Change-Id: I40628d32409543c9f4b40b7268a4538b4671102d --- M src/target/trx_toolkit/clck_gen.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index e5c7b0d..7232f74 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -27,7 +27,6 @@ import logging as log import threading import signal -import time from app_common import ApplicationBase from udp_link import UDPLink -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I40628d32409543c9f4b40b7268a4538b4671102d Gerrit-Change-Number: 19292 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:53:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:53:54 +0000 Subject: Change in libosmocore[master]: rate_ctr: Add functions to reset rate counter (groups) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19294 ) Change subject: rate_ctr: Add functions to reset rate counter (groups) ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/19294/3/include/osmocom/core/rate_ctr.h File include/osmocom/core/rate_ctr.h: https://gerrit.osmocom.org/c/libosmocore/+/19294/3/include/osmocom/core/rate_ctr.h at 119 PS3, Line 119: void rate_ctr_reset_ctr(struct rate_ctr *ctr); > Since structs are called rate_ctr and rate_ctr_group: [?] Ack https://gerrit.osmocom.org/c/libosmocore/+/19294/3/src/rate_ctr.c File src/rate_ctr.c: https://gerrit.osmocom.org/c/libosmocore/+/19294/3/src/rate_ctr.c at 448 PS3, Line 448: rate_ctr_for_each_counter(ctrg, reset_rate_ctr_handler, NULL); > Since we are inside the implementation here, it may make sense to simply iterate directly to avoid c [?] Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If2f806d044cd0fb6929dac44ef8f8a15941ffe9b Gerrit-Change-Number: 19294 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:53:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:56:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:56:06 +0000 Subject: Change in libosmocore[master]: stats: Add stats commands related to testing In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19296 ) Change subject: stats: Add stats commands related to testing ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19296/3/src/vty/stats_vty.c File src/vty/stats_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/19296/3/src/vty/stats_vty.c at 358 PS3, Line 358: manual reporting "manual reporting" is not explanatory enough, IMHO. manually triggered reporting? manually triggered reporting intervals? for no automatic reporting intervals? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9febcb65650abfd538caedfbca77a787e66d517a Gerrit-Change-Number: 19296 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:56:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:56:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:56:39 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: add function to generate e1-endpoint names In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19075 ) Change subject: mgcp_client: add function to generate e1-endpoint names ...................................................................... mgcp_client: add function to generate e1-endpoint names mgcp_client.h offers functions to generate endpoint names for wildcarded request. This is used in osmo-bsc, lets now also add a function that can generate e1-endpoint names. Change-Id: Iec35b5bae8a7b07ddb3559f7114a24dcd10e8f14 Related: OS#2547 --- M include/osmocom/mgcp_client/mgcp_client.h M src/libosmo-mgcp-client/mgcp_client.c M tests/mgcp_client/mgcp_client_test.c M tests/mgcp_client/mgcp_client_test.err M tests/mgcp_client/mgcp_client_test.ok 5 files changed, 126 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h index 32bd87b..d4dd2d9 100644 --- a/include/osmocom/mgcp_client/mgcp_client.h +++ b/include/osmocom/mgcp_client/mgcp_client.h @@ -137,6 +137,8 @@ const char *mgcp_client_endpoint_domain(const struct mgcp_client *mgcp); const char *mgcp_client_rtpbridge_wildcard(const struct mgcp_client *mgcp); +const char *mgcp_client_e1_epname(void *ctx, const struct mgcp_client *mgcp, uint8_t trunk_id, uint8_t ts, + uint8_t rate, uint8_t offset); /* Invoked when an MGCP response is received or sending failed. When the * response is passed as NULL, this indicates failure during transmission. */ diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index bbf805b..1ca7483 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -902,6 +902,58 @@ return _mgcp_client_name_append_domain(mgcp, "rtpbridge/*"); } +/*! Compose endpoint name for an E1 endpoint. + * \param[in] ctx talloc context. + * \param[in] mgcp MGCP client descriptor. + * \param[in] trunk_id id number of the E1 trunk (1-64). + * \param[in] ts timeslot on the E1 trunk (1-31). + * \param[in] rate bitrate used on the E1 trunk (e.g 16 for 16kbit). + * \param[in] offset bit offset of the E1 subslot (e.g. 4 for the third 16k subslot). + * \returns string containing the endpoint name (e.g. ds/e1-1/s-1/su16-4). */ +const char *mgcp_client_e1_epname(void *ctx, const struct mgcp_client *mgcp, uint8_t trunk_id, uint8_t ts, + uint8_t rate, uint8_t offset) +{ + /* See also comment in libosmo-mgcp, mgcp_client.c, gen_e1_epname() */ + const uint8_t valid_rates[] = { 64, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 8, 8, 8 }; + const uint8_t valid_offsets[] = { 0, 0, 4, 0, 2, 4, 6, 0, 1, 2, 3, 4, 5, 6, 7 }; + + uint8_t i; + bool rate_offs_valid = false; + char *epname; + + epname = + talloc_asprintf(ctx, "ds/e1-%u/s-%u/su%u-%u@%s", trunk_id, ts, rate, offset, + mgcp_client_endpoint_domain(mgcp)); + if (!epname) { + LOGP(DLMGCP, LOGL_ERROR, "Cannot compose MGCP e1-endpoint name!\n"); + return NULL; + } + + /* Check if the supplied rate/offset pair resembles a valid combination */ + for (i = 0; i < sizeof(valid_rates); i++) { + if (valid_rates[i] == rate && valid_offsets[i] == offset) + rate_offs_valid = true; + } + if (!rate_offs_valid) { + LOGP(DLMGCP, LOGL_ERROR, + "Cannot compose MGCP e1-endpoint name (%s), rate(%u)/offset(%u) combination is invalid!\n", epname, + rate, offset); + talloc_free(epname); + return NULL; + } + + /* An E1 line has a maximum of 32 timeslots, while the first (ts=0) is + * reserverd for framing and alignment, so we can not use it here. */ + if (ts == 0 || ts > 31) { + LOGP(DLMGCP, LOGL_ERROR, + "Cannot compose MGCP e1-endpoint name (%s), E1-timeslot number (%u) is invalid!\n", epname, ts); + talloc_free(epname); + return NULL; + } + + return epname; +} + struct mgcp_response_pending * mgcp_client_pending_add( struct mgcp_client *mgcp, mgcp_trans_id_t trans_id, diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c index d2e34a6..db9f4f8 100644 --- a/tests/mgcp_client/mgcp_client_test.c +++ b/tests/mgcp_client/mgcp_client_test.c @@ -547,6 +547,57 @@ printf("\n"); } +void test_mgcp_client_e1_epname(void) +{ + char *epname; + + if (mgcp) + talloc_free(mgcp); + mgcp = mgcp_client_init(ctx, &conf); + + /* Valid endpoint names */ + epname = (char *)mgcp_client_e1_epname(ctx, mgcp, 1, 15, 64, 0); + printf("%s\n", epname); + epname = (char *)mgcp_client_e1_epname(ctx, mgcp, 2, 14, 32, 0); + printf("%s\n", epname); + epname = (char *)mgcp_client_e1_epname(ctx, mgcp, 3, 13, 32, 4); + printf("%s\n", epname); + epname = (char *)mgcp_client_e1_epname(ctx, mgcp, 4, 12, 16, 0); + printf("%s\n", epname); + epname = (char *)mgcp_client_e1_epname(ctx, mgcp, 5, 11, 16, 2); + printf("%s\n", epname); + epname = (char *)mgcp_client_e1_epname(ctx, mgcp, 6, 10, 16, 4); + printf("%s\n", epname); + epname = (char *)mgcp_client_e1_epname(ctx, mgcp, 7, 9, 16, 6); + printf("%s\n", epname); + epname = (char *)mgcp_client_e1_epname(ctx, mgcp, 8, 8, 8, 0); + printf("%s\n", epname); + epname = (char *)mgcp_client_e1_epname(ctx, mgcp, 9, 7, 8, 1); + printf("%s\n", epname); + epname = (char *)mgcp_client_e1_epname(ctx, mgcp, 10, 6, 8, 2); + printf("%s\n", epname); + epname = (char *)mgcp_client_e1_epname(ctx, mgcp, 11, 5, 8, 3); + printf("%s\n", epname); + epname = (char *)mgcp_client_e1_epname(ctx, mgcp, 12, 4, 8, 4); + printf("%s\n", epname); + epname = (char *)mgcp_client_e1_epname(ctx, mgcp, 13, 3, 8, 5); + printf("%s\n", epname); + epname = (char *)mgcp_client_e1_epname(ctx, mgcp, 14, 2, 8, 6); + printf("%s\n", epname); + epname = (char *)mgcp_client_e1_epname(ctx, mgcp, 15, 1, 8, 7); + printf("%s\n", epname); + + /* A few invalid enpoint names */ + epname = (char *)mgcp_client_e1_epname(ctx, mgcp, 15, 1, 128, 0); + OSMO_ASSERT(epname == NULL); + epname = (char *)mgcp_client_e1_epname(ctx, mgcp, 15, 1, 8, 16); + OSMO_ASSERT(epname == NULL); + epname = (char *)mgcp_client_e1_epname(ctx, mgcp, 15, 0, 8, 2); + OSMO_ASSERT(epname == NULL); + epname = (char *)mgcp_client_e1_epname(ctx, mgcp, 15, 64, 8, 2); + OSMO_ASSERT(epname == NULL); +} + static const struct log_info_cat log_categories[] = { }; @@ -575,6 +626,7 @@ test_sdp_section_start(); test_map_codec_to_pt_and_map_pt_to_codec(); test_map_pt_to_codec(); + test_mgcp_client_e1_epname(); printf("Done\n"); fprintf(stderr, "Done\n"); diff --git a/tests/mgcp_client/mgcp_client_test.err b/tests/mgcp_client/mgcp_client_test.err index fbcf8f6..e114f79 100644 --- a/tests/mgcp_client/mgcp_client_test.err +++ b/tests/mgcp_client/mgcp_client_test.err @@ -72,4 +72,9 @@ DLMGCP ptmap contains illegal mapping: codec=0 maps to pt=100 DLMGCP ptmap contains illegal mapping: codec=113 maps to pt=2 DLMGCP ptmap contains illegal mapping: codec=0 maps to pt=100 +DLMGCP MGCP client: using endpoint domain '@mgw' +DLMGCP Cannot compose MGCP e1-endpoint name (ds/e1-15/s-1/su128-0 at mgw), rate(128)/offset(0) combination is invalid! +DLMGCP Cannot compose MGCP e1-endpoint name (ds/e1-15/s-1/su8-16 at mgw), rate(8)/offset(16) combination is invalid! +DLMGCP Cannot compose MGCP e1-endpoint name (ds/e1-15/s-0/su8-2 at mgw), E1-timeslot number (0) is invalid! +DLMGCP Cannot compose MGCP e1-endpoint name (ds/e1-15/s-64/su8-2 at mgw), E1-timeslot number (64) is invalid! Done diff --git a/tests/mgcp_client/mgcp_client_test.ok b/tests/mgcp_client/mgcp_client_test.ok index 8b3e15b..2b03ba1 100644 --- a/tests/mgcp_client/mgcp_client_test.ok +++ b/tests/mgcp_client/mgcp_client_test.ok @@ -178,4 +178,19 @@ 2 <= 2 100 <= 100 +ds/e1-1/s-15/su64-0 at mgw +ds/e1-2/s-14/su32-0 at mgw +ds/e1-3/s-13/su32-4 at mgw +ds/e1-4/s-12/su16-0 at mgw +ds/e1-5/s-11/su16-2 at mgw +ds/e1-6/s-10/su16-4 at mgw +ds/e1-7/s-9/su16-6 at mgw +ds/e1-8/s-8/su8-0 at mgw +ds/e1-9/s-7/su8-1 at mgw +ds/e1-10/s-6/su8-2 at mgw +ds/e1-11/s-5/su8-3 at mgw +ds/e1-12/s-4/su8-4 at mgw +ds/e1-13/s-3/su8-5 at mgw +ds/e1-14/s-2/su8-6 at mgw +ds/e1-15/s-1/su8-7 at mgw Done -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iec35b5bae8a7b07ddb3559f7114a24dcd10e8f14 Gerrit-Change-Number: 19075 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:56:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:56:40 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: use define constant to define max number of E1 subslots In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19118 ) Change subject: mgcp_endp: use define constant to define max number of E1 subslots ...................................................................... mgcp_endp: use define constant to define max number of E1 subslots There are 15 possible subslots (not all at the same time) in one E1 timeslot. Lets use a define constant for that. Change-Id: If7cb74e486946aff09e22abf8a8885bf0693f34e Related: OS#2547 --- M include/osmocom/mgcp/mgcp_endp.h M src/libosmo-mgcp/mgcp_endp.c 2 files changed, 5 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h index a58053a..879947b 100644 --- a/include/osmocom/mgcp/mgcp_endp.h +++ b/include/osmocom/mgcp/mgcp_endp.h @@ -27,6 +27,9 @@ struct mgcp_conn; struct mgcp_endpoint; +/* Number of E1 subslots (different variants, not all useable at the same time) */ +#define MGCP_ENDP_E1_SUBSLOTS 15 + #define LOGPENDP(endp, cat, level, fmt, args...) \ LOGP(cat, level, "endpoint:%s " fmt, \ endp ? endp->name : "none", \ diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index 82f7732..3ac3c5d 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -119,7 +119,7 @@ endp->type = &ep_typeset.rtp; endp->name = gen_e1_epname(endp, trunk->cfg->domain, trunk->trunk_nr, - index / 15, index % 15); + index / MGCP_ENDP_E1_SUBSLOTS, index % MGCP_ENDP_E1_SUBSLOTS); break; default: osmo_panic("Cannot allocate unimplemented trunk type %d! %s:%d\n", @@ -524,7 +524,7 @@ * endpoint we need to verify, only the overlaps need to be checked. This is * also the reason why the related subslot number is missing from each each * line. */ - const int8_t interlock_tab[15][16] = + const int8_t interlock_tab[MGCP_ENDP_E1_SUBSLOTS][15] = { { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, -1 }, { 0, 3, 4, 7, 8, 9, 10, -1, -1, -1, -1, -1, -1, -1, -1 }, { 0, 5, 6, 11, 12, 13, 14, -1, -1, -1, -1, -1, -1, -1, -1 }, -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If7cb74e486946aff09e22abf8a8885bf0693f34e Gerrit-Change-Number: 19118 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:56:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:56:40 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp.c: cosmetic: fix sourcecode formatting In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19178 ) Change subject: mgcp_endp.c: cosmetic: fix sourcecode formatting ...................................................................... mgcp_endp.c: cosmetic: fix sourcecode formatting Change-Id: Ib83442d9a033b96c304bfd5e81206405d98d2ed5 --- M src/libosmo-mgcp/mgcp_endp.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: neels: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index 3ac3c5d..5d9ec27 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -524,8 +524,8 @@ * endpoint we need to verify, only the overlaps need to be checked. This is * also the reason why the related subslot number is missing from each each * line. */ - const int8_t interlock_tab[MGCP_ENDP_E1_SUBSLOTS][15] = - { { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, -1 }, + const int8_t interlock_tab[MGCP_ENDP_E1_SUBSLOTS][15] = { + { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, -1 }, { 0, 3, 4, 7, 8, 9, 10, -1, -1, -1, -1, -1, -1, -1, -1 }, { 0, 5, 6, 11, 12, 13, 14, -1, -1, -1, -1, -1, -1, -1, -1 }, { 0, 1, 7, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib83442d9a033b96c304bfd5e81206405d98d2ed5 Gerrit-Change-Number: 19178 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:56:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:56:51 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: fix endpoint number configuration In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19121 ) Change subject: mgcp_vty: fix endpoint number configuration ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Gerrit-Change-Number: 19121 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:56:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:57:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:57:40 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: remove double check In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19119 ) Change subject: mgcp_trunk: remove double check ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I91fb8cf6e3b077ba8f18fdbcd071275c6fd7cacd Gerrit-Change-Number: 19119 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 11:57:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:57:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:57:45 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: remove double check In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19119 ) Change subject: mgcp_trunk: remove double check ...................................................................... mgcp_trunk: remove double check At the moment, the trunk prefix is checked twice. Lets re-arange the code a bit so that the check only happens once. Change-Id: I91fb8cf6e3b077ba8f18fdbcd071275c6fd7cacd Related: OS#2547 --- M src/libosmo-mgcp/mgcp_trunk.c 1 file changed, 2 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified Objections: neels: I would prefer this is not merged as is diff --git a/src/libosmo-mgcp/mgcp_trunk.c b/src/libosmo-mgcp/mgcp_trunk.c index e41ed0e..f3785cd 100644 --- a/src/libosmo-mgcp/mgcp_trunk.c +++ b/src/libosmo-mgcp/mgcp_trunk.c @@ -159,13 +159,9 @@ return mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); } - prefix_len = sizeof(MGCP_ENDPOINT_PREFIX_E1_TRUNK) - 1; - if (strncmp(epname, MGCP_ENDPOINT_PREFIX_E1_TRUNK, prefix_len) == 0) { - trunk_nr = e1_trunk_nr_from_epname(epname); - if (trunk_nr < 0) - return NULL; + trunk_nr = e1_trunk_nr_from_epname(epname); + if (trunk_nr > 0) return mgcp_trunk_by_num(cfg, MGCP_TRUNK_E1, trunk_nr); - } /* Earlier versions of osmo-mgw were accepting endpoint names * without trunk prefix. This is normally not allowed, each MGCP -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I91fb8cf6e3b077ba8f18fdbcd071275c6fd7cacd Gerrit-Change-Number: 19119 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:57:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:57:46 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: do not access endpoint array elements directly In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19120 ) Change subject: mgcp_test: do not access endpoint array elements directly ...................................................................... mgcp_test: do not access endpoint array elements directly The test assumes that the endpoint "rtpbridge/X at mgw" is at array position X in many places. This does not necessarly have to match. Accessing the array elements directly was the prefered way when the MGW did use integer numbers and not strings to identify endpoints. Since the endpoint name strings are used to access the endpoints the unit-test should also reflect this. Lets replace the integer variable last_endpoint with a string variable and do related verifications based on strings. Change-Id: Ic950c427f23be4a792af94972554637c2b0fbdf2 Related: OS#2659 --- M tests/mgcp/mgcp_test.c 1 file changed, 40 insertions(+), 31 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 0e87c15..9cafcf7 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -592,7 +592,7 @@ return msg; } -static int last_endpoint = -1; +static char last_endpoint[MGCP_ENDPOINT_MAXLEN]; static int mgcp_test_policy_cb(struct mgcp_endpoint *endp, int state, const char *transaction_id) @@ -604,10 +604,11 @@ state, endp->name); trunk = endp->trunk; - last_endpoint = -1; + last_endpoint[0] = '\0'; for (i = 0; i < trunk->vty_number_endpoints; i++) { if (strcmp(endp->name, trunk->endpoints[i]->name) == 0) - last_endpoint = i; + osmo_strlcpy(last_endpoint, trunk->endpoints[i]->name, + sizeof(last_endpoint)); } return MGCP_POLICY_CONT; @@ -787,7 +788,7 @@ printf("\n================================================\n"); printf("Testing %s\n", t->name); - last_endpoint = -1; + last_endpoint[0] = '\0'; dummy_packets = 0; osmo_talloc_replace_string(cfg, &trunk->audio_fmtp_extra, @@ -822,8 +823,9 @@ if (dummy_packets) printf("Dummy packets: %d\n", dummy_packets); - if (last_endpoint != -1) { - endp = trunk->endpoints[last_endpoint]; + if (last_endpoint[0] != '\0') { + endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); + OSMO_ASSERT(endp); conn = mgcp_conn_get_rtp(endp, "1"); if (conn) { @@ -878,10 +880,9 @@ /* Check detected payload type */ if (conn && t->ptype != PTYPE_IGNORE) { - OSMO_ASSERT(last_endpoint != -1); - endp = trunk->endpoints[last_endpoint]; + OSMO_ASSERT(last_endpoint[0] != '\0'); - fprintf(stderr, "endpoint 0x%x: " + fprintf(stderr, "endpoint:%s: " "payload type %d (expected %d)\n", last_endpoint, conn->end.codec->payload_type, t->ptype); @@ -1402,7 +1403,7 @@ mgcp_trunk_alloc_endpts(trunk2); /* Allocate endpoint 1 at mgw with two codecs */ - last_endpoint = -1; + last_endpoint[0] = '\0'; inp = create_msg(CRCX_MULT_1, NULL); resp = mgcp_handle_message(cfg, inp); OSMO_ASSERT(get_conn_id_from_response(resp->data, conn_id, @@ -1410,14 +1411,15 @@ msgb_free(inp); msgb_free(resp); - OSMO_ASSERT(last_endpoint == 1); - endp = trunk->endpoints[last_endpoint]; + OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/1 at mgw") == 0); + endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); + OSMO_ASSERT(endp); conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 18); /* Allocate 2 at mgw with three codecs, last one ignored */ - last_endpoint = -1; + last_endpoint[0] = '\0'; inp = create_msg(CRCX_MULT_2, NULL); resp = mgcp_handle_message(cfg, inp); OSMO_ASSERT(get_conn_id_from_response(resp->data, conn_id, @@ -1425,8 +1427,9 @@ msgb_free(inp); msgb_free(resp); - OSMO_ASSERT(last_endpoint == 2); - endp = trunk->endpoints[last_endpoint]; + OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/2 at mgw") == 0); + endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); + OSMO_ASSERT(endp); conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 18); @@ -1437,7 +1440,7 @@ * it makes and since we already decided in OS#2658 that a missing * LCO should pick a sane default codec, it makes sense to expect * the same behaviour if SDP lacks proper payload type information */ - last_endpoint = -1; + last_endpoint[0] = '\0'; inp = create_msg(CRCX_MULT_3, NULL); resp = mgcp_handle_message(cfg, inp); OSMO_ASSERT(get_conn_id_from_response(resp->data, conn_id, @@ -1445,14 +1448,15 @@ msgb_free(inp); msgb_free(resp); - OSMO_ASSERT(last_endpoint == 3); - endp = trunk->endpoints[last_endpoint]; + OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/3 at mgw") == 0); + endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); + OSMO_ASSERT(endp); conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 0); /* Allocate 4 at mgw with a single codec */ - last_endpoint = -1; + last_endpoint[0] = '\0'; inp = create_msg(CRCX_MULT_4, NULL); resp = mgcp_handle_message(cfg, inp); OSMO_ASSERT(get_conn_id_from_response(resp->data, conn_id, @@ -1460,14 +1464,15 @@ msgb_free(inp); msgb_free(resp); - OSMO_ASSERT(last_endpoint == 4); - endp = trunk->endpoints[last_endpoint]; + OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/4 at mgw") == 0); + endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); + OSMO_ASSERT(endp); conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 18); /* Allocate 5 at mgw and let osmo-mgw pick a codec from the list */ - last_endpoint = -1; + last_endpoint[0] = '\0'; inp = create_msg(CRCX_MULT_GSM_EXACT, NULL); trunk->no_audio_transcoding = 1; resp = mgcp_handle_message(cfg, inp); @@ -1476,19 +1481,21 @@ msgb_free(inp); msgb_free(resp); - OSMO_ASSERT(last_endpoint == 5); - endp = trunk->endpoints[last_endpoint]; + OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/5 at mgw") == 0); + endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); + OSMO_ASSERT(endp); conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 0); inp = create_msg(MDCX_NAT_DUMMY, conn_id); - last_endpoint = -1; + last_endpoint[0] = '\0'; resp = mgcp_handle_message(cfg, inp); msgb_free(inp); msgb_free(resp); - OSMO_ASSERT(last_endpoint == 5); - endp = trunk->endpoints[last_endpoint]; + OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/5 at mgw") == 0); + endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); + OSMO_ASSERT(endp); conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 3); @@ -1508,7 +1515,7 @@ conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(!conn); - last_endpoint = -1; + last_endpoint[0] = '\0'; inp = create_msg(CRCX_MULT_GSM_EXACT, NULL); trunk->no_audio_transcoding = 0; resp = mgcp_handle_message(cfg, inp); @@ -1517,8 +1524,9 @@ msgb_free(inp); msgb_free(resp); - OSMO_ASSERT(last_endpoint == 5); - endp = trunk->endpoints[last_endpoint]; + OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/5 at mgw") == 0); + endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); + OSMO_ASSERT(endp); conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 0); @@ -1543,7 +1551,8 @@ trunk->vty_number_endpoints = 64; mgcp_trunk_alloc_endpts(trunk); - endp = trunk->endpoints[1]; + endp = mgcp_endp_by_name(NULL, "rtpbridge/1 at mgw", cfg); + OSMO_ASSERT(endp); _conn = mgcp_conn_alloc(NULL, endp, MGCP_CONN_TYPE_RTP, "test-connection"); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic950c427f23be4a792af94972554637c2b0fbdf2 Gerrit-Change-Number: 19120 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:57:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:57:47 +0000 Subject: Change in osmo-mgw[master]: mgcp_vty: fix endpoint number configuration In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19121 ) Change subject: mgcp_vty: fix endpoint number configuration ...................................................................... mgcp_vty: fix endpoint number configuration At the moment the number of possible E1 endpoints (depends on the number of E1 timeslots that should be used) is hardcoded and the configuration of the number of virtual endpoints has an off-by-one problem. For the E1 timeslots one might choose not to occupy all E1 timeslots of once. A one TRX E1 BTS usually requires 3 E1 timeslots. One as D-Channel timeslot and two to cover the voice channels. The voice channels timeslots need to be set up in osmo-mgw, while the D-Channel timeslot must not be touched. The VTY config needs to be able to reflect that. Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Related: OS#2547 --- M src/libosmo-mgcp/mgcp_trunk.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 3 files changed, 37 insertions(+), 19 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_trunk.c b/src/libosmo-mgcp/mgcp_trunk.c index f3785cd..55a8953 100644 --- a/src/libosmo-mgcp/mgcp_trunk.c +++ b/src/libosmo-mgcp/mgcp_trunk.c @@ -47,7 +47,7 @@ trunk->audio_send_ptime = 1; trunk->audio_send_name = 1; - trunk->vty_number_endpoints = 33; + trunk->vty_number_endpoints = 32; trunk->omit_rtcp = 0; mgcp_trunk_set_keepalive(trunk, MGCP_KEEPALIVE_ONCE); @@ -67,13 +67,8 @@ { int i; struct mgcp_endpoint *endp; - - /* Make sure the amount of requested endpoints does not execeed - * sane limits. The VTY already limits the possible amount, - * however miss-initalation of the struct or memory corruption - * could still lead to an excessive allocation of endpoints, so - * better stop early if that is the case. */ - OSMO_ASSERT(trunk->vty_number_endpoints < 65534); + unsigned int number_endpoints; + unsigned int first_endpoint_nr; /* This function is called once on startup by the VTY to allocate the * endpoints. The number of endpoints must not change througout the @@ -81,15 +76,39 @@ OSMO_ASSERT(trunk->number_endpoints == 0); OSMO_ASSERT(trunk->endpoints == NULL); + switch (trunk->trunk_type) { + case MGCP_TRUNK_VIRTUAL: + /* Due to historical reasons the endpoints on the virtual + * trunk start counting at 1. */ + first_endpoint_nr = 1; + number_endpoints = trunk->vty_number_endpoints; + break; + case MGCP_TRUNK_E1: + /* The first timeslot on an E1 line is reserved for framing + * and alignment and can not be used for audio transport */ + first_endpoint_nr = 1 * MGCP_ENDP_E1_SUBSLOTS; + number_endpoints = 31 * MGCP_ENDP_E1_SUBSLOTS; + break; + default: + OSMO_ASSERT(false); + } + + /* Make sure the amount of requested endpoints does not execeed + * sane limits. The VTY already limits the possible amount, + * however miss-initialization of the struct or memory corruption + * could still lead to an excessive allocation of endpoints, so + * better stop early if that is the case. */ + OSMO_ASSERT(number_endpoints < 65534); + /* allocate pointer array for the endpoints */ trunk->endpoints = _talloc_zero_array(trunk->cfg, - sizeof(struct mgcp_endpoint *), trunk->vty_number_endpoints, "endpoints"); + sizeof(struct mgcp_endpoint *), number_endpoints, "endpoints"); if (!trunk->endpoints) return -1; /* create endpoints */ - for (i = 0; i < trunk->vty_number_endpoints; ++i) { - endp = mgcp_endp_alloc(trunk, i); + for (i = 0; i < number_endpoints; i++) { + endp = mgcp_endp_alloc(trunk, i + first_endpoint_nr); if (!endp) { talloc_free(trunk->endpoints); return -1; @@ -98,7 +117,7 @@ } /* make the endpoints we just created available to the MGW code */ - trunk->number_endpoints = trunk->vty_number_endpoints; + trunk->number_endpoints = number_endpoints; return 0; } diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 2f862f1..35b75fb 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -112,7 +112,7 @@ trunk->audio_send_name ? "" : "no ", VTY_NEWLINE); vty_out(vty, " loop %u%s", ! !trunk->audio_loop, VTY_NEWLINE); vty_out(vty, " number endpoints %u%s", - trunk->vty_number_endpoints - 1, VTY_NEWLINE); + trunk->vty_number_endpoints, VTY_NEWLINE); vty_out(vty, " %sallow-transcoding%s", trunk->no_audio_transcoding ? "no " : "", VTY_NEWLINE); if (g_cfg->call_agent_addr) @@ -289,7 +289,7 @@ vty_out(vty, "%s trunk %d with %d endpoints:%s", trunk->trunk_type == MGCP_TRUNK_VIRTUAL ? "Virtual" : "E1", - trunk->trunk_nr, trunk->number_endpoints - 1, VTY_NEWLINE); + trunk->trunk_nr, trunk->number_endpoints, VTY_NEWLINE); if (!trunk->endpoints) { vty_out(vty, "No endpoints allocated yet.%s", VTY_NEWLINE); @@ -710,13 +710,12 @@ DEFUN(cfg_mgcp_number_endp, cfg_mgcp_number_endp_cmd, - "number endpoints <0-65534>", + "number endpoints <1-65534>", "Number options\n" "Endpoints available\n" "Number endpoints\n") { struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); OSMO_ASSERT(trunk); - /* + 1 as we start counting at one */ - trunk->vty_number_endpoints = atoi(argv[0]) + 1; + trunk->vty_number_endpoints = atoi(argv[0]); return CMD_SUCCESS; } diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 9cafcf7..792ae1f 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -605,7 +605,7 @@ trunk = endp->trunk; last_endpoint[0] = '\0'; - for (i = 0; i < trunk->vty_number_endpoints; i++) { + for (i = 0; i < trunk->number_endpoints; i++) { if (strcmp(endp->name, trunk->endpoints[i]->name) == 0) osmo_strlcpy(last_endpoint, trunk->endpoints[i]->name, sizeof(last_endpoint)); @@ -656,7 +656,7 @@ static void mgcp_endpoints_release(struct mgcp_trunk *trunk) { int i; - for (i = 1; i < trunk->number_endpoints; i++) + for (i = 0; i < trunk->number_endpoints; i++) mgcp_endp_release(trunk->endpoints[i]); } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Gerrit-Change-Number: 19121 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:57:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:57:48 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: remove trunk2 from unit-test In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19165 ) Change subject: mgcp_test: remove trunk2 from unit-test ...................................................................... mgcp_test: remove trunk2 from unit-test Some of the unit-tests initalize a second trunk (trunk2) but the test never do anything with this trunk. Lets remove it. Change-Id: I228aa45160152091baac9d9c2e6486b774278b6a Related: OS#2659 --- M tests/mgcp/mgcp_test.c 1 file changed, 0 insertions(+), 25 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 792ae1f..66f79b0 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -762,7 +762,6 @@ struct mgcp_config *cfg; struct mgcp_endpoint *endp; struct mgcp_trunk *trunk; - struct mgcp_trunk *trunk2; int i; struct mgcp_conn_rtp *conn = NULL; char last_conn_id[256]; @@ -777,9 +776,6 @@ memset(last_conn_id, 0, sizeof(last_conn_id)); - trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1); - mgcp_trunk_alloc_endpts(trunk2); - for (i = 0; i < ARRAY_SIZE(tests); i++) { const struct mgcp_test *t = &tests[i]; struct msgb *inp; @@ -896,7 +892,6 @@ } } - mgcp_endpoints_release(trunk2); mgcp_endpoints_release(trunk); talloc_free(cfg); } @@ -905,7 +900,6 @@ { struct mgcp_config *cfg; struct mgcp_trunk *trunk; - struct mgcp_trunk *trunk2; int i; char last_conn_id[256]; int rc; @@ -918,9 +912,6 @@ memset(last_conn_id, 0, sizeof(last_conn_id)); - trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1); - mgcp_trunk_alloc_endpts(trunk2); - for (i = 0; i < ARRAY_SIZE(retransmit); i++) { const struct mgcp_test *t = &retransmit[i]; struct msgb *inp; @@ -959,7 +950,6 @@ msgb_free(msg); } - mgcp_endpoints_release(trunk2); mgcp_endpoints_release(trunk); talloc_free(cfg); } @@ -975,7 +965,6 @@ { struct mgcp_config *cfg; struct mgcp_trunk *trunk; - struct mgcp_trunk *trunk2; struct msgb *inp, *msg; char conn_id[256]; @@ -986,9 +975,6 @@ trunk->vty_number_endpoints = 64; mgcp_trunk_alloc_endpts(trunk); - trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1); - mgcp_trunk_alloc_endpts(trunk2); - inp = create_msg(CRCX, NULL); msg = mgcp_handle_message(cfg, inp); OSMO_ASSERT(msg); @@ -1016,7 +1002,6 @@ inp = create_msg(DLCX, conn_id); msgb_free(mgcp_handle_message(cfg, inp)); msgb_free(inp); - mgcp_endpoints_release(trunk2); mgcp_endpoints_release(trunk); talloc_free(cfg); } @@ -1384,7 +1369,6 @@ { struct mgcp_config *cfg; struct mgcp_trunk *trunk; - struct mgcp_trunk *trunk2; struct mgcp_endpoint *endp; struct msgb *inp, *resp; struct in_addr addr; @@ -1399,9 +1383,6 @@ mgcp_trunk_alloc_endpts(trunk); cfg->policy_cb = mgcp_test_policy_cb; - trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1); - mgcp_trunk_alloc_endpts(trunk2); - /* Allocate endpoint 1 at mgw with two codecs */ last_endpoint[0] = '\0'; inp = create_msg(CRCX_MULT_1, NULL); @@ -1531,7 +1512,6 @@ OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 0); - mgcp_endpoints_release(trunk2); mgcp_endpoints_release(trunk); talloc_free(cfg); } @@ -1591,7 +1571,6 @@ static void test_no_name(void) { struct mgcp_trunk *trunk; - struct mgcp_trunk *trunk2; struct mgcp_config *cfg; struct msgb *inp, *msg; @@ -1605,9 +1584,6 @@ cfg->policy_cb = mgcp_test_policy_cb; - trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1); - mgcp_trunk_alloc_endpts(trunk2); - inp = create_msg(CRCX, NULL); msg = mgcp_handle_message(cfg, inp); @@ -1619,7 +1595,6 @@ msgb_free(inp); msgb_free(msg); - mgcp_endpoints_release(trunk2); mgcp_endpoints_release(trunk); talloc_free(cfg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I228aa45160152091baac9d9c2e6486b774278b6a Gerrit-Change-Number: 19165 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 11:57:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 11:57:48 +0000 Subject: Change in osmo-mgw[master]: mgcp_trunk: use talloc_zero_array instead of _talloc_zero_array In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19174 ) Change subject: mgcp_trunk: use talloc_zero_array instead of _talloc_zero_array ...................................................................... mgcp_trunk: use talloc_zero_array instead of _talloc_zero_array _talloc_zero_array is not supposed to be called by the API user. Lets use talloc_zero_array instead. Related: OS#2659 Change-Id: I27549585016a7998e9233c52f6d86429fc75f509 --- M src/libosmo-mgcp/mgcp_trunk.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_trunk.c b/src/libosmo-mgcp/mgcp_trunk.c index 55a8953..0d7b385 100644 --- a/src/libosmo-mgcp/mgcp_trunk.c +++ b/src/libosmo-mgcp/mgcp_trunk.c @@ -101,8 +101,8 @@ OSMO_ASSERT(number_endpoints < 65534); /* allocate pointer array for the endpoints */ - trunk->endpoints = _talloc_zero_array(trunk->cfg, - sizeof(struct mgcp_endpoint *), number_endpoints, "endpoints"); + trunk->endpoints = talloc_zero_array(trunk->cfg, struct mgcp_endpoint*, + number_endpoints); if (!trunk->endpoints) return -1; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I27549585016a7998e9233c52f6d86429fc75f509 Gerrit-Change-Number: 19174 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 12:02:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 12:02:18 +0000 Subject: Change in osmo-bsc[master]: ipaccess_nanobts: Log ipaccess_sign_link_down event In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19283 ) Change subject: ipaccess_nanobts: Log ipaccess_sign_link_down event ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7c864e67fb2149685c687c137a59d567f5a03ca3 Gerrit-Change-Number: 19283 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 16 Jul 2020 12:02:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 12:02:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 12:02:19 +0000 Subject: Change in osmo-bsc[master]: ipaccess_nanobts: Log ipaccess_sign_link_down event In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19283 ) Change subject: ipaccess_nanobts: Log ipaccess_sign_link_down event ...................................................................... ipaccess_nanobts: Log ipaccess_sign_link_down event Change-Id: I7c864e67fb2149685c687c137a59d567f5a03ca3 --- M src/osmo-bsc/bts_ipaccess_nanobts.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index b21678b..5b60367 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -604,6 +604,8 @@ struct gsm_bts *bts = NULL; struct e1inp_sign_link *link; + LOGPIL(line, DLINP, LOGL_NOTICE, "Signalling link down\n"); + llist_for_each_entry(link, &ts->sign.sign_links, list) { /* Get bts pointer from the first element of the list. */ if (bts == NULL) @@ -614,6 +616,8 @@ } if (bts != NULL) ipaccess_drop_oml(bts, "link down"); + else + LOGPIL(line, DLINP, LOGL_NOTICE, "Signalling link down for unknown BTS\n"); } /* This function is called if we receive one OML/RSL message. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7c864e67fb2149685c687c137a59d567f5a03ca3 Gerrit-Change-Number: 19283 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 12:03:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 12:03:07 +0000 Subject: Change in osmo-bsc[master]: RR Release Cell selection IE: fix repeated EARFCNs encoding In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19210 ) Change subject: RR Release Cell selection IE: fix repeated EARFCNs encoding ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I59e427e4ebb1c6af99b27a15c40fed82457ac8ab Gerrit-Change-Number: 19210 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 12:03:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 12:03:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 12:03:19 +0000 Subject: Change in osmo-bsc[master]: RR Release Cell selection IE: fix repeated EARFCNs encoding In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19210 ) Change subject: RR Release Cell selection IE: fix repeated EARFCNs encoding ...................................................................... RR Release Cell selection IE: fix repeated EARFCNs encoding 3GPP 44.018 10.5.2.1e defines the EARFCNs encoded in the 'Cell selection indicator after release of all TCH and SDCCH IE' as follows: ::= [...] | 011 { 1 > } ** 0 So after a 3-bit discriminator of '3' there can be multiple E-UTRAN Descriptions, and each of them starts with a '1' bit to indicate that another item follows. Finally there is a '0' bit to indicate the list end. Before this patch, osmo-bsc only encoded the first '1' bit, and failed to repeat this before each following E-UTRAN Description. Fix that by moving the '1' encoding into the loop. The final '0' was missing. Add it. With these changes, adjust the size calculation in CELL_SEL_IND_AFTER_REL_MAX_BITS to match. Also fix CELL_SEL_IND_AFTER_REL_MAX_BYTES by using OSMO_BYTES_FOR_BITS() instead of the inaccurate (n/8)+1. A test for this is in I882c5e1f70bcc4833fc837a95c900ce291919cc5 (osmo-ttcn3-hacks). Related: SYS#4871 SYS#4872 Change-Id: I59e427e4ebb1c6af99b27a15c40fed82457ac8ab --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 8 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index f47c31f..f425b16 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -238,8 +238,8 @@ } -#define CELL_SEL_IND_AFTER_REL_MAX_BITS (4+MAX_EARFCN_LIST*19) -#define CELL_SEL_IND_AFTER_REL_MAX_BYTES ((CELL_SEL_IND_AFTER_REL_MAX_BITS/8)+1) +#define CELL_SEL_IND_AFTER_REL_MAX_BITS (3+MAX_EARFCN_LIST*20+1) +#define CELL_SEL_IND_AFTER_REL_MAX_BYTES OSMO_BYTES_FOR_BITS(CELL_SEL_IND_AFTER_REL_MAX_BITS) /* Generate a CSN.1 encoded "Cell Selection Indicator after release of all TCH and SDCCH" * as per TF 44.018 version 15.3.0 Table 10.5.2.1e.1. This only generates the "value" @@ -255,17 +255,18 @@ /* E-UTRAN Description */ bitvec_set_uint(&bv, 3, 3); - bitvec_set_bit(&bv, 1); for (i = 0; i < MAX_EARFCN_LIST; i++) { const struct osmo_earfcn_si2q *e = &bts->si_common.si2quater_neigh_list; if (e->arfcn[i] == OSMO_EARFCN_INVALID) continue; - if (bitvec_tailroom_bits(&bv) < 19) { + /* tailroom must fit one more EARFCN (20 bits), plus the final list term bit. */ + if (bitvec_tailroom_bits(&bv) < 21) { LOGP(DRR, LOGL_NOTICE, "%s: Not enough room to store EARFCN %u in the " "Cell Selection Indicator IE\n", gsm_bts_name(bts), e->arfcn[i]); } else { + bitvec_set_bit(&bv, 1); bitvec_set_uint(&bv, e->arfcn[i], 16); /* No "Measurement Bandwidth" */ bitvec_set_bit(&bv, 0); @@ -276,6 +277,9 @@ } } + /* list term */ + bitvec_set_bit(&bv, 0); + rc = bitvec_used_bytes(&bv); if (rc == 1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I59e427e4ebb1c6af99b27a15c40fed82457ac8ab Gerrit-Change-Number: 19210 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 12:03:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 12:03:20 +0000 Subject: Change in osmo-bsc[master]: RR Channel Release: pass Cause code from BSSMAP Clear to the BTS In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19214 ) Change subject: RR Channel Release: pass Cause code from BSSMAP Clear to the BTS ...................................................................... RR Channel Release: pass Cause code from BSSMAP Clear to the BTS In lchan.release, add 'cause_rr', and set RR Channel Release message's cause value to lchan.release.cause_rr. In lchan_release(), do not set lchan.release.rsl_error_cause to the RR cause value, these are unrelated. Store in new lchan.release.cause_rr instead. The rsl_error_cause is apparently only used for logging, except for one place in lchan_fsm_wait_activ_ack() that compares it to RSL_ERR_RCH_ALR_ACTV_ALLOC, so there should not be a functional difference by this fix. Propagate the BSSMAP Clear Command cause to the RR Channel Release: Add struct gscon_clear_cmd_data as event data for GSCON_EV_A_CLEAR_CMD -- so far it sent the is_csfb flag, add the gsm0808_cause; invoking the event happens in bssmap_handle_clear_cmd(). Adjust event handling in gscon_fsm_allstate(); there, pass the cause to gscon_release_lchans(). In gscon_release_lchans(), pass the cause to gscon_release_lchan(), and then lchan_release(), which sets the new lchan.release.cause_rr to the passed cause value. As soon as the lchan FSM enters the proper state, it calls gsm48_send_rr_release(). There, set the cause value in the encoded message to lchan.release.cause_rr. Interworking with osmo-msc: so far, osmo-msc fails to set the Clear Command cause code for normal release, it just passes 0 which amounts to GSM0808_CAUSE_RADIO_INTERFACE_MESSAGE_FAILURE. Before this patch, osmo-bsc always sent GSM48_RR_CAUSE_NORMAL in the RR Channel Release, and after this patch it will receive 0 == GSM0808_CAUSE_RADIO_INTERFACE_MESSAGE_FAILURE from osmo-msc and more accurately translate that to GSM48_RR_CAUSE_PROT_ERROR_UNSPC. This means in practice that we will now see an error cause in RR Channel Release instead of GSM48_RR_CAUSE_NORMAL when working with osmo-msc. For changing osmo-msc to send GSM0808_CAUSE_CALL_CONTROL instead (which translates to GSM48_RR_CAUSE_NORMAL), see OS#4664 and change-id I1347ed72ae7d7ea73a557b866e764819c5ef8c42 (osmo-msc). A test for this is in Ie6c99f28b610a67f2d59ec00b3541940e882251b (osmo-ttcn3-hacks). Related: SYS#4872 Change-Id: I734cc55c501d61bbdadee81a223b26f9df57f959 --- M include/osmocom/bsc/bsc_subscr_conn_fsm.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c 7 files changed, 65 insertions(+), 13 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bsc_subscr_conn_fsm.h b/include/osmocom/bsc/bsc_subscr_conn_fsm.h index 5475272..1a827d9 100644 --- a/include/osmocom/bsc/bsc_subscr_conn_fsm.h +++ b/include/osmocom/bsc/bsc_subscr_conn_fsm.h @@ -1,4 +1,6 @@ #pragma once +#include +#include #include enum gscon_fsm_event { @@ -40,6 +42,11 @@ GSCON_EV_FORGET_MGW_ENDPOINT, }; +struct gscon_clear_cmd_data { + enum gsm0808_cause cause_0808; + bool is_csfb; +}; + struct gsm_subscriber_connection; struct gsm_network; struct msgb; @@ -71,7 +78,7 @@ struct assignment_request *req); void gscon_change_primary_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *new_lchan); -void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_rr_release); +void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_rr_release, enum gsm48_rr_cause cause_rr); void gscon_lchan_releasing(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan); void gscon_forget_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan); diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 5336ebe..43d7040 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -571,6 +571,7 @@ * flag, so that the lchan will gracefully release at the next sensible junction. */ bool requested; bool do_rr_release; + enum gsm48_rr_cause rr_cause; /* There is an RSL error cause of value 0, so we need a separate flag. */ bool in_error; @@ -1896,4 +1897,6 @@ bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx); +enum gsm48_rr_cause bsc_gsm48_rr_cause_from_gsm0808_cause(enum gsm0808_cause c); + #endif /* _GSM_DATA_H */ diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 1d30246..0ed6715 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -182,14 +182,14 @@ lchan_release(lchan, do_rr_release, err, cause_rr); } -void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_rr_release) +void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_rr_release, enum gsm48_rr_cause cause_rr) { if (conn->ho.fi) handover_end(conn, HO_RESULT_CONN_RELEASE); assignment_reset(conn); - gscon_release_lchan(conn, conn->lchan, do_rr_release, false, 0); + gscon_release_lchan(conn, conn->lchan, do_rr_release, false, cause_rr); } static void handle_bssap_n_connect(struct osmo_fsm_inst *fi, struct osmo_scu_prim *scu_prim) @@ -746,17 +746,20 @@ static void gscon_fsm_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_subscriber_connection *conn = fi->priv; + const struct gscon_clear_cmd_data *ccd; /* Regular allstate event processing */ switch (event) { case GSCON_EV_A_CLEAR_CMD: + OSMO_ASSERT(data); + ccd = data; if (conn->lchan) - conn->lchan->release.is_csfb = *(bool *)data; + conn->lchan->release.is_csfb = ccd->is_csfb; /* MSC tells us to cleanly shut down */ if (conn->fi->state != ST_CLEARING) osmo_fsm_inst_state_chg(fi, ST_CLEARING, 60, 999); LOGPFSML(fi, LOGL_DEBUG, "Releasing all lchans (if any) after BSSMAP Clear Command\n"); - gscon_release_lchans(conn, true); + gscon_release_lchans(conn, true, bsc_gsm48_rr_cause_from_gsm0808_cause(ccd->cause_0808)); /* FIXME: Release all terestrial resources in ST_CLEARING */ /* According to 3GPP 48.008 3.1.9.1. "The BSS need not wait for the radio channel * release to be completed or for the guard timer to expire before returning the @@ -833,7 +836,9 @@ } LOGPFSML(fi, LOGL_DEBUG, "Releasing all lchans (if any) because this conn is terminating\n"); - gscon_release_lchans(conn, true); + /* when things go smoothly, the lchan should have been released before FSM instance termination. So if this is + * necessary it's probably "abnormal". */ + gscon_release_lchans(conn, true, GSM48_RR_CAUSE_ABNORMAL_UNSPEC); /* drop pending messages */ gscon_dtap_queue_flush(conn, 0); diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index f425b16..07978de 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -303,7 +303,7 @@ gh->msg_type = GSM48_MT_RR_CHAN_REL; cause = msgb_put(msg, 1); - cause[0] = GSM48_RR_CAUSE_NORMAL; + cause[0] = lchan->release.rr_cause; if (lchan->release.is_csfb) { uint8_t buf[CELL_SEL_IND_AFTER_REL_MAX_BYTES]; diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index f790b90..860e236 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -1840,3 +1840,30 @@ return result; } + +/* This may be specific to RR Channel Release, and the mappings were chosen by pure naive guessing without a proper + * specification available. */ +enum gsm48_rr_cause bsc_gsm48_rr_cause_from_gsm0808_cause(enum gsm0808_cause c) +{ + switch (c) { + case GSM0808_CAUSE_PREEMPTION: + return GSM48_RR_CAUSE_PREMPTIVE_REL; + case GSM0808_CAUSE_RADIO_INTERFACE_MESSAGE_FAILURE: + case GSM0808_CAUSE_INVALID_MESSAGE_CONTENTS: + case GSM0808_CAUSE_INFORMATION_ELEMENT_OR_FIELD_MISSING: + case GSM0808_CAUSE_INCORRECT_VALUE: + case GSM0808_CAUSE_UNKNOWN_MESSAGE_TYPE: + case GSM0808_CAUSE_UNKNOWN_INFORMATION_ELEMENT: + return GSM48_RR_CAUSE_PROT_ERROR_UNSPC; + case GSM0808_CAUSE_CALL_CONTROL: + case GSM0808_CAUSE_HANDOVER_SUCCESSFUL: + case GSM0808_CAUSE_BETTER_CELL: + case GSM0808_CAUSE_DIRECTED_RETRY: + case GSM0808_CAUSE_REDUCE_LOAD_IN_SERVING_CELL: + case GSM0808_CAUSE_RELOCATION_TRIGGERED: + case GSM0808_CAUSE_ALT_CHAN_CONFIG_REQUESTED: + return GSM48_RR_CAUSE_NORMAL; + default: + return GSM48_RR_CAUSE_ABNORMAL_UNSPEC; + } +} diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 68eef4b..dfb8a05 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -402,6 +402,8 @@ .meas_rep_last_seen_nr = 255, .last_error = lchan->last_error, + + .release.rr_cause = GSM48_RR_CAUSE_NORMAL, }; } @@ -1369,8 +1371,8 @@ struct osmo_fsm_inst *fi = lchan->fi; lchan->release.in_error = err; - lchan->release.rsl_error_cause = cause_rr; lchan->release.do_rr_release = do_rr_release; + lchan->release.rr_cause = cause_rr; /* States waiting for events will notice the desire to release when done waiting, so it is enough * to mark for release. */ diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 2deb7f4..1cacfe9 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -453,15 +453,23 @@ struct msgb *msg, unsigned int length) { struct tlv_parsed tp; - bool is_csfb = false; + struct gscon_clear_cmd_data ccd = { + .is_csfb = false, + }; tlv_parse(&tp, gsm0808_att_tlvdef(), msg->l4h + 1, length - 1, 0, 0); - /* FIXME: Check for mandatory cause IE, and use that in RR RELEASE cause! */ - if (TLVP_PRESENT(&tp, GSM0808_IE_CSFB_INDICATION)) - is_csfb = true; + ccd.cause_0808 = gsm0808_get_cause(&tp); + if (ccd.cause_0808 < 0) { + LOGPFSML(conn->fi, LOGL_ERROR, "Clear Command: Mandatory Cause IE not present.\n"); + /* Clear anyway, but without a proper cause. */ + ccd.cause_0808 = GSM0808_CAUSE_RADIO_INTERFACE_MESSAGE_FAILURE; + } - osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CLEAR_CMD, &is_csfb); + if (TLVP_PRESENT(&tp, GSM0808_IE_CSFB_INDICATION)) + ccd.is_csfb = true; + + osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CLEAR_CMD, &ccd); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I734cc55c501d61bbdadee81a223b26f9df57f959 Gerrit-Change-Number: 19214 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 12:03:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 16 Jul 2020 12:03:21 +0000 Subject: Change in osmo-bsc[master]: propagate RSL error cause codes to RR Channel Release cause In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19215 ) Change subject: propagate RSL error cause codes to RR Channel Release cause ...................................................................... propagate RSL error cause codes to RR Channel Release cause In various places that receive an error cause from RSL and place it in lchan.release.rsl_error_cause, translate it to an RR cause and place that in the recently added lchan.release.rr_cause. Hence the RR Channel Release message now reflects more specific error causes when the reason for the error was received in an RSL message's cause value. Change-Id: I46eb12c91a8c08162b43dd22c7ba825ef3bbc6ac --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/lchan_fsm.c 4 files changed, 34 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 43d7040..c357981 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1898,5 +1898,6 @@ bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx); enum gsm48_rr_cause bsc_gsm48_rr_cause_from_gsm0808_cause(enum gsm0808_cause c); +enum gsm48_rr_cause bsc_gsm48_rr_cause_from_rsl_cause(uint8_t c); #endif /* _GSM_DATA_H */ diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 0ed6715..72f2474 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -783,6 +783,8 @@ if (conn->lchan) { conn->lchan->release.in_error = true; conn->lchan->release.rsl_error_cause = data ? *(uint8_t*)data : RSL_ERR_IE_ERROR; + conn->lchan->release.rr_cause = + bsc_gsm48_rr_cause_from_rsl_cause(conn->lchan->release.rsl_error_cause); } gscon_bssmap_clear(conn, GSM0808_CAUSE_RADIO_INTERFACE_FAILURE); break; diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 860e236..a4f6b7f 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -1867,3 +1867,29 @@ return GSM48_RR_CAUSE_ABNORMAL_UNSPEC; } } + +/* Map RSL_ERR_* cause codes to gsm48_rr_cause codes. + * The mappings were chosen by naive guessing without a proper specification available. */ +enum gsm48_rr_cause bsc_gsm48_rr_cause_from_rsl_cause(uint8_t c) +{ + switch (c) { + case RSL_ERR_NORMAL_UNSPEC: + return GSM48_RR_CAUSE_NORMAL; + case RSL_ERR_MAND_IE_ERROR: + return GSM48_RR_CAUSE_INVALID_MAND_INF; + case RSL_ERR_OPT_IE_ERROR: + return GSM48_RR_CAUSE_COND_IE_ERROR; + case RSL_ERR_INVALID_MESSAGE: + case RSL_ERR_MSG_DISCR: + case RSL_ERR_MSG_TYPE: + case RSL_ERR_MSG_SEQ: + case RSL_ERR_IE_ERROR: + case RSL_ERR_IE_NONEXIST: + case RSL_ERR_IE_LENGTH: + case RSL_ERR_IE_CONTENT: + case RSL_ERR_PROTO: + return GSM48_RR_CAUSE_PROT_ERROR_UNSPC; + default: + return GSM48_RR_CAUSE_ABNORMAL_UNSPEC; + } +} diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index dfb8a05..bcf7c4b 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -681,6 +681,7 @@ if (data) { uint32_t next_state; lchan->release.rsl_error_cause = *(uint8_t*)data; + lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(lchan->release.rsl_error_cause); lchan->release.in_error = true; if (lchan->release.rsl_error_cause != RSL_ERR_RCH_ALR_ACTV_ALLOC) next_state = LCHAN_ST_BORKEN; @@ -693,6 +694,7 @@ rsl_err_name(lchan->release.rsl_error_cause), lchan->release.rsl_error_cause); } else { lchan->release.rsl_error_cause = RSL_ERR_IE_NONEXIST; + lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(lchan->release.rsl_error_cause); lchan->release.in_error = true; lchan_fail_to(LCHAN_ST_BORKEN, "Chan Activ NACK without cause IE"); } @@ -1109,6 +1111,7 @@ osmo_stat_item_dec(lchan->ts->trx->bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); lchan->release.in_error = true; lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING; + lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(lchan->release.rsl_error_cause); lchan_fsm_state_chg(LCHAN_ST_WAIT_RF_RELEASE_ACK); return; @@ -1125,6 +1128,7 @@ osmo_stat_item_dec(lchan->ts->trx->bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); lchan->release.in_error = true; lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING; + lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(lchan->release.rsl_error_cause); lchan_fsm_state_chg(LCHAN_ST_WAIT_AFTER_ERROR); /* TODO: we used to do this only for sysmobts: int do_free = is_sysmobts_v2(ts->trx->bts); @@ -1353,6 +1357,7 @@ default: lchan->release.in_error = true; lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING; + lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(lchan->release.rsl_error_cause); lchan_fail("Timeout"); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I46eb12c91a8c08162b43dd22c7ba825ef3bbc6ac Gerrit-Change-Number: 19215 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 12:24:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jul 2020 12:24:04 +0000 Subject: Change in osmo-bsc[master]: bts: Drop duplicated function to get trx by number References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19297 ) Change subject: bts: Drop duplicated function to get trx by number ...................................................................... bts: Drop duplicated function to get trx by number In the big mess of gsm_data we reached a point where we have multiple functions doing the same thing, most probably because it's hard finding stuff in there. Let's drop one of them (the one which less callers) and move it to bts.*, where it belongs. Change-Id: I9071a0ab250844619280fbe2be63ed99f2c87eb1 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/abis_nm.c M src/osmo-bsc/abis_om2000.c M src/osmo-bsc/abis_om2000_vty.c M src/osmo-bsc/bsc_ctrl_lookup.c M src/osmo-bsc/bts.c M src/osmo-bsc/gsm_data.c 8 files changed, 14 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/19297/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index a18d8ae..0ada79a 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -596,7 +596,7 @@ int gsm_set_bts_type(struct gsm_bts *bts, enum gsm_bts_type type); -struct gsm_bts_trx *gsm_bts_trx_by_nr(struct gsm_bts *bts, int nr); +struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num); int bts_gprs_mode_is_compat(struct gsm_bts *bts, enum bts_gprs_mode mode); diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index a9ce023..e9105b3 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -964,7 +964,6 @@ int match_idx); struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts); -struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num); extern const struct value_string gsm_chreq_descs[]; extern const struct value_string gsm_pchant_names[]; diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 4ce27f3..19eed8c 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -800,7 +800,7 @@ { struct abis_om_fom_hdr *foh = msgb_l3(oml_msg); struct e1inp_sign_link *sign_link = oml_msg->dst; - struct gsm_bts_trx *trx = gsm_bts_trx_by_nr(sign_link->trx->bts, foh->obj_inst.trx_nr); + struct gsm_bts_trx *trx = gsm_bts_trx_num(sign_link->trx->bts, foh->obj_inst.trx_nr); uint8_t ts_nr = foh->obj_inst.ts_nr; if (!trx) { LOGP(DNM, LOGL_ERROR, "%s Channel OPSTART ACK for sign_link without trx\n", @@ -2791,7 +2791,7 @@ /* The message might be received over the main OML link, so we cannot * just use sign_link->trx. Resolve it by number from the FOM header. */ - trx = gsm_bts_trx_by_nr(sign_link->trx->bts, foh->obj_inst.trx_nr); + trx = gsm_bts_trx_num(sign_link->trx->bts, foh->obj_inst.trx_nr); DEBUGPFOH(DNM, foh, "Rx IPACCESS(0x%02x): %s\n", foh->msg_type, osmo_hexdump(foh->data, oh->length - sizeof(*foh))); diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index 1e4ef97..5c8b378 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -1039,7 +1039,7 @@ case OM2K_MO_CLS_TX: case OM2K_MO_CLS_RX: /* Route through per-TRX OML Link to the appropriate TRX */ - trx = gsm_bts_trx_by_nr(bts, o2h->mo.inst); + trx = gsm_bts_trx_num(bts, o2h->mo.inst); if (!trx) { LOGP(DNM, LOGL_ERROR, "MO=%s Tx Dropping msg to " "non-existing TRX\n", om2k_mo_name(&o2h->mo)); @@ -1049,7 +1049,7 @@ break; case OM2K_MO_CLS_TS: /* Route through per-TRX OML Link to the appropriate TRX */ - trx = gsm_bts_trx_by_nr(bts, o2h->mo.assoc_so); + trx = gsm_bts_trx_num(bts, o2h->mo.assoc_so); if (!trx) { LOGP(DNM, LOGL_ERROR, "MO=%s Tx Dropping msg to " "non-existing TRX\n", om2k_mo_name(&o2h->mo)); diff --git a/src/osmo-bsc/abis_om2000_vty.c b/src/osmo-bsc/abis_om2000_vty.c index b00c7dd..26e8488 100644 --- a/src/osmo-bsc/abis_om2000_vty.c +++ b/src/osmo-bsc/abis_om2000_vty.c @@ -561,7 +561,7 @@ abis_om2k_tx_con_conf_req(bts); break; case OM2K_MO_CLS_TS: - trx = gsm_bts_trx_by_nr(bts, oms->mo.assoc_so); + trx = gsm_bts_trx_num(bts, oms->mo.assoc_so); if (!trx) { vty_out(vty, "%% BTS %u has no TRX %u%s", bts->nr, oms->mo.assoc_so, VTY_NEWLINE); @@ -578,7 +578,7 @@ case OM2K_MO_CLS_RX: case OM2K_MO_CLS_TX: case OM2K_MO_CLS_TRXC: - trx = gsm_bts_trx_by_nr(bts, oms->mo.inst); + trx = gsm_bts_trx_num(bts, oms->mo.inst); if (!trx) { vty_out(vty, "%% BTS %u has no TRX %u%s", bts->nr, oms->mo.inst, VTY_NEWLINE); diff --git a/src/osmo-bsc/bsc_ctrl_lookup.c b/src/osmo-bsc/bsc_ctrl_lookup.c index 38d1ba4..4328d76 100644 --- a/src/osmo-bsc/bsc_ctrl_lookup.c +++ b/src/osmo-bsc/bsc_ctrl_lookup.c @@ -29,6 +29,7 @@ #include #include #include +#include extern vector ctrl_node_vec; diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 9aae1d5..4b191b5 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -558,14 +558,18 @@ return 1; } -struct gsm_bts_trx *gsm_bts_trx_by_nr(struct gsm_bts *bts, int nr) +struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num) { struct gsm_bts_trx *trx; + if (num >= bts->num_trx) + return NULL; + llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->nr == nr) + if (trx->nr == num) return trx; } + return NULL; } diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 0dafa35..49121d6 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -349,21 +349,6 @@ return trx; } -struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num) -{ - struct gsm_bts_trx *trx; - - if (num >= bts->num_trx) - return NULL; - - llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->nr == num) - return trx; - } - - return NULL; -} - static char ts2str[255]; char *gsm_bts_name(const struct gsm_bts *bts) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9071a0ab250844619280fbe2be63ed99f2c87eb1 Gerrit-Change-Number: 19297 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 12:31:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jul 2020 12:31:01 +0000 Subject: Change in osmo-bsc[master]: Move struct gsm_bts: gsm_data.* => bts.* In-Reply-To: References: Message-ID: Hello lynxis lazus, dexter, fixeria, daniel, neels, laforge, Jenkins Builder, Hoernchen, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19287 to look at the new patch set (#3). Change subject: Move struct gsm_bts: gsm_data.* => bts.* ...................................................................... Move struct gsm_bts: gsm_data.* => bts.* Place all code related to the object into the related file. Having all the data model in one file made sense in early stage of development to make progress quickly, but nowadays it hurts more than helps, due to constantly growing size and more and more bits being added to the model, gaining in complexity. Currently, having lots of different objects mixed up in gsm_data.h is a hole of despair, where nobody can make any sense were to properly put new stuff in, ending up with functions related to same object in different files or with wrong prefixes, declarations of non-existing functions, etc. because people cannot make up their mind on strict relation to objects in the data model. Splitting them in files really helps finding code operating on a specific object and helping with logically splitting in the future. Change-Id: I00c15f5285b5c1a0109279b7ab192d5467a04ece --- M include/osmocom/bsc/Makefile.am A include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M src/ipaccess/Makefile.am M src/ipaccess/ipaccess-config.c M src/osmo-bsc/Makefile.am M src/osmo-bsc/abis_nm.c M src/osmo-bsc/abis_om2000.c M src/osmo-bsc/abis_om2000_vty.c M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/acc_ramp.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_ctrl_commands.c M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bsc_rf_ctrl.c M src/osmo-bsc/bsc_vty.c A src/osmo-bsc/bts.c M src/osmo-bsc/bts_ericsson_rbs2000.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c M src/osmo-bsc/bts_nokia_site.c M src/osmo-bsc/bts_siemens_bs11.c M src/osmo-bsc/bts_sysmobts.c M src/osmo-bsc/bts_unknown.c M src/osmo-bsc/cbch_scheduler.c M src/osmo-bsc/chan_alloc.c M src/osmo-bsc/codec_pref.c M src/osmo-bsc/e1_config.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/handover_decision.c M src/osmo-bsc/handover_decision_2.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/handover_logic.c M src/osmo-bsc/handover_vty.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c M src/osmo-bsc/lchan_select.c M src/osmo-bsc/meas_feed.c M src/osmo-bsc/neighbor_ident_vty.c M src/osmo-bsc/osmo_bsc_bssap.c M src/osmo-bsc/osmo_bsc_ctrl.c M src/osmo-bsc/osmo_bsc_filter.c M src/osmo-bsc/osmo_bsc_grace.c M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/osmo_bsc_msc.c M src/osmo-bsc/osmo_bsc_sigtran.c M src/osmo-bsc/paging.c M src/osmo-bsc/pcu_sock.c M src/osmo-bsc/rest_octets.c M src/osmo-bsc/smscb.c M src/osmo-bsc/system_information.c M src/osmo-bsc/timeslot_fsm.c M src/utils/Makefile.am M src/utils/bs11_config.c M tests/abis/Makefile.am M tests/abis/abis_test.c M tests/bsc/Makefile.am M tests/codec_pref/codec_pref_test.c M tests/gsm0408/Makefile.am M tests/gsm0408/gsm0408_test.c M tests/handover/Makefile.am M tests/handover/handover_test.c M tests/nanobts_omlattr/Makefile.am M tests/nanobts_omlattr/nanobts_omlattr_test.c 66 files changed, 1,471 insertions(+), 1,354 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/87/19287/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I00c15f5285b5c1a0109279b7ab192d5467a04ece Gerrit-Change-Number: 19287 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 13:27:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jul 2020 13:27:45 +0000 Subject: Change in osmo-bsc[master]: Move struct gsm_bts_trx: gsm-data.* => bts_trx.* References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19298 ) Change subject: Move struct gsm_bts_trx: gsm-data.* => bts_trx.* ...................................................................... Move struct gsm_bts_trx: gsm-data.* => bts_trx.* See rant fro similar recent commit moving stuff to bts.*. Change-Id: I11758ca3d255d849d77bd068f24bb68bde1f89a5 --- M include/osmocom/bsc/Makefile.am M include/osmocom/bsc/bts.h A include/osmocom/bsc/bts_trx.h M include/osmocom/bsc/gsm_data.h M src/ipaccess/Makefile.am M src/ipaccess/network_listen.c M src/osmo-bsc/Makefile.am M src/osmo-bsc/abis_nm.c M src/osmo-bsc/bsc_subscr_conn_fsm.c A src/osmo-bsc/bts_trx.c M src/osmo-bsc/gsm_data.c M src/utils/Makefile.am M tests/abis/Makefile.am M tests/bsc/Makefile.am M tests/gsm0408/Makefile.am M tests/handover/Makefile.am M tests/nanobts_omlattr/Makefile.am 17 files changed, 398 insertions(+), 331 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/98/19298/1 diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am index 4d2df20..c2a82ce 100644 --- a/include/osmocom/bsc/Makefile.am +++ b/include/osmocom/bsc/Makefile.am @@ -11,6 +11,7 @@ bsc_subscr_conn_fsm.h \ bss.h \ bts.h \ + bts_trx.h \ bts_ipaccess_nanobts_omlattr.h \ chan_alloc.h \ codec_pref.h \ diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index b38c11a..9b89f4f 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -13,6 +13,7 @@ #include #include "osmocom/bsc/gsm_data.h" +#include "osmocom/bsc/bts_trx.h" enum bts_counter_id { BTS_CTR_CHREQ_TOTAL, diff --git a/include/osmocom/bsc/bts_trx.h b/include/osmocom/bsc/bts_trx.h new file mode 100644 index 0000000..7e64439 --- /dev/null +++ b/include/osmocom/bsc/bts_trx.h @@ -0,0 +1,92 @@ +#pragma once + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include "osmocom/bsc/gsm_data.h" + +struct gsm_bts; + +#define TRX_NR_TS 8 + +/* One TRX in a BTS */ +struct gsm_bts_trx { + /* list header in bts->trx_list */ + struct llist_head list; + + struct gsm_bts *bts; + /* number of this TRX in the BTS */ + uint8_t nr; + /* human readable name / description */ + char *description; + /* how do we talk RSL with this TRX? */ + struct gsm_e1_subslot rsl_e1_link; + uint8_t rsl_tei; + struct e1inp_sign_link *rsl_link; + + /* Timeout for initiating the RSL connection. */ + struct osmo_timer_list rsl_connect_timeout; + + /* Some BTS (specifically Ericsson RBS) have a per-TRX OML Link */ + struct e1inp_sign_link *oml_link; + + struct gsm_abis_mo mo; + struct tlv_parsed nm_attr; + struct { + struct gsm_abis_mo mo; + } bb_transc; + + uint16_t arfcn; + int nominal_power; /* in dBm */ + unsigned int max_power_red; /* in actual dB */ + + union { + struct { + struct { + struct gsm_abis_mo mo; + } bbsig; + struct { + struct gsm_abis_mo mo; + } pa; + } bs11; + struct { + unsigned int test_state; + uint8_t test_nr; + struct rxlev_stats rxlev_stat; + } ipaccess; + struct { + struct { + struct om2k_mo om2k_mo; + } trxc; + struct { + struct om2k_mo om2k_mo; + } rx; + struct { + struct om2k_mo om2k_mo; + } tx; + } rbs2000; + }; + struct gsm_bts_trx_ts ts[TRX_NR_TS]; +}; + +struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts); +char *gsm_trx_name(const struct gsm_bts_trx *trx); + +struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr, + int *rc); + +void gsm_trx_lock_rf(struct gsm_bts_trx *trx, bool locked, const char *reason); +bool trx_is_usable(const struct gsm_bts_trx *trx); + +void gsm_trx_all_ts_dispatch(struct gsm_bts_trx *trx, uint32_t ts_ev, void *data); +int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan); +bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx); diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index f90bfa7..e85be70 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -40,6 +40,7 @@ struct gsm0808_cell_id; struct osmo_mgcpc_ep; struct gsm_bts; +struct gsm_bts_trx; /** annotations for msgb ownership */ #define __uses @@ -330,7 +331,6 @@ use 4 as magic number for BCCH hack - see osmo-bts-../oml.c:opstart_compl() */ #define CCCH_LCHAN 4 -#define TRX_NR_TS 8 #define TS_MAX_LCHAN 8 #define HARDCODED_ARFCN 123 @@ -713,66 +713,6 @@ struct gsm_lchan lchan[TS_MAX_LCHAN]; }; -/* One TRX in a BTS */ -struct gsm_bts_trx { - /* list header in bts->trx_list */ - struct llist_head list; - - struct gsm_bts *bts; - /* number of this TRX in the BTS */ - uint8_t nr; - /* human readable name / description */ - char *description; - /* how do we talk RSL with this TRX? */ - struct gsm_e1_subslot rsl_e1_link; - uint8_t rsl_tei; - struct e1inp_sign_link *rsl_link; - - /* Timeout for initiating the RSL connection. */ - struct osmo_timer_list rsl_connect_timeout; - - /* Some BTS (specifically Ericsson RBS) have a per-TRX OML Link */ - struct e1inp_sign_link *oml_link; - - struct gsm_abis_mo mo; - struct tlv_parsed nm_attr; - struct { - struct gsm_abis_mo mo; - } bb_transc; - - uint16_t arfcn; - int nominal_power; /* in dBm */ - unsigned int max_power_red; /* in actual dB */ - - union { - struct { - struct { - struct gsm_abis_mo mo; - } bbsig; - struct { - struct gsm_abis_mo mo; - } pa; - } bs11; - struct { - unsigned int test_state; - uint8_t test_nr; - struct rxlev_stats rxlev_stat; - } ipaccess; - struct { - struct { - struct om2k_mo om2k_mo; - } trxc; - struct { - struct om2k_mo om2k_mo; - } rx; - struct { - struct om2k_mo om2k_mo; - } tx; - } rbs2000; - }; - struct gsm_bts_trx_ts ts[TRX_NR_TS]; -}; - #define GSM_LCHAN_SI(lchan, i) (void *)((lchan)->si.buf[i][0]) /* @@ -962,8 +902,6 @@ const struct gsm0808_cell_id *cell_id, int match_idx); -struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts); - extern const struct value_string gsm_chreq_descs[]; extern const struct value_string gsm_pchant_names[]; extern const struct value_string gsm_pchant_descs[]; @@ -974,7 +912,6 @@ enum gsm_phys_chan_config gsm_pchan_parse(const char *name); const char *gsm_lchant_name(enum gsm_chan_t c); const char *gsm_chreq_name(enum gsm_chreq_reason_t c); -char *gsm_trx_name(const struct gsm_bts_trx *trx); char *gsm_ts_name(const struct gsm_bts_trx_ts *ts); char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts); char *gsm_lchan_name_compute(const struct gsm_lchan *lchan); @@ -1007,9 +944,6 @@ uint8_t gsm_ts_tsc(const struct gsm_bts_trx_ts *ts); -struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr, - int *rc); - enum gsm_phys_chan_config ts_pchan(struct gsm_bts_trx_ts *ts); uint8_t pchan_subslots(enum gsm_phys_chan_config pchan); bool ts_is_tch(struct gsm_bts_trx_ts *ts); @@ -1255,7 +1189,6 @@ void set_ts_e1link(struct gsm_bts_trx_ts *ts, uint8_t e1_nr, uint8_t e1_ts, uint8_t e1_ts_ss); -void gsm_trx_lock_rf(struct gsm_bts_trx *trx, bool locked, const char *reason); int gsm_bts_trx_set_system_infos(struct gsm_bts_trx *trx); int gsm_bts_set_system_infos(struct gsm_bts *bts); @@ -1265,17 +1198,11 @@ /* control interface handling */ int bsc_base_ctrl_cmds_install(void); -bool trx_is_usable(const struct gsm_bts_trx *trx); bool ts_is_usable(const struct gsm_bts_trx_ts *ts); int gsm_lchan_type_by_pchan(enum gsm_phys_chan_config pchan); enum gsm_phys_chan_config gsm_pchan_by_lchan_type(enum gsm_chan_t type); -void gsm_trx_all_ts_dispatch(struct gsm_bts_trx *trx, uint32_t ts_ev, void *data); -int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan); - -bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx); - enum gsm48_rr_cause bsc_gsm48_rr_cause_from_gsm0808_cause(enum gsm0808_cause c); enum gsm48_rr_cause bsc_gsm48_rr_cause_from_rsl_cause(uint8_t c); diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am index 273530c..a1812a9 100644 --- a/src/ipaccess/Makefile.am +++ b/src/ipaccess/Makefile.am @@ -47,6 +47,7 @@ # FIXME: resolve the bogus dependencies patched around here: ipaccess_config_LDADD = \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ @@ -61,7 +62,9 @@ $(NULL) ipaccess_proxy_LDADD = \ + $(top_builddir)/src/osmo-bsc/abis_nm.o \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(OSMO_LIBS) \ $(NULL) diff --git a/src/ipaccess/network_listen.c b/src/ipaccess/network_listen.c index bbaf798..e9f5c93 100644 --- a/src/ipaccess/network_listen.c +++ b/src/ipaccess/network_listen.c @@ -34,6 +34,7 @@ #include #include +#include #include #include #include diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am index f66421a..231707c 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -44,6 +44,7 @@ bsc_subscriber.c \ bsc_vty.c \ bts.c \ + bts_trx.c \ bts_ericsson_rbs2000.c \ bts_init.c \ bts_ipaccess_nanobts.c \ diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 19eed8c..d88ce24 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -3020,26 +3020,6 @@ memcpy(&_buf->rac, &ci, sizeof(ci)); } -void gsm_trx_lock_rf(struct gsm_bts_trx *trx, bool locked, const char *reason) -{ - uint8_t new_state = locked ? NM_STATE_LOCKED : NM_STATE_UNLOCKED; - - - if (!trx->bts || !trx->bts->oml_link) { - /* Set initial state which will be sent when BTS connects. */ - trx->mo.nm_state.administrative = new_state; - return; - } - - LOG_TRX(trx, DNM, LOGL_NOTICE, "Requesting administrative state change %s -> %s [%s]\n", - get_value_string(abis_nm_adm_state_names, trx->mo.nm_state.administrative), - get_value_string(abis_nm_adm_state_names, new_state), reason); - - abis_nm_chg_adm_state(trx->bts, NM_OC_RADIO_CARRIER, - trx->bts->bts_nr, trx->nr, 0xff, - new_state); -} - static const struct value_string ipacc_testres_names[] = { { NM_IPACC_TESTRES_SUCCESS, "SUCCESS" }, { NM_IPACC_TESTRES_TIMEOUT, "TIMEOUT" }, diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 72f2474..9b1fb3f 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c new file mode 100644 index 0000000..15d5b59 --- /dev/null +++ b/src/osmo-bsc/bts_trx.c @@ -0,0 +1,288 @@ +/* (C) 2008-2018 by Harald Welte + * (C) 2020 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include + +#include +#include +#include +#include +#include +#include +#include + +struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts) +{ + struct gsm_bts_trx *trx = talloc_zero(bts, struct gsm_bts_trx); + int k; + + if (!trx) + return NULL; + + trx->bts = bts; + trx->nr = bts->num_trx++; + trx->mo.nm_state.administrative = NM_STATE_UNLOCKED; + + gsm_mo_init(&trx->mo, bts, NM_OC_RADIO_CARRIER, + bts->nr, trx->nr, 0xff); + gsm_mo_init(&trx->bb_transc.mo, bts, NM_OC_BASEB_TRANSC, + bts->nr, trx->nr, 0xff); + + for (k = 0; k < TRX_NR_TS; k++) { + struct gsm_bts_trx_ts *ts = &trx->ts[k]; + int l; + + + ts->trx = trx; + ts->nr = k; + ts->pchan_from_config = ts->pchan_on_init = ts->pchan_is = GSM_PCHAN_NONE; + ts->tsc = -1; + + ts_fsm_alloc(ts); + + gsm_mo_init(&ts->mo, bts, NM_OC_CHANNEL, + bts->nr, trx->nr, ts->nr); + + ts->hopping.arfcns.data_len = sizeof(ts->hopping.arfcns_data); + ts->hopping.arfcns.data = ts->hopping.arfcns_data; + ts->hopping.ma.data_len = sizeof(ts->hopping.ma_data); + ts->hopping.ma.data = ts->hopping.ma_data; + + for (l = 0; l < TS_MAX_LCHAN; l++) { + struct gsm_lchan *lchan; + char *name; + lchan = &ts->lchan[l]; + + lchan->ts = ts; + lchan->nr = l; + lchan->type = GSM_LCHAN_NONE; + + name = gsm_lchan_name_compute(lchan); + lchan->name = talloc_strdup(trx, name); + } + } + + if (trx->nr != 0) + trx->nominal_power = bts->c0->nominal_power; + + llist_add_tail(&trx->list, &bts->trx_list); + + return trx; +} + +static char ts2str[255]; + +char *gsm_trx_name(const struct gsm_bts_trx *trx) +{ + if (!trx) + snprintf(ts2str, sizeof(ts2str), "(trx=NULL)"); + else + snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d)", + trx->bts->nr, trx->nr); + + return ts2str; +} + +/* determine logical channel based on TRX and channel number IE */ +struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr, + int *rc) +{ + uint8_t ts_nr = chan_nr & 0x07; + uint8_t cbits = chan_nr >> 3; + uint8_t lch_idx; + struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr]; + bool ok; + + if (rc) + *rc = -EINVAL; + + if (cbits == 0x01) { + lch_idx = 0; /* TCH/F */ + ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_TCH_F) + || ts->pchan_on_init == GSM_PCHAN_PDCH; /* PDCH? really? */ + } else if ((cbits & 0x1e) == 0x02) { + lch_idx = cbits & 0x1; /* TCH/H */ + ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_TCH_H); + } else if ((cbits & 0x1c) == 0x04) { + lch_idx = cbits & 0x3; /* SDCCH/4 */ + ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_CCCH_SDCCH4); + } else if ((cbits & 0x18) == 0x08) { + lch_idx = cbits & 0x7; /* SDCCH/8 */ + ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_SDCCH8_SACCH8C); + } else if (cbits == 0x10 || cbits == 0x11 || cbits == 0x12) { + lch_idx = 0; /* CCCH? */ + ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_CCCH); + /* FIXME: we should not return first sdcch4 !!! */ + } else if ((chan_nr & RSL_CHAN_NR_MASK) == RSL_CHAN_OSMO_PDCH) { + lch_idx = 0; + ok = (ts->pchan_on_init == GSM_PCHAN_TCH_F_TCH_H_PDCH); + } else + return NULL; + + if (rc && ok) + *rc = 0; + + return &ts->lchan[lch_idx]; +} + +void gsm_trx_lock_rf(struct gsm_bts_trx *trx, bool locked, const char *reason) +{ + uint8_t new_state = locked ? NM_STATE_LOCKED : NM_STATE_UNLOCKED; + + + if (!trx->bts || !trx->bts->oml_link) { + /* Set initial state which will be sent when BTS connects. */ + trx->mo.nm_state.administrative = new_state; + return; + } + + LOG_TRX(trx, DNM, LOGL_NOTICE, "Requesting administrative state change %s -> %s [%s]\n", + get_value_string(abis_nm_adm_state_names, trx->mo.nm_state.administrative), + get_value_string(abis_nm_adm_state_names, new_state), reason); + + abis_nm_chg_adm_state(trx->bts, NM_OC_RADIO_CARRIER, + trx->bts->bts_nr, trx->nr, 0xff, + new_state); +} + +bool trx_is_usable(const struct gsm_bts_trx *trx) +{ + /* FIXME: How does this behave for BS-11 ? */ + if (is_ipaccess_bts(trx->bts)) { + if (!nm_is_running(&trx->mo.nm_state) || + !nm_is_running(&trx->bb_transc.mo.nm_state)) + return false; + } else if (is_ericsson_bts(trx->bts)) { + /* The OM2000 -> 12.21 mapping we do doesn't have separate bb_transc MO */ + if (!nm_is_running(&trx->mo.nm_state)) + return false; + } + + return true; +} + + +void gsm_trx_all_ts_dispatch(struct gsm_bts_trx *trx, uint32_t ts_ev, void *data) +{ + int i; + for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + osmo_fsm_inst_dispatch(ts->fi, ts_ev, data); + } +} + +int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan) +{ + struct gsm_bts_trx_ts *ts; + struct gsm_lchan *lchan; + int j; + int count = 0; + + if (!trx_is_usable(trx)) + return 0; + + for (j = 0; j < ARRAY_SIZE(trx->ts); j++) { + ts = &trx->ts[j]; + if (!ts_is_usable(ts)) + continue; + + if (ts->pchan_is == GSM_PCHAN_PDCH) { + /* Dynamic timeslots in PDCH mode will become TCH if needed. */ + switch (ts->pchan_on_init) { + case GSM_PCHAN_TCH_F_PDCH: + if (pchan == GSM_PCHAN_TCH_F) + count++; + continue; + + case GSM_PCHAN_TCH_F_TCH_H_PDCH: + if (pchan == GSM_PCHAN_TCH_F) + count++; + else if (pchan == GSM_PCHAN_TCH_H) + count += 2; + continue; + + default: + /* Not dynamic, not applicable. */ + continue; + } + } + + if (ts->pchan_is != pchan) + continue; + + ts_for_each_lchan(lchan, ts) { + if (lchan_state_is(lchan, LCHAN_ST_UNUSED)) + count++; + } + } + + return count; +} + +bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx) +{ + bool combined = false; + bool result = true; + unsigned int i; + + /* Iterate over all timeslots */ + for (i = 0; i < 8; i++) { + const struct gsm_bts_trx_ts *ts = &trx->ts[i]; + + switch (ts->pchan_from_config) { + case GSM_PCHAN_CCCH_SDCCH4_CBCH: + case GSM_PCHAN_CCCH_SDCCH4: + /* CCCH+SDCCH4 can only be configured on TS0 */ + if (i > 0) { + LOGP(DNM, LOGL_ERROR, "Combined CCCH is not allowed " + "on TS%u > 0\n", i); + result = false; + } + if (i == 0) + combined = true; + /* fall-through */ + case GSM_PCHAN_CCCH: + /* 3GPP TS 45.002, Table 3, CCCH: TS (0, 2, 4, 6) */ + if (i % 2 != 0) { + LOGP(DNM, LOGL_ERROR, "%s is not allowed on odd TS%u\n", + gsm_pchan_name(ts->pchan_from_config), i); + result = false; + } + + /* There can be no more CCCHs if TS0/C0 is combined */ + if (i > 0 && combined) { + LOGP(DNM, LOGL_ERROR, "%s is not allowed on TS%u, " + "because TS0 is using combined channel configuration\n", + gsm_pchan_name(ts->pchan_from_config), i); + result = false; + } + break; + + default: + /* CCCH on TS0 is mandatory for C0 */ + if (trx->bts->c0 == trx && i == 0) { + LOGP(DNM, LOGL_ERROR, "TS0 on C0 must be CCCH/BCCH\n"); + result = false; + } + } + } + + return result; +} diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 5daee26..c0c8cf6 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -290,79 +290,8 @@ return NULL; } -struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts) -{ - struct gsm_bts_trx *trx = talloc_zero(bts, struct gsm_bts_trx); - int k; - - if (!trx) - return NULL; - - trx->bts = bts; - trx->nr = bts->num_trx++; - trx->mo.nm_state.administrative = NM_STATE_UNLOCKED; - - gsm_mo_init(&trx->mo, bts, NM_OC_RADIO_CARRIER, - bts->nr, trx->nr, 0xff); - gsm_mo_init(&trx->bb_transc.mo, bts, NM_OC_BASEB_TRANSC, - bts->nr, trx->nr, 0xff); - - for (k = 0; k < TRX_NR_TS; k++) { - struct gsm_bts_trx_ts *ts = &trx->ts[k]; - int l; - - - ts->trx = trx; - ts->nr = k; - ts->pchan_from_config = ts->pchan_on_init = ts->pchan_is = GSM_PCHAN_NONE; - ts->tsc = -1; - - ts_fsm_alloc(ts); - - gsm_mo_init(&ts->mo, bts, NM_OC_CHANNEL, - bts->nr, trx->nr, ts->nr); - - ts->hopping.arfcns.data_len = sizeof(ts->hopping.arfcns_data); - ts->hopping.arfcns.data = ts->hopping.arfcns_data; - ts->hopping.ma.data_len = sizeof(ts->hopping.ma_data); - ts->hopping.ma.data = ts->hopping.ma_data; - - for (l = 0; l < TS_MAX_LCHAN; l++) { - struct gsm_lchan *lchan; - char *name; - lchan = &ts->lchan[l]; - - lchan->ts = ts; - lchan->nr = l; - lchan->type = GSM_LCHAN_NONE; - - name = gsm_lchan_name_compute(lchan); - lchan->name = talloc_strdup(trx, name); - } - } - - if (trx->nr != 0) - trx->nominal_power = bts->c0->nominal_power; - - llist_add_tail(&trx->list, &bts->trx_list); - - return trx; -} - static char ts2str[255]; -char *gsm_trx_name(const struct gsm_bts_trx *trx) -{ - if (!trx) - snprintf(ts2str, sizeof(ts2str), "(trx=NULL)"); - else - snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d)", - trx->bts->nr, trx->nr); - - return ts2str; -} - - char *gsm_ts_name(const struct gsm_bts_trx_ts *ts) { snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d,ts=%d)", @@ -620,48 +549,6 @@ return gsm_pchan2chan_nr(lchan->ts->pchan_is, lchan->ts->nr, lchan->nr); } -/* determine logical channel based on TRX and channel number IE */ -struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr, - int *rc) -{ - uint8_t ts_nr = chan_nr & 0x07; - uint8_t cbits = chan_nr >> 3; - uint8_t lch_idx; - struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr]; - bool ok; - - if (rc) - *rc = -EINVAL; - - if (cbits == 0x01) { - lch_idx = 0; /* TCH/F */ - ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_TCH_F) - || ts->pchan_on_init == GSM_PCHAN_PDCH; /* PDCH? really? */ - } else if ((cbits & 0x1e) == 0x02) { - lch_idx = cbits & 0x1; /* TCH/H */ - ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_TCH_H); - } else if ((cbits & 0x1c) == 0x04) { - lch_idx = cbits & 0x3; /* SDCCH/4 */ - ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_CCCH_SDCCH4); - } else if ((cbits & 0x18) == 0x08) { - lch_idx = cbits & 0x7; /* SDCCH/8 */ - ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_SDCCH8_SACCH8C); - } else if (cbits == 0x10 || cbits == 0x11 || cbits == 0x12) { - lch_idx = 0; /* CCCH? */ - ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_CCCH); - /* FIXME: we should not return first sdcch4 !!! */ - } else if ((chan_nr & RSL_CHAN_NR_MASK) == RSL_CHAN_OSMO_PDCH) { - lch_idx = 0; - ok = (ts->pchan_on_init == GSM_PCHAN_TCH_F_TCH_H_PDCH); - } else - return NULL; - - if (rc && ok) - *rc = 0; - - return &ts->lchan[lch_idx]; -} - static const uint8_t subslots_per_pchan[] = { [GSM_PCHAN_NONE] = 0, [GSM_PCHAN_CCCH] = 0, @@ -708,31 +595,6 @@ return conn->lchan->ts->trx->bts; } -bool trx_is_usable(const struct gsm_bts_trx *trx) -{ - /* FIXME: How does this behave for BS-11 ? */ - if (is_ipaccess_bts(trx->bts)) { - if (!nm_is_running(&trx->mo.nm_state) || - !nm_is_running(&trx->bb_transc.mo.nm_state)) - return false; - } else if (is_ericsson_bts(trx->bts)) { - /* The OM2000 -> 12.21 mapping we do doesn't have separate bb_transc MO */ - if (!nm_is_running(&trx->mo.nm_state)) - return false; - } - - return true; -} - -void gsm_trx_all_ts_dispatch(struct gsm_bts_trx *trx, uint32_t ts_ev, void *data) -{ - int i; - for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { - struct gsm_bts_trx_ts *ts = &trx->ts[i]; - osmo_fsm_inst_dispatch(ts->fi, ts_ev, data); - } -} - static void _chan_desc_fill_tail(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan) { if (!lchan->ts->hopping.enabled) { @@ -950,54 +812,6 @@ } } -int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan) -{ - struct gsm_bts_trx_ts *ts; - struct gsm_lchan *lchan; - int j; - int count = 0; - - if (!trx_is_usable(trx)) - return 0; - - for (j = 0; j < ARRAY_SIZE(trx->ts); j++) { - ts = &trx->ts[j]; - if (!ts_is_usable(ts)) - continue; - - if (ts->pchan_is == GSM_PCHAN_PDCH) { - /* Dynamic timeslots in PDCH mode will become TCH if needed. */ - switch (ts->pchan_on_init) { - case GSM_PCHAN_TCH_F_PDCH: - if (pchan == GSM_PCHAN_TCH_F) - count++; - continue; - - case GSM_PCHAN_TCH_F_TCH_H_PDCH: - if (pchan == GSM_PCHAN_TCH_F) - count++; - else if (pchan == GSM_PCHAN_TCH_H) - count += 2; - continue; - - default: - /* Not dynamic, not applicable. */ - continue; - } - } - - if (ts->pchan_is != pchan) - continue; - - ts_for_each_lchan(lchan, ts) { - if (lchan_state_is(lchan, LCHAN_ST_UNUSED)) - count++; - } - } - - return count; -} - bool ts_is_usable(const struct gsm_bts_trx_ts *ts) { if (!trx_is_usable(ts->trx)) { @@ -1095,57 +909,6 @@ {} }; -bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx) -{ - bool combined = false; - bool result = true; - unsigned int i; - - /* Iterate over all timeslots */ - for (i = 0; i < 8; i++) { - const struct gsm_bts_trx_ts *ts = &trx->ts[i]; - - switch (ts->pchan_from_config) { - case GSM_PCHAN_CCCH_SDCCH4_CBCH: - case GSM_PCHAN_CCCH_SDCCH4: - /* CCCH+SDCCH4 can only be configured on TS0 */ - if (i > 0) { - LOGP(DNM, LOGL_ERROR, "Combined CCCH is not allowed " - "on TS%u > 0\n", i); - result = false; - } - if (i == 0) - combined = true; - /* fall-through */ - case GSM_PCHAN_CCCH: - /* 3GPP TS 45.002, Table 3, CCCH: TS (0, 2, 4, 6) */ - if (i % 2 != 0) { - LOGP(DNM, LOGL_ERROR, "%s is not allowed on odd TS%u\n", - gsm_pchan_name(ts->pchan_from_config), i); - result = false; - } - - /* There can be no more CCCHs if TS0/C0 is combined */ - if (i > 0 && combined) { - LOGP(DNM, LOGL_ERROR, "%s is not allowed on TS%u, " - "because TS0 is using combined channel configuration\n", - gsm_pchan_name(ts->pchan_from_config), i); - result = false; - } - break; - - default: - /* CCCH on TS0 is mandatory for C0 */ - if (trx->bts->c0 == trx && i == 0) { - LOGP(DNM, LOGL_ERROR, "TS0 on C0 must be CCCH/BCCH\n"); - result = false; - } - } - } - - return result; -} - /* This may be specific to RR Channel Release, and the mappings were chosen by pure naive guessing without a proper * specification available. */ enum gsm48_rr_cause bsc_gsm48_rr_cause_from_gsm0808_cause(enum gsm0808_cause c) diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 6696679..653ed97 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -49,6 +49,7 @@ bs11_config_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/bts_siemens_bs11.o \ $(top_builddir)/src/osmo-bsc/e1_config.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ @@ -118,7 +119,9 @@ $(NULL) meas_json_LDADD = \ + $(top_builddir)/src/osmo-bsc/abis_nm.o \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am index a01f56a..5f81ceb 100644 --- a/tests/abis/Makefile.am +++ b/tests/abis/Makefile.am @@ -27,6 +27,7 @@ abis_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(top_builddir)/src/osmo-bsc/net_init.o \ $(LIBOSMOCORE_LIBS) \ diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am index 7ea002e..012bd79 100644 --- a/tests/bsc/Makefile.am +++ b/tests/bsc/Makefile.am @@ -38,6 +38,7 @@ $(top_builddir)/src/osmo-bsc/osmo_bsc_filter.o \ $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(top_builddir)/src/osmo-bsc/handover_cfg.o \ $(top_builddir)/src/osmo-bsc/handover_logic.o \ diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am index 21b7873..790f3aa 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -23,9 +23,11 @@ $(NULL) gsm0408_test_LDADD = \ + $(top_builddir)/src/osmo-bsc/abis_nm.o \ $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(top_builddir)/src/osmo-bsc/net_init.o \ $(top_builddir)/src/osmo-bsc/rest_octets.o \ diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am index 571b7a9..661b3d2 100644 --- a/tests/handover/Makefile.am +++ b/tests/handover/Makefile.am @@ -58,6 +58,7 @@ $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \ $(top_builddir)/src/osmo-bsc/bsc_vty.o \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ $(top_builddir)/src/osmo-bsc/bts_unknown.o \ diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am index 93fdbe8..5a627ff 100644 --- a/tests/nanobts_omlattr/Makefile.am +++ b/tests/nanobts_omlattr/Makefile.am @@ -26,6 +26,7 @@ $(top_builddir)/src/osmo-bsc/abis_nm.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I11758ca3d255d849d77bd068f24bb68bde1f89a5 Gerrit-Change-Number: 19298 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 13:27:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jul 2020 13:27:46 +0000 Subject: Change in osmo-bsc[master]: Move gsm_bts_{trx_}set_system_infos APIs to bts{_trx}.* References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19299 ) Change subject: Move gsm_bts_{trx_}set_system_infos APIs to bts{_trx}.* ...................................................................... Move gsm_bts_{trx_}set_system_infos APIs to bts{_trx}.* Change-Id: I2aa83b499d6e5d06a0fa1001fee3111f7e639c94 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/bts_trx.h M include/osmocom/bsc/gsm_data.h M src/ipaccess/ipaccess-config.c M src/ipaccess/ipaccess-proxy.c M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bts.c M src/osmo-bsc/bts_trx.c M src/utils/bs11_config.c M src/utils/meas_json.c M tests/abis/abis_test.c M tests/bsc/bsc_test.c M tests/gsm0408/gsm0408_test.c M tests/nanobts_omlattr/nanobts_omlattr_test.c 14 files changed, 200 insertions(+), 170 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/99/19299/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 9b89f4f..730dee9 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -622,6 +622,8 @@ int bts_count_free_ts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan); +int gsm_bts_set_system_infos(struct gsm_bts *bts); + int gsm_bts_model_register(struct gsm_bts_model *model); struct gsm_bts_model *bts_model_find(enum gsm_bts_type type); diff --git a/include/osmocom/bsc/bts_trx.h b/include/osmocom/bsc/bts_trx.h index 7e64439..3a635ba 100644 --- a/include/osmocom/bsc/bts_trx.h +++ b/include/osmocom/bsc/bts_trx.h @@ -90,3 +90,5 @@ void gsm_trx_all_ts_dispatch(struct gsm_bts_trx *trx, uint32_t ts_ev, void *data); int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan); bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx); + +int gsm_bts_trx_set_system_infos(struct gsm_bts_trx *trx); diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index e85be70..a8b495f 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1189,9 +1189,6 @@ void set_ts_e1link(struct gsm_bts_trx_ts *ts, uint8_t e1_nr, uint8_t e1_ts, uint8_t e1_ts_ss); -int gsm_bts_trx_set_system_infos(struct gsm_bts_trx *trx); -int gsm_bts_set_system_infos(struct gsm_bts *bts); - /* generic E1 line operations for all ISDN-based BTS. */ extern struct e1inp_line_ops bts_isdn_e1inp_line_ops; diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 34ad57f..c9264d7 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -1133,18 +1133,12 @@ /* Stub */ int osmo_bsc_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *msg) -{ - return 0; -} - -/* Stub */ +{ return 0; } int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) -{ - return 0; -} - -/* Stub */ -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) -{ - return 0; -} +{ return 0; } +int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } +void pcu_info_update(struct gsm_bts *bts) {}; +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } +int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) +{ return 0; } +int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index 05a6f63..d5dd8d4 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -1254,7 +1254,9 @@ } /* Stub */ -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) -{ - return 0; -} +int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } +void pcu_info_update(struct gsm_bts *bts) {}; +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } +int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) +{ return 0; } +int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c index 4fc0ab1..e45b5e8 100644 --- a/src/osmo-bsc/bsc_init.c +++ b/src/osmo-bsc/bsc_init.c @@ -69,155 +69,6 @@ return 0; } -static int rsl_si(struct gsm_bts_trx *trx, enum osmo_sysinfo_type i, int si_len) -{ - struct gsm_bts *bts = trx->bts; - int rc, j; - - if (si_len) { - DEBUGP(DRR, "SI%s: %s\n", get_value_string(osmo_sitype_strs, i), - osmo_hexdump(GSM_BTS_SI(bts, i), GSM_MACBLOCK_LEN)); - } else - DEBUGP(DRR, "SI%s: OFF\n", get_value_string(osmo_sitype_strs, i)); - - switch (i) { - case SYSINFO_TYPE_5: - case SYSINFO_TYPE_5bis: - case SYSINFO_TYPE_5ter: - case SYSINFO_TYPE_6: - rc = rsl_sacch_filling(trx, osmo_sitype2rsl(i), - si_len ? GSM_BTS_SI(bts, i) : NULL, si_len); - break; - case SYSINFO_TYPE_2quater: - if (si_len == 0) { - rc = rsl_bcch_info(trx, i, NULL, 0); - break; - } - rc = 0; - for (j = 0; j <= bts->si2q_count; j++) - rc = rsl_bcch_info(trx, i, (const uint8_t *)GSM_BTS_SI2Q(bts, j), GSM_MACBLOCK_LEN); - break; - default: - rc = rsl_bcch_info(trx, i, si_len ? GSM_BTS_SI(bts, i) : NULL, si_len); - break; - } - - return rc; -} - -/* set all system information types for a TRX */ -int gsm_bts_trx_set_system_infos(struct gsm_bts_trx *trx) -{ - int i, rc; - struct gsm_bts *bts = trx->bts; - uint8_t gen_si[_MAX_SYSINFO_TYPE], n_si = 0, n; - int si_len[_MAX_SYSINFO_TYPE]; - - bts->si_common.cell_sel_par.ms_txpwr_max_ccch = - ms_pwr_ctl_lvl(bts->band, bts->ms_max_power); - bts->si_common.cell_sel_par.neci = bts->network->neci; - - /* Zero/forget the state of the dynamically computed SIs, leeping the static ones */ - bts->si_valid = bts->si_mode_static; - - /* First, we determine which of the SI messages we actually need */ - - if (trx == bts->c0) { - /* 1...4 are always present on a C0 TRX */ - gen_si[n_si++] = SYSINFO_TYPE_1; - gen_si[n_si++] = SYSINFO_TYPE_2; - gen_si[n_si++] = SYSINFO_TYPE_2bis; - gen_si[n_si++] = SYSINFO_TYPE_2ter; - gen_si[n_si++] = SYSINFO_TYPE_2quater; - gen_si[n_si++] = SYSINFO_TYPE_3; - gen_si[n_si++] = SYSINFO_TYPE_4; - - /* 13 is always present on a C0 TRX of a GPRS BTS */ - if (bts->gprs.mode != BTS_GPRS_NONE) - gen_si[n_si++] = SYSINFO_TYPE_13; - } - - /* 5 and 6 are always present on every TRX */ - gen_si[n_si++] = SYSINFO_TYPE_5; - gen_si[n_si++] = SYSINFO_TYPE_5bis; - gen_si[n_si++] = SYSINFO_TYPE_5ter; - gen_si[n_si++] = SYSINFO_TYPE_6; - - /* Second, we generate the selected SI via RSL */ - - for (n = 0; n < n_si; n++) { - i = gen_si[n]; - /* Only generate SI if this SI is not in "static" (user-defined) mode */ - if (!(bts->si_mode_static & (1 << i))) { - /* Set SI as being valid. gsm_generate_si() might unset - * it, if SI is not required. */ - bts->si_valid |= (1 << i); - rc = gsm_generate_si(bts, i); - if (rc < 0) - goto err_out; - si_len[i] = rc; - } else { - if (i == SYSINFO_TYPE_5 || i == SYSINFO_TYPE_5bis - || i == SYSINFO_TYPE_5ter) - si_len[i] = 18; - else if (i == SYSINFO_TYPE_6) - si_len[i] = 11; - else - si_len[i] = 23; - } - } - - /* Third, we send the selected SI via RSL */ - - for (n = 0; n < n_si; n++) { - i = gen_si[n]; - /* 3GPP TS 08.58 ?8.5.1 BCCH INFORMATION. If we don't currently - * have this SI, we send a zero-length RSL BCCH FILLING / - * SACCH FILLING in order to deactivate the SI, in case it - * might have previously been active */ - if (!GSM_BTS_HAS_SI(bts, i)) { - if (bts->si_unused_send_empty) - rc = rsl_si(trx, i, 0); - else - rc = 0; /* some nanoBTS fw don't like receiving empty unsupported SI */ - } else - rc = rsl_si(trx, i, si_len[i]); - if (rc < 0) - return rc; - } - - /* Make sure the PCU is aware (in case anything GPRS related has - * changed in SI */ - pcu_info_update(bts); - - return 0; -err_out: - LOGP(DRR, LOGL_ERROR, "Cannot generate SI%s for BTS %u: error <%s>, " - "most likely a problem with neighbor cell list generation\n", - get_value_string(osmo_sitype_strs, i), bts->nr, strerror(-rc)); - return rc; -} - -/* set all system information types for a BTS */ -int gsm_bts_set_system_infos(struct gsm_bts *bts) -{ - struct gsm_bts_trx *trx; - - /* Generate a new ID */ - bts->bcch_change_mark += 1; - bts->bcch_change_mark %= 0x7; - - llist_for_each_entry(trx, &bts->trx_list, list) { - int rc; - - rc = gsm_bts_trx_set_system_infos(trx); - if (rc != 0) - return rc; - } - - return 0; -} - /* XXX hard-coded for now */ #define T3122_CHAN_LOAD_SAMPLE_INTERVAL 1 /* in seconds */ diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index c943684..055cc47 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -750,3 +750,23 @@ return count; } + +/* set all system information types for a BTS */ +int gsm_bts_set_system_infos(struct gsm_bts *bts) +{ + struct gsm_bts_trx *trx; + + /* Generate a new ID */ + bts->bcch_change_mark += 1; + bts->bcch_change_mark %= 0x7; + + llist_for_each_entry(trx, &bts->trx_list, list) { + int rc; + + rc = gsm_bts_trx_set_system_infos(trx); + if (rc != 0) + return rc; + } + + return 0; +} diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c index 15d5b59..25a3fc7 100644 --- a/src/osmo-bsc/bts_trx.c +++ b/src/osmo-bsc/bts_trx.c @@ -25,7 +25,10 @@ #include #include #include +#include #include +#include +#include #include struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts) @@ -286,3 +289,132 @@ return result; } + +static int rsl_si(struct gsm_bts_trx *trx, enum osmo_sysinfo_type i, int si_len) +{ + struct gsm_bts *bts = trx->bts; + int rc, j; + + if (si_len) { + DEBUGP(DRR, "SI%s: %s\n", get_value_string(osmo_sitype_strs, i), + osmo_hexdump(GSM_BTS_SI(bts, i), GSM_MACBLOCK_LEN)); + } else + DEBUGP(DRR, "SI%s: OFF\n", get_value_string(osmo_sitype_strs, i)); + + switch (i) { + case SYSINFO_TYPE_5: + case SYSINFO_TYPE_5bis: + case SYSINFO_TYPE_5ter: + case SYSINFO_TYPE_6: + rc = rsl_sacch_filling(trx, osmo_sitype2rsl(i), + si_len ? GSM_BTS_SI(bts, i) : NULL, si_len); + break; + case SYSINFO_TYPE_2quater: + if (si_len == 0) { + rc = rsl_bcch_info(trx, i, NULL, 0); + break; + } + rc = 0; + for (j = 0; j <= bts->si2q_count; j++) + rc = rsl_bcch_info(trx, i, (const uint8_t *)GSM_BTS_SI2Q(bts, j), GSM_MACBLOCK_LEN); + break; + default: + rc = rsl_bcch_info(trx, i, si_len ? GSM_BTS_SI(bts, i) : NULL, si_len); + break; + } + + return rc; +} + +/* set all system information types for a TRX */ +int gsm_bts_trx_set_system_infos(struct gsm_bts_trx *trx) +{ + int i, rc; + struct gsm_bts *bts = trx->bts; + uint8_t gen_si[_MAX_SYSINFO_TYPE], n_si = 0, n; + int si_len[_MAX_SYSINFO_TYPE]; + + bts->si_common.cell_sel_par.ms_txpwr_max_ccch = + ms_pwr_ctl_lvl(bts->band, bts->ms_max_power); + bts->si_common.cell_sel_par.neci = bts->network->neci; + + /* Zero/forget the state of the dynamically computed SIs, leeping the static ones */ + bts->si_valid = bts->si_mode_static; + + /* First, we determine which of the SI messages we actually need */ + + if (trx == bts->c0) { + /* 1...4 are always present on a C0 TRX */ + gen_si[n_si++] = SYSINFO_TYPE_1; + gen_si[n_si++] = SYSINFO_TYPE_2; + gen_si[n_si++] = SYSINFO_TYPE_2bis; + gen_si[n_si++] = SYSINFO_TYPE_2ter; + gen_si[n_si++] = SYSINFO_TYPE_2quater; + gen_si[n_si++] = SYSINFO_TYPE_3; + gen_si[n_si++] = SYSINFO_TYPE_4; + + /* 13 is always present on a C0 TRX of a GPRS BTS */ + if (bts->gprs.mode != BTS_GPRS_NONE) + gen_si[n_si++] = SYSINFO_TYPE_13; + } + + /* 5 and 6 are always present on every TRX */ + gen_si[n_si++] = SYSINFO_TYPE_5; + gen_si[n_si++] = SYSINFO_TYPE_5bis; + gen_si[n_si++] = SYSINFO_TYPE_5ter; + gen_si[n_si++] = SYSINFO_TYPE_6; + + /* Second, we generate the selected SI via RSL */ + + for (n = 0; n < n_si; n++) { + i = gen_si[n]; + /* Only generate SI if this SI is not in "static" (user-defined) mode */ + if (!(bts->si_mode_static & (1 << i))) { + /* Set SI as being valid. gsm_generate_si() might unset + * it, if SI is not required. */ + bts->si_valid |= (1 << i); + rc = gsm_generate_si(bts, i); + if (rc < 0) + goto err_out; + si_len[i] = rc; + } else { + if (i == SYSINFO_TYPE_5 || i == SYSINFO_TYPE_5bis + || i == SYSINFO_TYPE_5ter) + si_len[i] = 18; + else if (i == SYSINFO_TYPE_6) + si_len[i] = 11; + else + si_len[i] = 23; + } + } + + /* Third, we send the selected SI via RSL */ + + for (n = 0; n < n_si; n++) { + i = gen_si[n]; + /* 3GPP TS 08.58 ?8.5.1 BCCH INFORMATION. If we don't currently + * have this SI, we send a zero-length RSL BCCH FILLING / + * SACCH FILLING in order to deactivate the SI, in case it + * might have previously been active */ + if (!GSM_BTS_HAS_SI(bts, i)) { + if (bts->si_unused_send_empty) + rc = rsl_si(trx, i, 0); + else + rc = 0; /* some nanoBTS fw don't like receiving empty unsupported SI */ + } else + rc = rsl_si(trx, i, si_len[i]); + if (rc < 0) + return rc; + } + + /* Make sure the PCU is aware (in case anything GPRS related has + * changed in SI */ + pcu_info_update(bts); + + return 0; +err_out: + LOGP(DRR, LOGL_ERROR, "Cannot generate SI%s for BTS %u: error <%s>, " + "most likely a problem with neighbor cell list generation\n", + get_value_string(osmo_sitype_strs, i), bts->nr, strerror(-rc)); + return rc; +} diff --git a/src/utils/bs11_config.c b/src/utils/bs11_config.c index c43c008..c279179 100644 --- a/src/utils/bs11_config.c +++ b/src/utils/bs11_config.c @@ -990,3 +990,8 @@ void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} int abis_rsl_rcvmsg(struct msgb *msg) { return 0; } int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } +void pcu_info_update(struct gsm_bts *bts) {}; +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } +int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) +{ return 0; } +int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/src/utils/meas_json.c b/src/utils/meas_json.c index 0fd99c0..b44a300 100644 --- a/src/utils/meas_json.c +++ b/src/utils/meas_json.c @@ -205,3 +205,8 @@ void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} int abis_rsl_rcvmsg(struct msgb *msg) { return 0; } int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } +void pcu_info_update(struct gsm_bts *bts) {}; +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } +int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) +{ return 0; } +int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/tests/abis/abis_test.c b/tests/abis/abis_test.c index 767a9fb..9d26edd 100644 --- a/tests/abis/abis_test.c +++ b/tests/abis/abis_test.c @@ -191,3 +191,8 @@ bool on_gsm_ts_init(struct gsm_bts_trx_ts *ts) { return true; } void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } +void pcu_info_update(struct gsm_bts *bts) {}; +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } +int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) +{ return 0; } +int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/tests/bsc/bsc_test.c b/tests/bsc/bsc_test.c index 164f78f..dd2b1bb 100644 --- a/tests/bsc/bsc_test.c +++ b/tests/bsc/bsc_test.c @@ -240,3 +240,8 @@ bool neighbor_ident_bts_entry_exists(uint8_t from_bts) { return false; } const char *handover_status(struct gsm_subscriber_connection *conn) { return "x"; } int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } +void pcu_info_update(struct gsm_bts *bts) {}; +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } +int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) +{ return 0; } +int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index b3e8b11..e53b83a 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -969,3 +969,8 @@ int rsl_encryption_cmd(struct msgb *msg) { return 0; } int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } + +void pcu_info_update(struct gsm_bts *bts) {}; +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } +int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) +{ return 0; } diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c index 4180f4a..ea98409 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.c +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c @@ -320,3 +320,8 @@ void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } +void pcu_info_update(struct gsm_bts *bts) {}; +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } +int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) +{ return 0; } +int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2aa83b499d6e5d06a0fa1001fee3111f7e639c94 Gerrit-Change-Number: 19299 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 13:27:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jul 2020 13:27:46 +0000 Subject: Change in osmo-bsc[master]: Move acc_ramp_init inside gsm_bts_alloc References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19300 ) Change subject: Move acc_ramp_init inside gsm_bts_alloc ...................................................................... Move acc_ramp_init inside gsm_bts_alloc The function initializes the struct owned by a bts, so it makes sense to have it done there instead of somewhere else later. It was most probably put in bsc_vty when it was initially introduced because of all the data structure and object file mess I untangled during last set of patches. Change-Id: I66c4b208583e92070793183b83b3a7b7edf6ba00 --- M src/ipaccess/Makefile.am M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/utils/Makefile.am M tests/abis/Makefile.am M tests/bsc/Makefile.am M tests/gsm0408/Makefile.am M tests/nanobts_omlattr/Makefile.am 8 files changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/00/19300/1 diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am index a1812a9..a11b295 100644 --- a/src/ipaccess/Makefile.am +++ b/src/ipaccess/Makefile.am @@ -49,6 +49,7 @@ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/acc_ramp.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ @@ -63,6 +64,7 @@ ipaccess_proxy_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/acc_ramp.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index aa08e8b..11e51be 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -2153,11 +2153,6 @@ bts = bsc_bts_alloc_register(gsmnet, GSM_BTS_TYPE_UNKNOWN, HARDCODED_BSIC); osmo_stat_item_inc(gsmnet->bsc_statg->items[BSC_STAT_NUM_BTS_TOTAL], 1); - /* - * Initialize bts->acc_ramp here. Else we could segfault while - * processing a configuration file with ACC ramping settings. - */ - acc_ramp_init(&bts->acc_ramp, bts); } else bts = gsm_bts_num(gsmnet, bts_nr); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 055cc47..7794024 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -387,6 +387,8 @@ bts_init_cbch_state(&bts->cbch_basic, bts); bts_init_cbch_state(&bts->cbch_extended, bts); + acc_ramp_init(&bts->acc_ramp, bts); + return bts; } diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 653ed97..683c227 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -48,6 +48,7 @@ bs11_config_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/acc_ramp.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/bts_siemens_bs11.o \ @@ -120,6 +121,7 @@ meas_json_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/acc_ramp.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am index 5f81ceb..031d689 100644 --- a/tests/abis/Makefile.am +++ b/tests/abis/Makefile.am @@ -26,6 +26,7 @@ abis_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/acc_ramp.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am index 012bd79..282f603 100644 --- a/tests/bsc/Makefile.am +++ b/tests/bsc/Makefile.am @@ -34,6 +34,7 @@ bsc_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/acc_ramp.o \ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ $(top_builddir)/src/osmo-bsc/osmo_bsc_filter.o \ $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \ diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am index 790f3aa..4e22392 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -24,6 +24,7 @@ gsm0408_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/acc_ramp.o \ $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ $(top_builddir)/src/osmo-bsc/bts.o \ diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am index 5a627ff..67d059f 100644 --- a/tests/nanobts_omlattr/Makefile.am +++ b/tests/nanobts_omlattr/Makefile.am @@ -24,6 +24,7 @@ nanobts_omlattr_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/acc_ramp.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I66c4b208583e92070793183b83b3a7b7edf6ba00 Gerrit-Change-Number: 19300 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 15:09:05 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 16 Jul 2020 15:09:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: replace istemplatekind with valueof References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19301 ) Change subject: MSC_ConnectionHandler: replace istemplatekind with valueof ...................................................................... MSC_ConnectionHandler: replace istemplatekind with valueof The function f_establish_fully() and f_ass_patch_lcls() use the built in TTCN3 function istemplatekind to check if the ass_tpl template is set to omit by the caller. This seems not to work, lets use valueof instead. Change-Id: I77272214301bc4982d8bcac64e09a0c679f038bb --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/19301/1 diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 7d8fce1..0697413 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -935,7 +935,7 @@ /* patch an BSSMAP ASS REQ with LCLS related IEs, depending on g_params */ function f_ass_patch_lcls(inout template (omit) PDU_BSSAP ass_tpl, inout template PDU_BSSAP ass_cpl) runs on MSC_ConnHdlr { - if (istemplatekind(ass_tpl, "omit")) { + if (not isvalue(ass_tpl)) { return; } if (ispresent(g_pars.lcls.gcr)) { @@ -1045,7 +1045,7 @@ } /* bail out early if no assignment requested */ - if (istemplatekind(ass_tpl, "omit")) { + if (not isvalue(ass_tpl)) { return; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I77272214301bc4982d8bcac64e09a0c679f038bb Gerrit-Change-Number: 19301 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 15:09:05 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 16 Jul 2020 15:09:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: test handling of EMERGENCY SETUP References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19302 ) Change subject: BSC_Tests: test handling of EMERGENCY SETUP ...................................................................... BSC_Tests: test handling of EMERGENCY SETUP The EMERGENCY SETUP is an L3 message that normally gets passed through transparently to the A interface. Nomrally the BSC will not look into L3 messages. However if EMERGENCY CALLS are allowed on a BTS or not is set in the system information. Also osmo-bsc has the option to deny EMERGENCY CALLS globally for all BTSs. Since EMERGENCY CALLS are a crucial application, the BSC should not only send the appropiate sysinfo messages that forbid emergency calling. It should also make sure that any attempt to make an emergency call is rejected early if emergency calls are denied. Lets add some checks to verify that the allow/deny mechanisms for EMERGENCY CALLS are working as expected. Depends: osmo-bsc Ia6eb38370ce4165d221d2ffbe1cd105c0628313c Change-Id: I486d99953529a1ce9f0a3950c9a97900922eee92 Related: OS#4548 --- M bsc/BSC_Tests.ttcn 1 file changed, 140 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/19302/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 410bc24..bb42a30 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -5810,6 +5810,142 @@ f_vty_transceive(BSCVTY, "exit"); } +/* Allow/Deny emergency calls globally via VTY */ +private function f_vty_allow_emerg_msc(boolean allow) runs on test_CT { + f_vty_enter_cfg_msc(BSCVTY, 0); + if (allow) { + f_vty_transceive(BSCVTY, "allow-emergency allow"); + } else { + f_vty_transceive(BSCVTY, "allow-emergency deny"); + } + f_vty_transceive(BSCVTY, "exit"); + f_vty_transceive(BSCVTY, "exit"); +} + +/* Allow/Deny emergency calls per BTS via VTY */ +private function f_vty_allow_emerg_bts(boolean allow, integer bts_nr) runs on test_CT { + f_vty_enter_cfg_bts(BSCVTY, bts_nr); + if (allow) { + f_vty_transceive(BSCVTY, "rach emergency call allowed 1"); + } else { + f_vty_transceive(BSCVTY, "rach emergency call allowed 0"); + } + f_vty_transceive(BSCVTY, "exit"); + f_vty_transceive(BSCVTY, "exit"); +} + +/* Begin assignmet procedure and send an EMERGENCY SETUP (RR) */ +private function f_assignment_emerg_setup() runs on MSC_ConnHdlr { + var PDU_ML3_MS_NW emerg_setup; + var octetstring emerg_setup_enc; + var RSL_Message emerg_setup_data_ind; + + f_establish_fully(omit, omit); + + emerg_setup := valueof(ts_ML3_MO_CC_EMERG_SETUP(1, valueof(ts_Bcap_voice))); + emerg_setup_enc := enc_PDU_ML3_MS_NW(emerg_setup); + emerg_setup_data_ind := valueof(ts_RSL_DATA_IND(g_chan_nr, valueof(ts_RslLinkID_DCCH(0)), emerg_setup_enc)); + + RSL.send(emerg_setup_data_ind); +} + +/* Test if the EMERGENCY SETUP gets passed on to the MSC via A when EMERGENCY + * CALLS are permitted by the BSC config. */ +private function f_TC_assignment_emerg_setup_allow(charstring id) runs on MSC_ConnHdlr { + var PDU_BSSAP emerg_setup_data_ind_bssap; + var PDU_ML3_MS_NW emerg_setup; + timer T := 3.0; + + f_assignment_emerg_setup() + + T.start; + alt { + [] BSSAP.receive(tr_BSSAP_DTAP) -> value emerg_setup_data_ind_bssap { + emerg_setup := dec_PDU_ML3_MS_NW(emerg_setup_data_ind_bssap.pdu.dtap); + if (not isbound(emerg_setup.msgs.cc.emergencySetup)) { + setverdict(fail, "no emergency setup"); + } + } + [] BSSAP.receive { + setverdict(fail, "unexpected BSSAP message!"); + } + [] T.timeout { + setverdict(fail, "timout waiting for EMERGENCY SETUP!"); + } + } + + setverdict(pass); +} + +/* Test if the EMERGENCY SETUP gets blocked by the BSC if EMERGENCY CALLS are + * forbidden by the BSC config. */ +private function f_TC_assignment_emerg_setup_deny(charstring id) runs on MSC_ConnHdlr { + var PDU_BSSAP emerg_setup_data_ind_bssap; + timer T := 3.0; + + f_assignment_emerg_setup() + + T.start; + alt { + [] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, decmatch tr_RRM_RR_RELEASE)) { + setverdict(pass); + } + [] RSL.receive { + setverdict(fail, "unexpected RSL message!"); + } + [] T.timeout { + setverdict(fail, "timout waiting for RR CHANNEL RELEASE!"); + } + } +} + +/* EMERGENCY CALL situation #1, allowed globally and by BTS */ +testcase TC_assignment_emerg_setup_allow() runs on test_CT { + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + var MSC_ConnHdlr vc_conn; + + f_init(1, true); + f_sleep(1.0); + + f_vty_allow_emerg_msc(true); + f_vty_allow_emerg_bts(true, 0); + vc_conn := f_start_handler(refers(f_TC_assignment_emerg_setup_allow), pars); + vc_conn.done; +} + +/* EMERGENCY CALL situation #2, forbidden globally but allowed by BTS */ +testcase TC_assignment_emerg_setup_deny_msc() runs on test_CT { + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + var MSC_ConnHdlr vc_conn; + + f_init(1, true); + f_sleep(1.0); + + f_vty_allow_emerg_msc(false); + f_vty_allow_emerg_bts(true, 0); + vc_conn := f_start_handler(refers(f_TC_assignment_emerg_setup_deny), pars); + vc_conn.done; +} + +/* EMERGENCY CALL situation #3, allowed globally but forbidden by BTS */ +testcase TC_assignment_emerg_setup_deny_bts() runs on test_CT { + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + var MSC_ConnHdlr vc_conn; + + /* Note: This simulates a spec violation by the MS, correct MS + * implementations would not try to establish an emergency call because + * the system information tells in advance that emergency calls are + * not forbidden */ + + f_init(1, true); + f_sleep(1.0); + + f_vty_allow_emerg_msc(true); + f_vty_allow_emerg_bts(false, 0); + vc_conn := f_start_handler(refers(f_TC_assignment_emerg_setup_deny), pars); + vc_conn.done; +} + /* Dyn PDCH todo: * activate OSMO as TCH/F * activate OSMO as TCH/H @@ -6023,6 +6159,10 @@ execute( TC_early_conn_fail() ); execute( TC_late_conn_fail() ); + /* Emergency call handling (deny / allow) */ + execute( TC_assignment_emerg_setup_allow() ); + execute( TC_assignment_emerg_setup_deny_msc() ); + execute( TC_assignment_emerg_setup_deny_bts() ); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I486d99953529a1ce9f0a3950c9a97900922eee92 Gerrit-Change-Number: 19302 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 15:33:55 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 16 Jul 2020 15:33:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: replace istemplatekind with valueof In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19301 ) Change subject: MSC_ConnectionHandler: replace istemplatekind with valueof ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19301/1/bsc/MSC_ConnectionHandler.ttcn File bsc/MSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19301/1/bsc/MSC_ConnectionHandler.ttcn at 938 PS1, Line 938: isvalue > isvalue(v_template) returns true, if v_template contains concrete value or "omit" So I am not sure if that's exactly what we need here. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19301/1/bsc/MSC_ConnectionHandler.ttcn at 942 PS1, Line 942: ass_tpl.pdu.bssmap ... because you cannot access/reference fields of "omit". -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I77272214301bc4982d8bcac64e09a0c679f038bb Gerrit-Change-Number: 19301 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 16 Jul 2020 15:33:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jul 16 16:22:03 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Jul 2020 16:22:03 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f107ec25f4dd_1cad2af072742600116358@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 135s] dh_auto_configure -O--buildsystem=meson [ 135s] install -d obj-x86_64-linux-gnu [ 135s] cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu [ 135s] Traceback (most recent call last): [ 135s] File "/usr/bin/meson", line 17, in [ 135s] from mesonbuild import mesonmain [ 135s] File "/usr/lib/python3/dist-packages/mesonbuild/mesonmain.py", line 25, in [ 135s] from . import mconf, mdist, minit, minstall, mintro, msetup, mtest, rewriter, msubprojects, munstable_coredata, mcompile [ 135s] File "/usr/lib/python3/dist-packages/mesonbuild/mconf.py", line 16, in [ 135s] from . import coredata, environment, mesonlib, build, mintro, mlog [ 135s] File "/usr/lib/python3/dist-packages/mesonbuild/build.py", line 26, in [ 135s] from . import dependencies [ 135s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/__init__.py", line 15, in [ 135s] from .boost import BoostDependency [ 135s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/boost.py", line 25, in [ 135s] from .base import DependencyException, ExternalDependency, PkgConfigDependency [ 135s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/base.py", line 32, in [ 135s] import pkg_resources [ 135s] ModuleNotFoundError: No module named 'pkg_resources' [ 135s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 135s] make: *** [debian/rules:11: binary] Error 2 [ 135s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 135s] ### VM INTERACTION START ### [ 138s] [ 126.026833] sysrq: SysRq : Power Off [ 139s] [ 126.034123] reboot: Power down [ 139s] ### VM INTERACTION END ### [ 139s] [ 139s] lamb05 failed "build open5gs_1.3.0.20200716.dsc" at Thu Jul 16 16:21:55 UTC 2020. [ 139s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 16 16:25:29 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Jul 2020 16:25:29 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f107f91cad0e_1cad2af072742600117578@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 152s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 152s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 152s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 152s] | | [ 152s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 152s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 152s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 152s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 152s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 152s] 2425 | MHD_start_daemon (unsigned int flags, [ 152s] | ^~~~~~~~~~~~~~~~ [ 153s] cc1: all warnings being treated as errors [ 153s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 153s] make[3]: *** Waiting for unfinished jobs.... [ 153s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 153s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 153s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 153s] make[1]: *** [Makefile:166: all] Error 2 [ 153s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 153s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 153s] make: *** [debian/rules:9: build] Error 25 [ 153s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 153s] ### VM INTERACTION START ### [ 156s] [ 142.779092] sysrq: SysRq : Power Off [ 156s] [ 142.783900] reboot: Power down [ 156s] ### VM INTERACTION END ### [ 156s] [ 156s] lamb24 failed "build ulfius_2.5.2-4.1.dsc" at Thu Jul 16 16:25:17 UTC 2020. [ 156s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 16 16:26:04 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Jul 2020 16:26:04 +0000 Subject: Build failure of network:osmocom:latest/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f107fadc930f_1cad2af07274260011774b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/open5gs/Debian_Unstable/x86_64 Package network:osmocom:latest/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest open5gs Last lines of build log: [ 477s] dh_auto_configure -O--buildsystem=meson [ 477s] install -d obj-x86_64-linux-gnu [ 477s] cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu [ 478s] Traceback (most recent call last): [ 478s] File "/usr/bin/meson", line 17, in [ 478s] from mesonbuild import mesonmain [ 478s] File "/usr/lib/python3/dist-packages/mesonbuild/mesonmain.py", line 25, in [ 478s] from . import mconf, mdist, minit, minstall, mintro, msetup, mtest, rewriter, msubprojects, munstable_coredata, mcompile [ 478s] File "/usr/lib/python3/dist-packages/mesonbuild/mconf.py", line 16, in [ 478s] from . import coredata, environment, mesonlib, build, mintro, mlog [ 478s] File "/usr/lib/python3/dist-packages/mesonbuild/build.py", line 26, in [ 478s] from . import dependencies [ 478s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/__init__.py", line 15, in [ 478s] from .boost import BoostDependency [ 478s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/boost.py", line 25, in [ 478s] from .base import DependencyException, ExternalDependency, PkgConfigDependency [ 478s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/base.py", line 32, in [ 478s] import pkg_resources [ 478s] ModuleNotFoundError: No module named 'pkg_resources' [ 478s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 478s] make: *** [debian/rules:11: binary] Error 2 [ 478s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 478s] ### VM INTERACTION START ### [ 481s] [ 404.305696] sysrq: SysRq : Power Off [ 481s] [ 404.313107] reboot: Power down [ 481s] ### VM INTERACTION END ### [ 481s] [ 481s] lamb55 failed "build open5gs_1.3.0~eoan1.dsc" at Thu Jul 16 16:26:01 UTC 2020. [ 481s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 16 16:26:21 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Jul 2020 16:26:21 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f107fce5eef7_1cad2af072742600117936@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 377s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 377s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 377s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 377s] | | [ 377s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 377s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 377s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 377s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 377s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 377s] 2425 | MHD_start_daemon (unsigned int flags, [ 377s] | ^~~~~~~~~~~~~~~~ [ 378s] cc1: all warnings being treated as errors [ 378s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 378s] make[3]: *** Waiting for unfinished jobs.... [ 378s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 378s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 378s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 378s] make[1]: *** [Makefile:166: all] Error 2 [ 378s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 378s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 378s] make: *** [debian/rules:9: build] Error 25 [ 378s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 378s] ### VM INTERACTION START ### [ 381s] [ 359.266621] sysrq: SysRq : Power Off [ 381s] [ 359.281191] reboot: Power down [ 381s] ### VM INTERACTION END ### [ 381s] [ 381s] lamb60 failed "build ulfius_2.5.2-4.1.dsc" at Thu Jul 16 16:26:15 UTC 2020. [ 381s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jul 16 18:53:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jul 2020 18:53:46 +0000 Subject: Change in osmo-bsc[master]: WIP: Introduce support for ACC subset rotation References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19303 ) Change subject: WIP: Introduce support for ACC subset rotation ...................................................................... WIP: Introduce support for ACC subset rotation Change-Id: I952c9eeae02809c7184078c655574ec817902e06 --- M include/osmocom/bsc/acc_ramp.h M include/osmocom/bsc/bts.h M src/osmo-bsc/acc_ramp.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/osmo-bsc/system_information.c M tests/gsm0408/gsm0408_test.c 7 files changed, 342 insertions(+), 94 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/19303/1 diff --git a/include/osmocom/bsc/acc_ramp.h b/include/osmocom/bsc/acc_ramp.h index 31fc74f..483f437 100644 --- a/include/osmocom/bsc/acc_ramp.h +++ b/include/osmocom/bsc/acc_ramp.h @@ -27,6 +27,40 @@ #include #include +#define ACC_MGR_QUANTUM_DEFAULT 20 /* 20 seconds */ + +/* Manage rotating subset of allowed Access Class as per configuration */ +struct acc_mgr { + struct gsm_bts *bts; /*!< backpointer to BTS using this ACC manager */ + /* Administrative Maximum Number of ACC 0-9 to be allowed at the same time. + Configurable through VTY cmd "access-control-class-roundrobin", + defaults to all allowed (10) */ + uint8_t len_allowed_adm; + /* Further limiting the number of ACC to use. It may be lower due + to ramping, based for instance on channel or system load. */ + uint8_t len_allowed_ramp; + + /* Time until next subset is generated */ + uint32_t rotation_time_sec; + struct osmo_timer_list rotate_timer; + + /* Bitmask containing subset of allowed ACC 0-9 on current rotation iteration */ + uint16_t allowed_subset_mask; + /* Number of bits (ACC) set in allowed_subset_mask: 0->min(len_allowed_ramp, len_allowed_adm) */ + uint8_t allowed_subset_mask_count; + /* Number of ACC 0-9 allowed as per adminsitrative (permanent) config. */ + uint8_t allowed_permanent_count; +}; + +void acc_mgr_init(struct acc_mgr *acc_mgr, struct gsm_bts *bts); +uint8_t acc_mgr_get_len_allowed_adm(struct acc_mgr *acc_mgr); +uint8_t acc_mgr_get_len_allowed_ramp(struct acc_mgr *acc_mgr); +void acc_mgr_set_len_allowed_adm(struct acc_mgr *acc_mgr, uint8_t len_allowed_adm); +void acc_mgr_set_len_allowed_ramp(struct acc_mgr *acc_mgr, uint8_t len_allowed_ramp); +void acc_mgr_set_rotation_time(struct acc_mgr *acc_mgr, uint32_t rotation_time_sec); +void acc_mgr_perm_subset_changed(struct acc_mgr *acc_mgr, struct gsm48_rach_control *rach_control); +void acc_mgr_apply_acc(struct acc_mgr *acc_mgr, struct gsm48_rach_control *rach_control); + /*! * Access control class (ACC) ramping is used to slowly make the cell available to * an increasing number of MS. This avoids overload at startup time in cases where @@ -126,33 +160,6 @@ return !(acc_ramp->step_interval_is_fixed); } -/*! - * Return bitmasks which correspond to access control classes that are currently - * denied access. Ramping is only concerned with those bits which control access - * for ACCs 0-9, and any of the other bits will always be set to zero in these masks, i.e. - * it is safe to OR these bitmasks with the corresponding fields in struct gsm48_rach_control. - * \param[in] acc_ramp Pointer to acc_ramp structure. - */ -static inline uint8_t acc_ramp_get_barred_t2(struct acc_ramp *acc_ramp) -{ - return ((acc_ramp->barred_accs >> 8) & 0x03); -}; -static inline uint8_t acc_ramp_get_barred_t3(struct acc_ramp *acc_ramp) -{ - return (acc_ramp->barred_accs & 0xff); -} - -/*! - * Potentially mark certain Access Control Classes (ACCs) as barred in accordance to ACC ramping. - * \param[in] rach_control RACH control parameters in which barred ACCs will be configured. - * \param[in] acc_ramp Pointer to acc_ramp structure. - */ -static inline void acc_ramp_apply(struct gsm48_rach_control *rach_control, struct acc_ramp *acc_ramp) -{ - rach_control->t2 |= acc_ramp_get_barred_t2(acc_ramp); - rach_control->t3 |= acc_ramp_get_barred_t3(acc_ramp); -} - void acc_ramp_init(struct acc_ramp *acc_ramp, struct gsm_bts *bts); int acc_ramp_set_step_size(struct acc_ramp *acc_ramp, unsigned int step_size); int acc_ramp_set_step_interval(struct acc_ramp *acc_ramp, unsigned int step_interval); diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 730dee9..16053a3 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -449,6 +449,7 @@ uint32_t si_mode_static; /* access control class ramping */ + struct acc_mgr acc_mgr; struct acc_ramp acc_ramp; /* exclude the BTS from the global RF Lock handling */ diff --git a/src/osmo-bsc/acc_ramp.c b/src/osmo-bsc/acc_ramp.c index 761ab09..8406b82 100644 --- a/src/osmo-bsc/acc_ramp.c +++ b/src/osmo-bsc/acc_ramp.c @@ -20,6 +20,8 @@ */ #include +#include +#include #include #include @@ -43,42 +45,276 @@ return (bts->si_common.rach_control.t3 & (1 << (acc))); } -static void allow_one_acc(struct acc_ramp *acc_ramp, unsigned int acc) +/*! + * Return bitmasks which correspond to access control classes that are currently + * denied access. Ramping is only concerned with those bits which control access + * for ACCs 0-9, and any of the other bits will always be set to zero in these masks, i.e. + * it is safe to OR these bitmasks with the corresponding fields in struct gsm48_rach_control. + * \param[in] acc_ramp Pointer to acc_ramp structure. + */ +static inline uint8_t acc_mgr_get_barred_t2(struct acc_mgr *acc_mgr) { - OSMO_ASSERT(acc <= 9); - if (acc_ramp->barred_accs & (1 << acc)) - LOG_BTS(acc_ramp->bts, DRSL, LOGL_NOTICE, - "ACC RAMP: allowing Access Control Class %u\n", acc); - acc_ramp->barred_accs &= ~(1 << acc); + return ((~acc_mgr->allowed_subset_mask) >> 8) & 0x03; +}; +static inline uint8_t acc_mgr_get_barred_t3(struct acc_mgr *acc_mgr) +{ + return (~acc_mgr->allowed_subset_mask) & 0xff; } -static void barr_one_acc(struct acc_ramp *acc_ramp, unsigned int acc) +static uint8_t acc_mgr_subset_len(struct acc_mgr *acc_mgr) { - OSMO_ASSERT(acc <= 9); - if ((acc_ramp->barred_accs & (1 << acc)) == 0) - LOG_BTS(acc_ramp->bts, DRSL, LOGL_NOTICE, - "ACC RAMP: barring Access Control Class %u\n", acc); - acc_ramp->barred_accs |= (1 << acc); + return OSMO_MIN(acc_mgr->len_allowed_ramp, acc_mgr->len_allowed_adm); } -static void barr_all_accs(struct acc_ramp *acc_ramp) +static void acc_mgr_enable_rotation_cond(struct acc_mgr *acc_mgr) { - unsigned int acc; - for (acc = 0; acc < 10; acc++) { - if (!acc_is_permanently_barred(acc_ramp->bts, acc)) - barr_one_acc(acc_ramp, acc); + if (acc_mgr->allowed_permanent_count && + acc_mgr->allowed_permanent_count == acc_mgr->allowed_subset_mask_count) { + if (!osmo_timer_pending(&acc_mgr->rotate_timer)) + osmo_timer_schedule(&acc_mgr->rotate_timer, acc_mgr->rotation_time_sec, 0); + } else { + /* No rotation needed, disable rotation timer */ + if (osmo_timer_pending(&acc_mgr->rotate_timer)) + osmo_timer_del(&acc_mgr->rotate_timer); } } -static void allow_all_accs(struct acc_ramp *acc_ramp) +static void acc_mgr_gen_subset(struct acc_mgr *acc_mgr, bool update_si) { - unsigned int acc; + uint8_t acc; + + acc_mgr->allowed_subset_mask = 0; /* clean mask */ + acc_mgr->allowed_subset_mask_count = 0; + acc_mgr->allowed_permanent_count = 0; + for (acc = 0; acc < 10; acc++) { - if (!acc_is_permanently_barred(acc_ramp->bts, acc)) - allow_one_acc(acc_ramp, acc); + if (acc_is_permanently_barred(acc_mgr->bts, acc)) + continue; + acc_mgr->allowed_permanent_count++; + if (acc_mgr->allowed_subset_mask_count < acc_mgr_subset_len(acc_mgr)) { + acc_mgr->allowed_subset_mask &= (1 << acc); + acc_mgr->allowed_subset_mask_count++; + } } + + LOG_BTS(acc_mgr->bts, DRSL, LOGL_INFO, + "ACC: New ACC allowed subset 0x%" PRIx16 " (allowed=%" PRIu8 + ", adm_len=%" PRIu8 ", ramp_len=%" PRIu8 ")\n", + acc_mgr->allowed_subset_mask, acc_mgr->allowed_subset_mask_count, + acc_mgr->len_allowed_adm, acc_mgr->len_allowed_ramp); + + acc_mgr_enable_rotation_cond(acc_mgr); + + /* Trigger SI data update, acc_mgr_apply_acc will bew called */ + if (update_si) + gsm_bts_set_system_infos(acc_mgr->bts); } +static uint8_t get_highest_allowed_acc(uint16_t mask) +{ + for (int i = 9; i >= 0; i--) { + if (mask & (1 << i)) + return i; + } + OSMO_ASSERT(0); + return 0; +} + +static uint8_t get_lowest_allowed_acc(uint16_t mask) +{ + for (int i = 0; i < 10; i++) { + if (mask & (1 << i)) + return i; + } + OSMO_ASSERT(0); + return 0; +} + +/* Call when either adm_len or ramp_len changed (and values have been updated) */ +static void acc_mgr_subset_length_changed(struct acc_mgr *acc_mgr) +{ + uint8_t curr_len = acc_mgr->allowed_subset_mask_count; + uint8_t new_len = acc_mgr_subset_len(acc_mgr); + uint8_t diff = new_len - curr_len; + uint8_t i; + + if (curr_len == new_len) + return; + + if (new_len == 0) { + acc_mgr->allowed_subset_mask = 0; + acc_mgr->allowed_subset_mask_count = 0; + acc_mgr_enable_rotation_cond(acc_mgr); + gsm_bts_set_system_infos(acc_mgr->bts); + return; + } + + if (curr_len == 0) { + acc_mgr_gen_subset(acc_mgr, true); + return; + } + + /* Try to add new ACCs to the set starting from highest one (since we rotate rolling up) */ + if (diff > 0) { /* curr_len < new_len */ + uint8_t highest = get_highest_allowed_acc(acc_mgr->allowed_subset_mask); + /* It's fine skipping highest in the loop since it's known to be already set: */ + for (i = (highest + 1) % 10; i != highest; i = (i + 1) % 10) { + if (acc_is_permanently_barred(acc_mgr->bts, i)) + continue; + if (acc_mgr->allowed_subset_mask & (1 << i)) + continue; /* already in set */ + acc_mgr->allowed_subset_mask &= (1 << i); + acc_mgr->allowed_subset_mask_count++; + diff--; + if (diff == 0) + break; + } + } else { /* curr_len > new_len, try removing from lowest one. */ + uint8_t lowest = get_lowest_allowed_acc(acc_mgr->allowed_subset_mask); + i = lowest; + do { + if ((acc_mgr->allowed_subset_mask & (1 << i))) { + acc_mgr->allowed_subset_mask &= ~(1 << i); + acc_mgr->allowed_subset_mask_count--; + diff++; + if (diff == 0) + break; + } + i = (i + 1) % 10; + } while(i != lowest); + } + + acc_mgr_enable_rotation_cond(acc_mgr); + + /* if we updated the set, notify about it */ + if (curr_len != acc_mgr->allowed_subset_mask_count) + gsm_bts_set_system_infos(acc_mgr->bts); + +} + +static void do_acc_rotate_step(void *data) +{ + struct acc_mgr *acc_mgr = data; + int i; + uint16_t old_mask = acc_mgr->allowed_subset_mask; + + /* Assumption: The size of the subset didn't change, that's handled by + * acc_mgr_subset_length_changed() + */ + + /* Assumption: Rotation timer has been disabled if no ACC is allowed */ + OSMO_ASSERT(acc_mgr->allowed_subset_mask_count != 0) + + /* One ACC is rotated at a time: Drop lowest ACC and add next from highest ACC */ + uint8_t lowest = get_lowest_allowed_acc(acc_mgr->allowed_subset_mask); + uint8_t highest = get_highest_allowed_acc(acc_mgr->allowed_subset_mask); + + acc_mgr->allowed_subset_mask &= ~(1 << lowest); + i = (highest + 1) % 10; + do { + if (!acc_is_permanently_barred(acc_mgr->bts, i) && + !(acc_mgr->allowed_subset_mask & (1 << i))) { + /* found first one which can be allowed, do it and be done */ + acc_mgr->allowed_subset_mask &= (1 << i); + acc_mgr->allowed_subset_mask_count++; + break; + } + i = (i + 1 ) % 10; + } while (i != (highest + 1) % 10); + + if (old_mask != acc_mgr->allowed_subset_mask) { + LOG_BTS(acc_mgr->bts, DRSL, LOGL_INFO, + "ACC: New ACC allowed subset 0x%" PRIx16 " -> 0x%" PRIx16 + " (allowed=%" PRIu8 ", adm_len=%" PRIu8 ", ramp_len=%" PRIu8 ")\n", + old_mask, acc_mgr->allowed_subset_mask, + acc_mgr->allowed_subset_mask_count, + acc_mgr->len_allowed_adm, acc_mgr->len_allowed_ramp); + gsm_bts_set_system_infos(acc_mgr->bts); + } + + osmo_timer_schedule(&acc_mgr->rotate_timer, acc_mgr->rotation_time_sec, 0); +} + +void acc_mgr_init(struct acc_mgr *acc_mgr, struct gsm_bts *bts) +{ + acc_mgr->bts = bts; + acc_mgr->len_allowed_adm = 10; /* Allow all by default */ + acc_mgr->len_allowed_ramp = 10; + acc_mgr->rotation_time_sec = ACC_MGR_QUANTUM_DEFAULT; + osmo_timer_setup(&acc_mgr->rotate_timer, do_acc_rotate_step, acc_mgr); + /* FIXME: Don't update SI yet, avoid crash due to bts->model being NULL */ + acc_mgr_gen_subset(acc_mgr, false); +} + +uint8_t acc_mgr_get_len_allowed_adm(struct acc_mgr *acc_mgr) +{ + return acc_mgr->len_allowed_adm; +} + +uint8_t acc_mgr_get_len_allowed_ramp(struct acc_mgr *acc_mgr) +{ + return acc_mgr->len_allowed_ramp; +} + +void acc_mgr_set_len_allowed_adm(struct acc_mgr *acc_mgr, uint8_t len_allowed_adm) +{ + uint8_t old_len; + if (acc_mgr->len_allowed_adm == len_allowed_adm) + return; + + LOG_BTS(acc_mgr->bts, DRSL, LOGL_DEBUG, + "ACC: administrative rotate subset size set to %" PRIu8 "\n", len_allowed_adm); + + old_len = acc_mgr_subset_len(acc_mgr); + acc_mgr->len_allowed_adm = len_allowed_adm; + if (old_len != acc_mgr_subset_len(acc_mgr)) + acc_mgr_subset_length_changed(acc_mgr); +} +void acc_mgr_set_len_allowed_ramp(struct acc_mgr *acc_mgr, uint8_t len_allowed_ramp) +{ + uint8_t old_len; + if (acc_mgr->len_allowed_ramp == len_allowed_ramp) + return; + + LOG_BTS(acc_mgr->bts, DRSL, LOGL_DEBUG, + "ACC: ramping rotate subset size set to %" PRIu8 "\n", len_allowed_ramp); + + old_len = acc_mgr_subset_len(acc_mgr); + acc_mgr->len_allowed_ramp = len_allowed_ramp; + if (old_len != acc_mgr_subset_len(acc_mgr)) + acc_mgr_subset_length_changed(acc_mgr); +} + +void acc_mgr_set_rotation_time(struct acc_mgr *acc_mgr, uint32_t rotation_time_sec) +{ + LOG_BTS(acc_mgr->bts, DRSL, LOGL_DEBUG, + "ACC: rotate subset time set to %" PRIu32 "\n", rotation_time_sec); + acc_mgr->rotation_time_sec = rotation_time_sec; +} + +void acc_mgr_perm_subset_changed(struct acc_mgr *acc_mgr, struct gsm48_rach_control *rach_control) +{ + /* Even if amount is the same, the allowed/barred ones may have changed, + * so let's retrigger generation of an entire subset rather than + * rotating it */ + acc_mgr_gen_subset(acc_mgr, true); +} + +/*! + * Potentially mark certain Access Control Classes (ACCs) as barred in accordance to ACC policy. + * \param[in] acc_mgr Pointer to acc_mgr structure. + * \param[in] rach_control RACH control parameters in which barred ACCs will be configured. + */ +void acc_mgr_apply_acc(struct acc_mgr *acc_mgr, struct gsm48_rach_control *rach_control) +{ + rach_control->t2 |= acc_mgr_get_barred_t2(acc_mgr); + rach_control->t3 |= acc_mgr_get_barred_t3(acc_mgr); +} + + +////////////////////////// +// acc_ramp +////////////////////////// static unsigned int get_next_step_interval(struct acc_ramp *acc_ramp) { struct gsm_bts *bts = acc_ramp->bts; @@ -104,42 +340,14 @@ static void do_acc_ramping_step(void *data) { struct acc_ramp *acc_ramp = data; - int i; + struct acc_mgr *acc_mgr = &acc_ramp->bts->acc_mgr; + uint8_t old_len = acc_mgr_get_len_allowed_ramp(acc_mgr); + uint8_t new_len = OSMO_MIN(10, old_len + acc_ramp->step_size); - /* Shortcut in case we only do one ramping step. */ - if (acc_ramp->step_size == ACC_RAMP_STEP_SIZE_MAX) { - allow_all_accs(acc_ramp); - gsm_bts_set_system_infos(acc_ramp->bts); - return; - } - - /* Allow 'step_size' ACCs, starting from ACC0. ACC9 will be allowed last. */ - for (i = 0; i < acc_ramp->step_size; i++) { - int idx = ffs(acc_ramp_get_barred_t3(acc_ramp)); - if (idx > 0) { - /* One of ACC0-ACC7 is still bared. */ - unsigned int acc = idx - 1; - if (!acc_is_permanently_barred(acc_ramp->bts, acc)) - allow_one_acc(acc_ramp, acc); - } else { - idx = ffs(acc_ramp_get_barred_t2(acc_ramp)); - if (idx == 1 || idx == 2) { - /* ACC8 or ACC9 is still barred. */ - unsigned int acc = idx - 1 + 8; - if (!acc_is_permanently_barred(acc_ramp->bts, acc)) - allow_one_acc(acc_ramp, acc); - } else { - /* All ACCs are now allowed. */ - break; - } - } - } - - gsm_bts_set_system_infos(acc_ramp->bts); + acc_mgr_set_len_allowed_ramp(acc_mgr, new_len); /* If we have not allowed all ACCs yet, schedule another ramping step. */ - if (acc_ramp_get_barred_t2(acc_ramp) != 0x00 || - acc_ramp_get_barred_t3(acc_ramp) != 0x00) + if (new_len != 10) osmo_timer_schedule(&acc_ramp->step_timer, get_next_step_interval(acc_ramp), 0); } @@ -279,7 +487,6 @@ acc_ramp->step_size = ACC_RAMP_STEP_SIZE_DEFAULT; acc_ramp->step_interval_sec = ACC_RAMP_STEP_INTERVAL_MIN; acc_ramp->step_interval_is_fixed = false; - allow_all_accs(acc_ramp); osmo_timer_setup(&acc_ramp->step_timer, do_acc_ramping_step, acc_ramp); osmo_signal_register_handler(SS_NM, acc_ramp_nm_sig_cb, acc_ramp); } @@ -344,7 +551,7 @@ if (acc_ramp_is_enabled(acc_ramp)) { /* Set all available ACCs to barred and start ramping up. */ - barr_all_accs(acc_ramp); + acc_mgr_set_len_allowed_ramp(&acc_ramp->bts->acc_mgr, 0); do_acc_ramping_step(acc_ramp); } } @@ -358,5 +565,5 @@ if (osmo_timer_pending(&acc_ramp->step_timer)) osmo_timer_del(&acc_ramp->step_timer); - allow_all_accs(acc_ramp); + acc_mgr_set_len_allowed_ramp(&acc_ramp->bts->acc_mgr, 10); } diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 11e51be..2afb8f6 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -404,6 +404,8 @@ VTY_NEWLINE); vty_out(vty, " Cell Reselection Hysteresis: %u dBm%s", bts->si_common.cell_sel_par.cell_resel_hyst*2, VTY_NEWLINE); + vty_out(vty, " Access Control Class rotation allow mask: 0x%" PRIx16 "%s", + bts->acc_mgr.allowed_subset_mask, VTY_NEWLINE); vty_out(vty, " Access Control Class ramping: %senabled%s", acc_ramp_is_enabled(&bts->acc_ramp) ? "" : "not ", VTY_NEWLINE); if (acc_ramp_is_enabled(&bts->acc_ramp)) { @@ -948,6 +950,10 @@ for (i = 0; i < 8; i++) if ((i != 2) && (bts->si_common.rach_control.t2 & (0x1 << i))) vty_out(vty, " rach access-control-class %d barred%s", i+8, VTY_NEWLINE); + if (bts->acc_mgr.len_allowed_adm < 10) + vty_out(vty, " access-control-class-rotate %" PRIu8 "%s", bts->acc_mgr.len_allowed_adm, VTY_NEWLINE); + if (bts->acc_mgr.rotation_time_sec != ACC_MGR_QUANTUM_DEFAULT) + vty_out(vty, " access-control-class-rotate-quantum %" PRIu32 "%s", bts->acc_mgr.rotation_time_sec, VTY_NEWLINE); vty_out(vty, " %saccess-control-class-ramping%s", acc_ramp_is_enabled(&bts->acc_ramp) ? "" : "no ", VTY_NEWLINE); if (!acc_ramp_step_interval_is_dynamic(&bts->acc_ramp)) { vty_out(vty, " access-control-class-ramping-step-interval %u%s", @@ -2745,6 +2751,9 @@ else bts->si_common.rach_control.t2 |= (0x1 << (control_class - 8)); + if (control_class < 10) + acc_mgr_perm_subset_changed(&bts->acc_mgr, &bts->si_common.rach_control); + return CMD_SUCCESS; } @@ -3640,6 +3649,30 @@ return CMD_SUCCESS; } +DEFUN(cfg_bts_acc_rotate, + cfg_bts_acc_rotate_cmd, + "access-control-rotate <0-10>", + "Enable Access Control Class allowed subset rotation\n" + "Size of the rotating allowed ACC 0-9 subset (default=10, no subset)\n") +{ + struct gsm_bts *bts = vty->index; + int len_allowed_adm = atoi(argv[0]); + acc_mgr_set_len_allowed_adm(&bts->acc_mgr, len_allowed_adm); + return CMD_SUCCESS; +} + +DEFUN(cfg_bts_acc_rotate_quantum, + cfg_bts_acc_rotate_quantum_cmd, + "access-control-rotate-quantum <1-65535>", + "Time between rotation of ACC 0-9 generated subsets\n" + "Time in seconds (default=" OSMO_STRINGIFY_VAL(ACC_MGR_QUANTUM_DEFAULT) ")\n") +{ + struct gsm_bts *bts = vty->index; + uint32_t rotation_time_sec = (uint32_t)atoi(argv[0]); + acc_mgr_set_rotation_time(&bts->acc_mgr, rotation_time_sec); + return CMD_SUCCESS; +} + DEFUN(cfg_bts_acc_ramping, cfg_bts_acc_ramping_cmd, "access-control-class-ramping", @@ -6493,6 +6526,8 @@ install_element(BTS_NODE, &cfg_bts_amr_hr_hyst3_cmd); install_element(BTS_NODE, &cfg_bts_amr_hr_start_mode_cmd); install_element(BTS_NODE, &cfg_bts_pcu_sock_cmd); + install_element(BTS_NODE, &cfg_bts_acc_rotate_cmd); + install_element(BTS_NODE, &cfg_bts_acc_rotate_quantum_cmd); install_element(BTS_NODE, &cfg_bts_acc_ramping_cmd); install_element(BTS_NODE, &cfg_bts_no_acc_ramping_cmd); install_element(BTS_NODE, &cfg_bts_acc_ramping_step_interval_cmd); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 7794024..4318b7e 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -387,6 +387,7 @@ bts_init_cbch_state(&bts->cbch_basic, bts); bts_init_cbch_state(&bts->cbch_extended, bts); + acc_mgr_init(&bts->acc_mgr, bts); acc_ramp_init(&bts->acc_ramp, bts); return bts; diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 13d0f46..be70600 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -723,8 +723,7 @@ list_arfcn(si1->cell_channel_description, 0xce, "Serving cell:"); si1->rach_control = bts->si_common.rach_control; - if (acc_ramp_is_enabled(&bts->acc_ramp)) - acc_ramp_apply(&si1->rach_control, &bts->acc_ramp); + acc_mgr_apply_acc(&bts->acc_mgr, &si1->rach_control); /* * SI1 Rest Octets (10.5.2.32), contains NCH position and band @@ -755,8 +754,7 @@ si2->ncc_permitted = bts->si_common.ncc_permitted; si2->rach_control = bts->si_common.rach_control; - if (acc_ramp_is_enabled(&bts->acc_ramp)) - acc_ramp_apply(&si2->rach_control, &bts->acc_ramp); + acc_mgr_apply_acc(&bts->acc_mgr, &si2->rach_control); return sizeof(*si2); } @@ -790,8 +788,7 @@ bts->si_valid &= ~(1 << SYSINFO_TYPE_2bis); si2b->rach_control = bts->si_common.rach_control; - if (acc_ramp_is_enabled(&bts->acc_ramp)) - acc_ramp_apply(&si2b->rach_control, &bts->acc_ramp); + acc_mgr_apply_acc(&bts->acc_mgr, &si2b->rach_control); /* SI2bis Rest Octets as per 3GPP TS 44.018 ?10.5.2.33 */ rc = rest_octets_si2bis(si2b->rest_octets); @@ -912,8 +909,7 @@ si3->cell_options = bts->si_common.cell_options; si3->cell_sel_par = bts->si_common.cell_sel_par; si3->rach_control = bts->si_common.rach_control; - if (acc_ramp_is_enabled(&bts->acc_ramp)) - acc_ramp_apply(&si3->rach_control, &bts->acc_ramp); + acc_mgr_apply_acc(&bts->acc_mgr, &si3->rach_control); /* allow/disallow DTXu */ gsm48_set_dtx(&si3->cell_options, bts->dtxu, bts->dtxu, true); @@ -962,8 +958,7 @@ gsm48_generate_lai2(&si4->lai, bts_lai(bts)); si4->cell_sel_par = bts->si_common.cell_sel_par; si4->rach_control = bts->si_common.rach_control; - if (acc_ramp_is_enabled(&bts->acc_ramp)) - acc_ramp_apply(&si4->rach_control, &bts->acc_ramp); + acc_mgr_apply_acc(&bts->acc_mgr, &si4->rach_control); /* Optional: CBCH Channel Description + CBCH Mobile Allocation */ cbch_lchan = gsm_bts_get_cbch(bts); diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index e53b83a..35531f8 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -140,6 +140,8 @@ { osmo_stat_item_group_free(bts->bts_statg); rate_ctr_group_free(bts->bts_ctrs); + if (osmo_timer_pending(&bts->acc_mgr.rotate_timer)) + osmo_timer_del(&bts->acc_mgr.rotate_timer); /* no need to llist_del(&bts->list), we never registered the bts there. */ talloc_free(bts); printf("BTS deallocated OK in %s()\n", msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I952c9eeae02809c7184078c655574ec817902e06 Gerrit-Change-Number: 19303 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 18:57:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 16 Jul 2020 18:57:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: test handling of EMERGENCY SETUP In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19302 ) Change subject: BSC_Tests: test handling of EMERGENCY SETUP ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I486d99953529a1ce9f0a3950c9a97900922eee92 Gerrit-Change-Number: 19302 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jul 2020 18:57:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 22:21:04 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 22:21:04 +0000 Subject: Change in libosmocore[master]: rate_ctr: Add functions to reset rate counter (groups) In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19294 to look at the new patch set (#4). Change subject: rate_ctr: Add functions to reset rate counter (groups) ...................................................................... rate_ctr: Add functions to reset rate counter (groups) Change-Id: If2f806d044cd0fb6929dac44ef8f8a15941ffe9b Related: SYS#4877 --- M TODO-RELEASE M include/osmocom/core/rate_ctr.h M src/rate_ctr.c 3 files changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/94/19294/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If2f806d044cd0fb6929dac44ef8f8a15941ffe9b Gerrit-Change-Number: 19294 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 22:21:04 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 22:21:04 +0000 Subject: Change in libosmocore[master]: stat_item: Add function to reset stat items and groups In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19295 to look at the new patch set (#4). Change subject: stat_item: Add function to reset stat items and groups ...................................................................... stat_item: Add function to reset stat items and groups Change-Id: I80fc0ea8865ec4efdcd4c982e69d863275fd9919 Related: SYS#4877 --- M TODO-RELEASE M include/osmocom/core/stat_item.h M src/stat_item.c 3 files changed, 34 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/95/19295/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I80fc0ea8865ec4efdcd4c982e69d863275fd9919 Gerrit-Change-Number: 19295 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 16 22:21:04 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 16 Jul 2020 22:21:04 +0000 Subject: Change in libosmocore[master]: stats: Add stats commands related to testing In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19296 to look at the new patch set (#4). Change subject: stats: Add stats commands related to testing ...................................................................... stats: Add stats commands related to testing * Allow to set the reporting interval to 0 for manual reporting * stats reset command to reset all statistics * stats report command to manually trigger statistics reporting Change-Id: I9febcb65650abfd538caedfbca77a787e66d517a Related: SYS#4877 --- M src/stats.c M src/vty/stats_vty.c 2 files changed, 53 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/19296/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9febcb65650abfd538caedfbca77a787e66d517a Gerrit-Change-Number: 19296 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Jul 17 01:40:34 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Jul 2020 01:40:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Leap_15.1_ARM/aarch64 In-Reply-To: References: Message-ID: <5f1101a067d03_1cad2af07274260020864@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Leap_15.1_ARM/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Leap_15.1_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 100s] Processing files: osmo-bsc-bs11-utils-1.6.0.184.3405c-lp151.1.1.aarch64 [ 100s] Provides: osmo-bsc-bs11-utils = 1.6.0.184.3405c-lp151.1.1 osmo-bsc-bs11-utils(aarch-64) = 1.6.0.184.3405c-lp151.1.1 [ 100s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 100s] Requires: ld-linux-aarch64.so.1()(64bit) ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) libc.so.6()(64bit) libc.so.6(GLIBC_2.17)(64bit) libosmoabis.so.6()(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.17)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 100s] Processing files: osmo-bsc-meas-utils-1.6.0.184.3405c-lp151.1.1.aarch64 [ 100s] Provides: osmo-bsc-meas-utils = 1.6.0.184.3405c-lp151.1.1 osmo-bsc-meas-utils(aarch-64) = 1.6.0.184.3405c-lp151.1.1 [ 100s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 100s] Requires: ld-linux-aarch64.so.1()(64bit) ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) libc.so.6()(64bit) libc.so.6(GLIBC_2.17)(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.17)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 100s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-lp151.1.1.aarch64 [ 100s] error: Installed (but unpackaged) file(s) found: [ 100s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 100s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 100s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 100s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 100s] [ 100s] [ 100s] RPM build errors: [ 100s] Installed (but unpackaged) file(s) found: [ 100s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 100s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 100s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 100s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 100s] ### VM INTERACTION START ### [ 103s] [ 91.450928] sysrq: SysRq : Power Off [ 103s] [ 91.461496] reboot: Power down [ 103s] ### VM INTERACTION END ### [ 103s] [ 103s] obs-arm-9 failed "build osmo-bsc.spec" at Fri Jul 17 01:40:30 UTC 2020. [ 103s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 17 01:44:17 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Jul 2020 01:44:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Factory_ARM/aarch64 In-Reply-To: References: Message-ID: <5f110274d0c91_1cad2af07274260020945@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Factory_ARM/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Factory_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 165s] Processing files: osmo-bsc-bs11-utils-1.6.0.184.3405c-1.1.aarch64 [ 165s] Provides: osmo-bsc-bs11-utils = 1.6.0.184.3405c-1.1 osmo-bsc-bs11-utils(aarch-64) = 1.6.0.184.3405c-1.1 [ 165s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 165s] Requires: ld-linux-aarch64.so.1()(64bit) ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) libc.so.6()(64bit) libc.so.6(GLIBC_2.17)(64bit) libosmoabis.so.6()(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.17)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 165s] Processing files: osmo-bsc-meas-utils-1.6.0.184.3405c-1.1.aarch64 [ 165s] Provides: osmo-bsc-meas-utils = 1.6.0.184.3405c-1.1 osmo-bsc-meas-utils(aarch-64) = 1.6.0.184.3405c-1.1 [ 165s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 165s] Requires: ld-linux-aarch64.so.1()(64bit) ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) libc.so.6()(64bit) libc.so.6(GLIBC_2.17)(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.17)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 165s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-1.1.aarch64 [ 165s] error: Installed (but unpackaged) file(s) found: [ 165s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 165s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 165s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 165s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 165s] [ 165s] [ 165s] RPM build errors: [ 165s] Installed (but unpackaged) file(s) found: [ 165s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 165s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 165s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 165s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 165s] ### VM INTERACTION START ### [ 168s] [ 130.479460] sysrq: Power Off [ 168s] [ 130.498141] reboot: Power down [ 168s] ### VM INTERACTION END ### [ 168s] [ 168s] obs-arm-1 failed "build osmo-bsc.spec" at Fri Jul 17 01:44:01 UTC 2020. [ 168s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 17 01:45:42 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Jul 2020 01:45:42 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in CentOS_8_Stream/aarch64 In-Reply-To: References: Message-ID: <5f1102cf6e1b5_1cad2af07274260020969@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/CentOS_8_Stream/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in CentOS_8_Stream/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 199s] Processing files: osmo-bsc-bs11-utils-debuginfo-1.6.0.184.3405c-1.1.aarch64 [ 199s] Provides: debuginfo(build-id) = a2d9f711a1632fd996769f72588b445b3ba5dcbe debuginfo(build-id) = e4ad8bf953531a1a5bae1db2ca22b690f0aed6a9 osmo-bsc-bs11-utils-debuginfo = 1.6.0.184.3405c-1.1 osmo-bsc-bs11-utils-debuginfo(aarch-64) = 1.6.0.184.3405c-1.1 [ 199s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 199s] Recommends: osmo-bsc-debugsource(aarch-64) = 1.6.0.184.3405c-1.1 [ 199s] Processing files: osmo-bsc-meas-utils-debuginfo-1.6.0.184.3405c-1.1.aarch64 [ 199s] Provides: debuginfo(build-id) = 7462de0248d02b539f1ff6cd8d204c5c7c154d02 osmo-bsc-meas-utils-debuginfo = 1.6.0.184.3405c-1.1 osmo-bsc-meas-utils-debuginfo(aarch-64) = 1.6.0.184.3405c-1.1 [ 199s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 199s] Recommends: osmo-bsc-debugsource(aarch-64) = 1.6.0.184.3405c-1.1 [ 199s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-1.1.aarch64 [ 199s] error: Installed (but unpackaged) file(s) found: [ 199s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 199s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 199s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 199s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 199s] [ 199s] [ 199s] RPM build errors: [ 199s] Installed (but unpackaged) file(s) found: [ 199s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 199s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 199s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 199s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 199s] ### VM INTERACTION START ### [ 200s] Powering off. [ 200s] [ 179.800741] reboot: Power down [ 200s] ### VM INTERACTION END ### [ 200s] [ 200s] obs-arm-3 failed "build osmo-bsc.spec" at Fri Jul 17 01:45:39 UTC 2020. [ 200s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 17 01:51:25 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Jul 2020 01:51:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <5f110437bbadc_1cad2af0727426002115b3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 120s] Processing files: osmo-bsc-bs11-utils-1.6.0.184.3405c-1.1.i586 [ 120s] Provides: osmo-bsc-bs11-utils = 1.6.0.184.3405c-1.1 osmo-bsc-bs11-utils(x86-32) = 1.6.0.184.3405c-1.1 [ 120s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 120s] Requires: libc.so.6 libc.so.6(GLIBC_2.0) libc.so.6(GLIBC_2.1) libc.so.6(GLIBC_2.1.3) libc.so.6(GLIBC_2.15) libc.so.6(GLIBC_2.17) libc.so.6(GLIBC_2.3.4) libc.so.6(GLIBC_2.4) libc.so.6(GLIBC_2.7) libosmoabis.so.6 libosmocore.so.12 libosmogsm.so.13 libosmogsm.so.13(LIBOSMOGSM_1.0) libpthread.so.0 libpthread.so.0(GLIBC_2.0) libtalloc.so.2 libtalloc.so.2(TALLOC_2.0.2) [ 120s] Processing files: osmo-bsc-meas-utils-1.6.0.184.3405c-1.1.i586 [ 120s] Provides: osmo-bsc-meas-utils = 1.6.0.184.3405c-1.1 osmo-bsc-meas-utils(x86-32) = 1.6.0.184.3405c-1.1 [ 120s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 120s] Requires: libc.so.6 libc.so.6(GLIBC_2.0) libc.so.6(GLIBC_2.1.3) libc.so.6(GLIBC_2.3.4) libc.so.6(GLIBC_2.4) libosmocore.so.12 libosmogsm.so.13 libosmogsm.so.13(LIBOSMOGSM_1.0) libpthread.so.0 libpthread.so.0(GLIBC_2.0) libtalloc.so.2 libtalloc.so.2(TALLOC_2.0.2) [ 120s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-1.1.i386 [ 120s] error: Installed (but unpackaged) file(s) found: [ 120s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 120s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 120s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 120s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 120s] [ 120s] [ 120s] RPM build errors: [ 120s] Installed (but unpackaged) file(s) found: [ 120s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 120s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 120s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 120s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 120s] ### VM INTERACTION START ### [ 123s] [ 108.683983] sysrq: Power Off [ 123s] [ 108.716289] reboot: Power down [ 123s] ### VM INTERACTION END ### [ 123s] [ 123s] lamb21 failed "build osmo-bsc.spec" at Fri Jul 17 01:51:09 UTC 2020. [ 123s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 17 02:09:08 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Jul 2020 02:09:08 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f11084f2ecb_1cad2af0727426002167b6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 226s] dh_auto_configure -O--buildsystem=meson [ 226s] install -d obj-x86_64-linux-gnu [ 226s] cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu [ 226s] Traceback (most recent call last): [ 226s] File "/usr/bin/meson", line 17, in [ 226s] from mesonbuild import mesonmain [ 226s] File "/usr/lib/python3/dist-packages/mesonbuild/mesonmain.py", line 25, in [ 226s] from . import mconf, mdist, minit, minstall, mintro, msetup, mtest, rewriter, msubprojects, munstable_coredata, mcompile [ 226s] File "/usr/lib/python3/dist-packages/mesonbuild/mconf.py", line 16, in [ 226s] from . import coredata, environment, mesonlib, build, mintro, mlog [ 226s] File "/usr/lib/python3/dist-packages/mesonbuild/build.py", line 26, in [ 226s] from . import dependencies [ 226s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/__init__.py", line 15, in [ 226s] from .boost import BoostDependency [ 226s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/boost.py", line 25, in [ 226s] from .base import DependencyException, ExternalDependency, PkgConfigDependency [ 226s] File "/usr/lib/python3/dist-packages/mesonbuild/dependencies/base.py", line 32, in [ 226s] import pkg_resources [ 226s] ModuleNotFoundError: No module named 'pkg_resources' [ 226s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 226s] make: *** [debian/rules:11: binary] Error 2 [ 226s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 226s] ### VM INTERACTION START ### [ 229s] [ 214.336180] sysrq: SysRq : Power Off [ 229s] [ 214.346609] reboot: Power down [ 229s] ### VM INTERACTION END ### [ 229s] [ 229s] lamb55 failed "build open5gs_1.3.0.20200717.dsc" at Fri Jul 17 02:08:56 UTC 2020. [ 229s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 17 02:37:25 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Jul 2020 02:37:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in CentOS_8_Stream/x86_64 In-Reply-To: References: Message-ID: <5f110efe3b9ac_1cad2af0727426002243d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/CentOS_8_Stream/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in CentOS_8_Stream/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 202s] Processing files: osmo-bsc-bs11-utils-debuginfo-1.6.0.184.3405c-1.1.x86_64 [ 202s] Provides: debuginfo(build-id) = 3393d40cd2b362e40476d7a1ba648f2451a52342 debuginfo(build-id) = 4bf47077fe7c3a64d5d041f16ddbb098f5e9b7e8 osmo-bsc-bs11-utils-debuginfo = 1.6.0.184.3405c-1.1 osmo-bsc-bs11-utils-debuginfo(x86-64) = 1.6.0.184.3405c-1.1 [ 202s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 202s] Recommends: osmo-bsc-debugsource(x86-64) = 1.6.0.184.3405c-1.1 [ 202s] Processing files: osmo-bsc-meas-utils-debuginfo-1.6.0.184.3405c-1.1.x86_64 [ 202s] Provides: debuginfo(build-id) = 90469cddc45ab6c04f5e8414db4213257477fb20 osmo-bsc-meas-utils-debuginfo = 1.6.0.184.3405c-1.1 osmo-bsc-meas-utils-debuginfo(x86-64) = 1.6.0.184.3405c-1.1 [ 202s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 202s] Recommends: osmo-bsc-debugsource(x86-64) = 1.6.0.184.3405c-1.1 [ 202s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-1.1.x86_64 [ 202s] error: Installed (but unpackaged) file(s) found: [ 202s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 202s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 202s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 202s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 202s] [ 202s] [ 202s] RPM build errors: [ 202s] Installed (but unpackaged) file(s) found: [ 202s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 202s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 202s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 202s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 202s] ### VM INTERACTION START ### [ 204s] Powering off. [ 204s] [ 176.472805] reboot: Power down [ 204s] ### VM INTERACTION END ### [ 204s] [ 204s] lamb06 failed "build osmo-bsc.spec" at Fri Jul 17 02:37:12 UTC 2020. [ 204s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 17 02:39:25 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Jul 2020 02:39:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Tumbleweed/x86_64 In-Reply-To: References: Message-ID: <5f110f76a84cc_1cad2af07274260022493d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 116s] Processing files: osmo-bsc-bs11-utils-1.6.0.184.3405c-1.1.x86_64 [ 116s] Provides: osmo-bsc-bs11-utils = 1.6.0.184.3405c-1.1 osmo-bsc-bs11-utils(x86-64) = 1.6.0.184.3405c-1.1 [ 116s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 116s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.14)(64bit) libc.so.6(GLIBC_2.15)(64bit) libc.so.6(GLIBC_2.17)(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libc.so.6(GLIBC_2.7)(64bit) libosmoabis.so.6()(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.2.5)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 116s] Processing files: osmo-bsc-meas-utils-1.6.0.184.3405c-1.1.x86_64 [ 116s] Provides: osmo-bsc-meas-utils = 1.6.0.184.3405c-1.1 osmo-bsc-meas-utils(x86-64) = 1.6.0.184.3405c-1.1 [ 116s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 116s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.2.5)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 116s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-1.1.x86_64 [ 116s] error: Installed (but unpackaged) file(s) found: [ 116s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 116s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 116s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 116s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 116s] [ 116s] [ 116s] RPM build errors: [ 116s] Installed (but unpackaged) file(s) found: [ 116s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 116s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 116s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 116s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 116s] ### VM INTERACTION START ### [ 120s] [ 110.785110] sysrq: Power Off [ 120s] [ 110.849523] reboot: Power down [ 120s] ### VM INTERACTION END ### [ 120s] [ 120s] lamb04 failed "build osmo-bsc.spec" at Fri Jul 17 02:39:08 UTC 2020. [ 120s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 17 02:40:34 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Jul 2020 02:40:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <5f110fb07d469_1cad2af072742600225680@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 71s] Processing files: osmo-bsc-bs11-utils-1.6.0.184.3405c-lp151.1.1.x86_64 [ 71s] Provides: osmo-bsc-bs11-utils = 1.6.0.184.3405c-lp151.1.1 osmo-bsc-bs11-utils(x86-64) = 1.6.0.184.3405c-lp151.1.1 [ 71s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 71s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.14)(64bit) libc.so.6(GLIBC_2.15)(64bit) libc.so.6(GLIBC_2.17)(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libc.so.6(GLIBC_2.7)(64bit) libosmoabis.so.6()(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.2.5)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 71s] Processing files: osmo-bsc-meas-utils-1.6.0.184.3405c-lp151.1.1.x86_64 [ 71s] Provides: osmo-bsc-meas-utils = 1.6.0.184.3405c-lp151.1.1 osmo-bsc-meas-utils(x86-64) = 1.6.0.184.3405c-lp151.1.1 [ 71s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 71s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.2.5)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 71s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-lp151.1.1.x86_64 [ 71s] error: Installed (but unpackaged) file(s) found: [ 71s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 71s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 71s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 71s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 71s] [ 71s] [ 71s] RPM build errors: [ 71s] Installed (but unpackaged) file(s) found: [ 71s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 71s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 71s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 71s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 71s] ### VM INTERACTION START ### [ 74s] [ 64.001155] sysrq: SysRq : Power Off [ 74s] [ 64.004692] reboot: Power down [ 74s] ### VM INTERACTION END ### [ 74s] [ 74s] cloud104 failed "build osmo-bsc.spec" at Fri Jul 17 02:40:33 UTC 2020. [ 74s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 17 02:40:51 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Jul 2020 02:40:51 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <5f110fd08db2a_1cad2af0727426002258e1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 67s] Processing files: osmo-bsc-bs11-utils-1.6.0.184.3405c-lp152.1.1.x86_64 [ 67s] Provides: osmo-bsc-bs11-utils = 1.6.0.184.3405c-lp152.1.1 osmo-bsc-bs11-utils(x86-64) = 1.6.0.184.3405c-lp152.1.1 [ 67s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 67s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.14)(64bit) libc.so.6(GLIBC_2.15)(64bit) libc.so.6(GLIBC_2.17)(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libc.so.6(GLIBC_2.7)(64bit) libosmoabis.so.6()(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.2.5)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 67s] Processing files: osmo-bsc-meas-utils-1.6.0.184.3405c-lp152.1.1.x86_64 [ 67s] Provides: osmo-bsc-meas-utils = 1.6.0.184.3405c-lp152.1.1 osmo-bsc-meas-utils(x86-64) = 1.6.0.184.3405c-lp152.1.1 [ 67s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 67s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.2.5)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 67s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-lp152.1.1.x86_64 [ 67s] error: Installed (but unpackaged) file(s) found: [ 67s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 67s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 67s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 67s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 67s] [ 67s] [ 67s] RPM build errors: [ 67s] Installed (but unpackaged) file(s) found: [ 67s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 67s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 67s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 67s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 67s] ### VM INTERACTION START ### [ 70s] [ 63.226286] sysrq: Power Off [ 70s] [ 63.240171] reboot: Power down [ 70s] ### VM INTERACTION END ### [ 70s] [ 70s] lamb16 failed "build osmo-bsc.spec" at Fri Jul 17 02:40:46 UTC 2020. [ 70s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Jul 17 02:49:01 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 17 Jul 2020 02:49:01 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19194 ) Change subject: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request ...................................................................... Patch Set 2: Code-Review+2 The idea of dropping DL TBF comes from the RACH case, because a PKT Resource Request is part of a two-phase request. However a PKT Resource Request can also be used to modify the current uplink TBF. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iab4afb66f0d671f7ad54909d2685a1613e12ab4d Gerrit-Change-Number: 19194 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 17 Jul 2020 02:49:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 02:52:50 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 17 Jul 2020 02:52:50 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19194 ) Change subject: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request ...................................................................... Patch Set 2: The code is still wrong ;). but not part of this patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iab4afb66f0d671f7ad54909d2685a1613e12ab4d Gerrit-Change-Number: 19194 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 17 Jul 2020 02:52:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Jul 17 03:21:08 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Jul 2020 03:21:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Leap_15.1_ARM/armv7l In-Reply-To: References: Message-ID: <5f11192f29274_1cad2af0727426002339aa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Leap_15.1_ARM/armv7l Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Leap_15.1_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 255s] Processing files: osmo-bsc-bs11-utils-1.6.0.184.3405c-lp151.1.1.armv7hl [ 255s] Provides: osmo-bsc-bs11-utils = 1.6.0.184.3405c-lp151.1.1 osmo-bsc-bs11-utils(armv7hl-32) = 1.6.0.184.3405c-lp151.1.1 [ 255s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 255s] Requires: ld-linux-armhf.so.3 ld-linux-armhf.so.3(GLIBC_2.4) libc.so.6 libc.so.6(GLIBC_2.15) libc.so.6(GLIBC_2.17) libc.so.6(GLIBC_2.4) libc.so.6(GLIBC_2.7) libgcc_s.so.1 libgcc_s.so.1(GCC_3.5) libosmoabis.so.6 libosmocore.so.12 libosmogsm.so.13 libosmogsm.so.13(LIBOSMOGSM_1.0) libpthread.so.0 libpthread.so.0(GLIBC_2.4) libtalloc.so.2 libtalloc.so.2(TALLOC_2.0.2) [ 255s] Processing files: osmo-bsc-meas-utils-1.6.0.184.3405c-lp151.1.1.armv7hl [ 255s] Provides: osmo-bsc-meas-utils = 1.6.0.184.3405c-lp151.1.1 osmo-bsc-meas-utils(armv7hl-32) = 1.6.0.184.3405c-lp151.1.1 [ 255s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 255s] Requires: ld-linux-armhf.so.3 ld-linux-armhf.so.3(GLIBC_2.4) libc.so.6 libc.so.6(GLIBC_2.4) libgcc_s.so.1 libgcc_s.so.1(GCC_3.5) libosmocore.so.12 libosmogsm.so.13 libosmogsm.so.13(LIBOSMOGSM_1.0) libpthread.so.0 libpthread.so.0(GLIBC_2.4) libtalloc.so.2 libtalloc.so.2(TALLOC_2.0.2) [ 255s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-lp151.1.1.arm [ 255s] error: Installed (but unpackaged) file(s) found: [ 255s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 255s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 255s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 255s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 255s] [ 255s] [ 255s] RPM build errors: [ 255s] Installed (but unpackaged) file(s) found: [ 255s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 255s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 255s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 255s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 255s] ### VM INTERACTION START ### [ 258s] [ 239.742462] sysrq: SysRq : Power Off [ 258s] [ 239.744503] reboot: Power down [ 258s] ### VM INTERACTION END ### [ 258s] [ 258s] armbuild13 failed "build osmo-bsc.spec" at Fri Jul 17 03:20:59 UTC 2020. [ 258s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 17 03:27:59 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Jul 2020 03:27:59 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f111ad184df5_1cad2af0727426002357ef@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 262s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 262s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 262s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 262s] | | [ 262s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 262s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 262s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 262s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 262s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 262s] 2425 | MHD_start_daemon (unsigned int flags, [ 262s] | ^~~~~~~~~~~~~~~~ [ 263s] cc1: all warnings being treated as errors [ 263s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 263s] make[3]: *** Waiting for unfinished jobs.... [ 263s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 263s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 263s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 263s] make[1]: *** [Makefile:166: all] Error 2 [ 263s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 263s] dh_auto_build: error: cd build && make -j3 "INSTALL=install --strip-program=true" returned exit code 2 [ 263s] make: *** [debian/rules:9: build] Error 25 [ 263s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 263s] ### VM INTERACTION START ### [ 266s] [ 222.132359] sysrq: SysRq : Power Off [ 266s] [ 222.149186] reboot: Power down [ 266s] ### VM INTERACTION END ### [ 266s] [ 266s] build72 failed "build ulfius_2.5.2-4.1.dsc" at Fri Jul 17 03:27:50 UTC 2020. [ 266s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 17 04:39:59 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Jul 2020 04:39:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Factory_ARM/armv7l In-Reply-To: References: Message-ID: <5f112bb5d90c5_1cad2af072742600255620@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Factory_ARM/armv7l Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 272s] Processing files: osmo-bsc-bs11-utils-1.6.0.184.3405c-1.1.armv7hl [ 272s] Provides: osmo-bsc-bs11-utils = 1.6.0.184.3405c-1.1 osmo-bsc-bs11-utils(armv7hl-32) = 1.6.0.184.3405c-1.1 [ 272s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 272s] Requires: ld-linux-armhf.so.3 ld-linux-armhf.so.3(GLIBC_2.4) libc.so.6 libc.so.6(GLIBC_2.15) libc.so.6(GLIBC_2.17) libc.so.6(GLIBC_2.4) libc.so.6(GLIBC_2.7) libgcc_s.so.1 libgcc_s.so.1(GCC_3.5) libosmoabis.so.6 libosmocore.so.12 libosmogsm.so.13 libosmogsm.so.13(LIBOSMOGSM_1.0) libpthread.so.0 libpthread.so.0(GLIBC_2.4) libtalloc.so.2 libtalloc.so.2(TALLOC_2.0.2) [ 272s] Processing files: osmo-bsc-meas-utils-1.6.0.184.3405c-1.1.armv7hl [ 272s] Provides: osmo-bsc-meas-utils = 1.6.0.184.3405c-1.1 osmo-bsc-meas-utils(armv7hl-32) = 1.6.0.184.3405c-1.1 [ 272s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 272s] Requires: ld-linux-armhf.so.3 ld-linux-armhf.so.3(GLIBC_2.4) libc.so.6 libc.so.6(GLIBC_2.4) libgcc_s.so.1 libgcc_s.so.1(GCC_3.5) libosmocore.so.12 libosmogsm.so.13 libosmogsm.so.13(LIBOSMOGSM_1.0) libpthread.so.0 libpthread.so.0(GLIBC_2.4) libtalloc.so.2 libtalloc.so.2(TALLOC_2.0.2) [ 272s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-1.1.arm [ 272s] error: Installed (but unpackaged) file(s) found: [ 272s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 272s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 272s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 272s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 272s] [ 272s] [ 272s] RPM build errors: [ 272s] Installed (but unpackaged) file(s) found: [ 272s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 272s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 272s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 272s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 272s] ### VM INTERACTION START ### [ 275s] [ 254.788911] sysrq: Power Off [ 275s] [ 254.790754] reboot: Power down [ 275s] ### VM INTERACTION END ### [ 275s] [ 275s] armbuild10 failed "build osmo-bsc.spec" at Fri Jul 17 04:39:52 UTC 2020. [ 275s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 17 06:28:17 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Jul 2020 06:28:17 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f11450699358_1cad2af072742600274662@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Testing/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 121s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 121s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 121s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 121s] | | [ 121s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 121s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 121s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 121s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 121s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 121s] 2425 | MHD_start_daemon (unsigned int flags, [ 121s] | ^~~~~~~~~~~~~~~~ [ 121s] cc1: all warnings being treated as errors [ 121s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 121s] make[3]: *** Waiting for unfinished jobs.... [ 121s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 121s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 121s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 121s] make[1]: *** [Makefile:166: all] Error 2 [ 121s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 121s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 121s] make: *** [debian/rules:9: build] Error 25 [ 121s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 121s] ### VM INTERACTION START ### [ 124s] [ 111.887405] sysrq: SysRq : Power Off [ 124s] [ 111.891959] reboot: Power down [ 124s] ### VM INTERACTION END ### [ 124s] [ 124s] lamb01 failed "build ulfius_2.5.2-4.1.dsc" at Fri Jul 17 06:28:16 UTC 2020. [ 124s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 17 06:29:08 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Jul 2020 06:29:08 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f114540c7737_1cad2af0727426002749a1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Testing/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 127s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 127s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 127s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 127s] | | [ 127s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 127s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 127s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 127s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 127s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 127s] 2425 | MHD_start_daemon (unsigned int flags, [ 127s] | ^~~~~~~~~~~~~~~~ [ 127s] cc1: all warnings being treated as errors [ 127s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 127s] make[3]: *** Waiting for unfinished jobs.... [ 127s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 127s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 127s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 127s] make[1]: *** [Makefile:166: all] Error 2 [ 127s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 127s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 127s] make: *** [debian/rules:9: build] Error 25 [ 127s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 127s] ### VM INTERACTION START ### [ 130s] [ 118.515342] sysrq: SysRq : Power Off [ 130s] [ 118.520739] reboot: Power down [ 131s] ### VM INTERACTION END ### [ 131s] [ 131s] lamb02 failed "build ulfius_2.5.2-4.1.dsc" at Fri Jul 17 06:28:59 UTC 2020. [ 131s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 17 06:30:17 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Jul 2020 06:30:17 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f11457d4df2e_1cad2af07274260027536d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 81s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 81s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 81s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 81s] | | [ 81s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 81s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 81s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 81s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 81s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 81s] 2425 | MHD_start_daemon (unsigned int flags, [ 81s] | ^~~~~~~~~~~~~~~~ [ 81s] cc1: all warnings being treated as errors [ 81s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 81s] make[3]: *** Waiting for unfinished jobs.... [ 82s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 82s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 82s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 82s] make[1]: *** [Makefile:166: all] Error 2 [ 82s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 82s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 82s] make: *** [debian/rules:9: build] Error 25 [ 82s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 82s] ### VM INTERACTION START ### [ 85s] [ 71.325695] sysrq: SysRq : Power Off [ 85s] [ 71.327733] reboot: Power down [ 85s] ### VM INTERACTION END ### [ 85s] [ 85s] wildcard2 failed "build ulfius_2.5.2-4.1.dsc" at Fri Jul 17 06:30:02 UTC 2020. [ 85s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 17 06:31:08 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Jul 2020 06:31:08 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1145b927336_1cad2af072742600275585@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 117s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 117s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 117s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 117s] | | [ 117s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 117s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 117s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 117s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 117s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 117s] 2425 | MHD_start_daemon (unsigned int flags, [ 117s] | ^~~~~~~~~~~~~~~~ [ 117s] cc1: all warnings being treated as errors [ 117s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 117s] make[3]: *** Waiting for unfinished jobs.... [ 118s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 118s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 118s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 118s] make[1]: *** [Makefile:166: all] Error 2 [ 118s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 118s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 118s] make: *** [debian/rules:9: build] Error 25 [ 118s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 118s] ### VM INTERACTION START ### [ 121s] [ 109.023845] sysrq: SysRq : Power Off [ 121s] [ 109.028645] reboot: Power down [ 121s] ### VM INTERACTION END ### [ 121s] [ 121s] lamb74 failed "build ulfius_2.5.2-4.1.dsc" at Fri Jul 17 06:30:55 UTC 2020. [ 121s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Jul 17 09:17:14 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 17 Jul 2020 09:17:14 +0000 Subject: Change in osmo-mgw[master]: refactor: use msgb to receive, pass and send RTP packets In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18913 ) Change subject: refactor: use msgb to receive, pass and send RTP packets ...................................................................... Patch Set 4: Code-Review+1 (2 comments) I have tested it with TTCN3 and current master, it works fine. We should merge it as soon as possible. Apart from that I did not touch the passing of RTP packets much yet, so if there are problems they will be minimal. https://gerrit.osmocom.org/c/osmo-mgw/+/18913/4/include/osmocom/mgcp/mgcp_internal.h File include/osmocom/mgcp/mgcp_internal.h: https://gerrit.osmocom.org/c/osmo-mgw/+/18913/4/include/osmocom/mgcp/mgcp_internal.h at 35 PS4, Line 35: /* FIXME: This this is only needed to compile the currently The constants CONN_ID_BTS, CONN_ID_NET are removed in earlier patches. https://gerrit.osmocom.org/c/osmo-mgw/+/18913/4/include/osmocom/mgcp/mgcp_internal.h at 39 PS4, Line 39: LOGPCONN in mgcp_conn.h does not work? Move this to mgcp_conn.h? (In the long run we should try to eliminate mgcp_internal.h and move the parts to the related modules.) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3af40b63bc49f8636d4e7ea2f8f83bb67f6619ee Gerrit-Change-Number: 18913 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jul 2020 09:17:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 10:31:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jul 2020 10:31:29 +0000 Subject: Change in libosmocore[master]: stat_item: Add function to reset stat items and groups In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19295 ) Change subject: stat_item: Add function to reset stat items and groups ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I80fc0ea8865ec4efdcd4c982e69d863275fd9919 Gerrit-Change-Number: 19295 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jul 2020 10:31:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 10:31:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jul 2020 10:31:45 +0000 Subject: Change in libosmocore[master]: rate_ctr: Add functions to reset rate counter (groups) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19294 ) Change subject: rate_ctr: Add functions to reset rate counter (groups) ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If2f806d044cd0fb6929dac44ef8f8a15941ffe9b Gerrit-Change-Number: 19294 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 17 Jul 2020 10:31:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 10:32:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jul 2020 10:32:23 +0000 Subject: Change in libosmocore[master]: stats: Add stats commands related to testing In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19296 ) Change subject: stats: Add stats commands related to testing ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9febcb65650abfd538caedfbca77a787e66d517a Gerrit-Change-Number: 19296 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 17 Jul 2020 10:32:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 10:33:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jul 2020 10:33:14 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19194 ) Change subject: pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request ...................................................................... pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request There's no real good explanation on why the DL TBF is dropped there, since PKT RESOUCE REQUEST is used basically during UL TBF establishment. Also, as decribed by TS 44.060 11.2.16 "Packet Resource Request": """ This message is sent on the PACCH by the mobile station to the network to request a change in the uplink resources assigned. """ Change-Id: Iab4afb66f0d671f7ad54909d2685a1613e12ab4d --- M src/pdch.cpp M tests/tbf/TbfTest.err 2 files changed, 0 insertions(+), 36 deletions(-) Approvals: lynxis lazus: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/pdch.cpp b/src/pdch.cpp index 6bddbfd..98d7678 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -549,7 +549,6 @@ if (request->ID.UnionType) { struct gprs_rlcmac_ul_tbf *ul_tbf; - struct gprs_rlcmac_dl_tbf *dl_tbf; uint32_t tlli = request->ID.u.TLLI; bool found = true; @@ -564,7 +563,6 @@ if (found) { ul_tbf = ms->ul_tbf(); - dl_tbf = ms->dl_tbf(); /* We got a RACH so the MS was in packet idle mode and thus * didn't have any active TBFs */ if (ul_tbf) { @@ -573,12 +571,6 @@ tlli); tbf_free(ul_tbf); } - if (dl_tbf) { - LOGPTBFUL(dl_tbf, LOGL_NOTICE, - "Got RACH from TLLI=0x%08x while TBF still exists. Release pending DL TBF\n", - tlli); - tbf_free(dl_tbf); - } } LOGP(DRLCMAC, LOGL_DEBUG, "MS requests UL TBF " diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 0d097ee..6eb86cf 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -1885,13 +1885,6 @@ Found TFI=0. +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) Got RACH from TLLI=0xf1223344 while TBF still exists. Release pending DL TBF -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) changes state from ASSIGN to RELEASING -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=RELEASING) free -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=RELEASING) stopping timer T0 [freeing TBF] -PDCH(TS 7, TRX 0): Detaching TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=RELEASING), 0 TBFs, USFs = 00, TFIs = 00000000. -Detaching TBF from MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=RELEASING) -********** DL-TBF ends here ********** MS requests UL TBF in packet resource request of single block, so we provide one: ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/0 @@ -1925,27 +1918,6 @@ TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) [DOWNLINK] UPLINK ASSIGNED TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_WAIT_ACK to GPRS_RLCMAC_UL_ASS_NONE TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes state from ASSIGN to FLOW -********** DL-TBF starts here ********** -Allocating DL TBF: MS_CLASS=1/0 -[DL] Slot Allocation (Algorithm A) for class 1 -- Skipping TS 0, because not enabled -- Skipping TS 1, because not enabled -- Skipping TS 2, because not enabled -- Skipping TS 3, because not enabled -- Skipping TS 4, because not enabled -- Skipping TS 5, because not enabled -- Skipping TS 6, because not enabled -[DL] Assign downlink TS=7 TFI=0 -PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL), 1 TBFs, USFs = 01, TFIs = 00000001. -TBF(TFI=0 TLLI=0x00000000 DIR=DL STATE=NULL) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NULL) -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 80 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) Trigger downlink assignment on PACCH -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NULL) Send dowlink assignment on PACCH, because TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) exists -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) changes DL ASS state from GPRS_RLCMAC_DL_ASS_NONE to GPRS_RLCMAC_DL_ASS_SEND_ASS -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NULL) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) set ass. type PACCH [prev CCCH:0, PACCH:0] -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) starting timer T0 [assignment (PACCH)] with 2 sec. 0 microsec, cur_fn=0 Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) UL DATA TFI=0 received (V(Q)=0 .. V(R)=0) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) restarting timer T3169 [acked (data)] with 5 sec. 0 microsec, cur_fn=0 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iab4afb66f0d671f7ad54909d2685a1613e12ab4d Gerrit-Change-Number: 19194 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 10:33:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jul 2020 10:33:15 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19195 ) Change subject: pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in MS RadioAccCap ...................................................................... pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in MS RadioAccCap If the information is not found in the message, 0 (unknown MS class) will be returned. If the MS already had some previous information on the MS class, let's not lose it by setting it back to 0. Take the opportunity to drop related log lines which are no needed, since set_(egprs_)ms_class() functions already log the value changes. Change-Id: Icd52209fd4395d78dc770e7869d1b1fe45a18ca0 --- M src/pdch.cpp M tests/tbf/TbfTest.err 2 files changed, 6 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/pdch.cpp b/src/pdch.cpp index 98d7678..3436e5b 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -588,20 +588,13 @@ } if (request->Exist_MS_Radio_Access_capability2) { uint8_t ms_class, egprs_ms_class; - ms_class = Decoding::get_ms_class_by_capability( - &request->MS_Radio_Access_capability2); - ms->set_ms_class(ms_class); - egprs_ms_class = - Decoding::get_egprs_ms_class_by_capability( - &request->MS_Radio_Access_capability2); - ms->set_egprs_ms_class(egprs_ms_class); + ms_class = Decoding::get_ms_class_by_capability(&request->MS_Radio_Access_capability2); + egprs_ms_class = Decoding::get_egprs_ms_class_by_capability(&request->MS_Radio_Access_capability2); + if (ms_class) + ms->set_ms_class(ms_class); + if (egprs_ms_class) + ms->set_egprs_ms_class(egprs_ms_class); } - if (!ms->ms_class()) - LOGP(DRLCMAC, LOGL_NOTICE, "MS does not give us a class.\n"); - if (ms->egprs_ms_class()) - LOGP(DRLCMAC, LOGL_INFO, - "MS supports EGPRS multislot class %d.\n", - ms->egprs_ms_class()); ul_tbf = tbf_alloc_ul(bts_data(), ms, trx_no(), tlli); if (!ul_tbf) { diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 6eb86cf..800d4f8 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -3111,7 +3111,6 @@ Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 -MS supports EGPRS multislot class 1. ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -3202,7 +3201,6 @@ Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 -MS supports EGPRS multislot class 1. ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -5840,7 +5838,6 @@ Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 -MS supports EGPRS multislot class 1. ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -6004,7 +6001,6 @@ Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 -MS supports EGPRS multislot class 1. ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -6329,7 +6325,6 @@ Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 -MS supports EGPRS multislot class 1. ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -7910,7 +7905,6 @@ MS requests UL TBF in packet resource request of single block, but there is no resource request scheduled! Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 -MS supports EGPRS multislot class 11. ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=11/11 [UL] Slot Allocation (Algorithm A) for class 11 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Icd52209fd4395d78dc770e7869d1b1fe45a18ca0 Gerrit-Change-Number: 19195 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 10:33:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jul 2020 10:33:15 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Fix wrong annoying log line about non-scheduled ResourceReq... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19196 ) Change subject: pdch.cpp: Fix wrong annoying log line about non-scheduled ResourceReq received ...................................................................... pdch.cpp: Fix wrong annoying log line about non-scheduled ResourceReq received It's perfectly fine receiving a Resource Request message under some circumstances (as stated in the comment added in the commit). To print issues only under non-expected circumstances, the function rcv_resource_request need to be refactored: * Destroying older UL_TBF is delayed because it is needed further down. * When the old UL_TBF is FINISHED, it's an acceptable time to receive a Resource request, so we check if that's the case and don't print a warning in that case. Change-Id: I4b4367126d6a16055cd2f45afc4a6b9c15a7c980 --- M src/pdch.cpp M tests/tbf/TbfTest.err 2 files changed, 22 insertions(+), 21 deletions(-) Approvals: daniel: Looks good to me, approved neels: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/pdch.cpp b/src/pdch.cpp index 3436e5b..cee92dc 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -550,42 +550,35 @@ if (request->ID.UnionType) { struct gprs_rlcmac_ul_tbf *ul_tbf; uint32_t tlli = request->ID.u.TLLI; - bool found = true; + bool ms_found = true; GprsMs *ms = bts()->ms_by_tlli(tlli); if (!ms) { - found = false; + ms_found = false; ms = bts()->ms_alloc(0, 0); /* ms class updated later */ } + ul_tbf = ms->ul_tbf(); /* hence ul_tbf may be NULL */ /* Keep the ms, even if it gets idle temporarily */ GprsMs::Guard guard(ms); - if (found) { - ul_tbf = ms->ul_tbf(); - /* We got a RACH so the MS was in packet idle mode and thus - * didn't have any active TBFs */ - if (ul_tbf) { - LOGPTBFUL(ul_tbf, LOGL_NOTICE, - "Got RACH from TLLI=0x%08x while TBF still exists. Killing pending UL TBF\n", - tlli); - tbf_free(ul_tbf); - } - } - LOGP(DRLCMAC, LOGL_DEBUG, "MS requests UL TBF " "in packet resource request of single " "block, so we provide one:\n"); sba = bts()->sba()->find(this, fn); - if (!sba) { - LOGP(DRLCMAC, LOGL_NOTICE, "MS requests UL TBF " - "in packet resource request of single " - "block, but there is no resource request " - "scheduled!\n"); - } else { + if (sba) { ms->set_ta(sba->ta); bts()->sba()->free_sba(sba); + } else if (!ul_tbf || !ul_tbf->state_is(GPRS_RLCMAC_FINISHED)) { + LOGPTBFUL(ul_tbf, LOGL_NOTICE, + "MS requests UL TBF in PACKET RESOURCE REQ of " + "single block, but there is no resource request " + "scheduled!\n"); } + /* else: Resource Request can be received even if not scheduled + by the network since it's used by MS to re-establish a new UL + TBF when last one has finished. */ + if (request->Exist_MS_Radio_Access_capability2) { uint8_t ms_class, egprs_ms_class; ms_class = Decoding::get_ms_class_by_capability(&request->MS_Radio_Access_capability2); @@ -596,6 +589,14 @@ ms->set_egprs_ms_class(egprs_ms_class); } + /* Get rid of previous finished UL TBF before providing a new one */ + if (ms_found && ul_tbf) { + if (!ul_tbf->state_is(GPRS_RLCMAC_FINISHED)) + LOGPTBFUL(ul_tbf, LOGL_NOTICE, + "Got PACKET RESOURCE REQ while TBF not finished, killing pending UL TBF\n"); + tbf_free(ul_tbf); + } + ul_tbf = tbf_alloc_ul(bts_data(), ms, trx_no(), tlli); if (!ul_tbf) { handle_tbf_reject(bts_data(), ms, tlli, diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 800d4f8..29c8eb3 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -7902,7 +7902,7 @@ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 MS requests UL TBF in packet resource request of single block, so we provide one: -MS requests UL TBF in packet resource request of single block, but there is no resource request scheduled! +(no TBF) MS requests UL TBF in PACKET RESOURCE REQ of single block, but there is no resource request scheduled! Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 ********** UL-TBF starts here ********** -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4b4367126d6a16055cd2f45afc4a6b9c15a7c980 Gerrit-Change-Number: 19196 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 10:33:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jul 2020 10:33:16 +0000 Subject: Change in osmo-pcu[master]: pdch.cpp: Store TLLI promptly on newly created TLLI in rcv_resource_r... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19197 ) Change subject: pdch.cpp: Store TLLI promptly on newly created TLLI in rcv_resource_request ...................................................................... pdch.cpp: Store TLLI promptly on newly created TLLI in rcv_resource_request The TLLI is tried to be updated later anyway during tbf_alloc_ul(), but this way it's clear that information is stored where it belongs as soon as possible. The change already shows clearer log lines in TbfTest.err. Change-Id: I20ce4eb94ecf85ce2835275d0056d9ecd1b558c3 --- M src/pdch.cpp M tests/tbf/TbfTest.err 2 files changed, 91 insertions(+), 90 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/pdch.cpp b/src/pdch.cpp index cee92dc..856da75 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -556,6 +556,7 @@ if (!ms) { ms_found = false; ms = bts()->ms_alloc(0, 0); /* ms class updated later */ + ms->set_tlli(tlli); } ul_tbf = ms->ul_tbf(); /* hence ul_tbf may be NULL */ diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 29c8eb3..195d850 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -1521,9 +1521,10 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/0 [UL] Slot Allocation (Algorithm A) for class 1 @@ -1537,11 +1538,10 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH) @@ -1602,9 +1602,10 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/0 [UL] Slot Allocation (Algorithm A) for class 1 @@ -1618,11 +1619,10 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH) @@ -1731,9 +1731,10 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf5667788, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf5667788, TA 220 -> 7 +Modifying MS object, TLLI = 0xf5667788, MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/0 [UL] Slot Allocation (Algorithm A) for class 1 @@ -1747,11 +1748,10 @@ [UL] Assign uplink TS=7 TFI=1 USF=1 PDCH(TS 7, TRX 0): Attaching TBF(TFI=1 TLLI=0x00000000 DIR=UL STATE=NULL), 2 TBFs, USFs = 03, TFIs = 00000003. TBF(TFI=1 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=1 TLLI=0x00000000 DIR=UL STATE=NULL) -TBF(TFI=1 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=1 TLLI=0x00000000 DIR=UL STATE=NULL) changes state from NULL to ASSIGN -TBF(TFI=1 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf5667788, not yet confirmed +Attaching TBF to MS object, TLLI = 0xf5667788, TBF = TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=NULL) +TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=NULL) changes state from NULL to ASSIGN +TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS Received RTS for PDCH: TRX=0 TS=7 FN=2654335 block_nr=11 scheduling USF=0 for required uplink resource of UL TFI=0 @@ -1797,9 +1797,10 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/0 [UL] Slot Allocation (Algorithm A) for class 1 @@ -1813,11 +1814,10 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2 @@ -1939,9 +1939,10 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/0 [UL] Slot Allocation (Algorithm A) for class 1 @@ -1955,11 +1956,10 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2 @@ -2085,9 +2085,10 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/0 [UL] Slot Allocation (Algorithm A) for class 1 @@ -2101,11 +2102,10 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2 @@ -3107,10 +3107,11 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 -Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, EGPRS MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -3125,13 +3126,12 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(0) slots(1) ws_pdch(0) +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(0) slots(1) ws_pdch(0) ws(64) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) @@ -3197,10 +3197,11 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 -Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, EGPRS MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -3215,13 +3216,12 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(0) slots(1) ws_pdch(0) +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(0) slots(1) ws_pdch(0) ws(64) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) @@ -5834,10 +5834,11 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 -Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, EGPRS MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -5852,13 +5853,12 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(0) slots(1) ws_pdch(0) +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(0) slots(1) ws_pdch(0) ws(64) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) @@ -5997,10 +5997,11 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 -Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, EGPRS MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -6015,13 +6016,12 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(0) slots(1) ws_pdch(0) +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(0) slots(1) ws_pdch(0) ws(64) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) @@ -6321,10 +6321,11 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: -Modifying MS object, TLLI = 0x00000000, TA 220 -> 7 -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1 -Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 +Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1 +Modifying MS object, TLLI = 0xf1223344, EGPRS MS class 0 -> 1 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=1/1 TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS @@ -6339,13 +6340,12 @@ [UL] Assign uplink TS=7 TFI=0 USF=0 PDCH(TS 7, TRX 0): Attaching TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS), 1 TBFs, USFs = 01, TFIs = 00000001. TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Setting Control TS 7 -Attaching TBF to MS object, TLLI = 0x00000000, TBF = TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 192, base(128) slots(1) ws_pdch(64) +Attaching TBF to MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 192, base(128) slots(1) ws_pdch(64) ws(192) -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN -TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL EGPRS) changes state from NULL to ASSIGN +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) @@ -7901,10 +7901,11 @@ +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ ------------------------- RX : Uplink Control Block ------------------------- Creating MS object, TLLI = 0x00000000 +Modifying MS object, UL TLLI: 0x00000000 -> 0xffeeddcc, not yet confirmed MS requests UL TBF in packet resource request of single block, so we provide one: (no TBF) MS requests UL TBF in PACKET RESOURCE REQ of single block, but there is no resource request scheduled! -Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11 -Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11 +Modifying MS object, TLLI = 0xffeeddcc, MS class 0 -> 11 +Modifying MS object, TLLI = 0xffeeddcc, EGPRS MS class 0 -> 11 ********** UL-TBF starts here ********** Allocating UL TBF: MS_CLASS=11/11 [UL] Slot Allocation (Algorithm A) for class 11 @@ -7918,7 +7919,6 @@ - Skipping TS 7, because no USF available [UL] algo A (suggested TRX: 0): failed to allocate a TS, no USF available No PDCH resource -Modifying MS object, UL TLLI: 0x00000000 -> 0xffeeddcc, not yet confirmed TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) changes state from NULL to ASSIGN Attaching TBF to MS object, TLLI = 0xffeeddcc, TBF = TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN) TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I20ce4eb94ecf85ce2835275d0056d9ecd1b558c3 Gerrit-Change-Number: 19197 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 11:41:22 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 17 Jul 2020 11:41:22 +0000 Subject: Change in libosmocore[master]: stat_item: Add function to reset stat items and groups In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19295 ) Change subject: stat_item: Add function to reset stat items and groups ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19295/3/include/osmocom/core/stat_item.h File include/osmocom/core/stat_item.h: https://gerrit.osmocom.org/c/libosmocore/+/19295/3/include/osmocom/core/stat_item.h at 119 PS3, Line 119: void osmo_stat_item_reset_group(struct osmo_stat_item_group *statg); > Same: [?] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I80fc0ea8865ec4efdcd4c982e69d863275fd9919 Gerrit-Change-Number: 19295 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jul 2020 11:41:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 11:41:27 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 17 Jul 2020 11:41:27 +0000 Subject: Change in libosmocore[master]: stats: Add stats commands related to testing In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19296 ) Change subject: stats: Add stats commands related to testing ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19296/3/src/vty/stats_vty.c File src/vty/stats_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/19296/3/src/vty/stats_vty.c at 358 PS3, Line 358: manual reporting > "manual reporting" is not explanatory enough, IMHO. [?] I think it's clearer now -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9febcb65650abfd538caedfbca77a787e66d517a Gerrit-Change-Number: 19296 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 17 Jul 2020 11:41:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 12:14:04 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jul 2020 12:14:04 +0000 Subject: Change in osmo-trx[master]: Transceiver: Restrict conditions where FN gaps are detected References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/19304 ) Change subject: Transceiver: Restrict conditions where FN gaps are detected ...................................................................... Transceiver: Restrict conditions where FN gaps are detected In pushRadioVector, like we did for driveTxPriorityQueue already, gaps are possible in any channel for TRX!=0, since TRX0 is the only one expected to be always transmitting. Since we always need to transmit there, it makes no sense to check for channel being not NONE. Change-Id: I3b4b85b9100f69dfa113c54a4357120bd11ec86f --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/04/19304/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index d750218..3be7746 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -468,7 +468,7 @@ } else { modFN = nowTime.FN() % state->fillerModulus[TN]; bursts[i] = state->fillerTable[modFN][TN]; - if (state->chanType[TN] != NONE) { + if (i == 0 && state->mFiller == FILLER_ZERO) { LOGCHAN(i, DTRXDDL, NOTICE) << "No Tx burst available for " << nowTime << ", retrans=" << state->mRetrans; state->ctrs.tx_unavailable_bursts++; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3b4b85b9100f69dfa113c54a4357120bd11ec86f Gerrit-Change-Number: 19304 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 12:25:13 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 17 Jul 2020 12:25:13 +0000 Subject: Change in osmo-trx[master]: Transceiver: Restrict conditions where FN gaps are detected In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19304 ) Change subject: Transceiver: Restrict conditions where FN gaps are detected ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3b4b85b9100f69dfa113c54a4357120bd11ec86f Gerrit-Change-Number: 19304 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Jul 2020 12:25:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 12:47:22 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 17 Jul 2020 12:47:22 +0000 Subject: Change in osmo-trx[master]: Transceiver: Restrict conditions where FN gaps are detected In-Reply-To: References: Message-ID: Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19304 ) Change subject: Transceiver: Restrict conditions where FN gaps are detected ...................................................................... Transceiver: Restrict conditions where FN gaps are detected In pushRadioVector, like we did for driveTxPriorityQueue already, gaps are possible in any channel for TRX!=0, since TRX0 is the only one expected to be always transmitting. Since we always need to transmit there, it makes no sense to check for channel being not NONE. Change-Id: I3b4b85b9100f69dfa113c54a4357120bd11ec86f --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hoernchen: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index d750218..3be7746 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -468,7 +468,7 @@ } else { modFN = nowTime.FN() % state->fillerModulus[TN]; bursts[i] = state->fillerTable[modFN][TN]; - if (state->chanType[TN] != NONE) { + if (i == 0 && state->mFiller == FILLER_ZERO) { LOGCHAN(i, DTRXDDL, NOTICE) << "No Tx burst available for " << nowTime << ", retrans=" << state->mRetrans; state->ctrs.tx_unavailable_bursts++; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3b4b85b9100f69dfa113c54a4357120bd11ec86f Gerrit-Change-Number: 19304 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 14:55:47 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 17 Jul 2020 14:55:47 +0000 Subject: Change in libosmocore[master]: rate_ctr: Add functions to reset rate counter (groups) In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19294 ) Change subject: rate_ctr: Add functions to reset rate counter (groups) ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/19294/3/include/osmocom/core/rate_ctr.h File include/osmocom/core/rate_ctr.h: https://gerrit.osmocom.org/c/libosmocore/+/19294/3/include/osmocom/core/rate_ctr.h at 119 PS3, Line 119: void rate_ctr_reset_ctr(struct rate_ctr *ctr); > Ack Done https://gerrit.osmocom.org/c/libosmocore/+/19294/3/src/rate_ctr.c File src/rate_ctr.c: https://gerrit.osmocom.org/c/libosmocore/+/19294/3/src/rate_ctr.c at 448 PS3, Line 448: rate_ctr_for_each_counter(ctrg, reset_rate_ctr_handler, NULL); > Ack Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If2f806d044cd0fb6929dac44ef8f8a15941ffe9b Gerrit-Change-Number: 19294 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 17 Jul 2020 14:55:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 14:58:33 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 17 Jul 2020 14:58:33 +0000 Subject: Change in libosmocore[master]: stat_item: Add function to reset stat items and groups In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19295 ) Change subject: stat_item: Add function to reset stat items and groups ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/19295/3/include/osmocom/core/stat_item.h File include/osmocom/core/stat_item.h: https://gerrit.osmocom.org/c/libosmocore/+/19295/3/include/osmocom/core/stat_item.h at 119 PS3, Line 119: void osmo_stat_item_reset_group(struct osmo_stat_item_group *statg); > Done Done https://gerrit.osmocom.org/c/libosmocore/+/19295/3/src/stat_item.c File src/stat_item.c: https://gerrit.osmocom.org/c/libosmocore/+/19295/3/src/stat_item.c at 388 PS3, Line 388: osmo_stat_item_for_each_item(statg, reset_osmo_stat_item_handler, NULL); > Same: iteratire directly. Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I80fc0ea8865ec4efdcd4c982e69d863275fd9919 Gerrit-Change-Number: 19295 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jul 2020 14:58:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 14:59:30 2020 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 17 Jul 2020 14:59:30 +0000 Subject: Change in libosmocore[master]: stats: Add stats commands related to testing In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19296 ) Change subject: stats: Add stats commands related to testing ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/19296/3/src/vty/stats_vty.c File src/vty/stats_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/19296/3/src/vty/stats_vty.c at 358 PS3, Line 358: manual reporting > I think it's clearer now Done https://gerrit.osmocom.org/c/libosmocore/+/19296/3/src/vty/stats_vty.c at 598 PS3, Line 598: rate_ctr_for_each_group(reset_rate_ctr_group_handler, NULL); > In the config "stats" represents the statistics subsystem as a whole, see [?] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9febcb65650abfd538caedfbca77a787e66d517a Gerrit-Change-Number: 19296 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 17 Jul 2020 14:59:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:34:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jul 2020 16:34:57 +0000 Subject: Change in osmo-trx[master]: trx_rate_ctr: Lower some log levels References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/19305 ) Change subject: trx_rate_ctr: Lower some log levels ...................................................................... trx_rate_ctr: Lower some log levels Change-Id: I1b5a63e6cc09ac02305c31ea7e94aff53ac0e5c2 --- M CommonLibs/trx_rate_ctr.cpp 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/05/19305/1 diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp index e45aba8..f12e4e3 100644 --- a/CommonLibs/trx_rate_ctr.cpp +++ b/CommonLibs/trx_rate_ctr.cpp @@ -135,12 +135,12 @@ static int dev_rate_ctr_timerfd_cb(struct osmo_fd *ofd, unsigned int what) { size_t chan; struct rate_ctr *ctr; - LOGC(DMAIN, NOTICE) << "Main thread is updating Device counters"; + LOGC(DMAIN, INFO) << "Main thread is updating Device counters"; dev_rate_ctr_mutex.lock(); for (chan = 0; chan < chan_len; chan++) { if (dev_ctrs_pending[chan].chan == PENDING_CHAN_NONE) continue; - LOGCHAN(chan, DMAIN, INFO) << "rate_ctr update"; + LOGCHAN(chan, DMAIN, DEBUG) << "rate_ctr update"; ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_RX_OVERRUNS]; rate_ctr_add(ctr, dev_ctrs_pending[chan].rx_overruns - ctr->current); ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_TX_UNDERRUNS]; @@ -166,12 +166,12 @@ static int trx_rate_ctr_timerfd_cb(struct osmo_fd *ofd, unsigned int what) { size_t chan; struct rate_ctr *ctr; - LOGC(DMAIN, NOTICE) << "Main thread is updating Transceiver counters"; + LOGC(DMAIN, INFO) << "Main thread is updating Transceiver counters"; trx_rate_ctr_mutex.lock(); for (chan = 0; chan < chan_len; chan++) { if (trx_ctrs_pending[chan].chan == PENDING_CHAN_NONE) continue; - LOGCHAN(chan, DMAIN, INFO) << "rate_ctr update"; + LOGCHAN(chan, DMAIN, DEBUG) << "rate_ctr update"; ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TX_STALE_BURSTS]; rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_stale_bursts - ctr->current); ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS]; @@ -206,7 +206,7 @@ switch (signal) { case S_DEVICE_COUNTER_CHANGE: dev_ctr = (struct device_counters *)signal_data; - LOGCHAN(dev_ctr->chan, DMAIN, NOTICE) << "Received counter change from radioDevice"; + LOGCHAN(dev_ctr->chan, DMAIN, INFO) << "Received counter change from radioDevice"; dev_rate_ctr_mutex.lock(); dev_ctrs_pending[dev_ctr->chan] = *dev_ctr; if (osmo_timerfd_schedule(&dev_rate_ctr_timerfd, &next_sched, &intv_sched) < 0) { @@ -216,7 +216,7 @@ break; case S_TRX_COUNTER_CHANGE: trx_ctr = (struct trx_counters *)signal_data; - LOGCHAN(trx_ctr->chan, DMAIN, NOTICE) << "Received counter change from Transceiver"; + LOGCHAN(trx_ctr->chan, DMAIN, INFO) << "Received counter change from Transceiver"; trx_rate_ctr_mutex.lock(); trx_ctrs_pending[trx_ctr->chan] = *trx_ctr; if (osmo_timerfd_schedule(&trx_rate_ctr_timerfd, &next_sched, &intv_sched) < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1b5a63e6cc09ac02305c31ea7e94aff53ac0e5c2 Gerrit-Change-Number: 19305 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:34:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jul 2020 16:34:58 +0000 Subject: Change in osmo-trx[master]: Introduce CTR log category References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/19306 ) Change subject: Introduce CTR log category ...................................................................... Introduce CTR log category This way i most usual rate_ctr related internal logging is disabled by default (notice), and it can b eeasily enabled by switching the category to info or debug. Change-Id: Id6c36432da7e7ce673c585bcae6772a695028ec5 --- M CommonLibs/debug.c M CommonLibs/debug.h M CommonLibs/trx_rate_ctr.cpp 3 files changed, 26 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/06/19306/1 diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c index b33476e..7ee8184 100644 --- a/CommonLibs/debug.c +++ b/CommonLibs/debug.c @@ -81,6 +81,12 @@ .color = NULL, .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DCTR] = { + .name = "DCTR", + .description = "Rate counter related logging", + .color = NULL, + .enabled = 1, .loglevel = LOGL_NOTICE, + }, }; const struct log_info log_info = { diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h index 8d70155..dd78168 100644 --- a/CommonLibs/debug.h +++ b/CommonLibs/debug.h @@ -16,6 +16,7 @@ DTRXDUL, DDEV, DDEVDRV, + DCTR, }; pid_t my_gettid(void); diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp index f12e4e3..1f44404 100644 --- a/CommonLibs/trx_rate_ctr.cpp +++ b/CommonLibs/trx_rate_ctr.cpp @@ -135,12 +135,12 @@ static int dev_rate_ctr_timerfd_cb(struct osmo_fd *ofd, unsigned int what) { size_t chan; struct rate_ctr *ctr; - LOGC(DMAIN, INFO) << "Main thread is updating Device counters"; + LOGC(DCTR, INFO) << "Main thread is updating Device counters"; dev_rate_ctr_mutex.lock(); for (chan = 0; chan < chan_len; chan++) { if (dev_ctrs_pending[chan].chan == PENDING_CHAN_NONE) continue; - LOGCHAN(chan, DMAIN, DEBUG) << "rate_ctr update"; + LOGCHAN(chan, DCTR, DEBUG) << "rate_ctr update"; ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_RX_OVERRUNS]; rate_ctr_add(ctr, dev_ctrs_pending[chan].rx_overruns - ctr->current); ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_TX_UNDERRUNS]; @@ -158,7 +158,7 @@ dev_ctrs_pending[chan].chan = PENDING_CHAN_NONE; } if (osmo_timerfd_disable(&dev_rate_ctr_timerfd) < 0) - LOGC(DMAIN, ERROR) << "Failed to disable timerfd"; + LOGC(DCTR, ERROR) << "Failed to disable timerfd"; dev_rate_ctr_mutex.unlock(); return 0; } @@ -166,12 +166,12 @@ static int trx_rate_ctr_timerfd_cb(struct osmo_fd *ofd, unsigned int what) { size_t chan; struct rate_ctr *ctr; - LOGC(DMAIN, INFO) << "Main thread is updating Transceiver counters"; + LOGC(DCTR, INFO) << "Main thread is updating Transceiver counters"; trx_rate_ctr_mutex.lock(); for (chan = 0; chan < chan_len; chan++) { if (trx_ctrs_pending[chan].chan == PENDING_CHAN_NONE) continue; - LOGCHAN(chan, DMAIN, DEBUG) << "rate_ctr update"; + LOGCHAN(chan, DCTR, DEBUG) << "rate_ctr update"; ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TX_STALE_BURSTS]; rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_stale_bursts - ctr->current); ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS]; @@ -186,7 +186,7 @@ trx_ctrs_pending[chan].chan = PENDING_CHAN_NONE; } if (osmo_timerfd_disable(&trx_rate_ctr_timerfd) < 0) - LOGC(DMAIN, ERROR) << "Failed to disable timerfd"; + LOGC(DCTR, ERROR) << "Failed to disable timerfd"; trx_rate_ctr_mutex.unlock(); return 0; } @@ -206,21 +206,21 @@ switch (signal) { case S_DEVICE_COUNTER_CHANGE: dev_ctr = (struct device_counters *)signal_data; - LOGCHAN(dev_ctr->chan, DMAIN, INFO) << "Received counter change from radioDevice"; + LOGCHAN(dev_ctr->chan, DCTR, INFO) << "Received counter change from radioDevice"; dev_rate_ctr_mutex.lock(); dev_ctrs_pending[dev_ctr->chan] = *dev_ctr; if (osmo_timerfd_schedule(&dev_rate_ctr_timerfd, &next_sched, &intv_sched) < 0) { - LOGC(DMAIN, ERROR) << "Failed to schedule timerfd: " << errno << " = "<< strerror(errno); + LOGC(DCTR, ERROR) << "Failed to schedule timerfd: " << errno << " = "<< strerror(errno); } dev_rate_ctr_mutex.unlock(); break; case S_TRX_COUNTER_CHANGE: trx_ctr = (struct trx_counters *)signal_data; - LOGCHAN(trx_ctr->chan, DMAIN, INFO) << "Received counter change from Transceiver"; + LOGCHAN(trx_ctr->chan, DCTR, INFO) << "Received counter change from Transceiver"; trx_rate_ctr_mutex.lock(); trx_ctrs_pending[trx_ctr->chan] = *trx_ctr; if (osmo_timerfd_schedule(&trx_rate_ctr_timerfd, &next_sched, &intv_sched) < 0) { - LOGC(DMAIN, ERROR) << "Failed to schedule timerfd: " << errno << " = "<< strerror(errno); + LOGC(DCTR, ERROR) << "Failed to schedule timerfd: " << errno << " = "<< strerror(errno); } trx_rate_ctr_mutex.unlock(); break; @@ -247,15 +247,15 @@ struct ctr_threshold *ctr_thr; struct rate_ctr *rate_ctr; size_t chan; - LOGC(DMAIN, DEBUG) << "threshold_timer_cb fired!"; + LOGC(DCTR, DEBUG) << "threshold_timer_cb fired!"; llist_for_each_entry(ctr_thr, &threshold_list, list) { for (chan = 0; chan < chan_len; chan++) { rate_ctr = &rate_ctrs[chan]->ctr[ctr_thr->ctr_id]; - LOGCHAN(chan, DMAIN, INFO) << "checking threshold: " << ctr_threshold_2_vty_str(ctr_thr) + LOGCHAN(chan, DCTR, INFO) << "checking threshold: " << ctr_threshold_2_vty_str(ctr_thr) << " ("<< rate_ctr->intv[ctr_thr->intv].rate << " vs " << ctr_thr->val << ")"; if (rate_ctr->intv[ctr_thr->intv].rate >= ctr_thr->val) { - LOGCHAN(chan, DMAIN, FATAL) << "threshold reached, stopping! " << ctr_threshold_2_vty_str(ctr_thr) + LOGCHAN(chan, DCTR, FATAL) << "threshold reached, stopping! " << ctr_threshold_2_vty_str(ctr_thr) << " ("<< rate_ctr->intv[ctr_thr->intv].rate << " vs " << ctr_thr->val << ")"; osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL); return; @@ -313,7 +313,7 @@ threshold_timer_sched_secs = OSMO_MAX((int)(min_secs / 2 - 1), 1); - LOGC(DMAIN, INFO) << "New ctr-error-threshold check interval: " + LOGC(DCTR, INFO) << "New ctr-error-threshold check interval: " << threshold_timer_sched_secs << " seconds"; osmo_timer_schedule(&threshold_timer, threshold_timer_sched_secs, 0); } @@ -333,18 +333,18 @@ trx_ctrs_pending[i].chan = PENDING_CHAN_NONE; rate_ctrs[i] = rate_ctr_group_alloc(ctx, &trx_chan_ctr_group_desc, i); if (!rate_ctrs[i]) { - LOGCHAN(i, DMAIN, ERROR) << "Failed to allocate rate ctr"; + LOGCHAN(i, DCTR, ERROR) << "Failed to allocate rate ctr"; exit(1); } } dev_rate_ctr_timerfd.fd = -1; if (osmo_timerfd_setup(&dev_rate_ctr_timerfd, dev_rate_ctr_timerfd_cb, NULL) < 0) { - LOGC(DMAIN, ERROR) << "Failed to setup timerfd"; + LOGC(DCTR, ERROR) << "Failed to setup timerfd"; exit(1); } trx_rate_ctr_timerfd.fd = -1; if (osmo_timerfd_setup(&trx_rate_ctr_timerfd, trx_rate_ctr_timerfd_cb, NULL) < 0) { - LOGC(DMAIN, ERROR) << "Failed to setup timerfd"; + LOGC(DCTR, ERROR) << "Failed to setup timerfd"; exit(1); } osmo_signal_register_handler(SS_DEVICE, device_sig_cb, NULL); @@ -361,7 +361,7 @@ new_ctr = talloc_zero(trx_rate_ctr_ctx, struct ctr_threshold); *new_ctr = *ctr; - LOGC(DMAIN, NOTICE) << "Adding new threshold check: " << ctr_threshold_2_vty_str(new_ctr); + LOGC(DCTR, NOTICE) << "Adding new threshold check: " << ctr_threshold_2_vty_str(new_ctr); llist_add(&new_ctr->list, &threshold_list); threshold_timer_update_intv(); } @@ -376,7 +376,7 @@ ctr->val != del_ctr->val) continue; - LOGC(DMAIN, NOTICE) << "Deleting threshold check: " << ctr_threshold_2_vty_str(del_ctr); + LOGC(DCTR, NOTICE) << "Deleting threshold check: " << ctr_threshold_2_vty_str(del_ctr); llist_del(&ctr->list); talloc_free(ctr); threshold_timer_update_intv(); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id6c36432da7e7ce673c585bcae6772a695028ec5 Gerrit-Change-Number: 19306 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:34:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jul 2020 16:34:59 +0000 Subject: Change in osmo-trx[master]: Transceiver: Lower some log levels which have an associated counter References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/19307 ) Change subject: Transceiver: Lower some log levels which have an associated counter ...................................................................... Transceiver: Lower some log levels which have an associated counter They are left as INFO instead of DEBUG since they show possible timing/performance issues in the setup. Change-Id: I8aab10054ac89c29b871259fdbe59636723ddfb6 --- M Transceiver52M/Transceiver.cpp 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/07/19307/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 3be7746..55d0acd 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -445,7 +445,7 @@ mtx->lock(); while ((burst = mTxPriorityQueues[i].getStaleBurst(nowTime))) { - LOGCHAN(i, DTRXDDL, NOTICE) << "dumping STALE burst in TRX->SDR interface (" + LOGCHAN(i, DTRXDDL, INFO) << "dumping STALE burst in TRX->SDR interface (" << burst->getTime() <<" vs " << nowTime << "), retrans=" << state->mRetrans; state->ctrs.tx_stale_bursts++; ratectr_changed = true; @@ -469,7 +469,7 @@ modFN = nowTime.FN() % state->fillerModulus[TN]; bursts[i] = state->fillerTable[modFN][TN]; if (i == 0 && state->mFiller == FILLER_ZERO) { - LOGCHAN(i, DTRXDDL, NOTICE) << "No Tx burst available for " << nowTime + LOGCHAN(i, DTRXDDL, INFO) << "No Tx burst available for " << nowTime << ", retrans=" << state->mRetrans; state->ctrs.tx_unavailable_bursts++; ratectr_changed = true; @@ -1073,12 +1073,12 @@ if (delta == 1) { /* usual expected scenario, continue code flow */ } else if (delta == 0) { - LOGCHAN(chan, DTRXDDL, NOTICE) << "Rx TRXD msg with repeated FN " << currTime; + LOGCHAN(chan, DTRXDDL, INFO) << "Rx TRXD msg with repeated FN " << currTime; state->ctrs.tx_trxd_fn_repeated++; dispatch_trx_rate_ctr_change(state, chan); return true; } else if (delta < 0) { - LOGCHAN(chan, DTRXDDL, NOTICE) << "Rx TRXD msg with previous FN " << currTime + LOGCHAN(chan, DTRXDDL, INFO) << "Rx TRXD msg with previous FN " << currTime << " vs last " << state->last_dl_time_rcv[tn]; state->ctrs.tx_trxd_fn_outoforder++; dispatch_trx_rate_ctr_change(state, chan); @@ -1088,7 +1088,7 @@ * on consecutive FNs in TRX0 since it must transmit continuously in all * setups. Also, osmo-trx supports optionally filling empty bursts on * its own. In that case bts-trx is not obliged to submit all bursts. */ - LOGCHAN(chan, DTRXDDL, NOTICE) << "Rx TRXD msg with future FN " << currTime + LOGCHAN(chan, DTRXDDL, INFO) << "Rx TRXD msg with future FN " << currTime << " vs last " << state->last_dl_time_rcv[tn] << ", " << delta - 1 << " FN lost"; state->ctrs.tx_trxd_fn_skipped += delta - 1; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I8aab10054ac89c29b871259fdbe59636723ddfb6 Gerrit-Change-Number: 19307 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:36:20 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 17 Jul 2020 16:36:20 +0000 Subject: Change in osmo-trx[master]: trx_rate_ctr: Lower some log levels In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19305 ) Change subject: trx_rate_ctr: Lower some log levels ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1b5a63e6cc09ac02305c31ea7e94aff53ac0e5c2 Gerrit-Change-Number: 19305 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Jul 2020 16:36:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:36:46 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 17 Jul 2020 16:36:46 +0000 Subject: Change in osmo-trx[master]: Introduce CTR log category In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19306 ) Change subject: Introduce CTR log category ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id6c36432da7e7ce673c585bcae6772a695028ec5 Gerrit-Change-Number: 19306 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Jul 2020 16:36:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:37:16 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 17 Jul 2020 16:37:16 +0000 Subject: Change in osmo-trx[master]: Transceiver: Lower some log levels which have an associated counter In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19307 ) Change subject: Transceiver: Lower some log levels which have an associated counter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I8aab10054ac89c29b871259fdbe59636723ddfb6 Gerrit-Change-Number: 19307 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Jul 2020 16:37:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:39:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jul 2020 16:39:03 +0000 Subject: Change in osmo-trx[master]: trx_rate_ctr: Lower some log levels In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19305 ) Change subject: trx_rate_ctr: Lower some log levels ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1b5a63e6cc09ac02305c31ea7e94aff53ac0e5c2 Gerrit-Change-Number: 19305 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Jul 2020 16:39:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:39:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jul 2020 16:39:23 +0000 Subject: Change in osmo-trx[master]: Introduce CTR log category In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19306 ) Change subject: Introduce CTR log category ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id6c36432da7e7ce673c585bcae6772a695028ec5 Gerrit-Change-Number: 19306 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Jul 2020 16:39:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:39:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jul 2020 16:39:42 +0000 Subject: Change in osmo-trx[master]: Transceiver: Lower some log levels which have an associated counter In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19307 ) Change subject: Transceiver: Lower some log levels which have an associated counter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I8aab10054ac89c29b871259fdbe59636723ddfb6 Gerrit-Change-Number: 19307 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Jul 2020 16:39:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:40:06 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 17 Jul 2020 16:40:06 +0000 Subject: Change in osmo-trx[master]: trx_rate_ctr: Lower some log levels In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19305 ) Change subject: trx_rate_ctr: Lower some log levels ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1b5a63e6cc09ac02305c31ea7e94aff53ac0e5c2 Gerrit-Change-Number: 19305 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Jul 2020 16:40:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:40:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jul 2020 16:40:19 +0000 Subject: Change in libosmocore[master]: rate_ctr: Add functions to reset rate counter (groups) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19294 ) Change subject: rate_ctr: Add functions to reset rate counter (groups) ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If2f806d044cd0fb6929dac44ef8f8a15941ffe9b Gerrit-Change-Number: 19294 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jul 2020 16:40:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:40:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jul 2020 16:40:36 +0000 Subject: Change in libosmocore[master]: stat_item: Add function to reset stat items and groups In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19295 ) Change subject: stat_item: Add function to reset stat items and groups ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I80fc0ea8865ec4efdcd4c982e69d863275fd9919 Gerrit-Change-Number: 19295 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jul 2020 16:40:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:41:19 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 17 Jul 2020 16:41:19 +0000 Subject: Change in osmo-trx[master]: Introduce CTR log category In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19306 ) Change subject: Introduce CTR log category ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id6c36432da7e7ce673c585bcae6772a695028ec5 Gerrit-Change-Number: 19306 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Jul 2020 16:41:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:41:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jul 2020 16:41:29 +0000 Subject: Change in libosmocore[master]: stats: Add stats commands related to testing In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19296 ) Change subject: stats: Add stats commands related to testing ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9febcb65650abfd538caedfbca77a787e66d517a Gerrit-Change-Number: 19296 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jul 2020 16:41:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:41:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jul 2020 16:41:31 +0000 Subject: Change in libosmocore[master]: rate_ctr: Add functions to reset rate counter (groups) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19294 ) Change subject: rate_ctr: Add functions to reset rate counter (groups) ...................................................................... rate_ctr: Add functions to reset rate counter (groups) Change-Id: If2f806d044cd0fb6929dac44ef8f8a15941ffe9b Related: SYS#4877 --- M TODO-RELEASE M include/osmocom/core/rate_ctr.h M src/rate_ctr.c 3 files changed, 25 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index e2fd830..3696681 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -15,3 +15,4 @@ gsm API/ABI change add new member to lapd_datalink gsm new API new gsm0808_create_common_id() gb new API new bssgp_tx_bvc_reset2() +core new API new rate_ctr_reset(), rate_ctr_group_reset() diff --git a/include/osmocom/core/rate_ctr.h b/include/osmocom/core/rate_ctr.h index f7e6e22..1669ce4 100644 --- a/include/osmocom/core/rate_ctr.h +++ b/include/osmocom/core/rate_ctr.h @@ -116,4 +116,7 @@ int rate_ctr_for_each_group(rate_ctr_group_handler_t handle_group, void *data); +void rate_ctr_reset(struct rate_ctr *ctr); +void rate_ctr_group_reset(struct rate_ctr_group *ctrg); + /*! @} */ diff --git a/src/rate_ctr.c b/src/rate_ctr.c index 026670b..9043a2c 100644 --- a/src/rate_ctr.c +++ b/src/rate_ctr.c @@ -426,4 +426,25 @@ return rc; } +/*! Reset a rate counter back to zero + * \param[in] ctr counter to reset + */ +void rate_ctr_reset(struct rate_ctr *ctr) +{ + memset(ctr, 0, sizeof(*ctr)); +} + +/*! Reset all counters in a group + * \param[in] ctrg counter group to reset + */ +void rate_ctr_group_reset(struct rate_ctr_group *ctrg) +{ + int i; + + for (i = 0; i < ctrg->desc->num_ctr; i++) { + struct rate_ctr *ctr = &ctrg->ctr[i]; + rate_ctr_reset(ctr); + } +} + /*! @} */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If2f806d044cd0fb6929dac44ef8f8a15941ffe9b Gerrit-Change-Number: 19294 Gerrit-PatchSet: 5 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:41:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jul 2020 16:41:31 +0000 Subject: Change in libosmocore[master]: stat_item: Add function to reset stat items and groups In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19295 ) Change subject: stat_item: Add function to reset stat items and groups ...................................................................... stat_item: Add function to reset stat items and groups Change-Id: I80fc0ea8865ec4efdcd4c982e69d863275fd9919 Related: SYS#4877 --- M TODO-RELEASE M include/osmocom/core/stat_item.h M src/stat_item.c 3 files changed, 34 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 3696681..a4d9dfb 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -16,3 +16,4 @@ gsm new API new gsm0808_create_common_id() gb new API new bssgp_tx_bvc_reset2() core new API new rate_ctr_reset(), rate_ctr_group_reset() +core new API new osmo_stat_item_reset(), osmo_stat_item_group_reset() diff --git a/include/osmocom/core/stat_item.h b/include/osmocom/core/stat_item.h index 806173a..4710dba 100644 --- a/include/osmocom/core/stat_item.h +++ b/include/osmocom/core/stat_item.h @@ -114,4 +114,8 @@ { return item->values[item->last_offs].value; } + +void osmo_stat_item_reset(struct osmo_stat_item *item); +void osmo_stat_item_group_reset(struct osmo_stat_item_group *statg); + /*! @} */ diff --git a/src/stat_item.c b/src/stat_item.c index 6716575..ba36464 100644 --- a/src/stat_item.c +++ b/src/stat_item.c @@ -356,4 +356,33 @@ return rc; } + +/*! Remove all values of a stat item + * \param[in] item stat item to reset + */ +void osmo_stat_item_reset(struct osmo_stat_item *item) +{ + unsigned int i; + + item->last_offs = item->desc->num_values - 1; + item->last_value_index = -1; + + for (i = 0; i <= item->last_offs; i++) { + item->values[i].value = item->desc->default_value; + item->values[i].id = OSMO_STAT_ITEM_NOVALUE_ID; + } +} + +/*! Reset all osmo stat items in a group + * \param[in] statg stat item group to reset + */ +void osmo_stat_item_group_reset(struct osmo_stat_item_group *statg) +{ + int i; + + for (i = 0; i < statg->desc->num_items; i++) { + struct osmo_stat_item *item = statg->items[i]; + osmo_stat_item_reset(item); + } +} /*! @} */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I80fc0ea8865ec4efdcd4c982e69d863275fd9919 Gerrit-Change-Number: 19295 Gerrit-PatchSet: 5 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:41:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jul 2020 16:41:32 +0000 Subject: Change in libosmocore[master]: stats: Add stats commands related to testing In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19296 ) Change subject: stats: Add stats commands related to testing ...................................................................... stats: Add stats commands related to testing * Allow to set the reporting interval to 0 for manual reporting * stats reset command to reset all statistics * stats report command to manually trigger statistics reporting Change-Id: I9febcb65650abfd538caedfbca77a787e66d517a Related: SYS#4877 --- M src/stats.c M src/vty/stats_vty.c 2 files changed, 53 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/stats.c b/src/stats.c index a5a4d4b..c91a978 100644 --- a/src/stats.c +++ b/src/stats.c @@ -181,12 +181,21 @@ if (rc < 0) LOGP(DLSTATS, LOGL_ERROR, "Failed to setup the timer with error code %d (fd=%d)\n", rc, osmo_stats_timer.fd); - rc = osmo_timerfd_schedule(&osmo_stats_timer, &ts_first, &ts_interval); - if (rc < 0) - LOGP(DLSTATS, LOGL_ERROR, "Failed to schedule the timer with error code %d (fd=%d, interval %d sec)\n", - rc, osmo_stats_timer.fd, interval); - LOGP(DLSTATS, LOGL_INFO, "Stats timer started with interval %d sec\n", interval); + if (interval == 0) { + rc = osmo_timerfd_disable(&osmo_stats_timer); + if (rc < 0) + LOGP(DLSTATS, LOGL_ERROR, "Failed to disable the timer with error code %d (fd=%d)\n", + rc, osmo_stats_timer.fd); + } else { + + rc = osmo_timerfd_schedule(&osmo_stats_timer, &ts_first, &ts_interval); + if (rc < 0) + LOGP(DLSTATS, LOGL_ERROR, "Failed to schedule the timer with error code %d (fd=%d, interval %d sec)\n", + rc, osmo_stats_timer.fd, interval); + + LOGP(DLSTATS, LOGL_INFO, "Stats timer started with interval %d sec\n", interval); + } return 0; } @@ -361,7 +370,7 @@ * \returns 0 on success; negative on error */ int osmo_stats_set_interval(int interval) { - if (interval <= 0) + if (interval < 0) return -EINVAL; osmo_stats_config->interval = interval; diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c index 4628281..1483eaa 100644 --- a/src/vty/stats_vty.c +++ b/src/vty/stats_vty.c @@ -43,6 +43,8 @@ #define SHOW_STATS_STR "Show statistical values\n" +#define STATS_STR "Stats related commands\n" + /*! \file stats_vty.c * VTY interface for statsd / statistic items * @@ -351,9 +353,9 @@ } DEFUN(cfg_stats_interval, cfg_stats_interval_cmd, - "stats interval <1-65535>", + "stats interval <0-65535>", CFG_STATS_STR "Set the reporting interval\n" - "Interval in seconds\n") + "Interval in seconds (0 disables the reporting interval)\n") { int rc; int interval = atoi(argv[0]); @@ -567,6 +569,37 @@ return CMD_SUCCESS; } +DEFUN(stats_report, + stats_report_cmd, + "stats report", + STATS_STR "Manurally trigger reporting of stats\n") +{ + osmo_stats_report(); + return CMD_SUCCESS; +} + +static int reset_rate_ctr_group_handler(struct rate_ctr_group *ctrg, void *sctx_) +{ + rate_ctr_group_reset(ctrg); + return 0; +} + +static int reset_osmo_stat_item_group_handler(struct osmo_stat_item_group *statg, void *sctx_) +{ + osmo_stat_item_group_reset(statg); + return 0; +} + +DEFUN(stats_reset, + stats_reset_cmd, + "stats reset", + STATS_STR "Reset all stats\n") +{ + rate_ctr_for_each_group(reset_rate_ctr_group_handler, NULL); + osmo_stat_item_for_each_group(reset_osmo_stat_item_group_handler, NULL); + return CMD_SUCCESS; +} + static int config_write_stats_reporter(struct vty *vty, struct osmo_stats_reporter *srep) { if (srep == NULL) @@ -666,4 +699,7 @@ install_element_ve(&show_stats_asciidoc_table_cmd); install_element_ve(&show_rate_counters_cmd); + + install_element(ENABLE_NODE, &stats_report_cmd); + install_element(ENABLE_NODE, &stats_reset_cmd); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9febcb65650abfd538caedfbca77a787e66d517a Gerrit-Change-Number: 19296 Gerrit-PatchSet: 5 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:44:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jul 2020 16:44:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: test handling of EMERGENCY SETUP In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19302 ) Change subject: BSC_Tests: test handling of EMERGENCY SETUP ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I486d99953529a1ce9f0a3950c9a97900922eee92 Gerrit-Change-Number: 19302 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jul 2020 16:44:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:45:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jul 2020 16:45:06 +0000 Subject: Change in osmo-bsc[master]: Move struct gsm_bts: gsm_data.* => bts.* In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19287 ) Change subject: Move struct gsm_bts: gsm_data.* => bts.* ...................................................................... Patch Set 3: Code-Review+1 so many reviewers and nobody but me can be bothered to have an opinion about this change? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I00c15f5285b5c1a0109279b7ab192d5467a04ece Gerrit-Change-Number: 19287 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jul 2020 16:45:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:46:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jul 2020 16:46:17 +0000 Subject: Change in osmo-bsc[master]: bts: Drop duplicated function to get trx by number In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19297 ) Change subject: bts: Drop duplicated function to get trx by number ...................................................................... Patch Set 2: Code-Review+1 you chose the right one to remove (gsm_bts_trx_num also exsits in osmo-bts, and hence we should retain this one) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9071a0ab250844619280fbe2be63ed99f2c87eb1 Gerrit-Change-Number: 19297 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jul 2020 16:46:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:48:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 17 Jul 2020 16:48:04 +0000 Subject: Change in osmo-bsc[master]: Move acc_ramp_init inside gsm_bts_alloc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19300 ) Change subject: Move acc_ramp_init inside gsm_bts_alloc ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/19300/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/19300/1//COMMIT_MSG at 12 PS1, Line 12: It was most probably put in bsc_vty when it was initially introduced : because of all the data structure and object file mess I untangled : during last set of patches. that's not a valid excuse. The function was named exactly the same before, and it did the exact same thing. I would suggest not to speculate here but keep things factual. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I66c4b208583e92070793183b83b3a7b7edf6ba00 Gerrit-Change-Number: 19300 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 17 Jul 2020 16:48:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 16:53:36 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 17 Jul 2020 16:53:36 +0000 Subject: Change in osmo-bsc[master]: Move struct gsm_bts: gsm_data.* => bts.* In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19287 ) Change subject: Move struct gsm_bts: gsm_data.* => bts.* ...................................................................... Patch Set 3: > Patch Set 3: Code-Review+1 > > so many reviewers and nobody but me can be bothered to have an opinion about this change? I already expressed my negative opinion when commenting on similar changes to osmo-bts, so I would prefer to stay neutral here. So far nobody else said that splitting up is something super-important. If Pau cannot proceed with new features without this... well, I will not block his work. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I00c15f5285b5c1a0109279b7ab192d5467a04ece Gerrit-Change-Number: 19287 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 17 Jul 2020 16:53:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 17:39:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jul 2020 17:39:56 +0000 Subject: Change in osmo-trx[master]: Introduce CTR log category In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19306 ) Change subject: Introduce CTR log category ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id6c36432da7e7ce673c585bcae6772a695028ec5 Gerrit-Change-Number: 19306 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Jul 2020 17:39:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 17:39:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jul 2020 17:39:59 +0000 Subject: Change in osmo-trx[master]: trx_rate_ctr: Lower some log levels In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19305 ) Change subject: trx_rate_ctr: Lower some log levels ...................................................................... trx_rate_ctr: Lower some log levels Change-Id: I1b5a63e6cc09ac02305c31ea7e94aff53ac0e5c2 --- M CommonLibs/trx_rate_ctr.cpp 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Hoernchen: Looks good to me, approved laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp index e45aba8..f12e4e3 100644 --- a/CommonLibs/trx_rate_ctr.cpp +++ b/CommonLibs/trx_rate_ctr.cpp @@ -135,12 +135,12 @@ static int dev_rate_ctr_timerfd_cb(struct osmo_fd *ofd, unsigned int what) { size_t chan; struct rate_ctr *ctr; - LOGC(DMAIN, NOTICE) << "Main thread is updating Device counters"; + LOGC(DMAIN, INFO) << "Main thread is updating Device counters"; dev_rate_ctr_mutex.lock(); for (chan = 0; chan < chan_len; chan++) { if (dev_ctrs_pending[chan].chan == PENDING_CHAN_NONE) continue; - LOGCHAN(chan, DMAIN, INFO) << "rate_ctr update"; + LOGCHAN(chan, DMAIN, DEBUG) << "rate_ctr update"; ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_RX_OVERRUNS]; rate_ctr_add(ctr, dev_ctrs_pending[chan].rx_overruns - ctr->current); ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_TX_UNDERRUNS]; @@ -166,12 +166,12 @@ static int trx_rate_ctr_timerfd_cb(struct osmo_fd *ofd, unsigned int what) { size_t chan; struct rate_ctr *ctr; - LOGC(DMAIN, NOTICE) << "Main thread is updating Transceiver counters"; + LOGC(DMAIN, INFO) << "Main thread is updating Transceiver counters"; trx_rate_ctr_mutex.lock(); for (chan = 0; chan < chan_len; chan++) { if (trx_ctrs_pending[chan].chan == PENDING_CHAN_NONE) continue; - LOGCHAN(chan, DMAIN, INFO) << "rate_ctr update"; + LOGCHAN(chan, DMAIN, DEBUG) << "rate_ctr update"; ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TX_STALE_BURSTS]; rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_stale_bursts - ctr->current); ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS]; @@ -206,7 +206,7 @@ switch (signal) { case S_DEVICE_COUNTER_CHANGE: dev_ctr = (struct device_counters *)signal_data; - LOGCHAN(dev_ctr->chan, DMAIN, NOTICE) << "Received counter change from radioDevice"; + LOGCHAN(dev_ctr->chan, DMAIN, INFO) << "Received counter change from radioDevice"; dev_rate_ctr_mutex.lock(); dev_ctrs_pending[dev_ctr->chan] = *dev_ctr; if (osmo_timerfd_schedule(&dev_rate_ctr_timerfd, &next_sched, &intv_sched) < 0) { @@ -216,7 +216,7 @@ break; case S_TRX_COUNTER_CHANGE: trx_ctr = (struct trx_counters *)signal_data; - LOGCHAN(trx_ctr->chan, DMAIN, NOTICE) << "Received counter change from Transceiver"; + LOGCHAN(trx_ctr->chan, DMAIN, INFO) << "Received counter change from Transceiver"; trx_rate_ctr_mutex.lock(); trx_ctrs_pending[trx_ctr->chan] = *trx_ctr; if (osmo_timerfd_schedule(&trx_rate_ctr_timerfd, &next_sched, &intv_sched) < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1b5a63e6cc09ac02305c31ea7e94aff53ac0e5c2 Gerrit-Change-Number: 19305 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 17:40:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jul 2020 17:40:01 +0000 Subject: Change in osmo-trx[master]: Introduce CTR log category In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19306 ) Change subject: Introduce CTR log category ...................................................................... Introduce CTR log category This way i most usual rate_ctr related internal logging is disabled by default (notice), and it can b eeasily enabled by switching the category to info or debug. Change-Id: Id6c36432da7e7ce673c585bcae6772a695028ec5 --- M CommonLibs/debug.c M CommonLibs/debug.h M CommonLibs/trx_rate_ctr.cpp 3 files changed, 26 insertions(+), 19 deletions(-) Approvals: Hoernchen: Looks good to me, approved laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Verified diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c index b33476e..7ee8184 100644 --- a/CommonLibs/debug.c +++ b/CommonLibs/debug.c @@ -81,6 +81,12 @@ .color = NULL, .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DCTR] = { + .name = "DCTR", + .description = "Rate counter related logging", + .color = NULL, + .enabled = 1, .loglevel = LOGL_NOTICE, + }, }; const struct log_info log_info = { diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h index 8d70155..dd78168 100644 --- a/CommonLibs/debug.h +++ b/CommonLibs/debug.h @@ -16,6 +16,7 @@ DTRXDUL, DDEV, DDEVDRV, + DCTR, }; pid_t my_gettid(void); diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp index f12e4e3..1f44404 100644 --- a/CommonLibs/trx_rate_ctr.cpp +++ b/CommonLibs/trx_rate_ctr.cpp @@ -135,12 +135,12 @@ static int dev_rate_ctr_timerfd_cb(struct osmo_fd *ofd, unsigned int what) { size_t chan; struct rate_ctr *ctr; - LOGC(DMAIN, INFO) << "Main thread is updating Device counters"; + LOGC(DCTR, INFO) << "Main thread is updating Device counters"; dev_rate_ctr_mutex.lock(); for (chan = 0; chan < chan_len; chan++) { if (dev_ctrs_pending[chan].chan == PENDING_CHAN_NONE) continue; - LOGCHAN(chan, DMAIN, DEBUG) << "rate_ctr update"; + LOGCHAN(chan, DCTR, DEBUG) << "rate_ctr update"; ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_RX_OVERRUNS]; rate_ctr_add(ctr, dev_ctrs_pending[chan].rx_overruns - ctr->current); ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_TX_UNDERRUNS]; @@ -158,7 +158,7 @@ dev_ctrs_pending[chan].chan = PENDING_CHAN_NONE; } if (osmo_timerfd_disable(&dev_rate_ctr_timerfd) < 0) - LOGC(DMAIN, ERROR) << "Failed to disable timerfd"; + LOGC(DCTR, ERROR) << "Failed to disable timerfd"; dev_rate_ctr_mutex.unlock(); return 0; } @@ -166,12 +166,12 @@ static int trx_rate_ctr_timerfd_cb(struct osmo_fd *ofd, unsigned int what) { size_t chan; struct rate_ctr *ctr; - LOGC(DMAIN, INFO) << "Main thread is updating Transceiver counters"; + LOGC(DCTR, INFO) << "Main thread is updating Transceiver counters"; trx_rate_ctr_mutex.lock(); for (chan = 0; chan < chan_len; chan++) { if (trx_ctrs_pending[chan].chan == PENDING_CHAN_NONE) continue; - LOGCHAN(chan, DMAIN, DEBUG) << "rate_ctr update"; + LOGCHAN(chan, DCTR, DEBUG) << "rate_ctr update"; ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TX_STALE_BURSTS]; rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_stale_bursts - ctr->current); ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS]; @@ -186,7 +186,7 @@ trx_ctrs_pending[chan].chan = PENDING_CHAN_NONE; } if (osmo_timerfd_disable(&trx_rate_ctr_timerfd) < 0) - LOGC(DMAIN, ERROR) << "Failed to disable timerfd"; + LOGC(DCTR, ERROR) << "Failed to disable timerfd"; trx_rate_ctr_mutex.unlock(); return 0; } @@ -206,21 +206,21 @@ switch (signal) { case S_DEVICE_COUNTER_CHANGE: dev_ctr = (struct device_counters *)signal_data; - LOGCHAN(dev_ctr->chan, DMAIN, INFO) << "Received counter change from radioDevice"; + LOGCHAN(dev_ctr->chan, DCTR, INFO) << "Received counter change from radioDevice"; dev_rate_ctr_mutex.lock(); dev_ctrs_pending[dev_ctr->chan] = *dev_ctr; if (osmo_timerfd_schedule(&dev_rate_ctr_timerfd, &next_sched, &intv_sched) < 0) { - LOGC(DMAIN, ERROR) << "Failed to schedule timerfd: " << errno << " = "<< strerror(errno); + LOGC(DCTR, ERROR) << "Failed to schedule timerfd: " << errno << " = "<< strerror(errno); } dev_rate_ctr_mutex.unlock(); break; case S_TRX_COUNTER_CHANGE: trx_ctr = (struct trx_counters *)signal_data; - LOGCHAN(trx_ctr->chan, DMAIN, INFO) << "Received counter change from Transceiver"; + LOGCHAN(trx_ctr->chan, DCTR, INFO) << "Received counter change from Transceiver"; trx_rate_ctr_mutex.lock(); trx_ctrs_pending[trx_ctr->chan] = *trx_ctr; if (osmo_timerfd_schedule(&trx_rate_ctr_timerfd, &next_sched, &intv_sched) < 0) { - LOGC(DMAIN, ERROR) << "Failed to schedule timerfd: " << errno << " = "<< strerror(errno); + LOGC(DCTR, ERROR) << "Failed to schedule timerfd: " << errno << " = "<< strerror(errno); } trx_rate_ctr_mutex.unlock(); break; @@ -247,15 +247,15 @@ struct ctr_threshold *ctr_thr; struct rate_ctr *rate_ctr; size_t chan; - LOGC(DMAIN, DEBUG) << "threshold_timer_cb fired!"; + LOGC(DCTR, DEBUG) << "threshold_timer_cb fired!"; llist_for_each_entry(ctr_thr, &threshold_list, list) { for (chan = 0; chan < chan_len; chan++) { rate_ctr = &rate_ctrs[chan]->ctr[ctr_thr->ctr_id]; - LOGCHAN(chan, DMAIN, INFO) << "checking threshold: " << ctr_threshold_2_vty_str(ctr_thr) + LOGCHAN(chan, DCTR, INFO) << "checking threshold: " << ctr_threshold_2_vty_str(ctr_thr) << " ("<< rate_ctr->intv[ctr_thr->intv].rate << " vs " << ctr_thr->val << ")"; if (rate_ctr->intv[ctr_thr->intv].rate >= ctr_thr->val) { - LOGCHAN(chan, DMAIN, FATAL) << "threshold reached, stopping! " << ctr_threshold_2_vty_str(ctr_thr) + LOGCHAN(chan, DCTR, FATAL) << "threshold reached, stopping! " << ctr_threshold_2_vty_str(ctr_thr) << " ("<< rate_ctr->intv[ctr_thr->intv].rate << " vs " << ctr_thr->val << ")"; osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL); return; @@ -313,7 +313,7 @@ threshold_timer_sched_secs = OSMO_MAX((int)(min_secs / 2 - 1), 1); - LOGC(DMAIN, INFO) << "New ctr-error-threshold check interval: " + LOGC(DCTR, INFO) << "New ctr-error-threshold check interval: " << threshold_timer_sched_secs << " seconds"; osmo_timer_schedule(&threshold_timer, threshold_timer_sched_secs, 0); } @@ -333,18 +333,18 @@ trx_ctrs_pending[i].chan = PENDING_CHAN_NONE; rate_ctrs[i] = rate_ctr_group_alloc(ctx, &trx_chan_ctr_group_desc, i); if (!rate_ctrs[i]) { - LOGCHAN(i, DMAIN, ERROR) << "Failed to allocate rate ctr"; + LOGCHAN(i, DCTR, ERROR) << "Failed to allocate rate ctr"; exit(1); } } dev_rate_ctr_timerfd.fd = -1; if (osmo_timerfd_setup(&dev_rate_ctr_timerfd, dev_rate_ctr_timerfd_cb, NULL) < 0) { - LOGC(DMAIN, ERROR) << "Failed to setup timerfd"; + LOGC(DCTR, ERROR) << "Failed to setup timerfd"; exit(1); } trx_rate_ctr_timerfd.fd = -1; if (osmo_timerfd_setup(&trx_rate_ctr_timerfd, trx_rate_ctr_timerfd_cb, NULL) < 0) { - LOGC(DMAIN, ERROR) << "Failed to setup timerfd"; + LOGC(DCTR, ERROR) << "Failed to setup timerfd"; exit(1); } osmo_signal_register_handler(SS_DEVICE, device_sig_cb, NULL); @@ -361,7 +361,7 @@ new_ctr = talloc_zero(trx_rate_ctr_ctx, struct ctr_threshold); *new_ctr = *ctr; - LOGC(DMAIN, NOTICE) << "Adding new threshold check: " << ctr_threshold_2_vty_str(new_ctr); + LOGC(DCTR, NOTICE) << "Adding new threshold check: " << ctr_threshold_2_vty_str(new_ctr); llist_add(&new_ctr->list, &threshold_list); threshold_timer_update_intv(); } @@ -376,7 +376,7 @@ ctr->val != del_ctr->val) continue; - LOGC(DMAIN, NOTICE) << "Deleting threshold check: " << ctr_threshold_2_vty_str(del_ctr); + LOGC(DCTR, NOTICE) << "Deleting threshold check: " << ctr_threshold_2_vty_str(del_ctr); llist_del(&ctr->list); talloc_free(ctr); threshold_timer_update_intv(); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id6c36432da7e7ce673c585bcae6772a695028ec5 Gerrit-Change-Number: 19306 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 17 17:40:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 17 Jul 2020 17:40:01 +0000 Subject: Change in osmo-trx[master]: Transceiver: Lower some log levels which have an associated counter In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19307 ) Change subject: Transceiver: Lower some log levels which have an associated counter ...................................................................... Transceiver: Lower some log levels which have an associated counter They are left as INFO instead of DEBUG since they show possible timing/performance issues in the setup. Change-Id: I8aab10054ac89c29b871259fdbe59636723ddfb6 --- M Transceiver52M/Transceiver.cpp 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Hoernchen: Looks good to me, approved laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 3be7746..55d0acd 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -445,7 +445,7 @@ mtx->lock(); while ((burst = mTxPriorityQueues[i].getStaleBurst(nowTime))) { - LOGCHAN(i, DTRXDDL, NOTICE) << "dumping STALE burst in TRX->SDR interface (" + LOGCHAN(i, DTRXDDL, INFO) << "dumping STALE burst in TRX->SDR interface (" << burst->getTime() <<" vs " << nowTime << "), retrans=" << state->mRetrans; state->ctrs.tx_stale_bursts++; ratectr_changed = true; @@ -469,7 +469,7 @@ modFN = nowTime.FN() % state->fillerModulus[TN]; bursts[i] = state->fillerTable[modFN][TN]; if (i == 0 && state->mFiller == FILLER_ZERO) { - LOGCHAN(i, DTRXDDL, NOTICE) << "No Tx burst available for " << nowTime + LOGCHAN(i, DTRXDDL, INFO) << "No Tx burst available for " << nowTime << ", retrans=" << state->mRetrans; state->ctrs.tx_unavailable_bursts++; ratectr_changed = true; @@ -1073,12 +1073,12 @@ if (delta == 1) { /* usual expected scenario, continue code flow */ } else if (delta == 0) { - LOGCHAN(chan, DTRXDDL, NOTICE) << "Rx TRXD msg with repeated FN " << currTime; + LOGCHAN(chan, DTRXDDL, INFO) << "Rx TRXD msg with repeated FN " << currTime; state->ctrs.tx_trxd_fn_repeated++; dispatch_trx_rate_ctr_change(state, chan); return true; } else if (delta < 0) { - LOGCHAN(chan, DTRXDDL, NOTICE) << "Rx TRXD msg with previous FN " << currTime + LOGCHAN(chan, DTRXDDL, INFO) << "Rx TRXD msg with previous FN " << currTime << " vs last " << state->last_dl_time_rcv[tn]; state->ctrs.tx_trxd_fn_outoforder++; dispatch_trx_rate_ctr_change(state, chan); @@ -1088,7 +1088,7 @@ * on consecutive FNs in TRX0 since it must transmit continuously in all * setups. Also, osmo-trx supports optionally filling empty bursts on * its own. In that case bts-trx is not obliged to submit all bursts. */ - LOGCHAN(chan, DTRXDDL, NOTICE) << "Rx TRXD msg with future FN " << currTime + LOGCHAN(chan, DTRXDDL, INFO) << "Rx TRXD msg with future FN " << currTime << " vs last " << state->last_dl_time_rcv[tn] << ", " << delta - 1 << " FN lost"; state->ctrs.tx_trxd_fn_skipped += delta - 1; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I8aab10054ac89c29b871259fdbe59636723ddfb6 Gerrit-Change-Number: 19307 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Jul 17 20:20:16 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Jul 2020 20:20:16 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Factory_ARM/aarch64 In-Reply-To: References: Message-ID: <5f120808c1c5c_1cad2af07274260047293c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Factory_ARM/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Factory_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 126s] Processing files: osmo-bsc-bs11-utils-1.6.0.184.3405c-1.1.aarch64 [ 126s] Provides: osmo-bsc-bs11-utils = 1.6.0.184.3405c-1.1 osmo-bsc-bs11-utils(aarch-64) = 1.6.0.184.3405c-1.1 [ 126s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 126s] Requires: ld-linux-aarch64.so.1()(64bit) ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) libc.so.6()(64bit) libc.so.6(GLIBC_2.17)(64bit) libosmoabis.so.6()(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.17)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 126s] Processing files: osmo-bsc-meas-utils-1.6.0.184.3405c-1.1.aarch64 [ 126s] Provides: osmo-bsc-meas-utils = 1.6.0.184.3405c-1.1 osmo-bsc-meas-utils(aarch-64) = 1.6.0.184.3405c-1.1 [ 126s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 126s] Requires: ld-linux-aarch64.so.1()(64bit) ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) libc.so.6()(64bit) libc.so.6(GLIBC_2.17)(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.17)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 126s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-1.1.aarch64 [ 126s] error: Installed (but unpackaged) file(s) found: [ 126s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 126s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 126s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 126s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 126s] [ 126s] [ 126s] RPM build errors: [ 126s] Installed (but unpackaged) file(s) found: [ 126s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 126s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 126s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 126s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 126s] ### VM INTERACTION START ### [ 129s] [ 118.630276] sysrq: Power Off [ 129s] [ 118.632066] reboot: Power down [ 130s] ### VM INTERACTION END ### [ 130s] [ 130s] obs-arm-8 failed "build osmo-bsc.spec" at Fri Jul 17 20:20:10 UTC 2020. [ 130s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 17 21:19:42 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Jul 2020 21:19:42 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f1215f9a273d_1cad2af072742600487412@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Testing/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 155s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 155s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 155s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 155s] | | [ 155s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 155s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 155s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 155s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 155s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 155s] 2425 | MHD_start_daemon (unsigned int flags, [ 155s] | ^~~~~~~~~~~~~~~~ [ 155s] cc1: all warnings being treated as errors [ 155s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 155s] make[3]: *** Waiting for unfinished jobs.... [ 156s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 156s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 156s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 156s] make[1]: *** [Makefile:166: all] Error 2 [ 156s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 156s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 156s] make: *** [debian/rules:9: build] Error 25 [ 156s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 156s] ### VM INTERACTION START ### [ 159s] [ 146.519122] sysrq: SysRq : Power Off [ 159s] [ 146.524501] reboot: Power down [ 159s] ### VM INTERACTION END ### [ 159s] [ 159s] lamb21 failed "build ulfius_2.5.2-4.1.dsc" at Fri Jul 17 21:19:25 UTC 2020. [ 159s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 17 21:21:59 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Jul 2020 21:21:59 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f12168ecbc30_1cad2af0727426004875e6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Testing/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 299s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 299s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 299s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 299s] | | [ 299s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 299s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 299s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 299s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 299s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 299s] 2425 | MHD_start_daemon (unsigned int flags, [ 299s] | ^~~~~~~~~~~~~~~~ [ 300s] cc1: all warnings being treated as errors [ 300s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 300s] make[3]: *** Waiting for unfinished jobs.... [ 300s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 300s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 300s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 300s] make[1]: *** [Makefile:166: all] Error 2 [ 300s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 300s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 300s] make: *** [debian/rules:9: build] Error 25 [ 300s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 300s] ### VM INTERACTION START ### [ 303s] [ 290.838262] sysrq: SysRq : Power Off [ 303s] [ 290.846134] reboot: Power down [ 303s] ### VM INTERACTION END ### [ 303s] [ 303s] lamb59 failed "build ulfius_2.5.2-4.1.dsc" at Fri Jul 17 21:21:54 UTC 2020. [ 303s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 18 01:38:33 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 18 Jul 2020 01:38:33 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <5f1252acae2ea_1cad2af0727426005341cd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 92s] Processing files: osmo-bsc-bs11-utils-1.6.0.184.3405c-2.1.i586 [ 92s] Provides: osmo-bsc-bs11-utils = 1.6.0.184.3405c-2.1 osmo-bsc-bs11-utils(x86-32) = 1.6.0.184.3405c-2.1 [ 92s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 92s] Requires: libc.so.6 libc.so.6(GLIBC_2.0) libc.so.6(GLIBC_2.1) libc.so.6(GLIBC_2.1.3) libc.so.6(GLIBC_2.15) libc.so.6(GLIBC_2.17) libc.so.6(GLIBC_2.3.4) libc.so.6(GLIBC_2.4) libc.so.6(GLIBC_2.7) libosmoabis.so.6 libosmocore.so.12 libosmogsm.so.13 libosmogsm.so.13(LIBOSMOGSM_1.0) libpthread.so.0 libpthread.so.0(GLIBC_2.0) libtalloc.so.2 libtalloc.so.2(TALLOC_2.0.2) [ 92s] Processing files: osmo-bsc-meas-utils-1.6.0.184.3405c-2.1.i586 [ 92s] Provides: osmo-bsc-meas-utils = 1.6.0.184.3405c-2.1 osmo-bsc-meas-utils(x86-32) = 1.6.0.184.3405c-2.1 [ 92s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 92s] Requires: libc.so.6 libc.so.6(GLIBC_2.0) libc.so.6(GLIBC_2.1.3) libc.so.6(GLIBC_2.3.4) libc.so.6(GLIBC_2.4) libosmocore.so.12 libosmogsm.so.13 libosmogsm.so.13(LIBOSMOGSM_1.0) libpthread.so.0 libpthread.so.0(GLIBC_2.0) libtalloc.so.2 libtalloc.so.2(TALLOC_2.0.2) [ 92s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-2.1.i386 [ 92s] error: Installed (but unpackaged) file(s) found: [ 92s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 92s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 92s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 92s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 92s] [ 92s] [ 92s] RPM build errors: [ 92s] Installed (but unpackaged) file(s) found: [ 92s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 92s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 92s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 92s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 92s] ### VM INTERACTION START ### [ 95s] [ 81.270181] sysrq: Power Off [ 95s] [ 81.274572] reboot: Power down [ 95s] ### VM INTERACTION END ### [ 95s] [ 95s] cloud112 failed "build osmo-bsc.spec" at Sat Jul 18 01:38:17 UTC 2020. [ 95s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 18 01:39:42 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 18 Jul 2020 01:39:42 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <5f1252eb73d58_1cad2af0727426005342aa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 66s] Processing files: osmo-bsc-bs11-utils-1.6.0.184.3405c-lp151.2.1.x86_64 [ 66s] Provides: osmo-bsc-bs11-utils = 1.6.0.184.3405c-lp151.2.1 osmo-bsc-bs11-utils(x86-64) = 1.6.0.184.3405c-lp151.2.1 [ 66s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 66s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.14)(64bit) libc.so.6(GLIBC_2.15)(64bit) libc.so.6(GLIBC_2.17)(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libc.so.6(GLIBC_2.7)(64bit) libosmoabis.so.6()(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.2.5)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 66s] Processing files: osmo-bsc-meas-utils-1.6.0.184.3405c-lp151.2.1.x86_64 [ 66s] Provides: osmo-bsc-meas-utils = 1.6.0.184.3405c-lp151.2.1 osmo-bsc-meas-utils(x86-64) = 1.6.0.184.3405c-lp151.2.1 [ 66s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 66s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.2.5)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 66s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-lp151.2.1.x86_64 [ 66s] error: Installed (but unpackaged) file(s) found: [ 66s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 66s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 66s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 66s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 66s] [ 66s] [ 66s] RPM build errors: [ 66s] Installed (but unpackaged) file(s) found: [ 66s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 66s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 66s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 66s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 66s] ### VM INTERACTION START ### [ 69s] [ 61.998752] sysrq: SysRq : Power Off [ 69s] [ 62.002300] reboot: Power down [ 69s] ### VM INTERACTION END ### [ 69s] [ 69s] lamb25 failed "build osmo-bsc.spec" at Sat Jul 18 01:39:25 UTC 2020. [ 69s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 18 01:39:42 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 18 Jul 2020 01:39:42 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <5f1252ec2c9a_1cad2af072742600534321@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 68s] Processing files: osmo-bsc-bs11-utils-1.6.0.184.3405c-lp152.2.1.x86_64 [ 68s] Provides: osmo-bsc-bs11-utils = 1.6.0.184.3405c-lp152.2.1 osmo-bsc-bs11-utils(x86-64) = 1.6.0.184.3405c-lp152.2.1 [ 68s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 68s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.14)(64bit) libc.so.6(GLIBC_2.15)(64bit) libc.so.6(GLIBC_2.17)(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libc.so.6(GLIBC_2.7)(64bit) libosmoabis.so.6()(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.2.5)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 68s] Processing files: osmo-bsc-meas-utils-1.6.0.184.3405c-lp152.2.1.x86_64 [ 68s] Provides: osmo-bsc-meas-utils = 1.6.0.184.3405c-lp152.2.1 osmo-bsc-meas-utils(x86-64) = 1.6.0.184.3405c-lp152.2.1 [ 68s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 68s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.2.5)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 68s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-lp152.2.1.x86_64 [ 68s] error: Installed (but unpackaged) file(s) found: [ 68s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 68s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 68s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 68s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 68s] [ 68s] [ 68s] RPM build errors: [ 68s] Installed (but unpackaged) file(s) found: [ 68s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 68s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 68s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 68s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 68s] ### VM INTERACTION START ### [ 72s] [ 64.644750] sysrq: Power Off [ 72s] [ 64.650216] reboot: Power down [ 72s] ### VM INTERACTION END ### [ 72s] [ 72s] lamb59 failed "build osmo-bsc.spec" at Sat Jul 18 01:39:37 UTC 2020. [ 72s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 18 01:40:16 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 18 Jul 2020 01:40:16 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Tumbleweed/x86_64 In-Reply-To: References: Message-ID: <5f1253062f7ba_1cad2af072742600534420@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 69s] Processing files: osmo-bsc-bs11-utils-1.6.0.184.3405c-2.1.x86_64 [ 69s] Provides: osmo-bsc-bs11-utils = 1.6.0.184.3405c-2.1 osmo-bsc-bs11-utils(x86-64) = 1.6.0.184.3405c-2.1 [ 69s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 69s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.14)(64bit) libc.so.6(GLIBC_2.15)(64bit) libc.so.6(GLIBC_2.17)(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libc.so.6(GLIBC_2.7)(64bit) libosmoabis.so.6()(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.2.5)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 69s] Processing files: osmo-bsc-meas-utils-1.6.0.184.3405c-2.1.x86_64 [ 69s] Provides: osmo-bsc-meas-utils = 1.6.0.184.3405c-2.1 osmo-bsc-meas-utils(x86-64) = 1.6.0.184.3405c-2.1 [ 69s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 69s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.2.5)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 69s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-2.1.x86_64 [ 69s] error: Installed (but unpackaged) file(s) found: [ 69s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 69s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 69s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 69s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 69s] [ 69s] [ 69s] RPM build errors: [ 69s] Installed (but unpackaged) file(s) found: [ 69s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 69s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 69s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 69s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 69s] ### VM INTERACTION START ### [ 72s] [ 64.620966] sysrq: Power Off [ 72s] [ 64.633251] reboot: Power down [ 72s] ### VM INTERACTION END ### [ 72s] [ 72s] lamb52 failed "build osmo-bsc.spec" at Sat Jul 18 01:40:05 UTC 2020. [ 72s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 18 01:41:08 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 18 Jul 2020 01:41:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in CentOS_8_Stream/x86_64 In-Reply-To: References: Message-ID: <5f1253443ebf8_1cad2af0727426005345a1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/CentOS_8_Stream/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in CentOS_8_Stream/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 128s] Processing files: osmo-bsc-bs11-utils-debuginfo-1.6.0.184.3405c-2.1.x86_64 [ 128s] Provides: debuginfo(build-id) = 453b191148d4290ab146fb51e7c12f07149da20d debuginfo(build-id) = 9f7a3eb701f7ece5533244da330f2ac40666d480 osmo-bsc-bs11-utils-debuginfo = 1.6.0.184.3405c-2.1 osmo-bsc-bs11-utils-debuginfo(x86-64) = 1.6.0.184.3405c-2.1 [ 128s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 128s] Recommends: osmo-bsc-debugsource(x86-64) = 1.6.0.184.3405c-2.1 [ 128s] Processing files: osmo-bsc-meas-utils-debuginfo-1.6.0.184.3405c-2.1.x86_64 [ 128s] Provides: debuginfo(build-id) = 50dcd459194cc734198bf46ed1de9c715b858024 osmo-bsc-meas-utils-debuginfo = 1.6.0.184.3405c-2.1 osmo-bsc-meas-utils-debuginfo(x86-64) = 1.6.0.184.3405c-2.1 [ 128s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 128s] Recommends: osmo-bsc-debugsource(x86-64) = 1.6.0.184.3405c-2.1 [ 128s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-2.1.x86_64 [ 128s] error: Installed (but unpackaged) file(s) found: [ 128s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 128s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 128s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 128s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 128s] [ 128s] [ 128s] RPM build errors: [ 128s] Installed (but unpackaged) file(s) found: [ 128s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 128s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 128s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 128s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 128s] ### VM INTERACTION START ### [ 129s] Powering off. [ 129s] [ 118.157275] reboot: Power down [ 129s] ### VM INTERACTION END ### [ 129s] [ 129s] lamb28 failed "build osmo-bsc.spec" at Sat Jul 18 01:41:05 UTC 2020. [ 129s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 18 02:52:33 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 18 Jul 2020 02:52:33 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Leap_15.1_ARM/aarch64 In-Reply-To: References: Message-ID: <5f126406a0dc3_1cad2af072742600540681@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Leap_15.1_ARM/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Leap_15.1_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 108s] Processing files: osmo-bsc-bs11-utils-1.6.0.184.3405c-lp151.2.1.aarch64 [ 108s] Provides: osmo-bsc-bs11-utils = 1.6.0.184.3405c-lp151.2.1 osmo-bsc-bs11-utils(aarch-64) = 1.6.0.184.3405c-lp151.2.1 [ 108s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 108s] Requires: ld-linux-aarch64.so.1()(64bit) ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) libc.so.6()(64bit) libc.so.6(GLIBC_2.17)(64bit) libosmoabis.so.6()(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.17)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 108s] Processing files: osmo-bsc-meas-utils-1.6.0.184.3405c-lp151.2.1.aarch64 [ 108s] Provides: osmo-bsc-meas-utils = 1.6.0.184.3405c-lp151.2.1 osmo-bsc-meas-utils(aarch-64) = 1.6.0.184.3405c-lp151.2.1 [ 108s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 108s] Requires: ld-linux-aarch64.so.1()(64bit) ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) libc.so.6()(64bit) libc.so.6(GLIBC_2.17)(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.17)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 108s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-lp151.2.1.aarch64 [ 108s] error: Installed (but unpackaged) file(s) found: [ 108s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 108s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 108s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 108s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 108s] [ 108s] [ 108s] RPM build errors: [ 108s] Installed (but unpackaged) file(s) found: [ 108s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 108s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 108s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 108s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 108s] ### VM INTERACTION START ### [ 111s] [ 101.358948] sysrq: SysRq : Power Off [ 111s] [ 101.361477] reboot: Power down [ 112s] ### VM INTERACTION END ### [ 112s] [ 112s] obs-arm-9 failed "build osmo-bsc.spec" at Sat Jul 18 02:52:32 UTC 2020. [ 112s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 18 03:03:42 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 18 Jul 2020 03:03:42 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in CentOS_8_Stream/aarch64 In-Reply-To: References: Message-ID: <5f12669c1af44_1cad2af07274260054130@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/CentOS_8_Stream/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in CentOS_8_Stream/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 170s] Processing files: osmo-bsc-bs11-utils-debuginfo-1.6.0.184.3405c-2.1.aarch64 [ 170s] Provides: debuginfo(build-id) = 190a28a4241cdad29aa6a984079dab07b93414f4 debuginfo(build-id) = 2c748ff7145705a1e162a6561c247c65dcc9b558 osmo-bsc-bs11-utils-debuginfo = 1.6.0.184.3405c-2.1 osmo-bsc-bs11-utils-debuginfo(aarch-64) = 1.6.0.184.3405c-2.1 [ 170s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 170s] Recommends: osmo-bsc-debugsource(aarch-64) = 1.6.0.184.3405c-2.1 [ 170s] Processing files: osmo-bsc-meas-utils-debuginfo-1.6.0.184.3405c-2.1.aarch64 [ 170s] Provides: debuginfo(build-id) = 60bbb0e5dd92498c86e36c0605c6a80ce6aed1ca osmo-bsc-meas-utils-debuginfo = 1.6.0.184.3405c-2.1 osmo-bsc-meas-utils-debuginfo(aarch-64) = 1.6.0.184.3405c-2.1 [ 170s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 170s] Recommends: osmo-bsc-debugsource(aarch-64) = 1.6.0.184.3405c-2.1 [ 170s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-2.1.aarch64 [ 170s] error: Installed (but unpackaged) file(s) found: [ 170s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 170s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 170s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 170s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 170s] [ 170s] [ 170s] RPM build errors: [ 170s] Installed (but unpackaged) file(s) found: [ 170s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 170s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 170s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 170s] /usr/share/doc/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 170s] ### VM INTERACTION START ### [ 171s] Powering off. [ 171s] [ 150.635698] reboot: Power down [ 171s] ### VM INTERACTION END ### [ 171s] [ 171s] obs-arm-9 failed "build osmo-bsc.spec" at Sat Jul 18 03:03:28 UTC 2020. [ 171s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 18 03:21:59 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 18 Jul 2020 03:21:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Factory_ARM/aarch64 In-Reply-To: References: Message-ID: <5f126aedf259c_1cad2af072742600544464@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Factory_ARM/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Factory_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 128s] Processing files: osmo-bsc-bs11-utils-1.6.0.184.3405c-2.1.aarch64 [ 128s] Provides: osmo-bsc-bs11-utils = 1.6.0.184.3405c-2.1 osmo-bsc-bs11-utils(aarch-64) = 1.6.0.184.3405c-2.1 [ 128s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 128s] Requires: ld-linux-aarch64.so.1()(64bit) ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) libc.so.6()(64bit) libc.so.6(GLIBC_2.17)(64bit) libosmoabis.so.6()(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.17)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 128s] Processing files: osmo-bsc-meas-utils-1.6.0.184.3405c-2.1.aarch64 [ 128s] Provides: osmo-bsc-meas-utils = 1.6.0.184.3405c-2.1 osmo-bsc-meas-utils(aarch-64) = 1.6.0.184.3405c-2.1 [ 128s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 128s] Requires: ld-linux-aarch64.so.1()(64bit) ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) libc.so.6()(64bit) libc.so.6(GLIBC_2.17)(64bit) libosmocore.so.12()(64bit) libosmogsm.so.13()(64bit) libosmogsm.so.13(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.17)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 128s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-2.1.aarch64 [ 128s] error: Installed (but unpackaged) file(s) found: [ 128s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 128s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 128s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 128s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 128s] [ 128s] [ 128s] RPM build errors: [ 128s] Installed (but unpackaged) file(s) found: [ 128s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 128s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 128s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 128s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 128s] ### VM INTERACTION START ### [ 131s] [ 114.668872] sysrq: Power Off [ 131s] [ 114.671068] reboot: Power down [ 131s] ### VM INTERACTION END ### [ 131s] [ 131s] obs-arm-8 failed "build osmo-bsc.spec" at Sat Jul 18 03:21:50 UTC 2020. [ 131s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 18 04:21:25 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 18 Jul 2020 04:21:25 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f1278e361807_1cad2af0727426005486ec@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Testing/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 112s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 112s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 112s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 112s] | | [ 112s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 112s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 112s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 112s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 112s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 112s] 2425 | MHD_start_daemon (unsigned int flags, [ 112s] | ^~~~~~~~~~~~~~~~ [ 112s] cc1: all warnings being treated as errors [ 112s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 112s] make[3]: *** Waiting for unfinished jobs.... [ 113s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 113s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 113s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 113s] make[1]: *** [Makefile:166: all] Error 2 [ 113s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 113s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 113s] make: *** [debian/rules:9: build] Error 25 [ 113s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 113s] ### VM INTERACTION START ### [ 116s] [ 105.140332] sysrq: SysRq : Power Off [ 116s] [ 105.143273] reboot: Power down [ 116s] ### VM INTERACTION END ### [ 116s] [ 116s] old-atreju5 failed "build ulfius_2.5.2-4.1.dsc" at Sat Jul 18 04:21:12 UTC 2020. [ 116s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 18 05:34:16 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 18 Jul 2020 05:34:16 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f1289e525f4c_1cad2af072742600555551@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Testing/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 114s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 114s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 114s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 114s] | | [ 114s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 114s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 114s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 114s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 114s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 114s] 2425 | MHD_start_daemon (unsigned int flags, [ 114s] | ^~~~~~~~~~~~~~~~ [ 114s] cc1: all warnings being treated as errors [ 114s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 114s] make[3]: *** Waiting for unfinished jobs.... [ 114s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 114s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 114s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 114s] make[1]: *** [Makefile:166: all] Error 2 [ 114s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 114s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 114s] make: *** [debian/rules:9: build] Error 25 [ 114s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 114s] ### VM INTERACTION START ### [ 117s] [ 106.004788] sysrq: SysRq : Power Off [ 117s] [ 106.011891] reboot: Power down [ 117s] ### VM INTERACTION END ### [ 117s] [ 117s] lamb19 failed "build ulfius_2.5.2-4.1.dsc" at Sat Jul 18 05:34:03 UTC 2020. [ 117s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 18 09:32:51 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 18 Jul 2020 09:32:51 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Leap_15.1_ARM/armv7l In-Reply-To: References: Message-ID: <5f12c1c881fbd_1cad2af072742600581011@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Leap_15.1_ARM/armv7l Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Leap_15.1_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 189s] Processing files: osmo-bsc-bs11-utils-1.6.0.184.3405c-lp151.2.1.armv7hl [ 189s] Provides: osmo-bsc-bs11-utils = 1.6.0.184.3405c-lp151.2.1 osmo-bsc-bs11-utils(armv7hl-32) = 1.6.0.184.3405c-lp151.2.1 [ 189s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 189s] Requires: ld-linux-armhf.so.3 ld-linux-armhf.so.3(GLIBC_2.4) libc.so.6 libc.so.6(GLIBC_2.15) libc.so.6(GLIBC_2.17) libc.so.6(GLIBC_2.4) libc.so.6(GLIBC_2.7) libgcc_s.so.1 libgcc_s.so.1(GCC_3.5) libosmoabis.so.6 libosmocore.so.12 libosmogsm.so.13 libosmogsm.so.13(LIBOSMOGSM_1.0) libpthread.so.0 libpthread.so.0(GLIBC_2.4) libtalloc.so.2 libtalloc.so.2(TALLOC_2.0.2) [ 189s] Processing files: osmo-bsc-meas-utils-1.6.0.184.3405c-lp151.2.1.armv7hl [ 189s] Provides: osmo-bsc-meas-utils = 1.6.0.184.3405c-lp151.2.1 osmo-bsc-meas-utils(armv7hl-32) = 1.6.0.184.3405c-lp151.2.1 [ 189s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 189s] Requires: ld-linux-armhf.so.3 ld-linux-armhf.so.3(GLIBC_2.4) libc.so.6 libc.so.6(GLIBC_2.4) libgcc_s.so.1 libgcc_s.so.1(GCC_3.5) libosmocore.so.12 libosmogsm.so.13 libosmogsm.so.13(LIBOSMOGSM_1.0) libpthread.so.0 libpthread.so.0(GLIBC_2.4) libtalloc.so.2 libtalloc.so.2(TALLOC_2.0.2) [ 189s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-lp151.2.1.arm [ 189s] error: Installed (but unpackaged) file(s) found: [ 189s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 189s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 189s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 189s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 189s] [ 189s] [ 189s] RPM build errors: [ 189s] Installed (but unpackaged) file(s) found: [ 189s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 189s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 189s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 189s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 189s] ### VM INTERACTION START ### [ 193s] [ 176.898250] sysrq: SysRq : Power Off [ 193s] [ 176.922618] reboot: Power down [ 194s] ### VM INTERACTION END ### [ 194s] [ 194s] obs-arm-5 failed "build osmo-bsc.spec" at Sat Jul 18 09:32:48 UTC 2020. [ 194s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 18 10:16:33 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 18 Jul 2020 10:16:33 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Factory_ARM/armv7l In-Reply-To: References: Message-ID: <5f12cc134aa30_1cad2af0727426005902af@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Factory_ARM/armv7l Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 143s] Processing files: osmo-bsc-bs11-utils-1.6.0.184.3405c-2.1.armv7hl [ 143s] Provides: osmo-bsc-bs11-utils = 1.6.0.184.3405c-2.1 osmo-bsc-bs11-utils(armv7hl-32) = 1.6.0.184.3405c-2.1 [ 143s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 143s] Requires: ld-linux-armhf.so.3 ld-linux-armhf.so.3(GLIBC_2.4) libc.so.6 libc.so.6(GLIBC_2.15) libc.so.6(GLIBC_2.17) libc.so.6(GLIBC_2.4) libc.so.6(GLIBC_2.7) libgcc_s.so.1 libgcc_s.so.1(GCC_3.5) libosmoabis.so.6 libosmocore.so.12 libosmogsm.so.13 libosmogsm.so.13(LIBOSMOGSM_1.0) libpthread.so.0 libpthread.so.0(GLIBC_2.4) libtalloc.so.2 libtalloc.so.2(TALLOC_2.0.2) [ 143s] Processing files: osmo-bsc-meas-utils-1.6.0.184.3405c-2.1.armv7hl [ 143s] Provides: osmo-bsc-meas-utils = 1.6.0.184.3405c-2.1 osmo-bsc-meas-utils(armv7hl-32) = 1.6.0.184.3405c-2.1 [ 143s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 143s] Requires: ld-linux-armhf.so.3 ld-linux-armhf.so.3(GLIBC_2.4) libc.so.6 libc.so.6(GLIBC_2.4) libgcc_s.so.1 libgcc_s.so.1(GCC_3.5) libosmocore.so.12 libosmogsm.so.13 libosmogsm.so.13(LIBOSMOGSM_1.0) libpthread.so.0 libpthread.so.0(GLIBC_2.4) libtalloc.so.2 libtalloc.so.2(TALLOC_2.0.2) [ 143s] Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.184.3405c-2.1.arm [ 143s] error: Installed (but unpackaged) file(s) found: [ 143s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 143s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 143s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 143s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 143s] [ 143s] [ 143s] RPM build errors: [ 143s] Installed (but unpackaged) file(s) found: [ 143s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.cfg [ 143s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 143s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 143s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg [ 143s] ### VM INTERACTION START ### [ 146s] [ 136.256441] sysrq: Power Off [ 146s] [ 136.283710] reboot: Power down [ 147s] ### VM INTERACTION END ### [ 147s] [ 147s] armbuild21 failed "build osmo-bsc.spec" at Sat Jul 18 10:16:32 UTC 2020. [ 147s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Jul 18 13:34:55 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 18 Jul 2020 13:34:55 +0000 Subject: Change in osmo-pcu[master]: bts: cosmetic: use DUMMY_VEC for padding where possible References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19308 ) Change subject: bts: cosmetic: use DUMMY_VEC for padding where possible ...................................................................... bts: cosmetic: use DUMMY_VEC for padding where possible Change-Id: I725a7bd1b0c4d2b0d73f1b6d1f16543bf3d9d9fe --- M src/bts.cpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/08/19308/1 diff --git a/src/bts.cpp b/src/bts.cpp index 617cd78..22b4c08 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -884,7 +884,7 @@ send_imm_ass_rej: /* Allocate a bit-vector for RR Immediate Assignment [Reject] */ struct bitvec *bv = bitvec_alloc(22, tall_pcu_ctx); /* without plen */ - bitvec_unhex(bv, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"); + bitvec_unhex(bv, DUMMY_VEC); /* standard '2B'O padding */ if (rc != 0) { LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment Reject on AGCH\n"); @@ -970,7 +970,7 @@ LOGPTBF(tbf, LOGL_INFO, "TX: START Immediate Assignment Downlink (PCH)\n"); bitvec *immediate_assignment = bitvec_alloc(22, tall_pcu_ctx); /* without plen */ - bitvec_unhex(immediate_assignment, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"); + bitvec_unhex(immediate_assignment, DUMMY_VEC); /* standard '2B'O padding */ /* use request reference that has maximum distance to current time, * so the assignment will not conflict with possible RACH requests. */ LOGP(DRLCMAC, LOGL_DEBUG, " - TRX=%d (%d) TS=%d TA=%d pollFN=%d\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I725a7bd1b0c4d2b0d73f1b6d1f16543bf3d9d9fe Gerrit-Change-Number: 19308 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 13:48:03 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 18 Jul 2020 13:48:03 +0000 Subject: Change in osmo-pcu[master]: encoding: drop log_alert_exit(), use OSMO_ASSERT() instead References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19309 ) Change subject: encoding: drop log_alert_exit(), use OSMO_ASSERT() instead ...................................................................... encoding: drop log_alert_exit(), use OSMO_ASSERT() instead Change-Id: Id5ef1c3c08dc7f264ad801e519d727d86f5ae5b8 --- M src/encoding.cpp 1 file changed, 2 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/09/19309/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index 92944f0..2564575 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -433,13 +433,6 @@ return plen; } -static inline void log_alert_exit(const char * error) -{ - LOGP(DRLCMACUL, LOGL_ERROR, "%s", error); - pcu_tx_txt_ind(PCU_OML_ALERT, error); - exit(1); -} - /* * Immediate assignment, sent on the CCCH/AGCH * see GSM 04.08, 9.1.18 and GSM 44.018, 9.1.18 + 10.5.2.16 @@ -494,9 +487,7 @@ // A zero-length LV. Just write L=0. bitvec_write_field(dest, &wp,0,8); - if ((wp % 8)) - log_alert_exit("Length of IMM.ASS without rest octets is not " - "multiple of 8 bits, PLEASE FIX!\n"); + OSMO_ASSERT(wp % 8 == 0); plen = wp / 8; @@ -748,9 +739,7 @@ bitvec_set_bytes(dest, mi, mi_len); // Mobile Identity wp += mi_len * 8; - if ((wp % 8)) - log_alert_exit("Length of PAG.REQ without rest octets is not " - "multiple of 8 bits, PLEASE FIX!\n"); + OSMO_ASSERT(wp % 8 == 0); plen = wp / 8; bitvec_write_field(dest, &wp,0x0,1); // "L" Notification List Number; NLN(PCH) = off -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id5ef1c3c08dc7f264ad801e519d727d86f5ae5b8 Gerrit-Change-Number: 19309 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 13:55:56 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 18 Jul 2020 13:55:56 +0000 Subject: Change in osmo-pcu[master]: encoding: assert() presence of Downlink TBF References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19310 ) Change subject: encoding: assert() presence of Downlink TBF ...................................................................... encoding: assert() presence of Downlink TBF This is not something that should normally happen. If it happens, then it's definitely a bug, and we should not tolerate it. Change-Id: I6e46ba42650f0db2399649b536a1d2b3f0fcbf04 --- M src/encoding.cpp 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/10/19310/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index 2564575..9dfd7c9 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -494,10 +494,7 @@ /* 3GPP TS 44.018 ?10.5.2.16 IA Rest Octets */ dest->cur_bit = wp; if (downlink) { - if (!as_dl_tbf(tbf)) { - LOGP(DRLCMACDL, LOGL_ERROR, "Cannot encode DL IMMEDIATE ASSIGNMENT without TBF\n"); - return -EINVAL; - } + OSMO_ASSERT(as_dl_tbf(tbf) != NULL); rc = write_ia_rest_downlink(as_dl_tbf(tbf), dest, polling, gsm48_ta_is_valid(ta), fn, alpha, gamma, ta_idx); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6e46ba42650f0db2399649b536a1d2b3f0fcbf04 Gerrit-Change-Number: 19310 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 14:47:34 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 18 Jul 2020 14:47:34 +0000 Subject: Change in osmo-sgsn[master]: gtphub: rename sgsn's oww osmo_sockaddr into sgsn_sockaddr References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19311 ) Change subject: gtphub: rename sgsn's oww osmo_sockaddr into sgsn_sockaddr ...................................................................... gtphub: rename sgsn's oww osmo_sockaddr into sgsn_sockaddr The osmo_ prefix should be only used for official struct/apis of libosmocore. This commit was done via `sed -i 's/osmo_sockaddr/sgsn_sockaddr/g'`. Change-Id: Ibb1ddce9ff1ffe7494de5cdb8ea1843c45fe4566 --- M include/osmocom/sgsn/gtphub.h M src/gtphub/gtphub.c M src/gtphub/gtphub_sock.c M tests/gtphub/gtphub_test.c 4 files changed, 95 insertions(+), 95 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/11/19311/1 diff --git a/include/osmocom/sgsn/gtphub.h b/include/osmocom/sgsn/gtphub.h index 8fd9f38..6a439b5 100644 --- a/include/osmocom/sgsn/gtphub.h +++ b/include/osmocom/sgsn/gtphub.h @@ -35,14 +35,14 @@ /* TODO move to osmocom/core/socket.c ? */ #include /* for IPPROTO_* etc */ -struct osmo_sockaddr { +struct sgsn_sockaddr { struct sockaddr_storage a; socklen_t l; }; /* TODO move to osmocom/core/socket.c ? */ /*! \brief Initialize a sockaddr - * \param[out] addr Valid osmo_sockaddr pointer to write result to + * \param[out] addr Valid sgsn_sockaddr pointer to write result to * \param[in] family Address Family like AF_INET, AF_INET6, AF_UNSPEC * \param[in] type Socket type like SOCK_DGRAM, SOCK_STREAM * \param[in] proto Protocol like IPPROTO_TCP, IPPROTO_UDP @@ -53,16 +53,16 @@ * Copy the first result from a getaddrinfo() call with the given parameters to * *addr and *addr_len. On error, do not change *addr and return nonzero. */ -int osmo_sockaddr_init(struct osmo_sockaddr *addr, +int sgsn_sockaddr_init(struct sgsn_sockaddr *addr, uint16_t family, uint16_t type, uint8_t proto, const char *host, uint16_t port); /* Conveniently pass AF_UNSPEC, SOCK_DGRAM and IPPROTO_UDP to - * osmo_sockaddr_init(). */ -static inline int osmo_sockaddr_init_udp(struct osmo_sockaddr *addr, + * sgsn_sockaddr_init(). */ +static inline int sgsn_sockaddr_init_udp(struct sgsn_sockaddr *addr, const char *host, uint16_t port) { - return osmo_sockaddr_init(addr, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, + return sgsn_sockaddr_init(addr, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, host, port); } @@ -71,25 +71,25 @@ * \param[in] addr_str_len Size of buffer addr_str points at. * \param[out] port_str Valid pointer to a buffer of length port_str_len. * \param[in] port_str_len Size of buffer port_str points at. - * \param[in] addr Binary representation as returned by osmo_sockaddr_init(). + * \param[in] addr Binary representation as returned by sgsn_sockaddr_init(). * \param[in] flags flags as passed to getnameinfo(). * \returns 0 on success, an error code on error. * * Return the IPv4 or IPv6 address string and the port (a.k.a. service) string - * representations of the given struct osmo_sockaddr in two caller provided + * representations of the given struct sgsn_sockaddr in two caller provided * char buffers. Flags of (NI_NUMERICHOST | NI_NUMERICSERV) return numeric * address and port. Either one of addr_str or port_str may be NULL, in which * case nothing is returned there. * - * See also osmo_sockaddr_to_str() (less flexible, but much more convenient). */ -int osmo_sockaddr_to_strs(char *addr_str, size_t addr_str_len, + * See also sgsn_sockaddr_to_str() (less flexible, but much more convenient). */ +int sgsn_sockaddr_to_strs(char *addr_str, size_t addr_str_len, char *port_str, size_t port_str_len, - const struct osmo_sockaddr *addr, + const struct sgsn_sockaddr *addr, int flags); -/*! \brief concatenate the parts returned by osmo_sockaddr_to_strs(). - * \param[in] addr Binary representation as returned by osmo_sockaddr_init(). +/*! \brief concatenate the parts returned by sgsn_sockaddr_to_strs(). + * \param[in] addr Binary representation as returned by sgsn_sockaddr_init(). * \param[in] buf A buffer to use for string operations. * \param[in] buf_len Length of the buffer. * \returns Address string (in buffer). @@ -98,33 +98,33 @@ * the form " port ". The returned string is valid until the * next invocation of this function. */ -const char *osmo_sockaddr_to_strb(const struct osmo_sockaddr *addr, +const char *sgsn_sockaddr_to_strb(const struct sgsn_sockaddr *addr, char *buf, size_t buf_len); -/*! \brief conveniently return osmo_sockaddr_to_strb() in a static buffer. - * \param[in] addr Binary representation as returned by osmo_sockaddr_init(). +/*! \brief conveniently return sgsn_sockaddr_to_strb() in a static buffer. + * \param[in] addr Binary representation as returned by sgsn_sockaddr_init(). * \returns Address string in static buffer. * - * See osmo_sockaddr_to_strb(). + * See sgsn_sockaddr_to_strb(). * - * Note: only one osmo_sockaddr_to_str() call will work per print/log - * statement. For two or more, use osmo_sockaddr_to_strb() with a separate + * Note: only one sgsn_sockaddr_to_str() call will work per print/log + * statement. For two or more, use sgsn_sockaddr_to_strb() with a separate * buffer each. */ -const char *osmo_sockaddr_to_str(const struct osmo_sockaddr *addr); +const char *sgsn_sockaddr_to_str(const struct sgsn_sockaddr *addr); -/*! \brief compare two osmo_sockaddr. +/*! \brief compare two sgsn_sockaddr. * \param[in] a The first address to compare. * \param[in] b The other address to compare. * \returns 0 if equal, otherwise -1 or 1. */ -int osmo_sockaddr_cmp(const struct osmo_sockaddr *a, - const struct osmo_sockaddr *b); +int sgsn_sockaddr_cmp(const struct sgsn_sockaddr *a, + const struct sgsn_sockaddr *b); /*! \brief Overwrite *dst with *src. * Like memcpy(), but copy only the valid bytes. */ -void osmo_sockaddr_copy(struct osmo_sockaddr *dst, - const struct osmo_sockaddr *src); +void sgsn_sockaddr_copy(struct sgsn_sockaddr *dst, + const struct sgsn_sockaddr *src); /* general */ @@ -179,7 +179,7 @@ /* Decode sa to gsna. Return 0 on success. If port is non-NULL, the port number * from sa is also returned. */ int gsn_addr_from_sockaddr(struct gsn_addr *gsna, uint16_t *port, - const struct osmo_sockaddr *sa); + const struct sgsn_sockaddr *sa); /* expiry */ @@ -389,7 +389,7 @@ struct gtphub_peer_addr *peer_addr; uint16_t port; unsigned int ref_count; /* references from other peers' seq_maps */ - struct osmo_sockaddr sa; /* a "cache" for (peer_addr->addr, port) */ + struct sgsn_sockaddr sa; /* a "cache" for (peer_addr->addr, port) */ int last_restart_count; /* 0..255 = valid, all else means unknown */ struct rate_ctr_group *counters_io; @@ -496,13 +496,13 @@ int gtphub_handle_buf(struct gtphub *hub, unsigned int side_idx, unsigned int port_idx, - const struct osmo_sockaddr *from_addr, + const struct sgsn_sockaddr *from_addr, uint8_t *buf, size_t received, time_t now, uint8_t **reply_buf, struct osmo_fd **to_ofd, - struct osmo_sockaddr *to_addr); + struct sgsn_sockaddr *to_addr); struct gtphub_peer_port *gtphub_port_have(struct gtphub *hub, struct gtphub_bind *bind, @@ -510,7 +510,7 @@ uint16_t port); struct gtphub_peer_port *gtphub_port_find_sa(const struct gtphub_bind *bind, - const struct osmo_sockaddr *addr); + const struct sgsn_sockaddr *addr); void gtphub_resolved_ggsn(struct gtphub *hub, const char *apn_oi_str, struct gsn_addr *resolved_addr, @@ -519,5 +519,5 @@ const char *gtphub_port_str(struct gtphub_peer_port *port); int gtphub_write(const struct osmo_fd *to, - const struct osmo_sockaddr *to_addr, + const struct sgsn_sockaddr *to_addr, const uint8_t *buf, size_t buf_len); diff --git a/src/gtphub/gtphub.c b/src/gtphub/gtphub.c index 7b355bf..c95696a 100644 --- a/src/gtphub/gtphub.c +++ b/src/gtphub/gtphub.c @@ -167,12 +167,12 @@ } int gsn_addr_from_sockaddr(struct gsn_addr *gsna, uint16_t *port, - const struct osmo_sockaddr *sa) + const struct sgsn_sockaddr *sa) { char addr_str[256]; char port_str[6]; - if (osmo_sockaddr_to_strs(addr_str, sizeof(addr_str), + if (sgsn_sockaddr_to_strs(addr_str, sizeof(addr_str), port_str, sizeof(port_str), sa, (NI_NUMERICHOST | NI_NUMERICSERV)) != 0) { @@ -925,7 +925,7 @@ /* Recv datagram from from->fd, write sender's address to *from_addr. * Return the number of bytes read, zero on error. */ static int gtphub_read(const struct osmo_fd *from, - struct osmo_sockaddr *from_addr, + struct sgsn_sockaddr *from_addr, uint8_t *buf, size_t buf_len) { OSMO_ASSERT(from_addr); @@ -946,7 +946,7 @@ } LOG(LOGL_DEBUG, "Received %d bytes from %s: %s%s\n", - (int)received, osmo_sockaddr_to_str(from_addr), + (int)received, sgsn_sockaddr_to_str(from_addr), osmo_hexdump(buf, received > 1000? 1000 : received), received > 1000 ? "..." : ""); @@ -1954,8 +1954,8 @@ struct gtphub *hub = from_sgsns_ofd->data; static uint8_t buf[4096]; - struct osmo_sockaddr from_addr; - struct osmo_sockaddr to_addr; + struct sgsn_sockaddr from_addr; + struct sgsn_sockaddr to_addr; struct osmo_fd *to_ofd; int len; uint8_t *reply_buf; @@ -1985,8 +1985,8 @@ struct gtphub *hub = from_ggsns_ofd->data; static uint8_t buf[4096]; - struct osmo_sockaddr from_addr; - struct osmo_sockaddr to_addr; + struct sgsn_sockaddr from_addr; + struct sgsn_sockaddr to_addr; struct osmo_fd *to_ofd; int len; uint8_t *reply_buf; @@ -2071,9 +2071,9 @@ static int gsn_addr_to_sockaddr(struct gsn_addr *src, uint16_t port, - struct osmo_sockaddr *dst) + struct sgsn_sockaddr *dst) { - return osmo_sockaddr_init_udp(dst, gsn_addr_to_str(src), port); + return sgsn_sockaddr_init_udp(dst, gsn_addr_to_str(src), port); } /* If p is an Echo request, replace p's data with the matching response and @@ -2107,7 +2107,7 @@ } struct gtphub_peer_port *gtphub_known_addr_have_port(const struct gtphub_bind *bind, - const struct osmo_sockaddr *addr); + const struct sgsn_sockaddr *addr); /* Parse buffer as GTP packet, replace elements in-place and return the ofd and * address to forward to. Return a pointer to the osmo_fd, but copy the @@ -2117,13 +2117,13 @@ int gtphub_handle_buf(struct gtphub *hub, unsigned int side_idx, unsigned int plane_idx, - const struct osmo_sockaddr *from_addr, + const struct sgsn_sockaddr *from_addr, uint8_t *buf, size_t received, time_t now, uint8_t **reply_buf, struct osmo_fd **to_ofd, - struct osmo_sockaddr *to_addr) + struct sgsn_sockaddr *to_addr) { struct gtphub_bind *from_bind = &hub->to_gsns[side_idx][plane_idx]; struct gtphub_bind *to_bind = &hub->to_gsns[other_side_idx(side_idx)][plane_idx]; @@ -2138,7 +2138,7 @@ (side_idx == GTPH_SIDE_GGSN)? "<-" : "->", gtphub_plane_idx_names[plane_idx], gtphub_side_idx_names[side_idx], - osmo_sockaddr_to_str(from_addr), + sgsn_sockaddr_to_str(from_addr), gtp_type_str(p.type)); if (p.rc <= 0) { @@ -2146,7 +2146,7 @@ gtp_type_str(p.type), gtphub_side_idx_names[side_idx], gtphub_plane_idx_names[plane_idx], - osmo_sockaddr_to_str(from_addr)); + sgsn_sockaddr_to_str(from_addr)); return -1; } @@ -2156,7 +2156,7 @@ reply_len = gtphub_handle_echo_req(hub, &p, reply_buf); if (reply_len > 0) { /* It was an echo. Nothing left to do. */ - osmo_sockaddr_copy(to_addr, from_addr); + sgsn_sockaddr_copy(to_addr, from_addr); *to_ofd = &from_bind->ofd; rate_ctr_inc(&from_bind->counters_io->ctr[GTPH_CTR_PKTS_OUT]); @@ -2165,7 +2165,7 @@ LOG(LOGL_DEBUG, "%s Echo response to %s: %d bytes to %s\n", (side_idx == GTPH_SIDE_GGSN)? "-->" : "<--", gtphub_side_idx_names[side_idx], - (int)reply_len, osmo_sockaddr_to_str(to_addr)); + (int)reply_len, sgsn_sockaddr_to_str(to_addr)); return reply_len; } if (reply_len < 0) @@ -2178,7 +2178,7 @@ * so no-one else is allowed to talk to us from that side. */ struct gtphub_peer_port *from_peer = hub->proxy[side_idx][plane_idx]; if (from_peer) { - if (osmo_sockaddr_cmp(&from_peer->sa, from_addr) != 0) { + if (sgsn_sockaddr_cmp(&from_peer->sa, from_addr) != 0) { LOG(LOGL_ERROR, "Rejecting: %s proxy configured, but GTP packet" " received on %s bind is from another sender:" @@ -2186,7 +2186,7 @@ gtphub_side_idx_names[side_idx], gtphub_side_idx_names[side_idx], gtphub_port_str(from_peer), - osmo_sockaddr_to_str(from_addr)); + sgsn_sockaddr_to_str(from_addr)); return -1; } } @@ -2204,7 +2204,7 @@ if (side_idx == GTPH_SIDE_GGSN) { LOG(LOGL_ERROR, "Dropping packet%s: unknown GGSN peer: %s\n", gtp_type_str(p.type), - osmo_sockaddr_to_str(from_addr)); + sgsn_sockaddr_to_str(from_addr)); return -1; } else { /* SGSN */ @@ -2216,7 +2216,7 @@ "Dropping packet%s: User plane peer was not" "announced by PDP Context: %s\n", gtp_type_str(p.type), - osmo_sockaddr_to_str(from_addr)); + sgsn_sockaddr_to_str(from_addr)); return -1; } @@ -2235,7 +2235,7 @@ LOG(LOGL_ERROR, "Dropping packet%s: invalid %s peer: %s\n", gtp_type_str(p.type), gtphub_side_idx_names[side_idx], - osmo_sockaddr_to_str(from_addr)); + sgsn_sockaddr_to_str(from_addr)); return -1; } @@ -2309,7 +2309,7 @@ if (!to_peer_from_seq) gtphub_map_seq(&p, from_peer, to_peer); - osmo_sockaddr_copy(to_addr, &to_peer->sa); + sgsn_sockaddr_copy(to_addr, &to_peer->sa); *reply_buf = (uint8_t*)p.data; @@ -2335,7 +2335,7 @@ (side_idx == GTPH_SIDE_SGSN)? "-->" : "<--", gtphub_side_idx_names[other_side_idx(side_idx)], p.header_tei, p.seq, - (int)received, osmo_sockaddr_to_str(to_addr)); + (int)received, sgsn_sockaddr_to_str(to_addr)); return received; } @@ -2645,7 +2645,7 @@ } struct gtphub_peer_port *gtphub_port_find_sa(const struct gtphub_bind *bind, - const struct osmo_sockaddr *addr) + const struct sgsn_sockaddr *addr) { struct gsn_addr gsna; uint16_t port; @@ -2762,7 +2762,7 @@ /* Find a GGSN peer with a matching address. If the address is known but the * port not, create a new port for that peer address. */ struct gtphub_peer_port *gtphub_known_addr_have_port(const struct gtphub_bind *bind, - const struct osmo_sockaddr *addr) + const struct sgsn_sockaddr *addr) { struct gtphub_peer_addr *pa; struct gtphub_peer_port *pp; @@ -2817,7 +2817,7 @@ /* TODO move to osmocom/core/socket.c ? */ /* use this in osmo_sock_init() to remove dup. */ -/* Internal: call getaddrinfo for osmo_sockaddr_init(). The caller is required +/* Internal: call getaddrinfo for sgsn_sockaddr_init(). The caller is required to call freeaddrinfo(*result), iff zero is returned. */ static int _osmo_getaddrinfo(struct addrinfo **result, uint16_t family, uint16_t type, uint8_t proto, @@ -2844,7 +2844,7 @@ } /* TODO move to osmocom/core/socket.c ? */ -int osmo_sockaddr_init(struct osmo_sockaddr *addr, +int sgsn_sockaddr_init(struct sgsn_sockaddr *addr, uint16_t family, uint16_t type, uint8_t proto, const char *host, uint16_t port) { @@ -2865,9 +2865,9 @@ return 0; } -int osmo_sockaddr_to_strs(char *addr_str, size_t addr_str_len, +int sgsn_sockaddr_to_strs(char *addr_str, size_t addr_str_len, char *port_str, size_t port_str_len, - const struct osmo_sockaddr *addr, + const struct sgsn_sockaddr *addr, int flags) { int rc; @@ -2896,14 +2896,14 @@ return rc; } -const char *osmo_sockaddr_to_strb(const struct osmo_sockaddr *addr, +const char *sgsn_sockaddr_to_strb(const struct sgsn_sockaddr *addr, char *buf, size_t buf_len) { const int portbuf_len = 6; OSMO_ASSERT(buf_len > portbuf_len); char *portbuf = buf + buf_len - portbuf_len; buf_len -= portbuf_len; - if (osmo_sockaddr_to_strs(buf, buf_len, + if (sgsn_sockaddr_to_strs(buf, buf_len, portbuf, portbuf_len, addr, NI_NUMERICHOST | NI_NUMERICSERV)) @@ -2918,17 +2918,17 @@ return buf; } -const char *osmo_sockaddr_to_str(const struct osmo_sockaddr *addr) +const char *sgsn_sockaddr_to_str(const struct sgsn_sockaddr *addr) { static char buf[256]; - const char *result = osmo_sockaddr_to_strb(addr, buf, sizeof(buf)); + const char *result = sgsn_sockaddr_to_strb(addr, buf, sizeof(buf)); if (! result) return "(invalid)"; return result; } -int osmo_sockaddr_cmp(const struct osmo_sockaddr *a, - const struct osmo_sockaddr *b) +int sgsn_sockaddr_cmp(const struct sgsn_sockaddr *a, + const struct sgsn_sockaddr *b) { if (a == b) return 0; @@ -2938,7 +2938,7 @@ return 1; if (a->l != b->l) { /* Lengths are not the same, but determine the order. Will - * anyone ever sort a list by osmo_sockaddr though...? */ + * anyone ever sort a list by sgsn_sockaddr though...? */ int cmp = memcmp(&a->a, &b->a, (a->l < b->l)? a->l : b->l); if (cmp == 0) { if (a->l < b->l) @@ -2951,8 +2951,8 @@ return memcmp(&a->a, &b->a, a->l); } -void osmo_sockaddr_copy(struct osmo_sockaddr *dst, - const struct osmo_sockaddr *src) +void sgsn_sockaddr_copy(struct sgsn_sockaddr *dst, + const struct sgsn_sockaddr *src) { OSMO_ASSERT(src->l <= sizeof(dst->a)); memcpy(&dst->a, &src->a, src->l); diff --git a/src/gtphub/gtphub_sock.c b/src/gtphub/gtphub_sock.c index 1acd5a6..1837533 100644 --- a/src/gtphub/gtphub_sock.c +++ b/src/gtphub/gtphub_sock.c @@ -33,13 +33,13 @@ LOGP(DGTPHUB, level, fmt, ##args) int gtphub_write(const struct osmo_fd *to, - const struct osmo_sockaddr *to_addr, + const struct sgsn_sockaddr *to_addr, const uint8_t *buf, size_t buf_len) { errno = 0; ssize_t sent = sendto(to->fd, buf, buf_len, 0, (struct sockaddr*)&to_addr->a, to_addr->l); - LOG(LOGL_DEBUG, "to %s\n", osmo_sockaddr_to_str(to_addr)); + LOG(LOGL_DEBUG, "to %s\n", sgsn_sockaddr_to_str(to_addr)); if (sent == -1) { LOG(LOGL_ERROR, "error: %s\n", strerror(errno)); diff --git a/tests/gtphub/gtphub_test.c b/tests/gtphub/gtphub_test.c index ed46176..d381b9b 100644 --- a/tests/gtphub/gtphub_test.c +++ b/tests/gtphub/gtphub_test.c @@ -378,37 +378,37 @@ char resolve_ggsn_got_imsi[GSM23003_IMSI_MAX_DIGITS+1]; char resolve_ggsn_got_ni[GSM_APN_LENGTH]; -struct osmo_sockaddr resolved_ggsn_addr; +struct sgsn_sockaddr resolved_ggsn_addr; static int resolve_to_ggsn(const char *addr, uint16_t port) { - LVL2_ASSERT(osmo_sockaddr_init_udp(&resolved_ggsn_addr, + LVL2_ASSERT(sgsn_sockaddr_init_udp(&resolved_ggsn_addr, addr, port) == 0); return 1; } -struct osmo_sockaddr resolved_sgsn_addr; +struct sgsn_sockaddr resolved_sgsn_addr; static int resolve_to_sgsn(const char *addr, uint16_t port) { - LVL2_ASSERT(osmo_sockaddr_init_udp(&resolved_sgsn_addr, + LVL2_ASSERT(sgsn_sockaddr_init_udp(&resolved_sgsn_addr, addr, port) == 0); return 1; } -struct osmo_sockaddr sgsn_sender; +struct sgsn_sockaddr sgsn_sender; static int send_from_sgsn(const char *addr, uint16_t port) { - LVL2_ASSERT(osmo_sockaddr_init_udp(&sgsn_sender, + LVL2_ASSERT(sgsn_sockaddr_init_udp(&sgsn_sender, addr, port) == 0); return 1; } -struct osmo_sockaddr ggsn_sender; +struct sgsn_sockaddr ggsn_sender; static int send_from_ggsn(const char *addr, uint16_t port) { - LVL2_ASSERT(osmo_sockaddr_init_udp(&ggsn_sender, + LVL2_ASSERT(sgsn_sockaddr_init_udp(&ggsn_sender, addr, port) == 0); return 1; @@ -491,18 +491,18 @@ /* override, requires '-Wl,--wrap=gtphub_write' */ int __real_gtphub_write(const struct osmo_fd *to, - const struct osmo_sockaddr *to_addr, + const struct sgsn_sockaddr *to_addr, const uint8_t *buf, size_t buf_len); int __wrap_gtphub_write(const struct osmo_fd *to, - const struct osmo_sockaddr *to_addr, + const struct sgsn_sockaddr *to_addr, const uint8_t *buf, size_t buf_len) { printf("Out-of-band gtphub_write(%d):\n" "to %s\n" "%s\n", (int)buf_len, - osmo_sockaddr_to_str(to_addr), + sgsn_sockaddr_to_str(to_addr), osmo_hexdump(buf, buf_len)); return 0; } @@ -553,11 +553,11 @@ } #define same_addr(GOT, EXPECTED) _same_addr((GOT),(EXPECTED), __FILE__, __LINE__) -static int _same_addr(const struct osmo_sockaddr *got, - const struct osmo_sockaddr *expected, +static int _same_addr(const struct sgsn_sockaddr *got, + const struct sgsn_sockaddr *expected, const char *file, int line) { - int cmp = osmo_sockaddr_cmp(got, expected); + int cmp = sgsn_sockaddr_cmp(got, expected); if (!cmp) return 1; char buf[256]; @@ -565,8 +565,8 @@ " expecting: '%s'\n" " got: '%s'\n\n", file, line, - osmo_sockaddr_to_str(expected), - osmo_sockaddr_to_strb(got, buf, sizeof(buf))); + sgsn_sockaddr_to_str(expected), + sgsn_sockaddr_to_strb(got, buf, sizeof(buf))); return 0; } @@ -668,7 +668,7 @@ now = 123; struct osmo_fd *to_ofd; - struct osmo_sockaddr to_addr; + struct sgsn_sockaddr to_addr; struct gtphub_peer_port *pp; int send; @@ -855,13 +855,13 @@ #define msg_from_sgsn_c(A,B,C,D) msg_from_sgsn(GTPH_PLANE_CTRL, A,B,C,D) #define msg_from_sgsn_u(A,B,C,D) msg_from_sgsn(GTPH_PLANE_USER, A,B,C,D) static int msg_from_sgsn(int plane_idx, - struct osmo_sockaddr *_sgsn_sender, - struct osmo_sockaddr *ggsn_receiver, + struct sgsn_sockaddr *_sgsn_sender, + struct sgsn_sockaddr *ggsn_receiver, const char *hex_from_sgsn, const char *hex_to_ggsn) { struct osmo_fd *ggsn_ofd = NULL; - struct osmo_sockaddr ggsn_addr; + struct sgsn_sockaddr ggsn_addr; int send; send = gtphub_handle_buf(hub, GTPH_SIDE_SGSN, plane_idx, _sgsn_sender, buf, msg(hex_from_sgsn), now, @@ -875,13 +875,13 @@ #define msg_from_ggsn_c(A,B,C,D) msg_from_ggsn(GTPH_PLANE_CTRL, A,B,C,D) #define msg_from_ggsn_u(A,B,C,D) msg_from_ggsn(GTPH_PLANE_USER, A,B,C,D) static int msg_from_ggsn(int plane_idx, - struct osmo_sockaddr *ggsn_sender, - struct osmo_sockaddr *sgsn_receiver, + struct sgsn_sockaddr *ggsn_sender, + struct sgsn_sockaddr *sgsn_receiver, const char *msg_from_ggsn, const char *msg_to_sgsn) { struct osmo_fd *sgsn_ofd; - struct osmo_sockaddr sgsn_addr; + struct sgsn_sockaddr sgsn_addr; int send; send = gtphub_handle_buf(hub, GTPH_SIDE_GGSN, plane_idx, ggsn_sender, buf, msg(msg_from_ggsn), now, -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ibb1ddce9ff1ffe7494de5cdb8ea1843c45fe4566 Gerrit-Change-Number: 19311 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 14:48:07 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 18 Jul 2020 14:48:07 +0000 Subject: Change in osmo-sgsn[master]: gtphub: rename sgsn's oww osmo_sockaddr into sgsn_sockaddr In-Reply-To: References: Message-ID: lynxis lazus has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19311 ) Change subject: gtphub: rename sgsn's oww osmo_sockaddr into sgsn_sockaddr ...................................................................... gtphub: rename sgsn's oww osmo_sockaddr into sgsn_sockaddr The osmo_ prefix should be only used for official struct/apis of libosmocore. This commit was done via `sed -i 's/osmo_sockaddr/sgsn_sockaddr/g'`. In prepartion of introducing a different api of osmo_sockaddr to libosmocore. Change-Id: Ibb1ddce9ff1ffe7494de5cdb8ea1843c45fe4566 --- M include/osmocom/sgsn/gtphub.h M src/gtphub/gtphub.c M src/gtphub/gtphub_sock.c M tests/gtphub/gtphub_test.c 4 files changed, 95 insertions(+), 95 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/11/19311/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ibb1ddce9ff1ffe7494de5cdb8ea1843c45fe4566 Gerrit-Change-Number: 19311 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 15:11:24 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 18 Jul 2020 15:11:24 +0000 Subject: Change in osmo-sgsn[master]: gtphub: rename sgsn's oww osmo_sockaddr into sgsn_sockaddr In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19311 ) Change subject: gtphub: rename sgsn's oww osmo_sockaddr into sgsn_sockaddr ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ibb1ddce9ff1ffe7494de5cdb8ea1843c45fe4566 Gerrit-Change-Number: 19311 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 18 Jul 2020 15:11:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 16:25:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 18 Jul 2020 16:25:50 +0000 Subject: Change in osmo-pcu[master]: bts: cosmetic: use DUMMY_VEC for padding where possible In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19308 ) Change subject: bts: cosmetic: use DUMMY_VEC for padding where possible ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I725a7bd1b0c4d2b0d73f1b6d1f16543bf3d9d9fe Gerrit-Change-Number: 19308 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 18 Jul 2020 16:25:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 16:27:17 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 18 Jul 2020 16:27:17 +0000 Subject: Change in osmo-pcu[master]: encoding: drop log_alert_exit(), use OSMO_ASSERT() instead In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19309 ) Change subject: encoding: drop log_alert_exit(), use OSMO_ASSERT() instead ...................................................................... Patch Set 1: why? isn't it good to alert through OML? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id5ef1c3c08dc7f264ad801e519d727d86f5ae5b8 Gerrit-Change-Number: 19309 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 18 Jul 2020 16:27:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 16:29:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 18 Jul 2020 16:29:32 +0000 Subject: Change in osmo-pcu[master]: encoding: assert() presence of Downlink TBF In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19310 ) Change subject: encoding: assert() presence of Downlink TBF ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/19310/1/src/encoding.cpp File src/encoding.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/19310/1/src/encoding.cpp at 497 PS1, Line 497: OSMO_ASSERT(as_dl_tbf(tbf) != NULL); what about keeping the log msg? it may be useful for instance if gsmtap log is used. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6e46ba42650f0db2399649b536a1d2b3f0fcbf04 Gerrit-Change-Number: 19310 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 18 Jul 2020 16:29:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 16:30:25 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 18 Jul 2020 16:30:25 +0000 Subject: Change in osmo-pcu[master]: encoding: drop log_alert_exit(), use OSMO_ASSERT() instead In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19309 ) Change subject: encoding: drop log_alert_exit(), use OSMO_ASSERT() instead ...................................................................... Patch Set 1: > Patch Set 1: > > why? isn't it good to alert through OML? Well, what would the operator of the BSC/BTS see? If osmo-pcu fails to encode an octet-aligned payload as required by the specs., it's definitely a bug in osmo-pcu. It should never happen. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id5ef1c3c08dc7f264ad801e519d727d86f5ae5b8 Gerrit-Change-Number: 19309 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 18 Jul 2020 16:30:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:32:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:32:34 +0000 Subject: Change in osmo-bsc[master]: remove examples/osmo-bsc/ericsson/osmo-bsc.cfg References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19312 ) Change subject: remove examples/osmo-bsc/ericsson/osmo-bsc.cfg ...................................................................... remove examples/osmo-bsc/ericsson/osmo-bsc.cfg This was an accidential copy of osmo-bsc.rbs2308.cfg Change-Id: I89c6c0fc2b9ec0054e71827118ddaa85fe3e9318 --- D doc/examples/osmo-bsc/ericsson/osmo-bsc.cfg 1 file changed, 0 insertions(+), 101 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/12/19312/1 diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.cfg deleted file mode 100644 index f79d457..0000000 --- a/doc/examples/osmo-bsc/ericsson/osmo-bsc.cfg +++ /dev/null @@ -1,101 +0,0 @@ -! -! OpenBSC (0.9.11.308-62d46) configuration saved from vty -!! -password foo -! -line vty - no login -! -log stderr - logging level lmi info - logging level linp info - logging level nm debug - logging level rsl debug - logging level llapd notice -log file bsc-rbs2k.log - logging timestamp 1 - logging filter all 1 - logging level lmi info - logging level linp info - logging level nm debug - logging level rsl debug -network - network country code 262 - mobile network code 42 - neci 0 - paging any use tch 0 - handover 0 - handover window rxlev averaging 10 - handover window rxqual averaging 1 - handover window rxlev neighbor averaging 10 - handover power budget interval 6 - handover power budget hysteresis 3 - handover maximum distance 9999 - timer t3101 10 - timer t3105 40 - timer t3109 4 - timer t3113 60 - bts 0 - type rbs2000 - band PCS1900 - cell_identity 0 - location_area_code 1 - training_sequence_code 7 - base_station_id_code 63 - ms max power 33 - cell reselection hysteresis 4 - rxlev access min 0 - channel allocator descending - rach tx integer 9 - rach max transmission 7 - oml e1 line 0 timeslot 1 sub-slot full - oml e1 tei 62 - neighbor-list mode automatic - gprs mode none - is-connection-list add 4 512 12 - is-connection-list add 16 524 12 - is-connection-list add 28 536 12 - is-connection-list add 40 548 12 - trx 0 - rf_locked 0 - arfcn 800 - nominal power 43 - max_power_red 14 - rsl e1 line 0 timeslot 1 sub-slot full - rsl e1 tei 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - hopping enabled 0 - e1 line 0 timeslot 1 sub-slot full - timeslot 1 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 2 sub-slot 1 - timeslot 2 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 2 sub-slot 2 - timeslot 3 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 2 sub-slot 3 - timeslot 4 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 3 sub-slot 0 - timeslot 5 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 3 sub-slot 1 - timeslot 6 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 3 sub-slot 2 - timeslot 7 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 3 sub-slot 3 -e1_input - e1_line 0 driver dahdi - e1_line 0 port 1 - pcap 20200703-rbs2k-10.pcap -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I89c6c0fc2b9ec0054e71827118ddaa85fe3e9318 Gerrit-Change-Number: 19312 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:32:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:32:35 +0000 Subject: Change in osmo-bsc[master]: osmo-bsc.spec.in: Package E1 config files References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19313 ) Change subject: osmo-bsc.spec.in: Package E1 config files ...................................................................... osmo-bsc.spec.in: Package E1 config files This resolves: [ 272s] error: Installed (but unpackaged) file(s) found: [ 272s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 272s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 272s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg Change-Id: I07329564152d6b4314f1ed90a221478e2d765b47 --- M contrib/osmo-bsc.spec.in 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/13/19313/1 diff --git a/contrib/osmo-bsc.spec.in b/contrib/osmo-bsc.spec.in index 1d44940..1120bf7 100644 --- a/contrib/osmo-bsc.spec.in +++ b/contrib/osmo-bsc.spec.in @@ -124,6 +124,7 @@ %{_docdir}/%{name}/examples/osmo-bsc/osmo-bsc.cfg %{_docdir}/%{name}/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg %{_docdir}/%{name}/examples/osmo-bsc/osmo-bsc-minimal.cfg +%{_docdir}/%{name}/examples/osmo-bsc/*/osmo-bsc*.cfg %dir %{_sysconfdir}/osmocom %config(noreplace) %{_sysconfdir}/osmocom/osmo-bsc.cfg %{_unitdir}/%{name}.service -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I07329564152d6b4314f1ed90a221478e2d765b47 Gerrit-Change-Number: 19313 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:32:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:32:35 +0000 Subject: Change in osmo-bsc[master]: debian: Package E1 configuration file examples References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19314 ) Change subject: debian: Package E1 configuration file examples ...................................................................... debian: Package E1 configuration file examples Change-Id: Idf06c5fa7eb0ea6b73dcc3b67718b3a0a755796f --- M debian/osmo-bsc.install 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/14/19314/1 diff --git a/debian/osmo-bsc.install b/debian/osmo-bsc.install index 8f91b03..e60bb50 100644 --- a/debian/osmo-bsc.install +++ b/debian/osmo-bsc.install @@ -3,3 +3,4 @@ usr/bin/osmo-bsc usr/share/doc/osmo-bsc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg usr/share/doc/osmo-bsc/examples usr/share/doc/osmo-bsc/examples/osmo-bsc/osmo-bsc.cfg usr/share/doc/osmo-bsc/examples +usr/share/doc/osmo-bsc/examples/osmo-bsc/*/osmo-bsc*.cfg usr/share/doc/osmo-bsc/examples -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19314 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idf06c5fa7eb0ea6b73dcc3b67718b3a0a755796f Gerrit-Change-Number: 19314 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:33:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:33:05 +0000 Subject: Change in osmo-bsc[master]: remove examples/osmo-bsc/ericsson/osmo-bsc.cfg In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19312 ) Change subject: remove examples/osmo-bsc/ericsson/osmo-bsc.cfg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I89c6c0fc2b9ec0054e71827118ddaa85fe3e9318 Gerrit-Change-Number: 19312 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sat, 18 Jul 2020 21:33:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:33:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:33:14 +0000 Subject: Change in osmo-bsc[master]: osmo-bsc.spec.in: Package E1 config files In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19313 ) Change subject: osmo-bsc.spec.in: Package E1 config files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I07329564152d6b4314f1ed90a221478e2d765b47 Gerrit-Change-Number: 19313 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sat, 18 Jul 2020 21:33:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:37:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:37:30 +0000 Subject: Change in osmo-pcu[master]: bts: cosmetic: use DUMMY_VEC for padding where possible In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19308 ) Change subject: bts: cosmetic: use DUMMY_VEC for padding where possible ...................................................................... Patch Set 1: Code-Review+2 not sure I agree with the name (DUMMY != PADDING), but you're just using the #define here, not introducing it. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I725a7bd1b0c4d2b0d73f1b6d1f16543bf3d9d9fe Gerrit-Change-Number: 19308 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 18 Jul 2020 21:37:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:39:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:39:24 +0000 Subject: Change in osmo-pcu[master]: encoding: drop log_alert_exit(), use OSMO_ASSERT() instead In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19309 ) Change subject: encoding: drop log_alert_exit(), use OSMO_ASSERT() instead ...................................................................... Patch Set 1: Code-Review+1 in general it is good to send ALERT via the BTS, as in most production deployments I doubt there is some kind of log aggregation in place for PCU+BTS, and anything not reported back via Abis is probably never looked at. However, this only applies for errors we actually expect to happen in the field, and not for clear programming bugs. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id5ef1c3c08dc7f264ad801e519d727d86f5ae5b8 Gerrit-Change-Number: 19309 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 18 Jul 2020 21:39:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:42:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:42:16 +0000 Subject: Change in osmo-pcu[master]: encoding: assert() presence of Downlink TBF In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19310 ) Change subject: encoding: assert() presence of Downlink TBF ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/19310/1/src/encoding.cpp File src/encoding.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/19310/1/src/encoding.cpp at 497 PS1, Line 497: OSMO_ASSERT(as_dl_tbf(tbf) != NULL); > what about keeping the log msg? it may be useful for instance if gsmtap log is used. UNRELATED: maybe we should make sure that osmo_panic_default() sends a GSMTAP packet, if gsmtap logging is enabled? This way the infrastructure takes care of it, not having to rely on developers sending an explicit log message before OSMO_ASSERT()? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6e46ba42650f0db2399649b536a1d2b3f0fcbf04 Gerrit-Change-Number: 19310 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 18 Jul 2020 21:42:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:42:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:42:52 +0000 Subject: Change in osmo-bsc[master]: remove examples/osmo-bsc/ericsson/osmo-bsc.cfg In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19312 ) Change subject: remove examples/osmo-bsc/ericsson/osmo-bsc.cfg ...................................................................... remove examples/osmo-bsc/ericsson/osmo-bsc.cfg This was an accidential copy of osmo-bsc.rbs2308.cfg Change-Id: I89c6c0fc2b9ec0054e71827118ddaa85fe3e9318 --- D doc/examples/osmo-bsc/ericsson/osmo-bsc.cfg 1 file changed, 0 insertions(+), 101 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.cfg deleted file mode 100644 index f79d457..0000000 --- a/doc/examples/osmo-bsc/ericsson/osmo-bsc.cfg +++ /dev/null @@ -1,101 +0,0 @@ -! -! OpenBSC (0.9.11.308-62d46) configuration saved from vty -!! -password foo -! -line vty - no login -! -log stderr - logging level lmi info - logging level linp info - logging level nm debug - logging level rsl debug - logging level llapd notice -log file bsc-rbs2k.log - logging timestamp 1 - logging filter all 1 - logging level lmi info - logging level linp info - logging level nm debug - logging level rsl debug -network - network country code 262 - mobile network code 42 - neci 0 - paging any use tch 0 - handover 0 - handover window rxlev averaging 10 - handover window rxqual averaging 1 - handover window rxlev neighbor averaging 10 - handover power budget interval 6 - handover power budget hysteresis 3 - handover maximum distance 9999 - timer t3101 10 - timer t3105 40 - timer t3109 4 - timer t3113 60 - bts 0 - type rbs2000 - band PCS1900 - cell_identity 0 - location_area_code 1 - training_sequence_code 7 - base_station_id_code 63 - ms max power 33 - cell reselection hysteresis 4 - rxlev access min 0 - channel allocator descending - rach tx integer 9 - rach max transmission 7 - oml e1 line 0 timeslot 1 sub-slot full - oml e1 tei 62 - neighbor-list mode automatic - gprs mode none - is-connection-list add 4 512 12 - is-connection-list add 16 524 12 - is-connection-list add 28 536 12 - is-connection-list add 40 548 12 - trx 0 - rf_locked 0 - arfcn 800 - nominal power 43 - max_power_red 14 - rsl e1 line 0 timeslot 1 sub-slot full - rsl e1 tei 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - hopping enabled 0 - e1 line 0 timeslot 1 sub-slot full - timeslot 1 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 2 sub-slot 1 - timeslot 2 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 2 sub-slot 2 - timeslot 3 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 2 sub-slot 3 - timeslot 4 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 3 sub-slot 0 - timeslot 5 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 3 sub-slot 1 - timeslot 6 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 3 sub-slot 2 - timeslot 7 - phys_chan_config TCH/F - hopping enabled 0 - e1 line 0 timeslot 3 sub-slot 3 -e1_input - e1_line 0 driver dahdi - e1_line 0 port 1 - pcap 20200703-rbs2k-10.pcap -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I89c6c0fc2b9ec0054e71827118ddaa85fe3e9318 Gerrit-Change-Number: 19312 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:42:52 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:42:52 +0000 Subject: Change in osmo-bsc[master]: osmo-bsc.spec.in: Package E1 config files In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19313 ) Change subject: osmo-bsc.spec.in: Package E1 config files ...................................................................... osmo-bsc.spec.in: Package E1 config files This resolves: [ 272s] error: Installed (but unpackaged) file(s) found: [ 272s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg [ 272s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg [ 272s] /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg Change-Id: I07329564152d6b4314f1ed90a221478e2d765b47 --- M contrib/osmo-bsc.spec.in 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/osmo-bsc.spec.in b/contrib/osmo-bsc.spec.in index 1d44940..1120bf7 100644 --- a/contrib/osmo-bsc.spec.in +++ b/contrib/osmo-bsc.spec.in @@ -124,6 +124,7 @@ %{_docdir}/%{name}/examples/osmo-bsc/osmo-bsc.cfg %{_docdir}/%{name}/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg %{_docdir}/%{name}/examples/osmo-bsc/osmo-bsc-minimal.cfg +%{_docdir}/%{name}/examples/osmo-bsc/*/osmo-bsc*.cfg %dir %{_sysconfdir}/osmocom %config(noreplace) %{_sysconfdir}/osmocom/osmo-bsc.cfg %{_unitdir}/%{name}.service -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I07329564152d6b4314f1ed90a221478e2d765b47 Gerrit-Change-Number: 19313 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:43:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:43:44 +0000 Subject: Change in osmo-sgsn[master]: gtphub: rename sgsn's oww osmo_sockaddr into sgsn_sockaddr In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19311 ) Change subject: gtphub: rename sgsn's oww osmo_sockaddr into sgsn_sockaddr ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ibb1ddce9ff1ffe7494de5cdb8ea1843c45fe4566 Gerrit-Change-Number: 19311 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 18 Jul 2020 21:43:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:43:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:43:49 +0000 Subject: Change in osmo-sgsn[master]: gtphub: rename sgsn's oww osmo_sockaddr into sgsn_sockaddr In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19311 ) Change subject: gtphub: rename sgsn's oww osmo_sockaddr into sgsn_sockaddr ...................................................................... gtphub: rename sgsn's oww osmo_sockaddr into sgsn_sockaddr The osmo_ prefix should be only used for official struct/apis of libosmocore. This commit was done via `sed -i 's/osmo_sockaddr/sgsn_sockaddr/g'`. In prepartion of introducing a different api of osmo_sockaddr to libosmocore. Change-Id: Ibb1ddce9ff1ffe7494de5cdb8ea1843c45fe4566 --- M include/osmocom/sgsn/gtphub.h M src/gtphub/gtphub.c M src/gtphub/gtphub_sock.c M tests/gtphub/gtphub_test.c 4 files changed, 95 insertions(+), 95 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sgsn/gtphub.h b/include/osmocom/sgsn/gtphub.h index 8fd9f38..6a439b5 100644 --- a/include/osmocom/sgsn/gtphub.h +++ b/include/osmocom/sgsn/gtphub.h @@ -35,14 +35,14 @@ /* TODO move to osmocom/core/socket.c ? */ #include /* for IPPROTO_* etc */ -struct osmo_sockaddr { +struct sgsn_sockaddr { struct sockaddr_storage a; socklen_t l; }; /* TODO move to osmocom/core/socket.c ? */ /*! \brief Initialize a sockaddr - * \param[out] addr Valid osmo_sockaddr pointer to write result to + * \param[out] addr Valid sgsn_sockaddr pointer to write result to * \param[in] family Address Family like AF_INET, AF_INET6, AF_UNSPEC * \param[in] type Socket type like SOCK_DGRAM, SOCK_STREAM * \param[in] proto Protocol like IPPROTO_TCP, IPPROTO_UDP @@ -53,16 +53,16 @@ * Copy the first result from a getaddrinfo() call with the given parameters to * *addr and *addr_len. On error, do not change *addr and return nonzero. */ -int osmo_sockaddr_init(struct osmo_sockaddr *addr, +int sgsn_sockaddr_init(struct sgsn_sockaddr *addr, uint16_t family, uint16_t type, uint8_t proto, const char *host, uint16_t port); /* Conveniently pass AF_UNSPEC, SOCK_DGRAM and IPPROTO_UDP to - * osmo_sockaddr_init(). */ -static inline int osmo_sockaddr_init_udp(struct osmo_sockaddr *addr, + * sgsn_sockaddr_init(). */ +static inline int sgsn_sockaddr_init_udp(struct sgsn_sockaddr *addr, const char *host, uint16_t port) { - return osmo_sockaddr_init(addr, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, + return sgsn_sockaddr_init(addr, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, host, port); } @@ -71,25 +71,25 @@ * \param[in] addr_str_len Size of buffer addr_str points at. * \param[out] port_str Valid pointer to a buffer of length port_str_len. * \param[in] port_str_len Size of buffer port_str points at. - * \param[in] addr Binary representation as returned by osmo_sockaddr_init(). + * \param[in] addr Binary representation as returned by sgsn_sockaddr_init(). * \param[in] flags flags as passed to getnameinfo(). * \returns 0 on success, an error code on error. * * Return the IPv4 or IPv6 address string and the port (a.k.a. service) string - * representations of the given struct osmo_sockaddr in two caller provided + * representations of the given struct sgsn_sockaddr in two caller provided * char buffers. Flags of (NI_NUMERICHOST | NI_NUMERICSERV) return numeric * address and port. Either one of addr_str or port_str may be NULL, in which * case nothing is returned there. * - * See also osmo_sockaddr_to_str() (less flexible, but much more convenient). */ -int osmo_sockaddr_to_strs(char *addr_str, size_t addr_str_len, + * See also sgsn_sockaddr_to_str() (less flexible, but much more convenient). */ +int sgsn_sockaddr_to_strs(char *addr_str, size_t addr_str_len, char *port_str, size_t port_str_len, - const struct osmo_sockaddr *addr, + const struct sgsn_sockaddr *addr, int flags); -/*! \brief concatenate the parts returned by osmo_sockaddr_to_strs(). - * \param[in] addr Binary representation as returned by osmo_sockaddr_init(). +/*! \brief concatenate the parts returned by sgsn_sockaddr_to_strs(). + * \param[in] addr Binary representation as returned by sgsn_sockaddr_init(). * \param[in] buf A buffer to use for string operations. * \param[in] buf_len Length of the buffer. * \returns Address string (in buffer). @@ -98,33 +98,33 @@ * the form " port ". The returned string is valid until the * next invocation of this function. */ -const char *osmo_sockaddr_to_strb(const struct osmo_sockaddr *addr, +const char *sgsn_sockaddr_to_strb(const struct sgsn_sockaddr *addr, char *buf, size_t buf_len); -/*! \brief conveniently return osmo_sockaddr_to_strb() in a static buffer. - * \param[in] addr Binary representation as returned by osmo_sockaddr_init(). +/*! \brief conveniently return sgsn_sockaddr_to_strb() in a static buffer. + * \param[in] addr Binary representation as returned by sgsn_sockaddr_init(). * \returns Address string in static buffer. * - * See osmo_sockaddr_to_strb(). + * See sgsn_sockaddr_to_strb(). * - * Note: only one osmo_sockaddr_to_str() call will work per print/log - * statement. For two or more, use osmo_sockaddr_to_strb() with a separate + * Note: only one sgsn_sockaddr_to_str() call will work per print/log + * statement. For two or more, use sgsn_sockaddr_to_strb() with a separate * buffer each. */ -const char *osmo_sockaddr_to_str(const struct osmo_sockaddr *addr); +const char *sgsn_sockaddr_to_str(const struct sgsn_sockaddr *addr); -/*! \brief compare two osmo_sockaddr. +/*! \brief compare two sgsn_sockaddr. * \param[in] a The first address to compare. * \param[in] b The other address to compare. * \returns 0 if equal, otherwise -1 or 1. */ -int osmo_sockaddr_cmp(const struct osmo_sockaddr *a, - const struct osmo_sockaddr *b); +int sgsn_sockaddr_cmp(const struct sgsn_sockaddr *a, + const struct sgsn_sockaddr *b); /*! \brief Overwrite *dst with *src. * Like memcpy(), but copy only the valid bytes. */ -void osmo_sockaddr_copy(struct osmo_sockaddr *dst, - const struct osmo_sockaddr *src); +void sgsn_sockaddr_copy(struct sgsn_sockaddr *dst, + const struct sgsn_sockaddr *src); /* general */ @@ -179,7 +179,7 @@ /* Decode sa to gsna. Return 0 on success. If port is non-NULL, the port number * from sa is also returned. */ int gsn_addr_from_sockaddr(struct gsn_addr *gsna, uint16_t *port, - const struct osmo_sockaddr *sa); + const struct sgsn_sockaddr *sa); /* expiry */ @@ -389,7 +389,7 @@ struct gtphub_peer_addr *peer_addr; uint16_t port; unsigned int ref_count; /* references from other peers' seq_maps */ - struct osmo_sockaddr sa; /* a "cache" for (peer_addr->addr, port) */ + struct sgsn_sockaddr sa; /* a "cache" for (peer_addr->addr, port) */ int last_restart_count; /* 0..255 = valid, all else means unknown */ struct rate_ctr_group *counters_io; @@ -496,13 +496,13 @@ int gtphub_handle_buf(struct gtphub *hub, unsigned int side_idx, unsigned int port_idx, - const struct osmo_sockaddr *from_addr, + const struct sgsn_sockaddr *from_addr, uint8_t *buf, size_t received, time_t now, uint8_t **reply_buf, struct osmo_fd **to_ofd, - struct osmo_sockaddr *to_addr); + struct sgsn_sockaddr *to_addr); struct gtphub_peer_port *gtphub_port_have(struct gtphub *hub, struct gtphub_bind *bind, @@ -510,7 +510,7 @@ uint16_t port); struct gtphub_peer_port *gtphub_port_find_sa(const struct gtphub_bind *bind, - const struct osmo_sockaddr *addr); + const struct sgsn_sockaddr *addr); void gtphub_resolved_ggsn(struct gtphub *hub, const char *apn_oi_str, struct gsn_addr *resolved_addr, @@ -519,5 +519,5 @@ const char *gtphub_port_str(struct gtphub_peer_port *port); int gtphub_write(const struct osmo_fd *to, - const struct osmo_sockaddr *to_addr, + const struct sgsn_sockaddr *to_addr, const uint8_t *buf, size_t buf_len); diff --git a/src/gtphub/gtphub.c b/src/gtphub/gtphub.c index 7b355bf..c95696a 100644 --- a/src/gtphub/gtphub.c +++ b/src/gtphub/gtphub.c @@ -167,12 +167,12 @@ } int gsn_addr_from_sockaddr(struct gsn_addr *gsna, uint16_t *port, - const struct osmo_sockaddr *sa) + const struct sgsn_sockaddr *sa) { char addr_str[256]; char port_str[6]; - if (osmo_sockaddr_to_strs(addr_str, sizeof(addr_str), + if (sgsn_sockaddr_to_strs(addr_str, sizeof(addr_str), port_str, sizeof(port_str), sa, (NI_NUMERICHOST | NI_NUMERICSERV)) != 0) { @@ -925,7 +925,7 @@ /* Recv datagram from from->fd, write sender's address to *from_addr. * Return the number of bytes read, zero on error. */ static int gtphub_read(const struct osmo_fd *from, - struct osmo_sockaddr *from_addr, + struct sgsn_sockaddr *from_addr, uint8_t *buf, size_t buf_len) { OSMO_ASSERT(from_addr); @@ -946,7 +946,7 @@ } LOG(LOGL_DEBUG, "Received %d bytes from %s: %s%s\n", - (int)received, osmo_sockaddr_to_str(from_addr), + (int)received, sgsn_sockaddr_to_str(from_addr), osmo_hexdump(buf, received > 1000? 1000 : received), received > 1000 ? "..." : ""); @@ -1954,8 +1954,8 @@ struct gtphub *hub = from_sgsns_ofd->data; static uint8_t buf[4096]; - struct osmo_sockaddr from_addr; - struct osmo_sockaddr to_addr; + struct sgsn_sockaddr from_addr; + struct sgsn_sockaddr to_addr; struct osmo_fd *to_ofd; int len; uint8_t *reply_buf; @@ -1985,8 +1985,8 @@ struct gtphub *hub = from_ggsns_ofd->data; static uint8_t buf[4096]; - struct osmo_sockaddr from_addr; - struct osmo_sockaddr to_addr; + struct sgsn_sockaddr from_addr; + struct sgsn_sockaddr to_addr; struct osmo_fd *to_ofd; int len; uint8_t *reply_buf; @@ -2071,9 +2071,9 @@ static int gsn_addr_to_sockaddr(struct gsn_addr *src, uint16_t port, - struct osmo_sockaddr *dst) + struct sgsn_sockaddr *dst) { - return osmo_sockaddr_init_udp(dst, gsn_addr_to_str(src), port); + return sgsn_sockaddr_init_udp(dst, gsn_addr_to_str(src), port); } /* If p is an Echo request, replace p's data with the matching response and @@ -2107,7 +2107,7 @@ } struct gtphub_peer_port *gtphub_known_addr_have_port(const struct gtphub_bind *bind, - const struct osmo_sockaddr *addr); + const struct sgsn_sockaddr *addr); /* Parse buffer as GTP packet, replace elements in-place and return the ofd and * address to forward to. Return a pointer to the osmo_fd, but copy the @@ -2117,13 +2117,13 @@ int gtphub_handle_buf(struct gtphub *hub, unsigned int side_idx, unsigned int plane_idx, - const struct osmo_sockaddr *from_addr, + const struct sgsn_sockaddr *from_addr, uint8_t *buf, size_t received, time_t now, uint8_t **reply_buf, struct osmo_fd **to_ofd, - struct osmo_sockaddr *to_addr) + struct sgsn_sockaddr *to_addr) { struct gtphub_bind *from_bind = &hub->to_gsns[side_idx][plane_idx]; struct gtphub_bind *to_bind = &hub->to_gsns[other_side_idx(side_idx)][plane_idx]; @@ -2138,7 +2138,7 @@ (side_idx == GTPH_SIDE_GGSN)? "<-" : "->", gtphub_plane_idx_names[plane_idx], gtphub_side_idx_names[side_idx], - osmo_sockaddr_to_str(from_addr), + sgsn_sockaddr_to_str(from_addr), gtp_type_str(p.type)); if (p.rc <= 0) { @@ -2146,7 +2146,7 @@ gtp_type_str(p.type), gtphub_side_idx_names[side_idx], gtphub_plane_idx_names[plane_idx], - osmo_sockaddr_to_str(from_addr)); + sgsn_sockaddr_to_str(from_addr)); return -1; } @@ -2156,7 +2156,7 @@ reply_len = gtphub_handle_echo_req(hub, &p, reply_buf); if (reply_len > 0) { /* It was an echo. Nothing left to do. */ - osmo_sockaddr_copy(to_addr, from_addr); + sgsn_sockaddr_copy(to_addr, from_addr); *to_ofd = &from_bind->ofd; rate_ctr_inc(&from_bind->counters_io->ctr[GTPH_CTR_PKTS_OUT]); @@ -2165,7 +2165,7 @@ LOG(LOGL_DEBUG, "%s Echo response to %s: %d bytes to %s\n", (side_idx == GTPH_SIDE_GGSN)? "-->" : "<--", gtphub_side_idx_names[side_idx], - (int)reply_len, osmo_sockaddr_to_str(to_addr)); + (int)reply_len, sgsn_sockaddr_to_str(to_addr)); return reply_len; } if (reply_len < 0) @@ -2178,7 +2178,7 @@ * so no-one else is allowed to talk to us from that side. */ struct gtphub_peer_port *from_peer = hub->proxy[side_idx][plane_idx]; if (from_peer) { - if (osmo_sockaddr_cmp(&from_peer->sa, from_addr) != 0) { + if (sgsn_sockaddr_cmp(&from_peer->sa, from_addr) != 0) { LOG(LOGL_ERROR, "Rejecting: %s proxy configured, but GTP packet" " received on %s bind is from another sender:" @@ -2186,7 +2186,7 @@ gtphub_side_idx_names[side_idx], gtphub_side_idx_names[side_idx], gtphub_port_str(from_peer), - osmo_sockaddr_to_str(from_addr)); + sgsn_sockaddr_to_str(from_addr)); return -1; } } @@ -2204,7 +2204,7 @@ if (side_idx == GTPH_SIDE_GGSN) { LOG(LOGL_ERROR, "Dropping packet%s: unknown GGSN peer: %s\n", gtp_type_str(p.type), - osmo_sockaddr_to_str(from_addr)); + sgsn_sockaddr_to_str(from_addr)); return -1; } else { /* SGSN */ @@ -2216,7 +2216,7 @@ "Dropping packet%s: User plane peer was not" "announced by PDP Context: %s\n", gtp_type_str(p.type), - osmo_sockaddr_to_str(from_addr)); + sgsn_sockaddr_to_str(from_addr)); return -1; } @@ -2235,7 +2235,7 @@ LOG(LOGL_ERROR, "Dropping packet%s: invalid %s peer: %s\n", gtp_type_str(p.type), gtphub_side_idx_names[side_idx], - osmo_sockaddr_to_str(from_addr)); + sgsn_sockaddr_to_str(from_addr)); return -1; } @@ -2309,7 +2309,7 @@ if (!to_peer_from_seq) gtphub_map_seq(&p, from_peer, to_peer); - osmo_sockaddr_copy(to_addr, &to_peer->sa); + sgsn_sockaddr_copy(to_addr, &to_peer->sa); *reply_buf = (uint8_t*)p.data; @@ -2335,7 +2335,7 @@ (side_idx == GTPH_SIDE_SGSN)? "-->" : "<--", gtphub_side_idx_names[other_side_idx(side_idx)], p.header_tei, p.seq, - (int)received, osmo_sockaddr_to_str(to_addr)); + (int)received, sgsn_sockaddr_to_str(to_addr)); return received; } @@ -2645,7 +2645,7 @@ } struct gtphub_peer_port *gtphub_port_find_sa(const struct gtphub_bind *bind, - const struct osmo_sockaddr *addr) + const struct sgsn_sockaddr *addr) { struct gsn_addr gsna; uint16_t port; @@ -2762,7 +2762,7 @@ /* Find a GGSN peer with a matching address. If the address is known but the * port not, create a new port for that peer address. */ struct gtphub_peer_port *gtphub_known_addr_have_port(const struct gtphub_bind *bind, - const struct osmo_sockaddr *addr) + const struct sgsn_sockaddr *addr) { struct gtphub_peer_addr *pa; struct gtphub_peer_port *pp; @@ -2817,7 +2817,7 @@ /* TODO move to osmocom/core/socket.c ? */ /* use this in osmo_sock_init() to remove dup. */ -/* Internal: call getaddrinfo for osmo_sockaddr_init(). The caller is required +/* Internal: call getaddrinfo for sgsn_sockaddr_init(). The caller is required to call freeaddrinfo(*result), iff zero is returned. */ static int _osmo_getaddrinfo(struct addrinfo **result, uint16_t family, uint16_t type, uint8_t proto, @@ -2844,7 +2844,7 @@ } /* TODO move to osmocom/core/socket.c ? */ -int osmo_sockaddr_init(struct osmo_sockaddr *addr, +int sgsn_sockaddr_init(struct sgsn_sockaddr *addr, uint16_t family, uint16_t type, uint8_t proto, const char *host, uint16_t port) { @@ -2865,9 +2865,9 @@ return 0; } -int osmo_sockaddr_to_strs(char *addr_str, size_t addr_str_len, +int sgsn_sockaddr_to_strs(char *addr_str, size_t addr_str_len, char *port_str, size_t port_str_len, - const struct osmo_sockaddr *addr, + const struct sgsn_sockaddr *addr, int flags) { int rc; @@ -2896,14 +2896,14 @@ return rc; } -const char *osmo_sockaddr_to_strb(const struct osmo_sockaddr *addr, +const char *sgsn_sockaddr_to_strb(const struct sgsn_sockaddr *addr, char *buf, size_t buf_len) { const int portbuf_len = 6; OSMO_ASSERT(buf_len > portbuf_len); char *portbuf = buf + buf_len - portbuf_len; buf_len -= portbuf_len; - if (osmo_sockaddr_to_strs(buf, buf_len, + if (sgsn_sockaddr_to_strs(buf, buf_len, portbuf, portbuf_len, addr, NI_NUMERICHOST | NI_NUMERICSERV)) @@ -2918,17 +2918,17 @@ return buf; } -const char *osmo_sockaddr_to_str(const struct osmo_sockaddr *addr) +const char *sgsn_sockaddr_to_str(const struct sgsn_sockaddr *addr) { static char buf[256]; - const char *result = osmo_sockaddr_to_strb(addr, buf, sizeof(buf)); + const char *result = sgsn_sockaddr_to_strb(addr, buf, sizeof(buf)); if (! result) return "(invalid)"; return result; } -int osmo_sockaddr_cmp(const struct osmo_sockaddr *a, - const struct osmo_sockaddr *b) +int sgsn_sockaddr_cmp(const struct sgsn_sockaddr *a, + const struct sgsn_sockaddr *b) { if (a == b) return 0; @@ -2938,7 +2938,7 @@ return 1; if (a->l != b->l) { /* Lengths are not the same, but determine the order. Will - * anyone ever sort a list by osmo_sockaddr though...? */ + * anyone ever sort a list by sgsn_sockaddr though...? */ int cmp = memcmp(&a->a, &b->a, (a->l < b->l)? a->l : b->l); if (cmp == 0) { if (a->l < b->l) @@ -2951,8 +2951,8 @@ return memcmp(&a->a, &b->a, a->l); } -void osmo_sockaddr_copy(struct osmo_sockaddr *dst, - const struct osmo_sockaddr *src) +void sgsn_sockaddr_copy(struct sgsn_sockaddr *dst, + const struct sgsn_sockaddr *src) { OSMO_ASSERT(src->l <= sizeof(dst->a)); memcpy(&dst->a, &src->a, src->l); diff --git a/src/gtphub/gtphub_sock.c b/src/gtphub/gtphub_sock.c index 1acd5a6..1837533 100644 --- a/src/gtphub/gtphub_sock.c +++ b/src/gtphub/gtphub_sock.c @@ -33,13 +33,13 @@ LOGP(DGTPHUB, level, fmt, ##args) int gtphub_write(const struct osmo_fd *to, - const struct osmo_sockaddr *to_addr, + const struct sgsn_sockaddr *to_addr, const uint8_t *buf, size_t buf_len) { errno = 0; ssize_t sent = sendto(to->fd, buf, buf_len, 0, (struct sockaddr*)&to_addr->a, to_addr->l); - LOG(LOGL_DEBUG, "to %s\n", osmo_sockaddr_to_str(to_addr)); + LOG(LOGL_DEBUG, "to %s\n", sgsn_sockaddr_to_str(to_addr)); if (sent == -1) { LOG(LOGL_ERROR, "error: %s\n", strerror(errno)); diff --git a/tests/gtphub/gtphub_test.c b/tests/gtphub/gtphub_test.c index ed46176..d381b9b 100644 --- a/tests/gtphub/gtphub_test.c +++ b/tests/gtphub/gtphub_test.c @@ -378,37 +378,37 @@ char resolve_ggsn_got_imsi[GSM23003_IMSI_MAX_DIGITS+1]; char resolve_ggsn_got_ni[GSM_APN_LENGTH]; -struct osmo_sockaddr resolved_ggsn_addr; +struct sgsn_sockaddr resolved_ggsn_addr; static int resolve_to_ggsn(const char *addr, uint16_t port) { - LVL2_ASSERT(osmo_sockaddr_init_udp(&resolved_ggsn_addr, + LVL2_ASSERT(sgsn_sockaddr_init_udp(&resolved_ggsn_addr, addr, port) == 0); return 1; } -struct osmo_sockaddr resolved_sgsn_addr; +struct sgsn_sockaddr resolved_sgsn_addr; static int resolve_to_sgsn(const char *addr, uint16_t port) { - LVL2_ASSERT(osmo_sockaddr_init_udp(&resolved_sgsn_addr, + LVL2_ASSERT(sgsn_sockaddr_init_udp(&resolved_sgsn_addr, addr, port) == 0); return 1; } -struct osmo_sockaddr sgsn_sender; +struct sgsn_sockaddr sgsn_sender; static int send_from_sgsn(const char *addr, uint16_t port) { - LVL2_ASSERT(osmo_sockaddr_init_udp(&sgsn_sender, + LVL2_ASSERT(sgsn_sockaddr_init_udp(&sgsn_sender, addr, port) == 0); return 1; } -struct osmo_sockaddr ggsn_sender; +struct sgsn_sockaddr ggsn_sender; static int send_from_ggsn(const char *addr, uint16_t port) { - LVL2_ASSERT(osmo_sockaddr_init_udp(&ggsn_sender, + LVL2_ASSERT(sgsn_sockaddr_init_udp(&ggsn_sender, addr, port) == 0); return 1; @@ -491,18 +491,18 @@ /* override, requires '-Wl,--wrap=gtphub_write' */ int __real_gtphub_write(const struct osmo_fd *to, - const struct osmo_sockaddr *to_addr, + const struct sgsn_sockaddr *to_addr, const uint8_t *buf, size_t buf_len); int __wrap_gtphub_write(const struct osmo_fd *to, - const struct osmo_sockaddr *to_addr, + const struct sgsn_sockaddr *to_addr, const uint8_t *buf, size_t buf_len) { printf("Out-of-band gtphub_write(%d):\n" "to %s\n" "%s\n", (int)buf_len, - osmo_sockaddr_to_str(to_addr), + sgsn_sockaddr_to_str(to_addr), osmo_hexdump(buf, buf_len)); return 0; } @@ -553,11 +553,11 @@ } #define same_addr(GOT, EXPECTED) _same_addr((GOT),(EXPECTED), __FILE__, __LINE__) -static int _same_addr(const struct osmo_sockaddr *got, - const struct osmo_sockaddr *expected, +static int _same_addr(const struct sgsn_sockaddr *got, + const struct sgsn_sockaddr *expected, const char *file, int line) { - int cmp = osmo_sockaddr_cmp(got, expected); + int cmp = sgsn_sockaddr_cmp(got, expected); if (!cmp) return 1; char buf[256]; @@ -565,8 +565,8 @@ " expecting: '%s'\n" " got: '%s'\n\n", file, line, - osmo_sockaddr_to_str(expected), - osmo_sockaddr_to_strb(got, buf, sizeof(buf))); + sgsn_sockaddr_to_str(expected), + sgsn_sockaddr_to_strb(got, buf, sizeof(buf))); return 0; } @@ -668,7 +668,7 @@ now = 123; struct osmo_fd *to_ofd; - struct osmo_sockaddr to_addr; + struct sgsn_sockaddr to_addr; struct gtphub_peer_port *pp; int send; @@ -855,13 +855,13 @@ #define msg_from_sgsn_c(A,B,C,D) msg_from_sgsn(GTPH_PLANE_CTRL, A,B,C,D) #define msg_from_sgsn_u(A,B,C,D) msg_from_sgsn(GTPH_PLANE_USER, A,B,C,D) static int msg_from_sgsn(int plane_idx, - struct osmo_sockaddr *_sgsn_sender, - struct osmo_sockaddr *ggsn_receiver, + struct sgsn_sockaddr *_sgsn_sender, + struct sgsn_sockaddr *ggsn_receiver, const char *hex_from_sgsn, const char *hex_to_ggsn) { struct osmo_fd *ggsn_ofd = NULL; - struct osmo_sockaddr ggsn_addr; + struct sgsn_sockaddr ggsn_addr; int send; send = gtphub_handle_buf(hub, GTPH_SIDE_SGSN, plane_idx, _sgsn_sender, buf, msg(hex_from_sgsn), now, @@ -875,13 +875,13 @@ #define msg_from_ggsn_c(A,B,C,D) msg_from_ggsn(GTPH_PLANE_CTRL, A,B,C,D) #define msg_from_ggsn_u(A,B,C,D) msg_from_ggsn(GTPH_PLANE_USER, A,B,C,D) static int msg_from_ggsn(int plane_idx, - struct osmo_sockaddr *ggsn_sender, - struct osmo_sockaddr *sgsn_receiver, + struct sgsn_sockaddr *ggsn_sender, + struct sgsn_sockaddr *sgsn_receiver, const char *msg_from_ggsn, const char *msg_to_sgsn) { struct osmo_fd *sgsn_ofd; - struct osmo_sockaddr sgsn_addr; + struct sgsn_sockaddr sgsn_addr; int send; send = gtphub_handle_buf(hub, GTPH_SIDE_GGSN, plane_idx, ggsn_sender, buf, msg(msg_from_ggsn), now, -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ibb1ddce9ff1ffe7494de5cdb8ea1843c45fe4566 Gerrit-Change-Number: 19311 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:44:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:44:26 +0000 Subject: Change in osmo-bsc[master]: Move struct gsm_bts: gsm_data.* => bts.* In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19287 ) Change subject: Move struct gsm_bts: gsm_data.* => bts.* ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I00c15f5285b5c1a0109279b7ab192d5467a04ece Gerrit-Change-Number: 19287 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 18 Jul 2020 21:44:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:44:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:44:37 +0000 Subject: Change in osmo-bsc[master]: bts: Drop duplicated function to get trx by number In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19297 ) Change subject: bts: Drop duplicated function to get trx by number ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9071a0ab250844619280fbe2be63ed99f2c87eb1 Gerrit-Change-Number: 19297 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 18 Jul 2020 21:44:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:45:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:45:00 +0000 Subject: Change in osmo-bsc[master]: Move struct gsm_bts_trx: gsm-data.* => bts_trx.* In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19298 ) Change subject: Move struct gsm_bts_trx: gsm-data.* => bts_trx.* ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I11758ca3d255d849d77bd068f24bb68bde1f89a5 Gerrit-Change-Number: 19298 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 18 Jul 2020 21:45:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:45:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:45:20 +0000 Subject: Change in osmo-bsc[master]: Move gsm_bts_{trx_}set_system_infos APIs to bts{_trx}.* In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19299 ) Change subject: Move gsm_bts_{trx_}set_system_infos APIs to bts{_trx}.* ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2aa83b499d6e5d06a0fa1001fee3111f7e639c94 Gerrit-Change-Number: 19299 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 18 Jul 2020 21:45:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:45:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:45:25 +0000 Subject: Change in osmo-bsc[master]: Move acc_ramp_init inside gsm_bts_alloc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19300 ) Change subject: Move acc_ramp_init inside gsm_bts_alloc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I66c4b208583e92070793183b83b3a7b7edf6ba00 Gerrit-Change-Number: 19300 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 18 Jul 2020 21:45:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:45:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:45:32 +0000 Subject: Change in osmo-bsc[master]: Move struct gsm_bts: gsm_data.* => bts.* In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19287 ) Change subject: Move struct gsm_bts: gsm_data.* => bts.* ...................................................................... Move struct gsm_bts: gsm_data.* => bts.* Place all code related to the object into the related file. Having all the data model in one file made sense in early stage of development to make progress quickly, but nowadays it hurts more than helps, due to constantly growing size and more and more bits being added to the model, gaining in complexity. Currently, having lots of different objects mixed up in gsm_data.h is a hole of despair, where nobody can make any sense were to properly put new stuff in, ending up with functions related to same object in different files or with wrong prefixes, declarations of non-existing functions, etc. because people cannot make up their mind on strict relation to objects in the data model. Splitting them in files really helps finding code operating on a specific object and helping with logically splitting in the future. Change-Id: I00c15f5285b5c1a0109279b7ab192d5467a04ece --- M include/osmocom/bsc/Makefile.am A include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M src/ipaccess/Makefile.am M src/ipaccess/ipaccess-config.c M src/osmo-bsc/Makefile.am M src/osmo-bsc/abis_nm.c M src/osmo-bsc/abis_om2000.c M src/osmo-bsc/abis_om2000_vty.c M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/acc_ramp.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_ctrl_commands.c M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bsc_rf_ctrl.c M src/osmo-bsc/bsc_vty.c A src/osmo-bsc/bts.c M src/osmo-bsc/bts_ericsson_rbs2000.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c M src/osmo-bsc/bts_nokia_site.c M src/osmo-bsc/bts_siemens_bs11.c M src/osmo-bsc/bts_sysmobts.c M src/osmo-bsc/bts_unknown.c M src/osmo-bsc/cbch_scheduler.c M src/osmo-bsc/chan_alloc.c M src/osmo-bsc/codec_pref.c M src/osmo-bsc/e1_config.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/handover_decision.c M src/osmo-bsc/handover_decision_2.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/handover_logic.c M src/osmo-bsc/handover_vty.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c M src/osmo-bsc/lchan_select.c M src/osmo-bsc/meas_feed.c M src/osmo-bsc/neighbor_ident_vty.c M src/osmo-bsc/osmo_bsc_bssap.c M src/osmo-bsc/osmo_bsc_ctrl.c M src/osmo-bsc/osmo_bsc_filter.c M src/osmo-bsc/osmo_bsc_grace.c M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/osmo_bsc_msc.c M src/osmo-bsc/osmo_bsc_sigtran.c M src/osmo-bsc/paging.c M src/osmo-bsc/pcu_sock.c M src/osmo-bsc/rest_octets.c M src/osmo-bsc/smscb.c M src/osmo-bsc/system_information.c M src/osmo-bsc/timeslot_fsm.c M src/utils/Makefile.am M src/utils/bs11_config.c M tests/abis/Makefile.am M tests/abis/abis_test.c M tests/bsc/Makefile.am M tests/codec_pref/codec_pref_test.c M tests/gsm0408/Makefile.am M tests/gsm0408/gsm0408_test.c M tests/handover/Makefile.am M tests/handover/handover_test.c M tests/nanobts_omlattr/Makefile.am M tests/nanobts_omlattr/nanobts_omlattr_test.c 66 files changed, 1,471 insertions(+), 1,354 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am index 7a296e4..4d2df20 100644 --- a/include/osmocom/bsc/Makefile.am +++ b/include/osmocom/bsc/Makefile.am @@ -10,6 +10,7 @@ bsc_subscriber.h \ bsc_subscr_conn_fsm.h \ bss.h \ + bts.h \ bts_ipaccess_nanobts_omlattr.h \ chan_alloc.h \ codec_pref.h \ diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h new file mode 100644 index 0000000..07d2793 --- /dev/null +++ b/include/osmocom/bsc/bts.h @@ -0,0 +1,634 @@ +#pragma once + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include "osmocom/bsc/gsm_data.h" + +enum bts_counter_id { + BTS_CTR_CHREQ_TOTAL, + BTS_CTR_CHREQ_SUCCESSFUL, + BTS_CTR_CHREQ_NO_CHANNEL, + BTS_CTR_CHAN_RF_FAIL, + BTS_CTR_CHAN_RLL_ERR, + BTS_CTR_BTS_OML_FAIL, + BTS_CTR_BTS_RSL_FAIL, + BTS_CTR_CODEC_AMR_F, + BTS_CTR_CODEC_AMR_H, + BTS_CTR_CODEC_EFR, + BTS_CTR_CODEC_V1_FR, + BTS_CTR_CODEC_V1_HR, + BTS_CTR_PAGING_ATTEMPTED, + BTS_CTR_PAGING_ALREADY, + BTS_CTR_PAGING_RESPONDED, + BTS_CTR_PAGING_EXPIRED, + BTS_CTR_PAGING_NO_ACTIVE_PAGING, + BTS_CTR_PAGING_MSC_FLUSH, + BTS_CTR_CHAN_ACT_TOTAL, + BTS_CTR_CHAN_ACT_NACK, + BTS_CTR_RSL_UNKNOWN, + BTS_CTR_RSL_IPA_NACK, + BTS_CTR_RSL_DELETE_IND, + BTS_CTR_MODE_MODIFY_NACK, + BTS_CTR_LCHAN_BORKEN_FROM_UNUSED, + BTS_CTR_LCHAN_BORKEN_FROM_WAIT_ACTIV_ACK, + BTS_CTR_LCHAN_BORKEN_FROM_WAIT_RF_RELEASE_ACK, + BTS_CTR_LCHAN_BORKEN_FROM_BORKEN, + BTS_CTR_LCHAN_BORKEN_FROM_UNKNOWN, + BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_ACK, + BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_NACK, + BTS_CTR_LCHAN_BORKEN_EV_RF_CHAN_REL_ACK, + BTS_CTR_LCHAN_BORKEN_EV_VTY, + BTS_CTR_LCHAN_BORKEN_EV_TEARDOWN, + BTS_CTR_TS_BORKEN_FROM_NOT_INITIALIZED, + BTS_CTR_TS_BORKEN_FROM_UNUSED, + BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_ACT, + BTS_CTR_TS_BORKEN_FROM_PDCH, + BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_DEACT, + BTS_CTR_TS_BORKEN_FROM_IN_USE, + BTS_CTR_TS_BORKEN_FROM_BORKEN, + BTS_CTR_TS_BORKEN_FROM_UNKNOWN, + BTS_CTR_TS_BORKEN_EV_PDCH_ACT_ACK_NACK, + BTS_CTR_TS_BORKEN_EV_PDCH_DEACT_ACK_NACK, + BTS_CTR_TS_BORKEN_EV_TEARDOWN, + BTS_CTR_ASSIGNMENT_ATTEMPTED, + BTS_CTR_ASSIGNMENT_COMPLETED, + BTS_CTR_ASSIGNMENT_STOPPED, + BTS_CTR_ASSIGNMENT_NO_CHANNEL, + BTS_CTR_ASSIGNMENT_TIMEOUT, + BTS_CTR_ASSIGNMENT_FAILED, + BTS_CTR_ASSIGNMENT_ERROR, +}; + +static const struct rate_ctr_desc bts_ctr_description[] = { + [BTS_CTR_CHREQ_TOTAL] = {"chreq:total", "Received channel requests"}, + [BTS_CTR_CHREQ_SUCCESSFUL] = {"chreq:successful", "Successful channel requests (immediate assign sent)"}, + [BTS_CTR_CHREQ_NO_CHANNEL] = {"chreq:no_channel", "Sent to MS no channel available"}, + [BTS_CTR_CHAN_RF_FAIL] = {"chan:rf_fail", "Received a RF failure indication from BTS"}, + [BTS_CTR_CHAN_RLL_ERR] = {"chan:rll_err", "Received a RLL failure with T200 cause from BTS"}, + [BTS_CTR_BTS_OML_FAIL] = {"oml_fail", "Received a TEI down on a OML link"}, + [BTS_CTR_BTS_RSL_FAIL] = {"rsl_fail", "Received a TEI down on a OML link"}, + [BTS_CTR_CODEC_AMR_F] = {"codec:amr_f", "Count the usage of AMR/F codec by channel mode requested"}, + [BTS_CTR_CODEC_AMR_H] = {"codec:amr_h", "Count the usage of AMR/H codec by channel mode requested"}, + [BTS_CTR_CODEC_EFR] = {"codec:efr", "Count the usage of EFR codec by channel mode requested"}, + [BTS_CTR_CODEC_V1_FR] = {"codec:fr", "Count the usage of FR codec by channel mode requested"}, + [BTS_CTR_CODEC_V1_HR] = {"codec:hr", "Count the usage of HR codec by channel mode requested"}, + + [BTS_CTR_PAGING_ATTEMPTED] = {"paging:attempted", "Paging attempts for a subscriber"}, + [BTS_CTR_PAGING_ALREADY] = {"paging:already", "Paging attempts ignored as subscriber was already being paged"}, + [BTS_CTR_PAGING_RESPONDED] = {"paging:responded", "Paging attempts with successful paging response"}, + [BTS_CTR_PAGING_EXPIRED] = {"paging:expired", "Paging Request expired because of timeout T3113"}, + [BTS_CTR_PAGING_NO_ACTIVE_PAGING] = {"paging:no_active_paging", "Paging response without an active paging request (arrived after paging expiration?)"}, + [BTS_CTR_PAGING_MSC_FLUSH] = {"paging:msc_flush", "Paging flushed due to MSC Reset BSSMAP message"}, + [BTS_CTR_CHAN_ACT_TOTAL] = {"chan_act:total", "Total number of Channel Activations"}, + [BTS_CTR_CHAN_ACT_NACK] = {"chan_act:nack", "Number of Channel Activations that the BTS NACKed"}, + [BTS_CTR_RSL_UNKNOWN] = {"rsl:unknown", "Number of unknown/unsupported RSL messages received from BTS"}, + [BTS_CTR_RSL_IPA_NACK] = {"rsl:ipa_nack", "Number of IPA (RTP/dyn-PDCH) related NACKs received from BTS"}, + [BTS_CTR_RSL_DELETE_IND] = {"rsl:delete_ind", "Number of RSL DELETE INDICATION (DL CCCH overload)"}, + [BTS_CTR_MODE_MODIFY_NACK] = {"chan:mode_modify_nack", "Number of Channel Mode Modify NACKs received from BTS"}, + + /* lchan/TS BORKEN state counters */ + [BTS_CTR_LCHAN_BORKEN_FROM_UNUSED] = {"lchan_borken:from_state:unused", "Transitions from lchan UNUSED state to BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_FROM_WAIT_ACTIV_ACK] = {"lchan_borken:from_state:wait_activ_ack", "Transitions from lchan WAIT_ACTIV_ACK state to BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_FROM_WAIT_RF_RELEASE_ACK] = {"lchan_borken:from_state:wait_rf_release_ack", "Transitions from lchan WAIT_RF_RELEASE_ACK state to BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_FROM_BORKEN] = {"lchan_borken:from_state:borken", "Transitions from lchan BORKEN state to BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_FROM_UNKNOWN] = {"lchan_borken:from_state:unknown", "Transitions from an unknown lchan state to BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_ACK] = {"lchan_borken:event:chan_activ_ack", "CHAN_ACTIV_ACK received in the lchan BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_NACK] = {"lchan_borken:event:chan_activ_nack", "CHAN_ACTIV_NACK received in the lchan BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_EV_RF_CHAN_REL_ACK] = {"lchan_borken:event:rf_chan_rel_ack", "RF_CHAN_REL_ACK received in the lchan BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_EV_VTY] = {"lchan_borken:event:vty", "VTY commands received in the lchan BORKEN state"}, + [BTS_CTR_LCHAN_BORKEN_EV_TEARDOWN] = {"lchan_borken:event:teardown", "lchan in a BORKEN state is shutting down (BTS disconnected?)"}, + [BTS_CTR_TS_BORKEN_FROM_NOT_INITIALIZED] = {"ts_borken:from_state:not_initialized", "Transitions from TS NOT_INITIALIZED state to BORKEN state"}, + [BTS_CTR_TS_BORKEN_FROM_UNUSED] = {"ts_borken:from_state:unused", "Transitions from TS UNUSED state to BORKEN state"}, + [BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_ACT] = {"ts_borken:from_state:wait_pdch_act", "Transitions from TS WAIT_PDCH_ACT state to BORKEN state"}, + [BTS_CTR_TS_BORKEN_FROM_PDCH] = {"ts_borken:from_state:pdch", "Transitions from TS PDCH state to BORKEN state"}, + [BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_DEACT] = {"ts_borken:from_state:wait_pdch_deact", "Transitions from TS WAIT_PDCH_DEACT state to BORKEN state"}, + [BTS_CTR_TS_BORKEN_FROM_IN_USE] = {"ts_borken:from_state:in_use", "Transitions from TS IN_USE state to BORKEN state"}, + [BTS_CTR_TS_BORKEN_FROM_BORKEN] = {"ts_borken:from_state:borken", "Transitions from TS BORKEN state to BORKEN state"}, + [BTS_CTR_TS_BORKEN_FROM_UNKNOWN] = {"ts_borken:from_state:unknown", "Transitions from an unknown TS state to BORKEN state"}, + [BTS_CTR_TS_BORKEN_EV_PDCH_ACT_ACK_NACK] = {"ts_borken:event:pdch_act_ack_nack", "PDCH_ACT_ACK/NACK received in the TS BORKEN state"}, + [BTS_CTR_TS_BORKEN_EV_PDCH_DEACT_ACK_NACK] = {"ts_borken:event:pdch_deact_ack_nack", "PDCH_DEACT_ACK/NACK received in the TS BORKEN state"}, + [BTS_CTR_TS_BORKEN_EV_TEARDOWN] = {"ts_borken:event:teardown", "TS in a BORKEN state is shutting down (BTS disconnected?)"}, + [BTS_CTR_ASSIGNMENT_ATTEMPTED] = {"assignment:attempted", "Assignment attempts"}, + [BTS_CTR_ASSIGNMENT_COMPLETED] = {"assignment:completed", "Assignment completed"}, + [BTS_CTR_ASSIGNMENT_STOPPED] = {"assignment:stopped", "Connection ended during Assignment"}, + [BTS_CTR_ASSIGNMENT_NO_CHANNEL] = {"assignment:no_channel", "Failure to allocate lchan for Assignment"}, + [BTS_CTR_ASSIGNMENT_TIMEOUT] = {"assignment:timeout", "Assignment timed out"}, + [BTS_CTR_ASSIGNMENT_FAILED] = {"assignment:failed", "Received Assignment Failure message"}, + [BTS_CTR_ASSIGNMENT_ERROR] = {"assignment:error", "Assignment failed for other reason"}, + +}; + +static const struct rate_ctr_group_desc bts_ctrg_desc = { + "bts", + "base transceiver station", + OSMO_STATS_CLASS_GLOBAL, + ARRAY_SIZE(bts_ctr_description), + bts_ctr_description, +}; + +enum { + BTS_STAT_CHAN_LOAD_AVERAGE, + BTS_STAT_CHAN_CCCH_SDCCH4_USED, + BTS_STAT_CHAN_CCCH_SDCCH4_TOTAL, + BTS_STAT_CHAN_TCH_F_USED, + BTS_STAT_CHAN_TCH_F_TOTAL, + BTS_STAT_CHAN_TCH_H_USED, + BTS_STAT_CHAN_TCH_H_TOTAL, + BTS_STAT_CHAN_SDCCH8_USED, + BTS_STAT_CHAN_SDCCH8_TOTAL, + BTS_STAT_CHAN_TCH_F_PDCH_USED, + BTS_STAT_CHAN_TCH_F_PDCH_TOTAL, + BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_USED, + BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_TOTAL, + BTS_STAT_CHAN_SDCCH8_CBCH_USED, + BTS_STAT_CHAN_SDCCH8_CBCH_TOTAL, + BTS_STAT_CHAN_TCH_F_TCH_H_PDCH_USED, + BTS_STAT_CHAN_TCH_F_TCH_H_PDCH_TOTAL, + BTS_STAT_T3122, + BTS_STAT_RACH_BUSY, + BTS_STAT_RACH_ACCESS, + BTS_STAT_OML_CONNECTED, + BTS_STAT_RSL_CONNECTED, + BTS_STAT_LCHAN_BORKEN, + BTS_STAT_TS_BORKEN, +}; + +enum gsm_bts_type { + GSM_BTS_TYPE_UNKNOWN, + GSM_BTS_TYPE_BS11, + GSM_BTS_TYPE_NANOBTS, + GSM_BTS_TYPE_RBS2000, + GSM_BTS_TYPE_NOKIA_SITE, + GSM_BTS_TYPE_OSMOBTS, + _NUM_GSM_BTS_TYPE +}; +extern const struct value_string bts_type_names[_NUM_GSM_BTS_TYPE+1]; +extern const struct value_string bts_type_descs[_NUM_GSM_BTS_TYPE+1]; + +enum gsm_bts_type_variant { + BTS_UNKNOWN, + BTS_OSMO_LITECELL15, + BTS_OSMO_OCTPHY, + BTS_OSMO_SYSMO, + BTS_OSMO_TRX, + _NUM_BTS_VARIANT +}; + +/* Used by OML layer for BTS Attribute reporting */ +enum bts_attribute { + BTS_TYPE_VARIANT, + BTS_SUB_MODEL, + TRX_PHY_VERSION, +}; + +struct vty; + +struct gsm_bts_model { + struct llist_head list; + + enum gsm_bts_type type; + enum gsm_bts_type_variant variant; + const char *name; + + bool started; + int (*start)(struct gsm_network *net); + int (*oml_rcvmsg)(struct msgb *msg); + char * (*oml_status)(const struct gsm_bts *bts); + + void (*e1line_bind_ops)(struct e1inp_line *line); + + void (*config_write_bts)(struct vty *vty, struct gsm_bts *bts); + void (*config_write_trx)(struct vty *vty, struct gsm_bts_trx *trx); + void (*config_write_ts)(struct vty *vty, struct gsm_bts_trx_ts *ts); + + /* Should SI2bis and SI2ter be disabled by default on this BTS model? */ + bool force_combined_si; + + struct tlv_definition nm_att_tlvdef; + + /* features of a given BTS model set via gsm_bts_model_register() locally */ + struct bitvec features; + uint8_t _features_data[MAX_BTS_FEATURES/8]; +}; + +/* One BTS */ +struct gsm_bts { + /* list header in net->bts_list */ + struct llist_head list; + + /* Geographical location of the BTS */ + struct llist_head loc_list; + + /* number of this BTS in network */ + uint8_t nr; + /* human readable name / description */ + char *description; + /* Cell Identity */ + uint16_t cell_identity; + /* location area code of this BTS */ + uint16_t location_area_code; + /* Base Station Identification Code (BSIC), lower 3 bits is BCC, + * which is used as TSC for the CCCH */ + uint8_t bsic; + /* type of BTS */ + enum gsm_bts_type type; + enum gsm_bts_type_variant variant; + struct gsm_bts_model *model; + enum gsm_band band; + char version[MAX_VERSION_LENGTH]; + char sub_model[MAX_VERSION_LENGTH]; + + /* features of a given BTS set/reported via OML */ + struct bitvec features; + uint8_t _features_data[MAX_BTS_FEATURES/8]; + + /* Connected PCU version (if any) */ + char pcu_version[MAX_VERSION_LENGTH]; + + /* maximum Tx power that the MS is permitted to use in this cell */ + int ms_max_power; + + /* how do we talk OML with this TRX? */ + struct gsm_e1_subslot oml_e1_link; + uint8_t oml_tei; + struct e1inp_sign_link *oml_link; + /* Timer to use for deferred drop of OML link, see \ref ipaccess_drop_oml_deferred */ + struct osmo_timer_list oml_drop_link_timer; + /* when OML link was established */ + time_t uptime; + + /* Abis network management O&M handle */ + struct abis_nm_h *nmh; + + struct gsm_abis_mo mo; + + /* number of this BTS on given E1 link */ + uint8_t bts_nr; + + /* DTX features of this BTS */ + enum gsm48_dtx_mode dtxu; + bool dtxd; + + /* paging state and control */ + struct gsm_bts_paging_state paging; + + /* CCCH is on C0 */ + struct gsm_bts_trx *c0; + + struct { + struct gsm_abis_mo mo; + } site_mgr; + + /* bitmask of all SI that are present/valid in si_buf */ + uint32_t si_valid; + /* 3GPP TS 44.018 Table 10.5.2.33b.1 INDEX and COUNT for SI2quater */ + uint8_t si2q_index; /* distinguish individual SI2quater messages */ + uint8_t si2q_count; /* si2q_index for the last (highest indexed) individual SI2quater message */ + /* buffers where we put the pre-computed SI */ + sysinfo_buf_t si_buf[_MAX_SYSINFO_TYPE][SI2Q_MAX_NUM]; + /* offsets used while generating SI2quater */ + size_t e_offset; + size_t u_offset; + /* 3GPP TS 08.58 ?8.5.1 BCCH INFORMATION. Some nanoBTS fail upon + * receival of empty SI disabling unsupported SI. see OS#3707. */ + bool si_unused_send_empty; + + /* ip.access Unit ID's have Site/BTS/TRX layout */ + union { + struct { + uint16_t site_id; + uint16_t bts_id; + uint32_t flags; + uint32_t rsl_ip; + } ip_access; + struct { + struct { + struct gsm_abis_mo mo; + } cclk; + struct { + struct gsm_abis_mo mo; + } rack; + struct gsm_envabtse envabtse[4]; + } bs11; + struct { + struct { + struct om2k_mo om2k_mo; + struct gsm_abis_mo mo; + struct llist_head conn_groups; + } cf; + struct { + struct om2k_mo om2k_mo; + struct gsm_abis_mo mo; + struct llist_head conn_groups; + } is; + struct { + struct om2k_mo om2k_mo; + struct gsm_abis_mo mo; + struct llist_head conn_groups; + } con; + struct { + struct om2k_mo om2k_mo; + struct gsm_abis_mo mo; + } dp; + struct { + struct om2k_mo om2k_mo; + struct gsm_abis_mo mo; + } tf; + struct { + struct om2k_mo om2k_mo; + struct gsm_abis_mo mo; + } mctr; + uint32_t use_superchannel:1; + struct { + uint16_t limit; + uint16_t active; + } om2k_version[16]; + } rbs2000; + struct { + uint8_t bts_type; + unsigned int configured:1, /* we sent the config data request */ + skip_reset:1, /* skip reset at bootstrap */ + no_loc_rel_cnf:1, /* don't wait for RSL REL CONF */ + bts_reset_timer_cnf, /* timer for BTS RESET */ + did_reset:1, /* we received a RESET ACK */ + wait_reset:2; /* we are waiting for reset to complete */ + struct osmo_timer_list reset_timer; + } nokia; + }; + + /* Not entirely sure how ip.access specific this is */ + struct { + enum bts_gprs_mode mode; + struct { + struct gsm_abis_mo mo; + uint16_t nsei; + uint8_t timer[7]; + } nse; + struct { + struct gsm_abis_mo mo; + uint16_t bvci; + uint8_t timer[11]; + struct gprs_rlc_cfg rlc_cfg; + } cell; + struct gsm_bts_gprs_nsvc nsvc[2]; + uint8_t rac; + uint8_t net_ctrl_ord; + bool ctrl_ack_type_use_block; + bool egprs_pkt_chan_request; + } gprs; + + /* threshold (in percent) when BTS shall send CCCH LOAD IND */ + int ccch_load_ind_thresh; + + /* RACH NM values */ + int rach_b_thresh; + int rach_ldavg_slots; + + /* transceivers */ + int num_trx; + struct llist_head trx_list; + + /* SI related items */ + int force_combined_si; + bool force_combined_si_set; + int bcch_change_mark; + + /* Abis NM queue */ + struct llist_head abis_queue; + int abis_nm_pend; + + struct gsm_network *network; + + /* should the channel allocator allocate channels from high TRX to TRX0, + * rather than starting from TRX0 and go upwards? */ + int chan_alloc_reverse; + + enum neigh_list_manual_mode neigh_list_manual_mode; + /* parameters from which we build SYSTEM INFORMATION */ + struct { + struct gsm48_rach_control rach_control; + uint8_t ncc_permitted; + struct gsm48_cell_sel_par cell_sel_par; + struct gsm48_si_selection_params cell_ro_sel_par; /* rest octet */ + struct gsm48_cell_options cell_options; + struct gsm48_control_channel_descr chan_desc; + struct bitvec neigh_list; + struct bitvec cell_alloc; + struct bitvec si5_neigh_list; + struct osmo_earfcn_si2q si2quater_neigh_list; + size_t uarfcn_length; /* index for uarfcn and scramble lists */ + struct { + /* bitmask large enough for all possible ARFCN's */ + uint8_t neigh_list[1024/8]; + uint8_t cell_alloc[1024/8]; + /* If the user wants a different neighbor list in SI5 than in SI2 */ + uint8_t si5_neigh_list[1024/8]; + uint8_t meas_bw_list[MAX_EARFCN_LIST]; + uint16_t earfcn_list[MAX_EARFCN_LIST]; + uint16_t uarfcn_list[MAX_EARFCN_LIST]; + uint16_t scramble_list[MAX_EARFCN_LIST]; + } data; + } si_common; + bool early_classmark_allowed; + bool early_classmark_allowed_3g; + /* for testing only: Have an infinitely long radio link timeout */ + bool infinite_radio_link_timeout; + + /* do we use static (user-defined) system information messages? (bitmask) */ + uint32_t si_mode_static; + + /* access control class ramping */ + struct acc_ramp acc_ramp; + + /* exclude the BTS from the global RF Lock handling */ + int excl_from_rf_lock; + + /* supported codecs beside FR */ + struct bts_codec_conf codec; + + /* BTS dependencies bit field */ + uint32_t depends_on[256/(8*4)]; + + /* full and half rate multirate config */ + struct amr_multirate_conf mr_full; + struct amr_multirate_conf mr_half; + + /* PCU socket state */ + char *pcu_sock_path; + struct pcu_sock_state *pcu_state; + + struct rate_ctr_group *bts_ctrs; + struct osmo_stat_item_group *bts_statg; + + struct handover_cfg *ho; + + /* A list of struct gsm_bts_ref, indicating neighbors of this BTS. + * When the si_common neigh_list is in automatic mode, it is populated from this list as well as + * gsm_network->neighbor_bss_cells. */ + struct llist_head local_neighbors; + + /* BTS-specific overrides for timer values from struct gsm_network. */ + uint8_t T3122; /* ASSIGNMENT REJECT wait indication */ + bool T3113_dynamic; /* Calculate T3113 timeout dynamically based on BTS channel config and load */ + + /* Periodic channel load measurements are used to maintain T3122. */ + struct load_counter chan_load_samples[7]; + int chan_load_samples_idx; + uint8_t chan_load_avg; /* current channel load average in percent (0 - 100). */ + + /* cell broadcast system */ + struct osmo_timer_list cbch_timer; + struct bts_smscb_chan_state cbch_basic; + struct bts_smscb_chan_state cbch_extended; + struct osmo_timer_list etws_timer; /* when to stop ETWS PN */ + + struct llist_head oml_fail_rep; +}; + +#define GSM_BTS_SI2Q(bts, i) (struct gsm48_system_information_type_2quater *)((bts)->si_buf[SYSINFO_TYPE_2quater][i]) +#define GSM_BTS_HAS_SI(bts, i) ((bts)->si_valid & (1 << i)) +#define GSM_BTS_SI(bts, i) (void *)((bts)->si_buf[i][0]) + +/* this actually refers to the IPA transport, not the BTS model */ +static inline int is_ipaccess_bts(const struct gsm_bts *bts) +{ + switch (bts->type) { + case GSM_BTS_TYPE_NANOBTS: + case GSM_BTS_TYPE_OSMOBTS: + return 1; + default: + break; + } + return 0; +} + +static inline int is_sysmobts_v2(const struct gsm_bts *bts) +{ + switch (bts->type) { + case GSM_BTS_TYPE_OSMOBTS: + return 1; + default: + break; + } + return 0; +} + +static inline int is_siemens_bts(const struct gsm_bts *bts) +{ + switch (bts->type) { + case GSM_BTS_TYPE_BS11: + return 1; + default: + break; + } + + return 0; +} + +static inline int is_nokia_bts(const struct gsm_bts *bts) +{ + switch (bts->type) { + case GSM_BTS_TYPE_NOKIA_SITE: + return 1; + default: + break; + } + + return 0; +} + +static inline int is_ericsson_bts(const struct gsm_bts *bts) +{ + switch (bts->type) { + case GSM_BTS_TYPE_RBS2000: + return 1; + default: + break; + } + + return 0; +} + +static inline int is_e1_bts(const struct gsm_bts *bts) +{ + switch (bts->type) { + case GSM_BTS_TYPE_BS11: + case GSM_BTS_TYPE_RBS2000: + case GSM_BTS_TYPE_NOKIA_SITE: + return 1; + default: + break; + } + + return 0; +} + +static inline const struct osmo_location_area_id *bts_lai(struct gsm_bts *bts) +{ + static struct osmo_location_area_id lai; + lai = (struct osmo_location_area_id){ + .plmn = bts->network->plmn, + .lac = bts->location_area_code, + }; + return &lai; +} + +struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, uint8_t bts_num); + +char *gsm_bts_name(const struct gsm_bts *bts); + +bool gsm_bts_matches_lai(const struct gsm_bts *bts, const struct osmo_location_area_id *lai); +bool gsm_bts_matches_cell_id(const struct gsm_bts *bts, const struct gsm0808_cell_id *cell_id); + +int gsm_bts_local_neighbor_add(struct gsm_bts *bts, struct gsm_bts *neighbor); +int gsm_bts_local_neighbor_del(struct gsm_bts *bts, const struct gsm_bts *neighbor); + +/* return the gsm_lchan for the CBCH (if it exists at all) */ +struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts); + +int gsm_set_bts_type(struct gsm_bts *bts, enum gsm_bts_type type); + +struct gsm_bts_trx *gsm_bts_trx_by_nr(struct gsm_bts *bts, int nr); + +int bts_gprs_mode_is_compat(struct gsm_bts *bts, enum bts_gprs_mode mode); + +unsigned long long bts_uptime(const struct gsm_bts *bts); + +char *get_model_oml_status(const struct gsm_bts *bts); +/* reset the state of all MO in the BTS */ +void gsm_bts_mo_reset(struct gsm_bts *bts); + +/* dependency handling */ +void bts_depend_mark(struct gsm_bts *bts, int dep); +void bts_depend_clear(struct gsm_bts *bts, int dep); +int bts_depend_check(struct gsm_bts *bts); +int bts_depend_is_depedency(struct gsm_bts *base, struct gsm_bts *other); + +int gsm_bts_get_radio_link_timeout(const struct gsm_bts *bts); +void gsm_bts_set_radio_link_timeout(struct gsm_bts *bts, int value); + +void gsm_bts_all_ts_dispatch(struct gsm_bts *bts, uint32_t ts_ev, void *data); + +int bts_count_free_ts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan); + +int gsm_bts_model_register(struct gsm_bts_model *model); +struct gsm_bts_model *bts_model_find(enum gsm_bts_type type); + +enum gsm_bts_type str2btstype(const char *arg); +const char *btstype2str(enum gsm_bts_type type); + +enum bts_attribute str2btsattr(const char *s); +const char *btsatttr2str(enum bts_attribute v); + +enum gsm_bts_type_variant str2btsvariant(const char *arg); +const char *btsvariant2str(enum gsm_bts_type_variant v); diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index c357981..a74e6d9 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -39,6 +39,7 @@ struct mgcp_client; struct gsm0808_cell_id; struct osmo_mgcpc_ep; +struct gsm_bts; /** annotations for msgb ownership */ #define __uses @@ -772,69 +773,8 @@ struct gsm_bts_trx_ts ts[TRX_NR_TS]; }; -#define GSM_BTS_SI2Q(bts, i) (struct gsm48_system_information_type_2quater *)((bts)->si_buf[SYSINFO_TYPE_2quater][i]) -#define GSM_BTS_HAS_SI(bts, i) ((bts)->si_valid & (1 << i)) -#define GSM_BTS_SI(bts, i) (void *)((bts)->si_buf[i][0]) #define GSM_LCHAN_SI(lchan, i) (void *)((lchan)->si.buf[i][0]) -enum gsm_bts_type { - GSM_BTS_TYPE_UNKNOWN, - GSM_BTS_TYPE_BS11, - GSM_BTS_TYPE_NANOBTS, - GSM_BTS_TYPE_RBS2000, - GSM_BTS_TYPE_NOKIA_SITE, - GSM_BTS_TYPE_OSMOBTS, - _NUM_GSM_BTS_TYPE -}; - -enum gsm_bts_type_variant { - BTS_UNKNOWN, - BTS_OSMO_LITECELL15, - BTS_OSMO_OCTPHY, - BTS_OSMO_SYSMO, - BTS_OSMO_TRX, - _NUM_BTS_VARIANT -}; - -/* Used by OML layer for BTS Attribute reporting */ -enum bts_attribute { - BTS_TYPE_VARIANT, - BTS_SUB_MODEL, - TRX_PHY_VERSION, -}; - -struct vty; - -struct gsm_bts_model { - struct llist_head list; - - enum gsm_bts_type type; - enum gsm_bts_type_variant variant; - const char *name; - - bool started; - int (*start)(struct gsm_network *net); - int (*oml_rcvmsg)(struct msgb *msg); - char * (*oml_status)(const struct gsm_bts *bts); - - void (*e1line_bind_ops)(struct e1inp_line *line); - - void (*config_write_bts)(struct vty *vty, struct gsm_bts *bts); - void (*config_write_trx)(struct vty *vty, struct gsm_bts_trx *trx); - void (*config_write_ts)(struct vty *vty, struct gsm_bts_trx_ts *ts); - - /* Should SI2bis and SI2ter be disabled by default on this BTS model? */ - bool force_combined_si; - - struct tlv_definition nm_att_tlvdef; - - /* features of a given BTS model set via gsm_bts_model_register() locally */ - struct bitvec features; - uint8_t _features_data[MAX_BTS_FEATURES/8]; -}; - - - /* * This keeps track of the paging status of one BTS. It * includes a number of pending requests, a back pointer @@ -1004,280 +944,6 @@ struct msgb *mb; }; -/* One BTS */ -struct gsm_bts { - /* list header in net->bts_list */ - struct llist_head list; - - /* Geographical location of the BTS */ - struct llist_head loc_list; - - /* number of this BTS in network */ - uint8_t nr; - /* human readable name / description */ - char *description; - /* Cell Identity */ - uint16_t cell_identity; - /* location area code of this BTS */ - uint16_t location_area_code; - /* Base Station Identification Code (BSIC), lower 3 bits is BCC, - * which is used as TSC for the CCCH */ - uint8_t bsic; - /* type of BTS */ - enum gsm_bts_type type; - enum gsm_bts_type_variant variant; - struct gsm_bts_model *model; - enum gsm_band band; - char version[MAX_VERSION_LENGTH]; - char sub_model[MAX_VERSION_LENGTH]; - - /* features of a given BTS set/reported via OML */ - struct bitvec features; - uint8_t _features_data[MAX_BTS_FEATURES/8]; - - /* Connected PCU version (if any) */ - char pcu_version[MAX_VERSION_LENGTH]; - - /* maximum Tx power that the MS is permitted to use in this cell */ - int ms_max_power; - - /* how do we talk OML with this TRX? */ - struct gsm_e1_subslot oml_e1_link; - uint8_t oml_tei; - struct e1inp_sign_link *oml_link; - /* Timer to use for deferred drop of OML link, see \ref ipaccess_drop_oml_deferred */ - struct osmo_timer_list oml_drop_link_timer; - /* when OML link was established */ - time_t uptime; - - /* Abis network management O&M handle */ - struct abis_nm_h *nmh; - - struct gsm_abis_mo mo; - - /* number of this BTS on given E1 link */ - uint8_t bts_nr; - - /* DTX features of this BTS */ - enum gsm48_dtx_mode dtxu; - bool dtxd; - - /* paging state and control */ - struct gsm_bts_paging_state paging; - - /* CCCH is on C0 */ - struct gsm_bts_trx *c0; - - struct { - struct gsm_abis_mo mo; - } site_mgr; - - /* bitmask of all SI that are present/valid in si_buf */ - uint32_t si_valid; - /* 3GPP TS 44.018 Table 10.5.2.33b.1 INDEX and COUNT for SI2quater */ - uint8_t si2q_index; /* distinguish individual SI2quater messages */ - uint8_t si2q_count; /* si2q_index for the last (highest indexed) individual SI2quater message */ - /* buffers where we put the pre-computed SI */ - sysinfo_buf_t si_buf[_MAX_SYSINFO_TYPE][SI2Q_MAX_NUM]; - /* offsets used while generating SI2quater */ - size_t e_offset; - size_t u_offset; - /* 3GPP TS 08.58 ?8.5.1 BCCH INFORMATION. Some nanoBTS fail upon - * receival of empty SI disabling unsupported SI. see OS#3707. */ - bool si_unused_send_empty; - - /* ip.access Unit ID's have Site/BTS/TRX layout */ - union { - struct { - uint16_t site_id; - uint16_t bts_id; - uint32_t flags; - uint32_t rsl_ip; - } ip_access; - struct { - struct { - struct gsm_abis_mo mo; - } cclk; - struct { - struct gsm_abis_mo mo; - } rack; - struct gsm_envabtse envabtse[4]; - } bs11; - struct { - struct { - struct om2k_mo om2k_mo; - struct gsm_abis_mo mo; - struct llist_head conn_groups; - } cf; - struct { - struct om2k_mo om2k_mo; - struct gsm_abis_mo mo; - struct llist_head conn_groups; - } is; - struct { - struct om2k_mo om2k_mo; - struct gsm_abis_mo mo; - struct llist_head conn_groups; - } con; - struct { - struct om2k_mo om2k_mo; - struct gsm_abis_mo mo; - } dp; - struct { - struct om2k_mo om2k_mo; - struct gsm_abis_mo mo; - } tf; - struct { - struct om2k_mo om2k_mo; - struct gsm_abis_mo mo; - } mctr; - uint32_t use_superchannel:1; - struct { - uint16_t limit; - uint16_t active; - } om2k_version[16]; - } rbs2000; - struct { - uint8_t bts_type; - unsigned int configured:1, /* we sent the config data request */ - skip_reset:1, /* skip reset at bootstrap */ - no_loc_rel_cnf:1, /* don't wait for RSL REL CONF */ - bts_reset_timer_cnf, /* timer for BTS RESET */ - did_reset:1, /* we received a RESET ACK */ - wait_reset:2; /* we are waiting for reset to complete */ - struct osmo_timer_list reset_timer; - } nokia; - }; - - /* Not entirely sure how ip.access specific this is */ - struct { - enum bts_gprs_mode mode; - struct { - struct gsm_abis_mo mo; - uint16_t nsei; - uint8_t timer[7]; - } nse; - struct { - struct gsm_abis_mo mo; - uint16_t bvci; - uint8_t timer[11]; - struct gprs_rlc_cfg rlc_cfg; - } cell; - struct gsm_bts_gprs_nsvc nsvc[2]; - uint8_t rac; - uint8_t net_ctrl_ord; - bool ctrl_ack_type_use_block; - bool egprs_pkt_chan_request; - } gprs; - - /* threshold (in percent) when BTS shall send CCCH LOAD IND */ - int ccch_load_ind_thresh; - - /* RACH NM values */ - int rach_b_thresh; - int rach_ldavg_slots; - - /* transceivers */ - int num_trx; - struct llist_head trx_list; - - /* SI related items */ - int force_combined_si; - bool force_combined_si_set; - int bcch_change_mark; - - /* Abis NM queue */ - struct llist_head abis_queue; - int abis_nm_pend; - - struct gsm_network *network; - - /* should the channel allocator allocate channels from high TRX to TRX0, - * rather than starting from TRX0 and go upwards? */ - int chan_alloc_reverse; - - enum neigh_list_manual_mode neigh_list_manual_mode; - /* parameters from which we build SYSTEM INFORMATION */ - struct { - struct gsm48_rach_control rach_control; - uint8_t ncc_permitted; - struct gsm48_cell_sel_par cell_sel_par; - struct gsm48_si_selection_params cell_ro_sel_par; /* rest octet */ - struct gsm48_cell_options cell_options; - struct gsm48_control_channel_descr chan_desc; - struct bitvec neigh_list; - struct bitvec cell_alloc; - struct bitvec si5_neigh_list; - struct osmo_earfcn_si2q si2quater_neigh_list; - size_t uarfcn_length; /* index for uarfcn and scramble lists */ - struct { - /* bitmask large enough for all possible ARFCN's */ - uint8_t neigh_list[1024/8]; - uint8_t cell_alloc[1024/8]; - /* If the user wants a different neighbor list in SI5 than in SI2 */ - uint8_t si5_neigh_list[1024/8]; - uint8_t meas_bw_list[MAX_EARFCN_LIST]; - uint16_t earfcn_list[MAX_EARFCN_LIST]; - uint16_t uarfcn_list[MAX_EARFCN_LIST]; - uint16_t scramble_list[MAX_EARFCN_LIST]; - } data; - } si_common; - bool early_classmark_allowed; - bool early_classmark_allowed_3g; - /* for testing only: Have an infinitely long radio link timeout */ - bool infinite_radio_link_timeout; - - /* do we use static (user-defined) system information messages? (bitmask) */ - uint32_t si_mode_static; - - /* access control class ramping */ - struct acc_ramp acc_ramp; - - /* exclude the BTS from the global RF Lock handling */ - int excl_from_rf_lock; - - /* supported codecs beside FR */ - struct bts_codec_conf codec; - - /* BTS dependencies bit field */ - uint32_t depends_on[256/(8*4)]; - - /* full and half rate multirate config */ - struct amr_multirate_conf mr_full; - struct amr_multirate_conf mr_half; - - /* PCU socket state */ - char *pcu_sock_path; - struct pcu_sock_state *pcu_state; - - struct rate_ctr_group *bts_ctrs; - struct osmo_stat_item_group *bts_statg; - - struct handover_cfg *ho; - - /* A list of struct gsm_bts_ref, indicating neighbors of this BTS. - * When the si_common neigh_list is in automatic mode, it is populated from this list as well as - * gsm_network->neighbor_bss_cells. */ - struct llist_head local_neighbors; - - /* BTS-specific overrides for timer values from struct gsm_network. */ - uint8_t T3122; /* ASSIGNMENT REJECT wait indication */ - bool T3113_dynamic; /* Calculate T3113 timeout dynamically based on BTS channel config and load */ - - /* Periodic channel load measurements are used to maintain T3122. */ - struct load_counter chan_load_samples[7]; - int chan_load_samples_idx; - uint8_t chan_load_avg; /* current channel load average in percent (0 - 100). */ - - /* cell broadcast system */ - struct osmo_timer_list cbch_timer; - struct bts_smscb_chan_state cbch_basic; - struct bts_smscb_chan_state cbch_extended; - struct osmo_timer_list etws_timer; /* when to stop ETWS PN */ - - struct llist_head oml_fail_rep; -}; - /* One rejected BTS */ struct gsm_bts_rejected { /* list header in net->bts_rejected */ @@ -1291,28 +957,14 @@ struct gsm_network *gsm_network_init(void *ctx); -struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, uint8_t bts_num); struct gsm_bts *gsm_bts_num(const struct gsm_network *net, int num); -bool gsm_bts_matches_lai(const struct gsm_bts *bts, const struct osmo_location_area_id *lai); -bool gsm_bts_matches_cell_id(const struct gsm_bts *bts, const struct gsm0808_cell_id *cell_id); struct gsm_bts *gsm_bts_by_cell_id(const struct gsm_network *net, const struct gsm0808_cell_id *cell_id, int match_idx); -int gsm_bts_local_neighbor_add(struct gsm_bts *bts, struct gsm_bts *neighbor); -int gsm_bts_local_neighbor_del(struct gsm_bts *bts, const struct gsm_bts *neighbor); struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts); struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num); -enum gsm_bts_type str2btstype(const char *arg); -const char *btstype2str(enum gsm_bts_type type); - -enum bts_attribute str2btsattr(const char *s); -const char *btsatttr2str(enum bts_attribute v); - -enum gsm_bts_type_variant str2btsvariant(const char *arg); -const char *btsvariant2str(enum gsm_bts_type_variant v); - extern const struct value_string gsm_chreq_descs[]; extern const struct value_string gsm_pchant_names[]; extern const struct value_string gsm_pchant_descs[]; @@ -1323,7 +975,6 @@ enum gsm_phys_chan_config gsm_pchan_parse(const char *name); const char *gsm_lchant_name(enum gsm_chan_t c); const char *gsm_chreq_name(enum gsm_chreq_reason_t c); -char *gsm_bts_name(const struct gsm_bts *bts); char *gsm_trx_name(const struct gsm_bts_trx *trx); char *gsm_ts_name(const struct gsm_bts_trx_ts *ts); char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts); @@ -1335,6 +986,8 @@ } void gsm_abis_mo_reset(struct gsm_abis_mo *mo); +void gsm_mo_init(struct gsm_abis_mo *mo, struct gsm_bts *bts, + uint8_t obj_class, uint8_t p1, uint8_t p2, uint8_t p3); struct gsm_nm_state * gsm_objclass2nmstate(struct gsm_bts *bts, uint8_t obj_class, @@ -1343,9 +996,6 @@ gsm_objclass2obj(struct gsm_bts *bts, uint8_t obj_class, const struct abis_om_obj_inst *obj_inst); -/* reset the state of all MO in the BTS */ -void gsm_bts_mo_reset(struct gsm_bts *bts); - uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan, uint8_t ts_nr, uint8_t lchan_nr); uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan); @@ -1356,16 +1006,7 @@ const struct gsm_lchan *lchan); void gsm48_lchan2chan_desc_as_configured(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan); -/* return the gsm_lchan for the CBCH (if it exists at all) */ -struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts); - -static inline uint8_t gsm_ts_tsc(const struct gsm_bts_trx_ts *ts) -{ - if (ts->tsc != -1) - return ts->tsc; - else - return ts->trx->bts->bsic & 7; -} +uint8_t gsm_ts_tsc(const struct gsm_bts_trx_ts *ts); struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr, int *rc); @@ -1375,164 +1016,11 @@ bool ts_is_tch(struct gsm_bts_trx_ts *ts); -static inline struct gsm_bts *conn_get_bts(struct gsm_subscriber_connection *conn) { - if (!conn || !conn->lchan) - return NULL; - return conn->lchan->ts->trx->bts; -} +struct gsm_bts *conn_get_bts(struct gsm_subscriber_connection *conn); void conn_update_ms_power_class(struct gsm_subscriber_connection *conn, uint8_t power_class); void lchan_update_ms_power_ctrl_level(struct gsm_lchan *lchan, int ms_power_dbm); -enum bts_counter_id { - BTS_CTR_CHREQ_TOTAL, - BTS_CTR_CHREQ_SUCCESSFUL, - BTS_CTR_CHREQ_NO_CHANNEL, - BTS_CTR_CHAN_RF_FAIL, - BTS_CTR_CHAN_RLL_ERR, - BTS_CTR_BTS_OML_FAIL, - BTS_CTR_BTS_RSL_FAIL, - BTS_CTR_CODEC_AMR_F, - BTS_CTR_CODEC_AMR_H, - BTS_CTR_CODEC_EFR, - BTS_CTR_CODEC_V1_FR, - BTS_CTR_CODEC_V1_HR, - BTS_CTR_PAGING_ATTEMPTED, - BTS_CTR_PAGING_ALREADY, - BTS_CTR_PAGING_RESPONDED, - BTS_CTR_PAGING_EXPIRED, - BTS_CTR_PAGING_NO_ACTIVE_PAGING, - BTS_CTR_PAGING_MSC_FLUSH, - BTS_CTR_CHAN_ACT_TOTAL, - BTS_CTR_CHAN_ACT_NACK, - BTS_CTR_RSL_UNKNOWN, - BTS_CTR_RSL_IPA_NACK, - BTS_CTR_RSL_DELETE_IND, - BTS_CTR_MODE_MODIFY_NACK, - BTS_CTR_LCHAN_BORKEN_FROM_UNUSED, - BTS_CTR_LCHAN_BORKEN_FROM_WAIT_ACTIV_ACK, - BTS_CTR_LCHAN_BORKEN_FROM_WAIT_RF_RELEASE_ACK, - BTS_CTR_LCHAN_BORKEN_FROM_BORKEN, - BTS_CTR_LCHAN_BORKEN_FROM_UNKNOWN, - BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_ACK, - BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_NACK, - BTS_CTR_LCHAN_BORKEN_EV_RF_CHAN_REL_ACK, - BTS_CTR_LCHAN_BORKEN_EV_VTY, - BTS_CTR_LCHAN_BORKEN_EV_TEARDOWN, - BTS_CTR_TS_BORKEN_FROM_NOT_INITIALIZED, - BTS_CTR_TS_BORKEN_FROM_UNUSED, - BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_ACT, - BTS_CTR_TS_BORKEN_FROM_PDCH, - BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_DEACT, - BTS_CTR_TS_BORKEN_FROM_IN_USE, - BTS_CTR_TS_BORKEN_FROM_BORKEN, - BTS_CTR_TS_BORKEN_FROM_UNKNOWN, - BTS_CTR_TS_BORKEN_EV_PDCH_ACT_ACK_NACK, - BTS_CTR_TS_BORKEN_EV_PDCH_DEACT_ACK_NACK, - BTS_CTR_TS_BORKEN_EV_TEARDOWN, - BTS_CTR_ASSIGNMENT_ATTEMPTED, - BTS_CTR_ASSIGNMENT_COMPLETED, - BTS_CTR_ASSIGNMENT_STOPPED, - BTS_CTR_ASSIGNMENT_NO_CHANNEL, - BTS_CTR_ASSIGNMENT_TIMEOUT, - BTS_CTR_ASSIGNMENT_FAILED, - BTS_CTR_ASSIGNMENT_ERROR, -}; - -static const struct rate_ctr_desc bts_ctr_description[] = { - [BTS_CTR_CHREQ_TOTAL] = {"chreq:total", "Received channel requests"}, - [BTS_CTR_CHREQ_SUCCESSFUL] = {"chreq:successful", "Successful channel requests (immediate assign sent)"}, - [BTS_CTR_CHREQ_NO_CHANNEL] = {"chreq:no_channel", "Sent to MS no channel available"}, - [BTS_CTR_CHAN_RF_FAIL] = {"chan:rf_fail", "Received a RF failure indication from BTS"}, - [BTS_CTR_CHAN_RLL_ERR] = {"chan:rll_err", "Received a RLL failure with T200 cause from BTS"}, - [BTS_CTR_BTS_OML_FAIL] = {"oml_fail", "Received a TEI down on a OML link"}, - [BTS_CTR_BTS_RSL_FAIL] = {"rsl_fail", "Received a TEI down on a OML link"}, - [BTS_CTR_CODEC_AMR_F] = {"codec:amr_f", "Count the usage of AMR/F codec by channel mode requested"}, - [BTS_CTR_CODEC_AMR_H] = {"codec:amr_h", "Count the usage of AMR/H codec by channel mode requested"}, - [BTS_CTR_CODEC_EFR] = {"codec:efr", "Count the usage of EFR codec by channel mode requested"}, - [BTS_CTR_CODEC_V1_FR] = {"codec:fr", "Count the usage of FR codec by channel mode requested"}, - [BTS_CTR_CODEC_V1_HR] = {"codec:hr", "Count the usage of HR codec by channel mode requested"}, - - [BTS_CTR_PAGING_ATTEMPTED] = {"paging:attempted", "Paging attempts for a subscriber"}, - [BTS_CTR_PAGING_ALREADY] = {"paging:already", "Paging attempts ignored as subscriber was already being paged"}, - [BTS_CTR_PAGING_RESPONDED] = {"paging:responded", "Paging attempts with successful paging response"}, - [BTS_CTR_PAGING_EXPIRED] = {"paging:expired", "Paging Request expired because of timeout T3113"}, - [BTS_CTR_PAGING_NO_ACTIVE_PAGING] = {"paging:no_active_paging", "Paging response without an active paging request (arrived after paging expiration?)"}, - [BTS_CTR_PAGING_MSC_FLUSH] = {"paging:msc_flush", "Paging flushed due to MSC Reset BSSMAP message"}, - [BTS_CTR_CHAN_ACT_TOTAL] = {"chan_act:total", "Total number of Channel Activations"}, - [BTS_CTR_CHAN_ACT_NACK] = {"chan_act:nack", "Number of Channel Activations that the BTS NACKed"}, - [BTS_CTR_RSL_UNKNOWN] = {"rsl:unknown", "Number of unknown/unsupported RSL messages received from BTS"}, - [BTS_CTR_RSL_IPA_NACK] = {"rsl:ipa_nack", "Number of IPA (RTP/dyn-PDCH) related NACKs received from BTS"}, - [BTS_CTR_RSL_DELETE_IND] = {"rsl:delete_ind", "Number of RSL DELETE INDICATION (DL CCCH overload)"}, - [BTS_CTR_MODE_MODIFY_NACK] = {"chan:mode_modify_nack", "Number of Channel Mode Modify NACKs received from BTS"}, - - /* lchan/TS BORKEN state counters */ - [BTS_CTR_LCHAN_BORKEN_FROM_UNUSED] = {"lchan_borken:from_state:unused", "Transitions from lchan UNUSED state to BORKEN state"}, - [BTS_CTR_LCHAN_BORKEN_FROM_WAIT_ACTIV_ACK] = {"lchan_borken:from_state:wait_activ_ack", "Transitions from lchan WAIT_ACTIV_ACK state to BORKEN state"}, - [BTS_CTR_LCHAN_BORKEN_FROM_WAIT_RF_RELEASE_ACK] = {"lchan_borken:from_state:wait_rf_release_ack", "Transitions from lchan WAIT_RF_RELEASE_ACK state to BORKEN state"}, - [BTS_CTR_LCHAN_BORKEN_FROM_BORKEN] = {"lchan_borken:from_state:borken", "Transitions from lchan BORKEN state to BORKEN state"}, - [BTS_CTR_LCHAN_BORKEN_FROM_UNKNOWN] = {"lchan_borken:from_state:unknown", "Transitions from an unknown lchan state to BORKEN state"}, - [BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_ACK] = {"lchan_borken:event:chan_activ_ack", "CHAN_ACTIV_ACK received in the lchan BORKEN state"}, - [BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_NACK] = {"lchan_borken:event:chan_activ_nack", "CHAN_ACTIV_NACK received in the lchan BORKEN state"}, - [BTS_CTR_LCHAN_BORKEN_EV_RF_CHAN_REL_ACK] = {"lchan_borken:event:rf_chan_rel_ack", "RF_CHAN_REL_ACK received in the lchan BORKEN state"}, - [BTS_CTR_LCHAN_BORKEN_EV_VTY] = {"lchan_borken:event:vty", "VTY commands received in the lchan BORKEN state"}, - [BTS_CTR_LCHAN_BORKEN_EV_TEARDOWN] = {"lchan_borken:event:teardown", "lchan in a BORKEN state is shutting down (BTS disconnected?)"}, - [BTS_CTR_TS_BORKEN_FROM_NOT_INITIALIZED] = {"ts_borken:from_state:not_initialized", "Transitions from TS NOT_INITIALIZED state to BORKEN state"}, - [BTS_CTR_TS_BORKEN_FROM_UNUSED] = {"ts_borken:from_state:unused", "Transitions from TS UNUSED state to BORKEN state"}, - [BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_ACT] = {"ts_borken:from_state:wait_pdch_act", "Transitions from TS WAIT_PDCH_ACT state to BORKEN state"}, - [BTS_CTR_TS_BORKEN_FROM_PDCH] = {"ts_borken:from_state:pdch", "Transitions from TS PDCH state to BORKEN state"}, - [BTS_CTR_TS_BORKEN_FROM_WAIT_PDCH_DEACT] = {"ts_borken:from_state:wait_pdch_deact", "Transitions from TS WAIT_PDCH_DEACT state to BORKEN state"}, - [BTS_CTR_TS_BORKEN_FROM_IN_USE] = {"ts_borken:from_state:in_use", "Transitions from TS IN_USE state to BORKEN state"}, - [BTS_CTR_TS_BORKEN_FROM_BORKEN] = {"ts_borken:from_state:borken", "Transitions from TS BORKEN state to BORKEN state"}, - [BTS_CTR_TS_BORKEN_FROM_UNKNOWN] = {"ts_borken:from_state:unknown", "Transitions from an unknown TS state to BORKEN state"}, - [BTS_CTR_TS_BORKEN_EV_PDCH_ACT_ACK_NACK] = {"ts_borken:event:pdch_act_ack_nack", "PDCH_ACT_ACK/NACK received in the TS BORKEN state"}, - [BTS_CTR_TS_BORKEN_EV_PDCH_DEACT_ACK_NACK] = {"ts_borken:event:pdch_deact_ack_nack", "PDCH_DEACT_ACK/NACK received in the TS BORKEN state"}, - [BTS_CTR_TS_BORKEN_EV_TEARDOWN] = {"ts_borken:event:teardown", "TS in a BORKEN state is shutting down (BTS disconnected?)"}, - [BTS_CTR_ASSIGNMENT_ATTEMPTED] = {"assignment:attempted", "Assignment attempts"}, - [BTS_CTR_ASSIGNMENT_COMPLETED] = {"assignment:completed", "Assignment completed"}, - [BTS_CTR_ASSIGNMENT_STOPPED] = {"assignment:stopped", "Connection ended during Assignment"}, - [BTS_CTR_ASSIGNMENT_NO_CHANNEL] = {"assignment:no_channel", "Failure to allocate lchan for Assignment"}, - [BTS_CTR_ASSIGNMENT_TIMEOUT] = {"assignment:timeout", "Assignment timed out"}, - [BTS_CTR_ASSIGNMENT_FAILED] = {"assignment:failed", "Received Assignment Failure message"}, - [BTS_CTR_ASSIGNMENT_ERROR] = {"assignment:error", "Assignment failed for other reason"}, - -}; - -static const struct rate_ctr_group_desc bts_ctrg_desc = { - "bts", - "base transceiver station", - OSMO_STATS_CLASS_GLOBAL, - ARRAY_SIZE(bts_ctr_description), - bts_ctr_description, -}; - -enum { - BTS_STAT_CHAN_LOAD_AVERAGE, - BTS_STAT_CHAN_CCCH_SDCCH4_USED, - BTS_STAT_CHAN_CCCH_SDCCH4_TOTAL, - BTS_STAT_CHAN_TCH_F_USED, - BTS_STAT_CHAN_TCH_F_TOTAL, - BTS_STAT_CHAN_TCH_H_USED, - BTS_STAT_CHAN_TCH_H_TOTAL, - BTS_STAT_CHAN_SDCCH8_USED, - BTS_STAT_CHAN_SDCCH8_TOTAL, - BTS_STAT_CHAN_TCH_F_PDCH_USED, - BTS_STAT_CHAN_TCH_F_PDCH_TOTAL, - BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_USED, - BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_TOTAL, - BTS_STAT_CHAN_SDCCH8_CBCH_USED, - BTS_STAT_CHAN_SDCCH8_CBCH_TOTAL, - BTS_STAT_CHAN_TCH_F_TCH_H_PDCH_USED, - BTS_STAT_CHAN_TCH_F_TCH_H_PDCH_TOTAL, - BTS_STAT_T3122, - BTS_STAT_RACH_BUSY, - BTS_STAT_RACH_ACCESS, - BTS_STAT_OML_CONNECTED, - BTS_STAT_RSL_CONNECTED, - BTS_STAT_LCHAN_BORKEN, - BTS_STAT_TS_BORKEN, -}; - enum { BSC_CTR_ASSIGNMENT_ATTEMPTED, BSC_CTR_ASSIGNMENT_COMPLETED, @@ -1743,20 +1231,8 @@ ver : 7; }; -static inline const struct osmo_location_area_id *bts_lai(struct gsm_bts *bts) -{ - static struct osmo_location_area_id lai; - lai = (struct osmo_location_area_id){ - .plmn = bts->network->plmn, - .lac = bts->location_area_code, - }; - return &lai; -} - extern void talloc_ctx_init(void *ctx_root); -int gsm_set_bts_type(struct gsm_bts *bts, enum gsm_bts_type type); - enum gsm_bts_type parse_btstype(const char *arg); const char *btstype2str(enum gsm_bts_type type); struct gsm_bts *gsm_bts_by_lac(struct gsm_network *net, unsigned int lac, @@ -1764,91 +1240,14 @@ extern void *tall_bsc_ctx; -/* this actually refers to the IPA transport, not the BTS model */ -static inline int is_ipaccess_bts(const struct gsm_bts *bts) -{ - switch (bts->type) { - case GSM_BTS_TYPE_NANOBTS: - case GSM_BTS_TYPE_OSMOBTS: - return 1; - default: - break; - } - return 0; -} - -static inline int is_sysmobts_v2(const struct gsm_bts *bts) -{ - switch (bts->type) { - case GSM_BTS_TYPE_OSMOBTS: - return 1; - default: - break; - } - return 0; -} - -static inline int is_siemens_bts(const struct gsm_bts *bts) -{ - switch (bts->type) { - case GSM_BTS_TYPE_BS11: - return 1; - default: - break; - } - - return 0; -} - -static inline int is_nokia_bts(const struct gsm_bts *bts) -{ - switch (bts->type) { - case GSM_BTS_TYPE_NOKIA_SITE: - return 1; - default: - break; - } - - return 0; -} - -static inline int is_ericsson_bts(const struct gsm_bts *bts) -{ - switch (bts->type) { - case GSM_BTS_TYPE_RBS2000: - return 1; - default: - break; - } - - return 0; -} - -static inline int is_e1_bts(const struct gsm_bts *bts) -{ - switch (bts->type) { - case GSM_BTS_TYPE_BS11: - case GSM_BTS_TYPE_RBS2000: - case GSM_BTS_TYPE_NOKIA_SITE: - return 1; - default: - break; - } - - return 0; -} - extern struct gsm_network *bsc_gsmnet; enum bts_gprs_mode bts_gprs_mode_parse(const char *arg, int *valid); const char *bts_gprs_mode_name(enum bts_gprs_mode mode); -int bts_gprs_mode_is_compat(struct gsm_bts *bts, enum bts_gprs_mode mode); void gsm48_ra_id_by_bts(struct gsm48_ra_id *buf, struct gsm_bts *bts); void gprs_ra_id_by_bts(struct gprs_ra_id *raid, struct gsm_bts *bts); -int gsm_bts_model_register(struct gsm_bts_model *model); - struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *network); struct gsm_bts *gsm_bts_alloc_register(struct gsm_network *net, enum gsm_bts_type type, uint8_t bsic); @@ -1858,42 +1257,23 @@ uint8_t e1_ts, uint8_t e1_ts_ss); void gsm_trx_lock_rf(struct gsm_bts_trx *trx, bool locked, const char *reason); -struct gsm_bts_trx *gsm_bts_trx_by_nr(struct gsm_bts *bts, int nr); int gsm_bts_trx_set_system_infos(struct gsm_bts_trx *trx); int gsm_bts_set_system_infos(struct gsm_bts *bts); /* generic E1 line operations for all ISDN-based BTS. */ extern struct e1inp_line_ops bts_isdn_e1inp_line_ops; -extern const struct value_string bts_type_names[_NUM_GSM_BTS_TYPE+1]; -extern const struct value_string bts_type_descs[_NUM_GSM_BTS_TYPE+1]; - -char *get_model_oml_status(const struct gsm_bts *bts); - -unsigned long long bts_uptime(const struct gsm_bts *bts); - /* control interface handling */ int bsc_base_ctrl_cmds_install(void); -/* dependency handling */ -void bts_depend_mark(struct gsm_bts *bts, int dep); -void bts_depend_clear(struct gsm_bts *bts, int dep); -int bts_depend_check(struct gsm_bts *bts); -int bts_depend_is_depedency(struct gsm_bts *base, struct gsm_bts *other); - -int gsm_bts_get_radio_link_timeout(const struct gsm_bts *bts); -void gsm_bts_set_radio_link_timeout(struct gsm_bts *bts, int value); - bool trx_is_usable(const struct gsm_bts_trx *trx); bool ts_is_usable(const struct gsm_bts_trx_ts *ts); int gsm_lchan_type_by_pchan(enum gsm_phys_chan_config pchan); enum gsm_phys_chan_config gsm_pchan_by_lchan_type(enum gsm_chan_t type); -void gsm_bts_all_ts_dispatch(struct gsm_bts *bts, uint32_t ts_ev, void *data); void gsm_trx_all_ts_dispatch(struct gsm_bts_trx *trx, uint32_t ts_ev, void *data); - -int bts_count_free_ts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan); +int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan); bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx); diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am index 145ea39..273530c 100644 --- a/src/ipaccess/Makefile.am +++ b/src/ipaccess/Makefile.am @@ -46,6 +46,7 @@ # FIXME: resolve the bogus dependencies patched around here: ipaccess_config_LDADD = \ + $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ @@ -57,9 +58,10 @@ ipaccess_proxy_SOURCES = \ ipaccess-proxy.c \ stubs.c \ - $(top_srcdir)/src/osmo-bsc/gsm_data.c \ $(NULL) ipaccess_proxy_LDADD = \ + $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(OSMO_LIBS) \ $(NULL) diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index f7d7332..34ad57f 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -56,6 +56,7 @@ #include #include #include +#include struct gsm_network *bsc_gsmnet; diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am index 0665af6..f66421a 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -43,6 +43,7 @@ bsc_subscr_conn_fsm.c \ bsc_subscriber.c \ bsc_vty.c \ + bts.c \ bts_ericsson_rbs2000.c \ bts_init.c \ bts_ipaccess_nanobts.c \ diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 8dde8de..4ce27f3 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -48,6 +48,7 @@ #include #include #include +#include #include #define OM_ALLOC_SIZE 1024 @@ -853,14 +854,6 @@ return true; } -char *get_model_oml_status(const struct gsm_bts *bts) -{ - if (bts->model->oml_status) - return bts->model->oml_status(bts); - - return "unknown"; -} - void abis_nm_queue_send_next(struct gsm_bts *bts) { int wait = 0; diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index 0aea684..1e4ef97 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -44,6 +44,7 @@ #include #include #include +#include #include /* FIXME: move to libosmocore */ diff --git a/src/osmo-bsc/abis_om2000_vty.c b/src/osmo-bsc/abis_om2000_vty.c index 222546f..b00c7dd 100644 --- a/src/osmo-bsc/abis_om2000_vty.c +++ b/src/osmo-bsc/abis_om2000_vty.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index f6e564b..1ffdd06 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -54,7 +54,7 @@ #include #include #include - +#include #define RSL_ALLOC_SIZE 1024 #define RSL_ALLOC_HEADROOM 128 diff --git a/src/osmo-bsc/acc_ramp.c b/src/osmo-bsc/acc_ramp.c index b79c0c2..761ab09 100644 --- a/src/osmo-bsc/acc_ramp.c +++ b/src/osmo-bsc/acc_ramp.c @@ -29,6 +29,7 @@ #include #include #include +#include /* * Check if an ACC has been permanently barred for a BTS, diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index cd5abc8..ca29daa 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -34,6 +34,7 @@ #include #include #include +#include #include diff --git a/src/osmo-bsc/bsc_ctrl_commands.c b/src/osmo-bsc/bsc_ctrl_commands.c index 774ded2..9383167 100644 --- a/src/osmo-bsc/bsc_ctrl_commands.c +++ b/src/osmo-bsc/bsc_ctrl_commands.c @@ -30,6 +30,7 @@ #include #include #include +#include CTRL_CMD_DEFINE(net_mcc, "mcc"); static int get_net_mcc(struct ctrl_cmd *cmd, void *_data) diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c index 7333533..4fc0ab1 100644 --- a/src/osmo-bsc/bsc_init.c +++ b/src/osmo-bsc/bsc_init.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -68,24 +69,6 @@ return 0; } -unsigned long long bts_uptime(const struct gsm_bts *bts) -{ - struct timespec tp; - - if (!bts->uptime || !bts->oml_link) { - LOGP(DNM, LOGL_ERROR, "BTS %u OML link uptime unavailable\n", bts->nr); - return 0; - } - - if (clock_gettime(CLOCK_MONOTONIC, &tp) != 0) { - LOGP(DNM, LOGL_ERROR, "BTS %u uptime computation failure: %s\n", bts->nr, strerror(errno)); - return 0; - } - - /* monotonic clock helps to ensure that the conversion is valid */ - return difftime(tp.tv_sec, bts->uptime); -} - static int rsl_si(struct gsm_bts_trx *trx, enum osmo_sysinfo_type i, int si_len) { struct gsm_bts *bts = trx->bts; diff --git a/src/osmo-bsc/bsc_rf_ctrl.c b/src/osmo-bsc/bsc_rf_ctrl.c index c72154a..1e04f21 100644 --- a/src/osmo-bsc/bsc_rf_ctrl.c +++ b/src/osmo-bsc/bsc_rf_ctrl.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 36b16a2..aa08e8b 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -73,6 +73,7 @@ #include #include #include +#include #include #include diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c new file mode 100644 index 0000000..71968f6 --- /dev/null +++ b/src/osmo-bsc/bts.c @@ -0,0 +1,748 @@ +/* (C) 2008-2018 by Harald Welte + * (C) 2020 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include + +#include +#include +#include + +const struct value_string bts_attribute_names[] = { + OSMO_VALUE_STRING(BTS_TYPE_VARIANT), + OSMO_VALUE_STRING(BTS_SUB_MODEL), + OSMO_VALUE_STRING(TRX_PHY_VERSION), + { 0, NULL } +}; + +enum bts_attribute str2btsattr(const char *s) +{ + return get_string_value(bts_attribute_names, s); +} + +const char *btsatttr2str(enum bts_attribute v) +{ + return get_value_string(bts_attribute_names, v); +} + +const struct value_string osmo_bts_variant_names[_NUM_BTS_VARIANT + 1] = { + { BTS_UNKNOWN, "unknown" }, + { BTS_OSMO_LITECELL15, "osmo-bts-lc15" }, + { BTS_OSMO_OCTPHY, "osmo-bts-octphy" }, + { BTS_OSMO_SYSMO, "osmo-bts-sysmo" }, + { BTS_OSMO_TRX, "omso-bts-trx" }, + { 0, NULL } +}; + +enum gsm_bts_type_variant str2btsvariant(const char *arg) +{ + return get_string_value(osmo_bts_variant_names, arg); +} + +const char *btsvariant2str(enum gsm_bts_type_variant v) +{ + return get_value_string(osmo_bts_variant_names, v); +} + +const struct value_string bts_type_names[_NUM_GSM_BTS_TYPE + 1] = { + { GSM_BTS_TYPE_UNKNOWN, "unknown" }, + { GSM_BTS_TYPE_BS11, "bs11" }, + { GSM_BTS_TYPE_NANOBTS, "nanobts" }, + { GSM_BTS_TYPE_RBS2000, "rbs2000" }, + { GSM_BTS_TYPE_NOKIA_SITE, "nokia_site" }, + { GSM_BTS_TYPE_OSMOBTS, "sysmobts" }, + { 0, NULL } +}; + +const struct value_string bts_type_descs[_NUM_GSM_BTS_TYPE+1] = { + { GSM_BTS_TYPE_UNKNOWN, "Unknown BTS Type" }, + { GSM_BTS_TYPE_BS11, "Siemens BTS (BS-11 or compatible)" }, + { GSM_BTS_TYPE_NANOBTS, "ip.access nanoBTS or compatible" }, + { GSM_BTS_TYPE_RBS2000, "Ericsson RBS2000 Series" }, + { GSM_BTS_TYPE_NOKIA_SITE, "Nokia {Metro,Ultra,In}Site" }, + { GSM_BTS_TYPE_OSMOBTS, "sysmocom sysmoBTS" }, + { 0, NULL } +}; + +enum gsm_bts_type str2btstype(const char *arg) +{ + return get_string_value(bts_type_names, arg); +} + +const char *btstype2str(enum gsm_bts_type type) +{ + return get_value_string(bts_type_names, type); +} + +static void bts_init_cbch_state(struct bts_smscb_chan_state *cstate, struct gsm_bts *bts) +{ + cstate->bts = bts; + INIT_LLIST_HEAD(&cstate->messages); +} + +static LLIST_HEAD(bts_models); + +struct gsm_bts_model *bts_model_find(enum gsm_bts_type type) +{ + struct gsm_bts_model *model; + + llist_for_each_entry(model, &bts_models, list) { + if (model->type == type) + return model; + } + + return NULL; +} + +int gsm_bts_model_register(struct gsm_bts_model *model) +{ + if (bts_model_find(model->type)) + return -EEXIST; + + tlv_def_patch(&model->nm_att_tlvdef, &abis_nm_att_tlvdef); + llist_add_tail(&model->list, &bts_models); + return 0; +} + +static const struct osmo_stat_item_desc bts_stat_desc[] = { + [BTS_STAT_CHAN_LOAD_AVERAGE] = { "chanloadavg", "Channel load average", "%", 16, 0 }, + [BTS_STAT_CHAN_CCCH_SDCCH4_USED] = { "chan_ccch_sdcch4:used", + "Number of CCCH+SDCCH4 channels used", "", 16, 0 }, + [BTS_STAT_CHAN_CCCH_SDCCH4_TOTAL] = { "chan_ccch_sdcch4:total", + "Number of CCCH+SDCCH4 channels total", "", 16, 0 }, + [BTS_STAT_CHAN_TCH_F_USED] = { "chan_tch_f:used", + "Number of TCH/F channels used", "", 16, 0 }, + [BTS_STAT_CHAN_TCH_F_TOTAL] = { "chan_tch_f:total", + "Number of TCH/F channels total", "", 16, 0 }, + [BTS_STAT_CHAN_TCH_H_USED] = { "chan_tch_h:used", + "Number of TCH/H channels used", "", 16, 0 }, + [BTS_STAT_CHAN_TCH_H_TOTAL] = { "chan_tch_h:total", + "Number of TCH/H channels total", "", 16, 0 }, + [BTS_STAT_CHAN_SDCCH8_USED] = { "chan_sdcch8:used", + "Number of SDCCH8 channels used", "", 16, 0 }, + [BTS_STAT_CHAN_SDCCH8_TOTAL] = { "chan_sdcch8:total", + "Number of SDCCH8 channels total", "", 16, 0 }, + [BTS_STAT_CHAN_TCH_F_PDCH_USED] = { "chan_tch_f_pdch:used", + "Number of TCH/F_PDCH channels used", "", 16, 0 }, + [BTS_STAT_CHAN_TCH_F_PDCH_TOTAL] = { "chan_tch_f_pdch:total", + "Number of TCH/F_PDCH channels total", "", 16, 0 }, + [BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_USED] = { "chan_ccch_sdcch4_cbch:used", + "Number of CCCH+SDCCH4+CBCH channels used", "", 16, 0 }, + [BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_TOTAL] = { "chan_ccch_sdcch4_cbch:total", + "Number of CCCH+SDCCH4+CBCH channels total", "", 16, 0 }, + [BTS_STAT_CHAN_SDCCH8_CBCH_USED] = { "chan_sdcch8_cbch:used", + "Number of SDCCH8+CBCH channels used", "", 16, 0 }, + [BTS_STAT_CHAN_SDCCH8_CBCH_TOTAL] = { "chan_sdcch8_cbch:total", + "Number of SDCCH8+CBCH channels total", "", 16, 0 }, + [BTS_STAT_CHAN_TCH_F_TCH_H_PDCH_USED] = { "chan_tch_f_tch_h_pdch:used", + "Number of TCH/F_TCH/H_PDCH channels used", "", 16, 0 }, + [BTS_STAT_CHAN_TCH_F_TCH_H_PDCH_TOTAL] = { "chan_tch_f_tch_h_pdch:total", + "Number of TCH/F_TCH/H_PDCH channels total", "", 16, 0 }, + [BTS_STAT_T3122] = { "T3122", "T3122 IMMEDIATE ASSIGNMENT REJECT wait indicator", + "s", 16, GSM_T3122_DEFAULT }, + [BTS_STAT_RACH_BUSY] = { "rach_busy", + "RACH slots with signal above threshold", "%", 16, 0 }, + [BTS_STAT_RACH_ACCESS] = { "rach_access", + "RACH slots with access bursts in them", "%", 16, 0 }, + [BTS_STAT_OML_CONNECTED] = { "oml_connected", "Number of OML links connected", "", 16, 0 }, + [BTS_STAT_RSL_CONNECTED] = { "rsl_connected", "Number of RSL links connected", "", 16, 0 }, + [BTS_STAT_LCHAN_BORKEN] = { "lchan_borken", + "Number of lchans in the BORKEN state", "", 16, 0 }, + [BTS_STAT_TS_BORKEN] = { "ts_borken", + "Number of timeslots in the BORKEN state", "", 16, 0 }, +}; + +static const struct osmo_stat_item_group_desc bts_statg_desc = { + .group_name_prefix = "bts", + .group_description = "base transceiver station", + .class_id = OSMO_STATS_CLASS_GLOBAL, + .num_items = ARRAY_SIZE(bts_stat_desc), + .item_desc = bts_stat_desc, +}; + +static const uint8_t bts_nse_timer_default[] = { 3, 3, 3, 3, 30, 3, 10 }; +static const uint8_t bts_cell_timer_default[] = + { 3, 3, 3, 3, 3, 10, 3, 10, 3, 10, 3 }; +static const struct gprs_rlc_cfg rlc_cfg_default = { + .parameter = { + [RLC_T3142] = 20, + [RLC_T3169] = 5, + [RLC_T3191] = 5, + [RLC_T3193] = 160, /* 10ms */ + [RLC_T3195] = 5, + [RLC_N3101] = 10, + [RLC_N3103] = 4, + [RLC_N3105] = 8, + [CV_COUNTDOWN] = 15, + [T_DL_TBF_EXT] = 250 * 10, /* ms */ + [T_UL_TBF_EXT] = 250 * 10, /* ms */ + }, + .paging = { + .repeat_time = 5 * 50, /* ms */ + .repeat_count = 3, + }, + .cs_mask = 0x1fff, + .initial_cs = 2, + .initial_mcs = 6, +}; + +/* Initialize those parts that don't require osmo-bsc specific dependencies. + * This part is shared among the thin programs in osmo-bsc/src/utils/. + * osmo-bsc requires further initialization that pulls in more dependencies (see + * bsc_bts_alloc_register()). */ +struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, uint8_t bts_num) +{ + struct gsm_bts *bts = talloc_zero(net, struct gsm_bts); + struct gsm48_multi_rate_conf mr_cfg; + int i; + + if (!bts) + return NULL; + + bts->nr = bts_num; + bts->num_trx = 0; + INIT_LLIST_HEAD(&bts->trx_list); + bts->network = net; + + bts->ms_max_power = 15; /* dBm */ + + gsm_mo_init(&bts->mo, bts, NM_OC_BTS, + bts->nr, 0xff, 0xff); + gsm_mo_init(&bts->site_mgr.mo, bts, NM_OC_SITE_MANAGER, + 0xff, 0xff, 0xff); + + for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++) { + bts->gprs.nsvc[i].bts = bts; + bts->gprs.nsvc[i].id = i; + gsm_mo_init(&bts->gprs.nsvc[i].mo, bts, NM_OC_GPRS_NSVC, + bts->nr, i, 0xff); + } + memcpy(&bts->gprs.nse.timer, bts_nse_timer_default, + sizeof(bts->gprs.nse.timer)); + gsm_mo_init(&bts->gprs.nse.mo, bts, NM_OC_GPRS_NSE, + bts->nr, 0xff, 0xff); + memcpy(&bts->gprs.cell.timer, bts_cell_timer_default, + sizeof(bts->gprs.cell.timer)); + gsm_mo_init(&bts->gprs.cell.mo, bts, NM_OC_GPRS_CELL, + bts->nr, 0xff, 0xff); + memcpy(&bts->gprs.cell.rlc_cfg, &rlc_cfg_default, + sizeof(bts->gprs.cell.rlc_cfg)); + + /* 3GPP TS 08.18, chapter 5.4.1: 0 is reserved for signalling */ + bts->gprs.cell.bvci = 2; + + /* init statistics */ + bts->bts_ctrs = rate_ctr_group_alloc(bts, &bts_ctrg_desc, bts->nr); + if (!bts->bts_ctrs) { + talloc_free(bts); + return NULL; + } + bts->bts_statg = osmo_stat_item_group_alloc(bts, &bts_statg_desc, bts->nr); + + /* create our primary TRX */ + bts->c0 = gsm_bts_trx_alloc(bts); + if (!bts->c0) { + rate_ctr_group_free(bts->bts_ctrs); + osmo_stat_item_group_free(bts->bts_statg); + talloc_free(bts); + return NULL; + } + bts->c0->ts[0].pchan_from_config = GSM_PCHAN_CCCH_SDCCH4; /* TODO: really?? */ + + bts->ccch_load_ind_thresh = 10; /* 10% of Load: Start sending CCCH LOAD IND */ + bts->rach_b_thresh = -1; + bts->rach_ldavg_slots = -1; + + bts->paging.free_chans_need = -1; + INIT_LLIST_HEAD(&bts->paging.pending_requests); + + bts->features.data = &bts->_features_data[0]; + bts->features.data_len = sizeof(bts->_features_data); + + /* si handling */ + bts->bcch_change_mark = 1; + bts->chan_load_avg = 0; + + /* timer overrides */ + bts->T3122 = 0; /* not overridden by default */ + bts->T3113_dynamic = true; /* dynamic by default */ + + bts->dtxu = GSM48_DTX_SHALL_NOT_BE_USED; + bts->dtxd = false; + bts->gprs.ctrl_ack_type_use_block = true; /* use RLC/MAC control block */ + bts->neigh_list_manual_mode = NL_MODE_AUTOMATIC; + bts->early_classmark_allowed_3g = true; /* 3g Early Classmark Sending controlled by bts->early_classmark_allowed param */ + bts->si_unused_send_empty = true; + bts->si_common.cell_sel_par.cell_resel_hyst = 2; /* 4 dB */ + bts->si_common.cell_sel_par.rxlev_acc_min = 0; + bts->si_common.si2quater_neigh_list.arfcn = bts->si_common.data.earfcn_list; + bts->si_common.si2quater_neigh_list.meas_bw = bts->si_common.data.meas_bw_list; + bts->si_common.si2quater_neigh_list.length = MAX_EARFCN_LIST; + bts->si_common.si2quater_neigh_list.thresh_hi = 0; + osmo_earfcn_init(&bts->si_common.si2quater_neigh_list); + bts->si_common.neigh_list.data = bts->si_common.data.neigh_list; + bts->si_common.neigh_list.data_len = + sizeof(bts->si_common.data.neigh_list); + bts->si_common.si5_neigh_list.data = bts->si_common.data.si5_neigh_list; + bts->si_common.si5_neigh_list.data_len = + sizeof(bts->si_common.data.si5_neigh_list); + bts->si_common.cell_alloc.data = bts->si_common.data.cell_alloc; + bts->si_common.cell_alloc.data_len = + sizeof(bts->si_common.data.cell_alloc); + bts->si_common.rach_control.re = 1; /* no re-establishment */ + bts->si_common.rach_control.tx_integer = 9; /* 12 slots spread - 217/115 slots delay */ + bts->si_common.rach_control.max_trans = 3; /* 7 retransmissions */ + bts->si_common.rach_control.t2 = 4; /* no emergency calls */ + bts->si_common.chan_desc.att = 1; /* attachment required */ + bts->si_common.chan_desc.bs_pa_mfrms = RSL_BS_PA_MFRMS_5; /* paging frames */ + bts->si_common.chan_desc.bs_ag_blks_res = 1; /* reserved AGCH blocks */ + bts->si_common.chan_desc.t3212 = osmo_tdef_get(net->T_defs, 3212, OSMO_TDEF_CUSTOM, -1); + gsm_bts_set_radio_link_timeout(bts, 32); /* Use RADIO LINK TIMEOUT of 32 */ + + INIT_LLIST_HEAD(&bts->abis_queue); + INIT_LLIST_HEAD(&bts->loc_list); + INIT_LLIST_HEAD(&bts->local_neighbors); + INIT_LLIST_HEAD(&bts->oml_fail_rep); + + /* Enable all codecs by default. These get reset to a more fine grained selection IF a + * 'codec-support' config appears in the config file (see bsc_vty.c). */ + bts->codec = (struct bts_codec_conf){ + .hr = 1, + .efr = 1, + .amr = 1, + }; + + /* Set reasonable defaults for AMR-FR and AMR-HR rate configuration. + * (see also 3GPP TS 28.062, Table 7.11.3.1.3-2) */ + mr_cfg = (struct gsm48_multi_rate_conf) { + .m4_75 = 1, + .m5_15 = 0, + .m5_90 = 1, + .m6_70 = 0, + .m7_40 = 1, + .m7_95 = 0, + .m10_2 = 0, + .m12_2 = 1 + }; + memcpy(bts->mr_full.gsm48_ie, &mr_cfg, sizeof(bts->mr_full.gsm48_ie)); + bts->mr_full.ms_mode[0].mode = 0; + bts->mr_full.ms_mode[1].mode = 2; + bts->mr_full.ms_mode[2].mode = 4; + bts->mr_full.ms_mode[3].mode = 7; + bts->mr_full.bts_mode[0].mode = 0; + bts->mr_full.bts_mode[1].mode = 2; + bts->mr_full.bts_mode[2].mode = 4; + bts->mr_full.bts_mode[3].mode = 7; + for (i = 0; i < 3; i++) { + bts->mr_full.ms_mode[i].hysteresis = 8; + bts->mr_full.ms_mode[i].threshold = 32; + bts->mr_full.bts_mode[i].hysteresis = 8; + bts->mr_full.bts_mode[i].threshold = 32; + } + bts->mr_full.num_modes = 4; + + mr_cfg = (struct gsm48_multi_rate_conf) { + .m4_75 = 1, + .m5_15 = 0, + .m5_90 = 1, + .m6_70 = 0, + .m7_40 = 1, + .m7_95 = 0, + .m10_2 = 0, + .m12_2 = 0 + }; + memcpy(bts->mr_half.gsm48_ie, &mr_cfg, sizeof(bts->mr_half.gsm48_ie)); + bts->mr_half.ms_mode[0].mode = 0; + bts->mr_half.ms_mode[1].mode = 2; + bts->mr_half.ms_mode[2].mode = 4; + bts->mr_half.ms_mode[3].mode = 7; + bts->mr_half.bts_mode[0].mode = 0; + bts->mr_half.bts_mode[1].mode = 2; + bts->mr_half.bts_mode[2].mode = 4; + bts->mr_half.bts_mode[3].mode = 7; + for (i = 0; i < 3; i++) { + bts->mr_half.ms_mode[i].hysteresis = 8; + bts->mr_half.ms_mode[i].threshold = 32; + bts->mr_half.bts_mode[i].hysteresis = 8; + bts->mr_half.bts_mode[i].threshold = 32; + } + bts->mr_half.num_modes = 3; + + bts_init_cbch_state(&bts->cbch_basic, bts); + bts_init_cbch_state(&bts->cbch_extended, bts); + + return bts; +} + +static char ts2str[255]; + +char *gsm_bts_name(const struct gsm_bts *bts) +{ + if (!bts) + snprintf(ts2str, sizeof(ts2str), "(bts=NULL)"); + else + snprintf(ts2str, sizeof(ts2str), "(bts=%d)", bts->nr); + + return ts2str; +} + +bool gsm_bts_matches_lai(const struct gsm_bts *bts, const struct osmo_location_area_id *lai) +{ + return osmo_plmn_cmp(&lai->plmn, &bts->network->plmn) == 0 + && lai->lac == bts->location_area_code; +} + +bool gsm_bts_matches_cell_id(const struct gsm_bts *bts, const struct gsm0808_cell_id *cell_id) +{ + const union gsm0808_cell_id_u *id = &cell_id->id; + if (!bts || !cell_id) + return false; + + switch (cell_id->id_discr) { + case CELL_IDENT_WHOLE_GLOBAL: + return gsm_bts_matches_lai(bts, &id->global.lai) + && id->global.cell_identity == bts->cell_identity; + case CELL_IDENT_LAC_AND_CI: + return id->lac_and_ci.lac == bts->location_area_code + && id->lac_and_ci.ci == bts->cell_identity; + case CELL_IDENT_CI: + return id->ci == bts->cell_identity; + case CELL_IDENT_NO_CELL: + return false; + case CELL_IDENT_LAI_AND_LAC: + return gsm_bts_matches_lai(bts, &id->lai_and_lac); + case CELL_IDENT_LAC: + return id->lac == bts->location_area_code; + case CELL_IDENT_BSS: + return true; + case CELL_IDENT_UTRAN_PLMN_LAC_RNC: + case CELL_IDENT_UTRAN_RNC: + case CELL_IDENT_UTRAN_LAC_RNC: + return false; + default: + OSMO_ASSERT(false); + } +} + +static struct gsm_bts_ref *gsm_bts_ref_find(const struct llist_head *list, const struct gsm_bts *bts) +{ + struct gsm_bts_ref *ref; + if (!bts) + return NULL; + llist_for_each_entry(ref, list, entry) { + if (ref->bts == bts) + return ref; + } + return NULL; +} + +/* Add a BTS reference to the local_neighbors list. + * Return 1 if added, 0 if such an entry already existed, and negative on errors. */ +int gsm_bts_local_neighbor_add(struct gsm_bts *bts, struct gsm_bts *neighbor) +{ + struct gsm_bts_ref *ref; + if (!bts || !neighbor) + return -ENOMEM; + + if (bts == neighbor) + return -EINVAL; + + /* Already got this entry? */ + ref = gsm_bts_ref_find(&bts->local_neighbors, neighbor); + if (ref) + return 0; + + ref = talloc_zero(bts, struct gsm_bts_ref); + if (!ref) + return -ENOMEM; + ref->bts = neighbor; + llist_add_tail(&ref->entry, &bts->local_neighbors); + return 1; +} + +/* Remove a BTS reference from the local_neighbors list. + * Return 1 if removed, 0 if no such entry existed, and negative on errors. */ +int gsm_bts_local_neighbor_del(struct gsm_bts *bts, const struct gsm_bts *neighbor) +{ + struct gsm_bts_ref *ref; + if (!bts || !neighbor) + return -ENOMEM; + + ref = gsm_bts_ref_find(&bts->local_neighbors, neighbor); + if (!ref) + return 0; + + llist_del(&ref->entry); + talloc_free(ref); + return 1; +} + +/* return the gsm_lchan for the CBCH (if it exists at all) */ +struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts) +{ + struct gsm_lchan *lchan = NULL; + struct gsm_bts_trx *trx = bts->c0; + + if (trx->ts[0].pchan_from_config == GSM_PCHAN_CCCH_SDCCH4_CBCH) + lchan = &trx->ts[0].lchan[2]; + else { + int i; + for (i = 0; i < 8; i++) { + if (trx->ts[i].pchan_from_config == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) { + lchan = &trx->ts[i].lchan[2]; + break; + } + } + } + + return lchan; +} + +int gsm_set_bts_type(struct gsm_bts *bts, enum gsm_bts_type type) +{ + struct gsm_bts_model *model; + + model = bts_model_find(type); + if (!model) + return -EINVAL; + + bts->type = type; + bts->model = model; + + if (model->start && !model->started) { + int ret = model->start(bts->network); + if (ret < 0) + return ret; + + model->started = true; + } + + switch (bts->type) { + case GSM_BTS_TYPE_NANOBTS: + case GSM_BTS_TYPE_OSMOBTS: + /* Set the default OML Stream ID to 0xff */ + bts->oml_tei = 0xff; + bts->c0->nominal_power = 23; + break; + case GSM_BTS_TYPE_RBS2000: + INIT_LLIST_HEAD(&bts->rbs2000.is.conn_groups); + INIT_LLIST_HEAD(&bts->rbs2000.con.conn_groups); + break; + case GSM_BTS_TYPE_BS11: + case GSM_BTS_TYPE_UNKNOWN: + case GSM_BTS_TYPE_NOKIA_SITE: + /* Set default BTS reset timer */ + bts->nokia.bts_reset_timer_cnf = 15; + case _NUM_GSM_BTS_TYPE: + break; + } + + return 0; +} + +int bts_gprs_mode_is_compat(struct gsm_bts *bts, enum bts_gprs_mode mode) +{ + if (mode != BTS_GPRS_NONE && + !osmo_bts_has_feature(&bts->model->features, BTS_FEAT_GPRS)) { + return 0; + } + if (mode == BTS_GPRS_EGPRS && + !osmo_bts_has_feature(&bts->model->features, BTS_FEAT_EGPRS)) { + return 0; + } + + return 1; +} + +struct gsm_bts_trx *gsm_bts_trx_by_nr(struct gsm_bts *bts, int nr) +{ + struct gsm_bts_trx *trx; + + llist_for_each_entry(trx, &bts->trx_list, list) { + if (trx->nr == nr) + return trx; + } + return NULL; +} + +unsigned long long bts_uptime(const struct gsm_bts *bts) +{ + struct timespec tp; + + if (!bts->uptime || !bts->oml_link) { + LOGP(DNM, LOGL_ERROR, "BTS %u OML link uptime unavailable\n", bts->nr); + return 0; + } + + if (clock_gettime(CLOCK_MONOTONIC, &tp) != 0) { + LOGP(DNM, LOGL_ERROR, "BTS %u uptime computation failure: %s\n", bts->nr, strerror(errno)); + return 0; + } + + /* monotonic clock helps to ensure that the conversion is valid */ + return difftime(tp.tv_sec, bts->uptime); +} + +char *get_model_oml_status(const struct gsm_bts *bts) +{ + if (bts->model->oml_status) + return bts->model->oml_status(bts); + + return "unknown"; +} + +/* reset the state of all MO in the BTS */ +void gsm_bts_mo_reset(struct gsm_bts *bts) +{ + struct gsm_bts_trx *trx; + unsigned int i; + + gsm_abis_mo_reset(&bts->mo); + gsm_abis_mo_reset(&bts->site_mgr.mo); + for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++) + gsm_abis_mo_reset(&bts->gprs.nsvc[i].mo); + gsm_abis_mo_reset(&bts->gprs.nse.mo); + gsm_abis_mo_reset(&bts->gprs.cell.mo); + + llist_for_each_entry(trx, &bts->trx_list, list) { + gsm_abis_mo_reset(&trx->mo); + gsm_abis_mo_reset(&trx->bb_transc.mo); + + for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + gsm_abis_mo_reset(&ts->mo); + } + } +} + +/* Assume there are only 256 possible bts */ +osmo_static_assert(sizeof(((struct gsm_bts *) 0)->nr) == 1, _bts_nr_is_256); +static void depends_calc_index_bit(int bts_nr, int *idx, int *bit) +{ + *idx = bts_nr / (8 * 4); + *bit = bts_nr % (8 * 4); +} + +void bts_depend_mark(struct gsm_bts *bts, int dep) +{ + int idx, bit; + depends_calc_index_bit(dep, &idx, &bit); + + bts->depends_on[idx] |= 1 << bit; +} + +void bts_depend_clear(struct gsm_bts *bts, int dep) +{ + int idx, bit; + depends_calc_index_bit(dep, &idx, &bit); + + bts->depends_on[idx] &= ~(1 << bit); +} + +int bts_depend_is_depedency(struct gsm_bts *base, struct gsm_bts *other) +{ + int idx, bit; + depends_calc_index_bit(other->nr, &idx, &bit); + + /* Check if there is a depends bit */ + return (base->depends_on[idx] & (1 << bit)) > 0; +} + +static int bts_is_online(struct gsm_bts *bts) +{ + /* TODO: support E1 BTS too */ + if (!is_ipaccess_bts(bts)) + return 1; + + if (!bts->oml_link) + return 0; + + return bts->mo.nm_state.operational == NM_OPSTATE_ENABLED; +} + +int bts_depend_check(struct gsm_bts *bts) +{ + struct gsm_bts *other_bts; + + llist_for_each_entry(other_bts, &bts->network->bts_list, list) { + if (!bts_depend_is_depedency(bts, other_bts)) + continue; + if (bts_is_online(other_bts)) + continue; + return 0; + } + return 1; +} + +/* get the radio link timeout (based on SACCH decode errors, according + * to algorithm specified in TS 05.08 section 5.2. A value of -1 + * indicates we should use an infinitely long timeout, which only works + * with OsmoBTS as the BTS implementation */ +int gsm_bts_get_radio_link_timeout(const struct gsm_bts *bts) +{ + const struct gsm48_cell_options *cell_options = &bts->si_common.cell_options; + + if (bts->infinite_radio_link_timeout) + return -1; + else { + /* Encoding as per Table 10.5.21 of TS 04.08 */ + return (cell_options->radio_link_timeout + 1) << 2; + } +} + +/* set the radio link timeout (based on SACCH decode errors, according + * to algorithm specified in TS 05.08 Section 5.2. A value of -1 + * indicates we should use an infinitely long timeout, which only works + * with OsmoBTS as the BTS implementation */ +void gsm_bts_set_radio_link_timeout(struct gsm_bts *bts, int value) +{ + struct gsm48_cell_options *cell_options = &bts->si_common.cell_options; + + if (value < 0) + bts->infinite_radio_link_timeout = true; + else { + bts->infinite_radio_link_timeout = false; + /* Encoding as per Table 10.5.21 of TS 04.08 */ + if (value < 4) + value = 4; + if (value > 64) + value = 64; + cell_options->radio_link_timeout = (value >> 2) - 1; + } +} + +void gsm_bts_all_ts_dispatch(struct gsm_bts *bts, uint32_t ts_ev, void *data) +{ + struct gsm_bts_trx *trx; + llist_for_each_entry(trx, &bts->trx_list, list) + gsm_trx_all_ts_dispatch(trx, ts_ev, data); +} + + +/* Count number of free TS of given pchan type */ +int bts_count_free_ts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan) +{ + struct gsm_bts_trx *trx; + int count = 0; + + llist_for_each_entry(trx, &bts->trx_list, list) + count += trx_count_free_ts(trx, pchan); + + return count; +} diff --git a/src/osmo-bsc/bts_ericsson_rbs2000.c b/src/osmo-bsc/bts_ericsson_rbs2000.c index 02ef463..1297b30 100644 --- a/src/osmo-bsc/bts_ericsson_rbs2000.c +++ b/src/osmo-bsc/bts_ericsson_rbs2000.c @@ -29,6 +29,7 @@ #include #include #include +#include #include diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 5b60367..49720e5 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -45,6 +45,7 @@ #include #include #include +#include static int bts_model_nanobts_start(struct gsm_network *net); static void bts_model_nanobts_e1line_bind_ops(struct e1inp_line *line); diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c index be823ae..b979cc7 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c @@ -23,7 +23,7 @@ #include #include #include - +#include struct msgb *nanobts_attr_bts_get(struct gsm_bts *bts) { diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c index 523c9ed..2b6f918 100644 --- a/src/osmo-bsc/bts_nokia_site.c +++ b/src/osmo-bsc/bts_nokia_site.c @@ -37,6 +37,7 @@ #include #include #include +#include #include diff --git a/src/osmo-bsc/bts_siemens_bs11.c b/src/osmo-bsc/bts_siemens_bs11.c index 057a0e1..c808421 100644 --- a/src/osmo-bsc/bts_siemens_bs11.c +++ b/src/osmo-bsc/bts_siemens_bs11.c @@ -30,6 +30,7 @@ #include #include #include +#include static int bts_model_bs11_start(struct gsm_network *net); diff --git a/src/osmo-bsc/bts_sysmobts.c b/src/osmo-bsc/bts_sysmobts.c index 6f9dc77..df43d76 100644 --- a/src/osmo-bsc/bts_sysmobts.c +++ b/src/osmo-bsc/bts_sysmobts.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include diff --git a/src/osmo-bsc/bts_unknown.c b/src/osmo-bsc/bts_unknown.c index b6b56a8..b5471ce 100644 --- a/src/osmo-bsc/bts_unknown.c +++ b/src/osmo-bsc/bts_unknown.c @@ -21,6 +21,7 @@ #include +#include #include #include diff --git a/src/osmo-bsc/cbch_scheduler.c b/src/osmo-bsc/cbch_scheduler.c index ef93b7a..8021804 100644 --- a/src/osmo-bsc/cbch_scheduler.c +++ b/src/osmo-bsc/cbch_scheduler.c @@ -28,6 +28,7 @@ #include #include #include +#include /* add all pages of given SMSCB so they appear as soon as possible *after* (included) base_idx. */ static int bts_smscb_sched_add_after(struct bts_smscb_page **sched_arr, int sched_arr_size, diff --git a/src/osmo-bsc/chan_alloc.c b/src/osmo-bsc/chan_alloc.c index 9b80df3..6829251 100644 --- a/src/osmo-bsc/chan_alloc.c +++ b/src/osmo-bsc/chan_alloc.c @@ -34,6 +34,7 @@ #include #include #include +#include #include diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index 6ec6d05..58a7867 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -27,6 +27,7 @@ #include #include #include +#include /* Determine whether a permitted speech value is specifies a half rate or full * rate codec */ diff --git a/src/osmo-bsc/e1_config.c b/src/osmo-bsc/e1_config.c index 4389f66..9ccbbfd 100644 --- a/src/osmo-bsc/e1_config.c +++ b/src/osmo-bsc/e1_config.c @@ -30,6 +30,7 @@ #include #include #include +#include #define SAPI_L2ML 0 #define SAPI_OML 62 diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 07978de..e54a937 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -44,6 +44,7 @@ #include #include #include +#include int gsm48_sendmsg(struct msgb *msg) diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 2829b67..d5915f4 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -36,6 +36,7 @@ #include #include +#include #define LOG_COMPL_L3(pdisc, mtype, loglevel, format, args...) \ LOGP(DRSL, loglevel, "%s %s: " format, gsm48_pdisc_name(pdisc), gsm48_pdisc_msgtype_name(pdisc, mtype), ##args) diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index a4f6b7f..1295592 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -44,11 +44,10 @@ #include #include #include +#include void *tall_bsc_ctx = NULL; -static LLIST_HEAD(bts_models); - void set_ts_e1link(struct gsm_bts_trx_ts *ts, uint8_t e1_nr, uint8_t e1_ts, uint8_t e1_ts_ss) { @@ -57,49 +56,6 @@ ts->e1_link.e1_ts_ss = e1_ts_ss; } -static struct gsm_bts_model *bts_model_find(enum gsm_bts_type type) -{ - struct gsm_bts_model *model; - - llist_for_each_entry(model, &bts_models, list) { - if (model->type == type) - return model; - } - - return NULL; -} - -int gsm_bts_model_register(struct gsm_bts_model *model) -{ - if (bts_model_find(model->type)) - return -EEXIST; - - tlv_def_patch(&model->nm_att_tlvdef, &abis_nm_att_tlvdef); - llist_add_tail(&model->list, &bts_models); - return 0; -} - -const struct value_string bts_type_descs[_NUM_GSM_BTS_TYPE+1] = { - { GSM_BTS_TYPE_UNKNOWN, "Unknown BTS Type" }, - { GSM_BTS_TYPE_BS11, "Siemens BTS (BS-11 or compatible)" }, - { GSM_BTS_TYPE_NANOBTS, "ip.access nanoBTS or compatible" }, - { GSM_BTS_TYPE_RBS2000, "Ericsson RBS2000 Series" }, - { GSM_BTS_TYPE_NOKIA_SITE, "Nokia {Metro,Ultra,In}Site" }, - { GSM_BTS_TYPE_OSMOBTS, "sysmocom sysmoBTS" }, - { 0, NULL } -}; - -struct gsm_bts_trx *gsm_bts_trx_by_nr(struct gsm_bts *bts, int nr) -{ - struct gsm_bts_trx *trx; - - llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->nr == nr) - return trx; - } - return NULL; -} - /* Search for a BTS in the given Location Area; optionally start searching * with start_bts (for continuing to search after the first result) */ struct gsm_bts *gsm_bts_by_lac(struct gsm_network *net, unsigned int lac, @@ -149,62 +105,6 @@ return get_value_string(bts_gprs_mode_names, mode); } -int bts_gprs_mode_is_compat(struct gsm_bts *bts, enum bts_gprs_mode mode) -{ - if (mode != BTS_GPRS_NONE && - !osmo_bts_has_feature(&bts->model->features, BTS_FEAT_GPRS)) { - return 0; - } - if (mode == BTS_GPRS_EGPRS && - !osmo_bts_has_feature(&bts->model->features, BTS_FEAT_EGPRS)) { - return 0; - } - - return 1; -} - -int gsm_set_bts_type(struct gsm_bts *bts, enum gsm_bts_type type) -{ - struct gsm_bts_model *model; - - model = bts_model_find(type); - if (!model) - return -EINVAL; - - bts->type = type; - bts->model = model; - - if (model->start && !model->started) { - int ret = model->start(bts->network); - if (ret < 0) - return ret; - - model->started = true; - } - - switch (bts->type) { - case GSM_BTS_TYPE_NANOBTS: - case GSM_BTS_TYPE_OSMOBTS: - /* Set the default OML Stream ID to 0xff */ - bts->oml_tei = 0xff; - bts->c0->nominal_power = 23; - break; - case GSM_BTS_TYPE_RBS2000: - INIT_LLIST_HEAD(&bts->rbs2000.is.conn_groups); - INIT_LLIST_HEAD(&bts->rbs2000.con.conn_groups); - break; - case GSM_BTS_TYPE_BS11: - case GSM_BTS_TYPE_UNKNOWN: - case GSM_BTS_TYPE_NOKIA_SITE: - /* Set default BTS reset timer */ - bts->nokia.bts_reset_timer_cnf = 15; - case _NUM_GSM_BTS_TYPE: - break; - } - - return 0; -} - struct gsm_bts *gsm_bts_alloc_register(struct gsm_network *net, enum gsm_bts_type type, uint8_t bsic) { @@ -248,166 +148,14 @@ gsm48_encode_ra(buf, &raid); } -/* Assume there are only 256 possible bts */ -osmo_static_assert(sizeof(((struct gsm_bts *) 0)->nr) == 1, _bts_nr_is_256); -static void depends_calc_index_bit(int bts_nr, int *idx, int *bit) -{ - *idx = bts_nr / (8 * 4); - *bit = bts_nr % (8 * 4); -} - -void bts_depend_mark(struct gsm_bts *bts, int dep) -{ - int idx, bit; - depends_calc_index_bit(dep, &idx, &bit); - - bts->depends_on[idx] |= 1 << bit; -} - -void bts_depend_clear(struct gsm_bts *bts, int dep) -{ - int idx, bit; - depends_calc_index_bit(dep, &idx, &bit); - - bts->depends_on[idx] &= ~(1 << bit); -} - -int bts_depend_is_depedency(struct gsm_bts *base, struct gsm_bts *other) -{ - int idx, bit; - depends_calc_index_bit(other->nr, &idx, &bit); - - /* Check if there is a depends bit */ - return (base->depends_on[idx] & (1 << bit)) > 0; -} - -static int bts_is_online(struct gsm_bts *bts) -{ - /* TODO: support E1 BTS too */ - if (!is_ipaccess_bts(bts)) - return 1; - - if (!bts->oml_link) - return 0; - - return bts->mo.nm_state.operational == NM_OPSTATE_ENABLED; -} - -int bts_depend_check(struct gsm_bts *bts) -{ - struct gsm_bts *other_bts; - - llist_for_each_entry(other_bts, &bts->network->bts_list, list) { - if (!bts_depend_is_depedency(bts, other_bts)) - continue; - if (bts_is_online(other_bts)) - continue; - return 0; - } - return 1; -} - -/* get the radio link timeout (based on SACCH decode errors, according - * to algorithm specified in TS 05.08 section 5.2. A value of -1 - * indicates we should use an infinitely long timeout, which only works - * with OsmoBTS as the BTS implementation */ -int gsm_bts_get_radio_link_timeout(const struct gsm_bts *bts) -{ - const struct gsm48_cell_options *cell_options = &bts->si_common.cell_options; - - if (bts->infinite_radio_link_timeout) - return -1; - else { - /* Encoding as per Table 10.5.21 of TS 04.08 */ - return (cell_options->radio_link_timeout + 1) << 2; - } -} - -/* set the radio link timeout (based on SACCH decode errors, according - * to algorithm specified in TS 05.08 Section 5.2. A value of -1 - * indicates we should use an infinitely long timeout, which only works - * with OsmoBTS as the BTS implementation */ -void gsm_bts_set_radio_link_timeout(struct gsm_bts *bts, int value) -{ - struct gsm48_cell_options *cell_options = &bts->si_common.cell_options; - - if (value < 0) - bts->infinite_radio_link_timeout = true; - else { - bts->infinite_radio_link_timeout = false; - /* Encoding as per Table 10.5.21 of TS 04.08 */ - if (value < 4) - value = 4; - if (value > 64) - value = 64; - cell_options->radio_link_timeout = (value >> 2) - 1; - } -} - -static const struct osmo_stat_item_desc bts_stat_desc[] = { - [BTS_STAT_CHAN_LOAD_AVERAGE] = { "chanloadavg", "Channel load average", "%", 16, 0 }, - [BTS_STAT_CHAN_CCCH_SDCCH4_USED] = { "chan_ccch_sdcch4:used", - "Number of CCCH+SDCCH4 channels used", "", 16, 0 }, - [BTS_STAT_CHAN_CCCH_SDCCH4_TOTAL] = { "chan_ccch_sdcch4:total", - "Number of CCCH+SDCCH4 channels total", "", 16, 0 }, - [BTS_STAT_CHAN_TCH_F_USED] = { "chan_tch_f:used", - "Number of TCH/F channels used", "", 16, 0 }, - [BTS_STAT_CHAN_TCH_F_TOTAL] = { "chan_tch_f:total", - "Number of TCH/F channels total", "", 16, 0 }, - [BTS_STAT_CHAN_TCH_H_USED] = { "chan_tch_h:used", - "Number of TCH/H channels used", "", 16, 0 }, - [BTS_STAT_CHAN_TCH_H_TOTAL] = { "chan_tch_h:total", - "Number of TCH/H channels total", "", 16, 0 }, - [BTS_STAT_CHAN_SDCCH8_USED] = { "chan_sdcch8:used", - "Number of SDCCH8 channels used", "", 16, 0 }, - [BTS_STAT_CHAN_SDCCH8_TOTAL] = { "chan_sdcch8:total", - "Number of SDCCH8 channels total", "", 16, 0 }, - [BTS_STAT_CHAN_TCH_F_PDCH_USED] = { "chan_tch_f_pdch:used", - "Number of TCH/F_PDCH channels used", "", 16, 0 }, - [BTS_STAT_CHAN_TCH_F_PDCH_TOTAL] = { "chan_tch_f_pdch:total", - "Number of TCH/F_PDCH channels total", "", 16, 0 }, - [BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_USED] = { "chan_ccch_sdcch4_cbch:used", - "Number of CCCH+SDCCH4+CBCH channels used", "", 16, 0 }, - [BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_TOTAL] = { "chan_ccch_sdcch4_cbch:total", - "Number of CCCH+SDCCH4+CBCH channels total", "", 16, 0 }, - [BTS_STAT_CHAN_SDCCH8_CBCH_USED] = { "chan_sdcch8_cbch:used", - "Number of SDCCH8+CBCH channels used", "", 16, 0 }, - [BTS_STAT_CHAN_SDCCH8_CBCH_TOTAL] = { "chan_sdcch8_cbch:total", - "Number of SDCCH8+CBCH channels total", "", 16, 0 }, - [BTS_STAT_CHAN_TCH_F_TCH_H_PDCH_USED] = { "chan_tch_f_tch_h_pdch:used", - "Number of TCH/F_TCH/H_PDCH channels used", "", 16, 0 }, - [BTS_STAT_CHAN_TCH_F_TCH_H_PDCH_TOTAL] = { "chan_tch_f_tch_h_pdch:total", - "Number of TCH/F_TCH/H_PDCH channels total", "", 16, 0 }, - [BTS_STAT_T3122] = { "T3122", "T3122 IMMEDIATE ASSIGNMENT REJECT wait indicator", - "s", 16, GSM_T3122_DEFAULT }, - [BTS_STAT_RACH_BUSY] = { "rach_busy", - "RACH slots with signal above threshold", "%", 16, 0 }, - [BTS_STAT_RACH_ACCESS] = { "rach_access", - "RACH slots with access bursts in them", "%", 16, 0 }, - [BTS_STAT_OML_CONNECTED] = { "oml_connected", "Number of OML links connected", "", 16, 0 }, - [BTS_STAT_RSL_CONNECTED] = { "rsl_connected", "Number of RSL links connected", "", 16, 0 }, - [BTS_STAT_LCHAN_BORKEN] = { "lchan_borken", - "Number of lchans in the BORKEN state", "", 16, 0 }, - [BTS_STAT_TS_BORKEN] = { "ts_borken", - "Number of timeslots in the BORKEN state", "", 16, 0 }, -}; - -static const struct osmo_stat_item_group_desc bts_statg_desc = { - .group_name_prefix = "bts", - .group_description = "base transceiver station", - .class_id = OSMO_STATS_CLASS_GLOBAL, - .num_items = ARRAY_SIZE(bts_stat_desc), - .item_desc = bts_stat_desc, -}; - void gsm_abis_mo_reset(struct gsm_abis_mo *mo) { mo->nm_state.operational = NM_OPSTATE_NULL; mo->nm_state.availability = NM_AVSTATE_POWER_OFF; } -static void gsm_mo_init(struct gsm_abis_mo *mo, struct gsm_bts *bts, - uint8_t obj_class, uint8_t p1, uint8_t p2, uint8_t p3) +void gsm_mo_init(struct gsm_abis_mo *mo, struct gsm_bts *bts, + uint8_t obj_class, uint8_t p1, uint8_t p2, uint8_t p3) { mo->bts = bts; mo->obj_class = obj_class; @@ -417,62 +165,6 @@ gsm_abis_mo_reset(mo); } -const struct value_string bts_attribute_names[] = { - OSMO_VALUE_STRING(BTS_TYPE_VARIANT), - OSMO_VALUE_STRING(BTS_SUB_MODEL), - OSMO_VALUE_STRING(TRX_PHY_VERSION), - { 0, NULL } -}; - -enum bts_attribute str2btsattr(const char *s) -{ - return get_string_value(bts_attribute_names, s); -} - -const char *btsatttr2str(enum bts_attribute v) -{ - return get_value_string(bts_attribute_names, v); -} - -const struct value_string osmo_bts_variant_names[_NUM_BTS_VARIANT + 1] = { - { BTS_UNKNOWN, "unknown" }, - { BTS_OSMO_LITECELL15, "osmo-bts-lc15" }, - { BTS_OSMO_OCTPHY, "osmo-bts-octphy" }, - { BTS_OSMO_SYSMO, "osmo-bts-sysmo" }, - { BTS_OSMO_TRX, "omso-bts-trx" }, - { 0, NULL } -}; - -enum gsm_bts_type_variant str2btsvariant(const char *arg) -{ - return get_string_value(osmo_bts_variant_names, arg); -} - -const char *btsvariant2str(enum gsm_bts_type_variant v) -{ - return get_value_string(osmo_bts_variant_names, v); -} - -const struct value_string bts_type_names[_NUM_GSM_BTS_TYPE + 1] = { - { GSM_BTS_TYPE_UNKNOWN, "unknown" }, - { GSM_BTS_TYPE_BS11, "bs11" }, - { GSM_BTS_TYPE_NANOBTS, "nanobts" }, - { GSM_BTS_TYPE_RBS2000, "rbs2000" }, - { GSM_BTS_TYPE_NOKIA_SITE, "nokia_site" }, - { GSM_BTS_TYPE_OSMOBTS, "sysmobts" }, - { 0, NULL } -}; - -enum gsm_bts_type str2btstype(const char *arg) -{ - return get_string_value(bts_type_names, arg); -} - -const char *btstype2str(enum gsm_bts_type type) -{ - return get_value_string(bts_type_names, type); -} - const struct value_string gsm_chreq_descs[] = { { GSM_CHREQ_REASON_EMERG, "emergency call" }, { GSM_CHREQ_REASON_PAG, "answer to paging" }, @@ -577,44 +269,6 @@ return NULL; } -bool gsm_bts_matches_lai(const struct gsm_bts *bts, const struct osmo_location_area_id *lai) -{ - return osmo_plmn_cmp(&lai->plmn, &bts->network->plmn) == 0 - && lai->lac == bts->location_area_code; -} - -bool gsm_bts_matches_cell_id(const struct gsm_bts *bts, const struct gsm0808_cell_id *cell_id) -{ - const union gsm0808_cell_id_u *id = &cell_id->id; - if (!bts || !cell_id) - return false; - - switch (cell_id->id_discr) { - case CELL_IDENT_WHOLE_GLOBAL: - return gsm_bts_matches_lai(bts, &id->global.lai) - && id->global.cell_identity == bts->cell_identity; - case CELL_IDENT_LAC_AND_CI: - return id->lac_and_ci.lac == bts->location_area_code - && id->lac_and_ci.ci == bts->cell_identity; - case CELL_IDENT_CI: - return id->ci == bts->cell_identity; - case CELL_IDENT_NO_CELL: - return false; - case CELL_IDENT_LAI_AND_LAC: - return gsm_bts_matches_lai(bts, &id->lai_and_lac); - case CELL_IDENT_LAC: - return id->lac == bts->location_area_code; - case CELL_IDENT_BSS: - return true; - case CELL_IDENT_UTRAN_PLMN_LAC_RNC: - case CELL_IDENT_UTRAN_RNC: - case CELL_IDENT_UTRAN_LAC_RNC: - return false; - default: - OSMO_ASSERT(false); - } -} - /* From a list of local BTSes that match the cell_id, return the Nth one, or NULL if there is no such * match. */ struct gsm_bts *gsm_bts_by_cell_id(const struct gsm_network *net, @@ -636,59 +290,6 @@ return NULL; } -struct gsm_bts_ref *gsm_bts_ref_find(const struct llist_head *list, const struct gsm_bts *bts) -{ - struct gsm_bts_ref *ref; - if (!bts) - return NULL; - llist_for_each_entry(ref, list, entry) { - if (ref->bts == bts) - return ref; - } - return NULL; -} - -/* Add a BTS reference to the local_neighbors list. - * Return 1 if added, 0 if such an entry already existed, and negative on errors. */ -int gsm_bts_local_neighbor_add(struct gsm_bts *bts, struct gsm_bts *neighbor) -{ - struct gsm_bts_ref *ref; - if (!bts || !neighbor) - return -ENOMEM; - - if (bts == neighbor) - return -EINVAL; - - /* Already got this entry? */ - ref = gsm_bts_ref_find(&bts->local_neighbors, neighbor); - if (ref) - return 0; - - ref = talloc_zero(bts, struct gsm_bts_ref); - if (!ref) - return -ENOMEM; - ref->bts = neighbor; - llist_add_tail(&ref->entry, &bts->local_neighbors); - return 1; -} - -/* Remove a BTS reference from the local_neighbors list. - * Return 1 if removed, 0 if no such entry existed, and negative on errors. */ -int gsm_bts_local_neighbor_del(struct gsm_bts *bts, const struct gsm_bts *neighbor) -{ - struct gsm_bts_ref *ref; - if (!bts || !neighbor) - return -ENOMEM; - - ref = gsm_bts_ref_find(&bts->local_neighbors, neighbor); - if (!ref) - return 0; - - llist_del(&ref->entry); - talloc_free(ref); - return 1; -} - struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts) { struct gsm_bts_trx *trx = talloc_zero(bts, struct gsm_bts_trx); @@ -748,251 +349,6 @@ return trx; } - -static const uint8_t bts_nse_timer_default[] = { 3, 3, 3, 3, 30, 3, 10 }; -static const uint8_t bts_cell_timer_default[] = - { 3, 3, 3, 3, 3, 10, 3, 10, 3, 10, 3 }; -static const struct gprs_rlc_cfg rlc_cfg_default = { - .parameter = { - [RLC_T3142] = 20, - [RLC_T3169] = 5, - [RLC_T3191] = 5, - [RLC_T3193] = 160, /* 10ms */ - [RLC_T3195] = 5, - [RLC_N3101] = 10, - [RLC_N3103] = 4, - [RLC_N3105] = 8, - [CV_COUNTDOWN] = 15, - [T_DL_TBF_EXT] = 250 * 10, /* ms */ - [T_UL_TBF_EXT] = 250 * 10, /* ms */ - }, - .paging = { - .repeat_time = 5 * 50, /* ms */ - .repeat_count = 3, - }, - .cs_mask = 0x1fff, - .initial_cs = 2, - .initial_mcs = 6, -}; - -static void bts_init_cbch_state(struct bts_smscb_chan_state *cstate, struct gsm_bts *bts) -{ - cstate->bts = bts; - INIT_LLIST_HEAD(&cstate->messages); -} - -/* Initialize those parts that don't require osmo-bsc specific dependencies. - * This part is shared among the thin programs in osmo-bsc/src/utils/. - * osmo-bsc requires further initialization that pulls in more dependencies (see - * bsc_bts_alloc_register()). */ -struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, uint8_t bts_num) -{ - struct gsm_bts *bts = talloc_zero(net, struct gsm_bts); - struct gsm48_multi_rate_conf mr_cfg; - int i; - - if (!bts) - return NULL; - - bts->nr = bts_num; - bts->num_trx = 0; - INIT_LLIST_HEAD(&bts->trx_list); - bts->network = net; - - bts->ms_max_power = 15; /* dBm */ - - gsm_mo_init(&bts->mo, bts, NM_OC_BTS, - bts->nr, 0xff, 0xff); - gsm_mo_init(&bts->site_mgr.mo, bts, NM_OC_SITE_MANAGER, - 0xff, 0xff, 0xff); - - for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++) { - bts->gprs.nsvc[i].bts = bts; - bts->gprs.nsvc[i].id = i; - gsm_mo_init(&bts->gprs.nsvc[i].mo, bts, NM_OC_GPRS_NSVC, - bts->nr, i, 0xff); - } - memcpy(&bts->gprs.nse.timer, bts_nse_timer_default, - sizeof(bts->gprs.nse.timer)); - gsm_mo_init(&bts->gprs.nse.mo, bts, NM_OC_GPRS_NSE, - bts->nr, 0xff, 0xff); - memcpy(&bts->gprs.cell.timer, bts_cell_timer_default, - sizeof(bts->gprs.cell.timer)); - gsm_mo_init(&bts->gprs.cell.mo, bts, NM_OC_GPRS_CELL, - bts->nr, 0xff, 0xff); - memcpy(&bts->gprs.cell.rlc_cfg, &rlc_cfg_default, - sizeof(bts->gprs.cell.rlc_cfg)); - - /* 3GPP TS 08.18, chapter 5.4.1: 0 is reserved for signalling */ - bts->gprs.cell.bvci = 2; - - /* init statistics */ - bts->bts_ctrs = rate_ctr_group_alloc(bts, &bts_ctrg_desc, bts->nr); - if (!bts->bts_ctrs) { - talloc_free(bts); - return NULL; - } - bts->bts_statg = osmo_stat_item_group_alloc(bts, &bts_statg_desc, bts->nr); - - /* create our primary TRX */ - bts->c0 = gsm_bts_trx_alloc(bts); - if (!bts->c0) { - rate_ctr_group_free(bts->bts_ctrs); - osmo_stat_item_group_free(bts->bts_statg); - talloc_free(bts); - return NULL; - } - bts->c0->ts[0].pchan_from_config = GSM_PCHAN_CCCH_SDCCH4; /* TODO: really?? */ - - bts->ccch_load_ind_thresh = 10; /* 10% of Load: Start sending CCCH LOAD IND */ - bts->rach_b_thresh = -1; - bts->rach_ldavg_slots = -1; - - bts->paging.free_chans_need = -1; - INIT_LLIST_HEAD(&bts->paging.pending_requests); - - bts->features.data = &bts->_features_data[0]; - bts->features.data_len = sizeof(bts->_features_data); - - /* si handling */ - bts->bcch_change_mark = 1; - bts->chan_load_avg = 0; - - /* timer overrides */ - bts->T3122 = 0; /* not overridden by default */ - bts->T3113_dynamic = true; /* dynamic by default */ - - bts->dtxu = GSM48_DTX_SHALL_NOT_BE_USED; - bts->dtxd = false; - bts->gprs.ctrl_ack_type_use_block = true; /* use RLC/MAC control block */ - bts->neigh_list_manual_mode = NL_MODE_AUTOMATIC; - bts->early_classmark_allowed_3g = true; /* 3g Early Classmark Sending controlled by bts->early_classmark_allowed param */ - bts->si_unused_send_empty = true; - bts->si_common.cell_sel_par.cell_resel_hyst = 2; /* 4 dB */ - bts->si_common.cell_sel_par.rxlev_acc_min = 0; - bts->si_common.si2quater_neigh_list.arfcn = bts->si_common.data.earfcn_list; - bts->si_common.si2quater_neigh_list.meas_bw = bts->si_common.data.meas_bw_list; - bts->si_common.si2quater_neigh_list.length = MAX_EARFCN_LIST; - bts->si_common.si2quater_neigh_list.thresh_hi = 0; - osmo_earfcn_init(&bts->si_common.si2quater_neigh_list); - bts->si_common.neigh_list.data = bts->si_common.data.neigh_list; - bts->si_common.neigh_list.data_len = - sizeof(bts->si_common.data.neigh_list); - bts->si_common.si5_neigh_list.data = bts->si_common.data.si5_neigh_list; - bts->si_common.si5_neigh_list.data_len = - sizeof(bts->si_common.data.si5_neigh_list); - bts->si_common.cell_alloc.data = bts->si_common.data.cell_alloc; - bts->si_common.cell_alloc.data_len = - sizeof(bts->si_common.data.cell_alloc); - bts->si_common.rach_control.re = 1; /* no re-establishment */ - bts->si_common.rach_control.tx_integer = 9; /* 12 slots spread - 217/115 slots delay */ - bts->si_common.rach_control.max_trans = 3; /* 7 retransmissions */ - bts->si_common.rach_control.t2 = 4; /* no emergency calls */ - bts->si_common.chan_desc.att = 1; /* attachment required */ - bts->si_common.chan_desc.bs_pa_mfrms = RSL_BS_PA_MFRMS_5; /* paging frames */ - bts->si_common.chan_desc.bs_ag_blks_res = 1; /* reserved AGCH blocks */ - bts->si_common.chan_desc.t3212 = osmo_tdef_get(net->T_defs, 3212, OSMO_TDEF_CUSTOM, -1); - gsm_bts_set_radio_link_timeout(bts, 32); /* Use RADIO LINK TIMEOUT of 32 */ - - INIT_LLIST_HEAD(&bts->abis_queue); - INIT_LLIST_HEAD(&bts->loc_list); - INIT_LLIST_HEAD(&bts->local_neighbors); - INIT_LLIST_HEAD(&bts->oml_fail_rep); - - /* Enable all codecs by default. These get reset to a more fine grained selection IF a - * 'codec-support' config appears in the config file (see bsc_vty.c). */ - bts->codec = (struct bts_codec_conf){ - .hr = 1, - .efr = 1, - .amr = 1, - }; - - /* Set reasonable defaults for AMR-FR and AMR-HR rate configuration. - * (see also 3GPP TS 28.062, Table 7.11.3.1.3-2) */ - mr_cfg = (struct gsm48_multi_rate_conf) { - .m4_75 = 1, - .m5_15 = 0, - .m5_90 = 1, - .m6_70 = 0, - .m7_40 = 1, - .m7_95 = 0, - .m10_2 = 0, - .m12_2 = 1 - }; - memcpy(bts->mr_full.gsm48_ie, &mr_cfg, sizeof(bts->mr_full.gsm48_ie)); - bts->mr_full.ms_mode[0].mode = 0; - bts->mr_full.ms_mode[1].mode = 2; - bts->mr_full.ms_mode[2].mode = 4; - bts->mr_full.ms_mode[3].mode = 7; - bts->mr_full.bts_mode[0].mode = 0; - bts->mr_full.bts_mode[1].mode = 2; - bts->mr_full.bts_mode[2].mode = 4; - bts->mr_full.bts_mode[3].mode = 7; - for (i = 0; i < 3; i++) { - bts->mr_full.ms_mode[i].hysteresis = 8; - bts->mr_full.ms_mode[i].threshold = 32; - bts->mr_full.bts_mode[i].hysteresis = 8; - bts->mr_full.bts_mode[i].threshold = 32; - } - bts->mr_full.num_modes = 4; - - mr_cfg = (struct gsm48_multi_rate_conf) { - .m4_75 = 1, - .m5_15 = 0, - .m5_90 = 1, - .m6_70 = 0, - .m7_40 = 1, - .m7_95 = 0, - .m10_2 = 0, - .m12_2 = 0 - }; - memcpy(bts->mr_half.gsm48_ie, &mr_cfg, sizeof(bts->mr_half.gsm48_ie)); - bts->mr_half.ms_mode[0].mode = 0; - bts->mr_half.ms_mode[1].mode = 2; - bts->mr_half.ms_mode[2].mode = 4; - bts->mr_half.ms_mode[3].mode = 7; - bts->mr_half.bts_mode[0].mode = 0; - bts->mr_half.bts_mode[1].mode = 2; - bts->mr_half.bts_mode[2].mode = 4; - bts->mr_half.bts_mode[3].mode = 7; - for (i = 0; i < 3; i++) { - bts->mr_half.ms_mode[i].hysteresis = 8; - bts->mr_half.ms_mode[i].threshold = 32; - bts->mr_half.bts_mode[i].hysteresis = 8; - bts->mr_half.bts_mode[i].threshold = 32; - } - bts->mr_half.num_modes = 3; - - bts_init_cbch_state(&bts->cbch_basic, bts); - bts_init_cbch_state(&bts->cbch_extended, bts); - - return bts; -} - -/* reset the state of all MO in the BTS */ -void gsm_bts_mo_reset(struct gsm_bts *bts) -{ - struct gsm_bts_trx *trx; - unsigned int i; - - gsm_abis_mo_reset(&bts->mo); - gsm_abis_mo_reset(&bts->site_mgr.mo); - for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++) - gsm_abis_mo_reset(&bts->gprs.nsvc[i].mo); - gsm_abis_mo_reset(&bts->gprs.nse.mo); - gsm_abis_mo_reset(&bts->gprs.cell.mo); - - llist_for_each_entry(trx, &bts->trx_list, list) { - gsm_abis_mo_reset(&trx->mo); - gsm_abis_mo_reset(&trx->bb_transc.mo); - - for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { - struct gsm_bts_trx_ts *ts = &trx->ts[i]; - gsm_abis_mo_reset(&ts->mo); - } - } -} - struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num) { struct gsm_bts_trx *trx; @@ -1010,16 +366,6 @@ static char ts2str[255]; -char *gsm_bts_name(const struct gsm_bts *bts) -{ - if (!bts) - snprintf(ts2str, sizeof(ts2str), "(bts=NULL)"); - else - snprintf(ts2str, sizeof(ts2str), "(bts=%d)", bts->nr); - - return ts2str; -} - char *gsm_trx_name(const struct gsm_bts_trx *trx) { if (!trx) @@ -1289,27 +635,6 @@ return gsm_pchan2chan_nr(lchan->ts->pchan_is, lchan->ts->nr, lchan->nr); } -/* return the gsm_lchan for the CBCH (if it exists at all) */ -struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts) -{ - struct gsm_lchan *lchan = NULL; - struct gsm_bts_trx *trx = bts->c0; - - if (trx->ts[0].pchan_from_config == GSM_PCHAN_CCCH_SDCCH4_CBCH) - lchan = &trx->ts[0].lchan[2]; - else { - int i; - for (i = 0; i < 8; i++) { - if (trx->ts[i].pchan_from_config == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) { - lchan = &trx->ts[i].lchan[2]; - break; - } - } - } - - return lchan; -} - /* determine logical channel based on TRX and channel number IE */ struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr, int *rc) @@ -1392,6 +717,12 @@ return pchan_is_tch(ts->pchan_is); } +struct gsm_bts *conn_get_bts(struct gsm_subscriber_connection *conn) { + if (!conn || !conn->lchan) + return NULL; + return conn->lchan->ts->trx->bts; +} + bool trx_is_usable(const struct gsm_bts_trx *trx) { /* FIXME: How does this behave for BS-11 ? */ @@ -1417,13 +748,6 @@ } } -void gsm_bts_all_ts_dispatch(struct gsm_bts *bts, uint32_t ts_ev, void *data) -{ - struct gsm_bts_trx *trx; - llist_for_each_entry(trx, &bts->trx_list, list) - gsm_trx_all_ts_dispatch(trx, ts_ev, data); -} - static void _chan_desc_fill_tail(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan) { if (!lchan->ts->hopping.enabled) { @@ -1458,6 +782,14 @@ _chan_desc_fill_tail(cd, lchan); } +uint8_t gsm_ts_tsc(const struct gsm_bts_trx_ts *ts) +{ + if (ts->tsc != -1) + return ts->tsc; + else + return ts->trx->bts->bsic & 7; +} + bool nm_is_running(const struct gsm_nm_state *s) { if (s->operational != NM_OPSTATE_ENABLED) return false; @@ -1633,7 +965,7 @@ } } -static int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan) +int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan) { struct gsm_bts_trx_ts *ts; struct gsm_lchan *lchan; @@ -1681,18 +1013,6 @@ return count; } -/* Count number of free TS of given pchan type */ -int bts_count_free_ts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan) -{ - struct gsm_bts_trx *trx; - int count = 0; - - llist_for_each_entry(trx, &bts->trx_list, list) - count += trx_count_free_ts(trx, pchan); - - return count; -} - bool ts_is_usable(const struct gsm_bts_trx_ts *ts) { if (!trx_is_usable(ts->trx)) { diff --git a/src/osmo-bsc/handover_decision.c b/src/osmo-bsc/handover_decision.c index 5338400..7eb8f31 100644 --- a/src/osmo-bsc/handover_decision.c +++ b/src/osmo-bsc/handover_decision.c @@ -34,6 +34,7 @@ #include #include +#include /* did we get a RXLEV for a given cell in the given report? */ static int rxlev_for_cell_in_rep(struct gsm_meas_rep *mr, diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index ab507e8..8caa2e3 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -37,6 +37,7 @@ #include #include #include +#include #define LOGPHOBTS(bts, level, fmt, args...) \ LOGP(DHODEC, level, "(BTS %u) " fmt, bts->nr, ## args) diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 0b88b27..8ed5945 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -43,6 +43,7 @@ #include #include #include +#include #define LOG_FMT_BTS "bts %u lac-ci %u-%u arfcn-bsic %d-%d" #define LOG_ARGS_BTS(bts) \ diff --git a/src/osmo-bsc/handover_logic.c b/src/osmo-bsc/handover_logic.c index 5be8383..071228e 100644 --- a/src/osmo-bsc/handover_logic.c +++ b/src/osmo-bsc/handover_logic.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include diff --git a/src/osmo-bsc/handover_vty.c b/src/osmo-bsc/handover_vty.c index a418aa7..81313e2 100644 --- a/src/osmo-bsc/handover_vty.c +++ b/src/osmo-bsc/handover_vty.c @@ -27,6 +27,7 @@ #include #include #include +#include static struct handover_cfg *ho_cfg_from_vty(struct vty *vty) { diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index bcf7c4b..e879059 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -39,7 +39,7 @@ #include #include #include - +#include static struct osmo_fsm lchan_fsm; diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 4be9790..2def2f5 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -30,6 +30,7 @@ #include #include #include +#include static struct osmo_fsm lchan_rtp_fsm; diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c index d63db22..d2dba1b 100644 --- a/src/osmo-bsc/lchan_select.c +++ b/src/osmo-bsc/lchan_select.c @@ -28,6 +28,7 @@ #include #include +#include static struct gsm_lchan * _lc_find_trx(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan, diff --git a/src/osmo-bsc/meas_feed.c b/src/osmo-bsc/meas_feed.c index f9a3626..889f6ef 100644 --- a/src/osmo-bsc/meas_feed.c +++ b/src/osmo-bsc/meas_feed.c @@ -19,6 +19,7 @@ #include #include #include +#include struct meas_feed_state { struct osmo_wqueue wqueue; diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index 54d6944..7feed2a 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -30,6 +30,7 @@ #include #include #include +#include static struct gsm_network *g_net = NULL; static struct neighbor_ident_list *g_neighbor_cells = NULL; diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 1cacfe9..bf38d10 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include diff --git a/src/osmo-bsc/osmo_bsc_ctrl.c b/src/osmo-bsc/osmo_bsc_ctrl.c index b94a749..5ebe597 100644 --- a/src/osmo-bsc/osmo_bsc_ctrl.c +++ b/src/osmo-bsc/osmo_bsc_ctrl.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include diff --git a/src/osmo-bsc/osmo_bsc_filter.c b/src/osmo-bsc/osmo_bsc_filter.c index 08c3a50..f664231 100644 --- a/src/osmo-bsc/osmo_bsc_filter.c +++ b/src/osmo-bsc/osmo_bsc_filter.c @@ -26,6 +26,7 @@ #include #include #include +#include #include diff --git a/src/osmo-bsc/osmo_bsc_grace.c b/src/osmo-bsc/osmo_bsc_grace.c index 56edee5..a26a716 100644 --- a/src/osmo-bsc/osmo_bsc_grace.c +++ b/src/osmo-bsc/osmo_bsc_grace.c @@ -25,6 +25,7 @@ #include #include #include +#include int bsc_grace_allow_new_connection(struct gsm_network *network, struct gsm_bts *bts) { diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index ada6047..84b44f7 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -64,6 +64,7 @@ #include #include #include +#include #include diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index f2a1e5b..5e02b4a 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index afc6c8d..de4be26 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -34,6 +34,7 @@ #include #include #include +#include #include /* A pointer to a list with all involved MSCs diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 7859c69..521598f 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -53,6 +53,7 @@ #include #include #include +#include void *tall_paging_ctx = NULL; diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 3e0b7bf..ae4ac8a 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -44,6 +44,7 @@ #include #include #include +#include static int pcu_sock_send(struct gsm_bts *bts, struct msgb *msg); uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx); diff --git a/src/osmo-bsc/rest_octets.c b/src/osmo-bsc/rest_octets.c index 0d806f3..7307cb8 100644 --- a/src/osmo-bsc/rest_octets.c +++ b/src/osmo-bsc/rest_octets.c @@ -33,6 +33,7 @@ #include #include #include +#include /* generate SI1 rest octets */ int rest_octets_si1(uint8_t *data, uint8_t *nch_pos, int is1800_net) diff --git a/src/osmo-bsc/smscb.c b/src/osmo-bsc/smscb.c index 8d48af9..436826a 100644 --- a/src/osmo-bsc/smscb.c +++ b/src/osmo-bsc/smscb.c @@ -41,6 +41,7 @@ #include #include #include +#include /********************************************************************************* * Helper Functions diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index b17a909..13d0f46 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -41,6 +41,7 @@ #include #include #include +#include struct gsm0808_cell_id_list2; diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 4816daf..0aecfae 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -28,6 +28,7 @@ #include #include #include +#include static struct osmo_fsm ts_fsm; diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index e585e0d..6696679 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -48,6 +48,7 @@ bs11_config_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_siemens_bs11.o \ $(top_builddir)/src/osmo-bsc/e1_config.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ @@ -117,6 +118,7 @@ $(NULL) meas_json_LDADD = \ + $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/src/utils/bs11_config.c b/src/utils/bs11_config.c index 1156233..c43c008 100644 --- a/src/utils/bs11_config.c +++ b/src/utils/bs11_config.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am index 60054d9..a01f56a 100644 --- a/tests/abis/Makefile.am +++ b/tests/abis/Makefile.am @@ -26,6 +26,7 @@ abis_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(top_builddir)/src/osmo-bsc/net_init.o \ $(LIBOSMOCORE_LIBS) \ diff --git a/tests/abis/abis_test.c b/tests/abis/abis_test.c index 43934f3..767a9fb 100644 --- a/tests/abis/abis_test.c +++ b/tests/abis/abis_test.c @@ -26,6 +26,7 @@ #include #include +#include #include #include diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am index b301f9e..7ea002e 100644 --- a/tests/bsc/Makefile.am +++ b/tests/bsc/Makefile.am @@ -37,6 +37,7 @@ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ $(top_builddir)/src/osmo-bsc/osmo_bsc_filter.o \ $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \ + $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(top_builddir)/src/osmo-bsc/handover_cfg.o \ $(top_builddir)/src/osmo-bsc/handover_logic.o \ diff --git a/tests/codec_pref/codec_pref_test.c b/tests/codec_pref/codec_pref_test.c index f163f35..5f4c831 100644 --- a/tests/codec_pref/codec_pref_test.c +++ b/tests/codec_pref/codec_pref_test.c @@ -20,6 +20,7 @@ */ #include +#include #include #include #include diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am index aff7c7d..21b7873 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -25,6 +25,7 @@ gsm0408_test_LDADD = \ $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ + $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(top_builddir)/src/osmo-bsc/net_init.o \ $(top_builddir)/src/osmo-bsc/rest_octets.o \ diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 5ff9491..b3e8b11 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am index 736b444..571b7a9 100644 --- a/tests/handover/Makefile.am +++ b/tests/handover/Makefile.am @@ -57,6 +57,7 @@ $(top_builddir)/src/osmo-bsc/bsc_subscr_conn_fsm.o \ $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \ $(top_builddir)/src/osmo-bsc/bsc_vty.o \ + $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ $(top_builddir)/src/osmo-bsc/bts_unknown.o \ diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 1a756cd..edc3219 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -47,6 +47,7 @@ #include #include #include +#include void *ctx; diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am index aa7045e..93fdbe8 100644 --- a/tests/nanobts_omlattr/Makefile.am +++ b/tests/nanobts_omlattr/Makefile.am @@ -25,6 +25,7 @@ nanobts_omlattr_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ + $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c index a3ba8e0..4180f4a 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.c +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I00c15f5285b5c1a0109279b7ab192d5467a04ece Gerrit-Change-Number: 19287 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:45:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:45:33 +0000 Subject: Change in osmo-bsc[master]: bts: Drop duplicated function to get trx by number In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19297 ) Change subject: bts: Drop duplicated function to get trx by number ...................................................................... bts: Drop duplicated function to get trx by number In the big mess of gsm_data we reached a point where we have multiple functions doing the same thing, most probably because it's hard finding stuff in there. Let's drop one of them (the one which less callers) and move it to bts.*, where it belongs. Change-Id: I9071a0ab250844619280fbe2be63ed99f2c87eb1 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/abis_nm.c M src/osmo-bsc/abis_om2000.c M src/osmo-bsc/abis_om2000_vty.c M src/osmo-bsc/bsc_ctrl_lookup.c M src/osmo-bsc/bts.c M src/osmo-bsc/gsm_data.c 8 files changed, 14 insertions(+), 25 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 07d2793..b38c11a 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -598,7 +598,7 @@ int gsm_set_bts_type(struct gsm_bts *bts, enum gsm_bts_type type); -struct gsm_bts_trx *gsm_bts_trx_by_nr(struct gsm_bts *bts, int nr); +struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num); int bts_gprs_mode_is_compat(struct gsm_bts *bts, enum bts_gprs_mode mode); diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index a74e6d9..f90bfa7 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -963,7 +963,6 @@ int match_idx); struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts); -struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num); extern const struct value_string gsm_chreq_descs[]; extern const struct value_string gsm_pchant_names[]; diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 4ce27f3..19eed8c 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -800,7 +800,7 @@ { struct abis_om_fom_hdr *foh = msgb_l3(oml_msg); struct e1inp_sign_link *sign_link = oml_msg->dst; - struct gsm_bts_trx *trx = gsm_bts_trx_by_nr(sign_link->trx->bts, foh->obj_inst.trx_nr); + struct gsm_bts_trx *trx = gsm_bts_trx_num(sign_link->trx->bts, foh->obj_inst.trx_nr); uint8_t ts_nr = foh->obj_inst.ts_nr; if (!trx) { LOGP(DNM, LOGL_ERROR, "%s Channel OPSTART ACK for sign_link without trx\n", @@ -2791,7 +2791,7 @@ /* The message might be received over the main OML link, so we cannot * just use sign_link->trx. Resolve it by number from the FOM header. */ - trx = gsm_bts_trx_by_nr(sign_link->trx->bts, foh->obj_inst.trx_nr); + trx = gsm_bts_trx_num(sign_link->trx->bts, foh->obj_inst.trx_nr); DEBUGPFOH(DNM, foh, "Rx IPACCESS(0x%02x): %s\n", foh->msg_type, osmo_hexdump(foh->data, oh->length - sizeof(*foh))); diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index 1e4ef97..5c8b378 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -1039,7 +1039,7 @@ case OM2K_MO_CLS_TX: case OM2K_MO_CLS_RX: /* Route through per-TRX OML Link to the appropriate TRX */ - trx = gsm_bts_trx_by_nr(bts, o2h->mo.inst); + trx = gsm_bts_trx_num(bts, o2h->mo.inst); if (!trx) { LOGP(DNM, LOGL_ERROR, "MO=%s Tx Dropping msg to " "non-existing TRX\n", om2k_mo_name(&o2h->mo)); @@ -1049,7 +1049,7 @@ break; case OM2K_MO_CLS_TS: /* Route through per-TRX OML Link to the appropriate TRX */ - trx = gsm_bts_trx_by_nr(bts, o2h->mo.assoc_so); + trx = gsm_bts_trx_num(bts, o2h->mo.assoc_so); if (!trx) { LOGP(DNM, LOGL_ERROR, "MO=%s Tx Dropping msg to " "non-existing TRX\n", om2k_mo_name(&o2h->mo)); diff --git a/src/osmo-bsc/abis_om2000_vty.c b/src/osmo-bsc/abis_om2000_vty.c index b00c7dd..26e8488 100644 --- a/src/osmo-bsc/abis_om2000_vty.c +++ b/src/osmo-bsc/abis_om2000_vty.c @@ -561,7 +561,7 @@ abis_om2k_tx_con_conf_req(bts); break; case OM2K_MO_CLS_TS: - trx = gsm_bts_trx_by_nr(bts, oms->mo.assoc_so); + trx = gsm_bts_trx_num(bts, oms->mo.assoc_so); if (!trx) { vty_out(vty, "%% BTS %u has no TRX %u%s", bts->nr, oms->mo.assoc_so, VTY_NEWLINE); @@ -578,7 +578,7 @@ case OM2K_MO_CLS_RX: case OM2K_MO_CLS_TX: case OM2K_MO_CLS_TRXC: - trx = gsm_bts_trx_by_nr(bts, oms->mo.inst); + trx = gsm_bts_trx_num(bts, oms->mo.inst); if (!trx) { vty_out(vty, "%% BTS %u has no TRX %u%s", bts->nr, oms->mo.inst, VTY_NEWLINE); diff --git a/src/osmo-bsc/bsc_ctrl_lookup.c b/src/osmo-bsc/bsc_ctrl_lookup.c index 38d1ba4..4328d76 100644 --- a/src/osmo-bsc/bsc_ctrl_lookup.c +++ b/src/osmo-bsc/bsc_ctrl_lookup.c @@ -29,6 +29,7 @@ #include #include #include +#include extern vector ctrl_node_vec; diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 71968f6..c943684 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -570,14 +570,18 @@ return 1; } -struct gsm_bts_trx *gsm_bts_trx_by_nr(struct gsm_bts *bts, int nr) +struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num) { struct gsm_bts_trx *trx; + if (num >= bts->num_trx) + return NULL; + llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->nr == nr) + if (trx->nr == num) return trx; } + return NULL; } diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 1295592..5daee26 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -349,21 +349,6 @@ return trx; } -struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num) -{ - struct gsm_bts_trx *trx; - - if (num >= bts->num_trx) - return NULL; - - llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->nr == num) - return trx; - } - - return NULL; -} - static char ts2str[255]; char *gsm_trx_name(const struct gsm_bts_trx *trx) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9071a0ab250844619280fbe2be63ed99f2c87eb1 Gerrit-Change-Number: 19297 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:45:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:45:33 +0000 Subject: Change in osmo-bsc[master]: Move struct gsm_bts_trx: gsm-data.* => bts_trx.* In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19298 ) Change subject: Move struct gsm_bts_trx: gsm-data.* => bts_trx.* ...................................................................... Move struct gsm_bts_trx: gsm-data.* => bts_trx.* See rant fro similar recent commit moving stuff to bts.*. Change-Id: I11758ca3d255d849d77bd068f24bb68bde1f89a5 --- M include/osmocom/bsc/Makefile.am M include/osmocom/bsc/bts.h A include/osmocom/bsc/bts_trx.h M include/osmocom/bsc/gsm_data.h M src/ipaccess/Makefile.am M src/ipaccess/network_listen.c M src/osmo-bsc/Makefile.am M src/osmo-bsc/abis_nm.c M src/osmo-bsc/bsc_subscr_conn_fsm.c A src/osmo-bsc/bts_trx.c M src/osmo-bsc/gsm_data.c M src/utils/Makefile.am M tests/abis/Makefile.am M tests/bsc/Makefile.am M tests/gsm0408/Makefile.am M tests/handover/Makefile.am M tests/nanobts_omlattr/Makefile.am 17 files changed, 398 insertions(+), 331 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am index 4d2df20..c2a82ce 100644 --- a/include/osmocom/bsc/Makefile.am +++ b/include/osmocom/bsc/Makefile.am @@ -11,6 +11,7 @@ bsc_subscr_conn_fsm.h \ bss.h \ bts.h \ + bts_trx.h \ bts_ipaccess_nanobts_omlattr.h \ chan_alloc.h \ codec_pref.h \ diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index b38c11a..9b89f4f 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -13,6 +13,7 @@ #include #include "osmocom/bsc/gsm_data.h" +#include "osmocom/bsc/bts_trx.h" enum bts_counter_id { BTS_CTR_CHREQ_TOTAL, diff --git a/include/osmocom/bsc/bts_trx.h b/include/osmocom/bsc/bts_trx.h new file mode 100644 index 0000000..7e64439 --- /dev/null +++ b/include/osmocom/bsc/bts_trx.h @@ -0,0 +1,92 @@ +#pragma once + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include "osmocom/bsc/gsm_data.h" + +struct gsm_bts; + +#define TRX_NR_TS 8 + +/* One TRX in a BTS */ +struct gsm_bts_trx { + /* list header in bts->trx_list */ + struct llist_head list; + + struct gsm_bts *bts; + /* number of this TRX in the BTS */ + uint8_t nr; + /* human readable name / description */ + char *description; + /* how do we talk RSL with this TRX? */ + struct gsm_e1_subslot rsl_e1_link; + uint8_t rsl_tei; + struct e1inp_sign_link *rsl_link; + + /* Timeout for initiating the RSL connection. */ + struct osmo_timer_list rsl_connect_timeout; + + /* Some BTS (specifically Ericsson RBS) have a per-TRX OML Link */ + struct e1inp_sign_link *oml_link; + + struct gsm_abis_mo mo; + struct tlv_parsed nm_attr; + struct { + struct gsm_abis_mo mo; + } bb_transc; + + uint16_t arfcn; + int nominal_power; /* in dBm */ + unsigned int max_power_red; /* in actual dB */ + + union { + struct { + struct { + struct gsm_abis_mo mo; + } bbsig; + struct { + struct gsm_abis_mo mo; + } pa; + } bs11; + struct { + unsigned int test_state; + uint8_t test_nr; + struct rxlev_stats rxlev_stat; + } ipaccess; + struct { + struct { + struct om2k_mo om2k_mo; + } trxc; + struct { + struct om2k_mo om2k_mo; + } rx; + struct { + struct om2k_mo om2k_mo; + } tx; + } rbs2000; + }; + struct gsm_bts_trx_ts ts[TRX_NR_TS]; +}; + +struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts); +char *gsm_trx_name(const struct gsm_bts_trx *trx); + +struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr, + int *rc); + +void gsm_trx_lock_rf(struct gsm_bts_trx *trx, bool locked, const char *reason); +bool trx_is_usable(const struct gsm_bts_trx *trx); + +void gsm_trx_all_ts_dispatch(struct gsm_bts_trx *trx, uint32_t ts_ev, void *data); +int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan); +bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx); diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index f90bfa7..e85be70 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -40,6 +40,7 @@ struct gsm0808_cell_id; struct osmo_mgcpc_ep; struct gsm_bts; +struct gsm_bts_trx; /** annotations for msgb ownership */ #define __uses @@ -330,7 +331,6 @@ use 4 as magic number for BCCH hack - see osmo-bts-../oml.c:opstart_compl() */ #define CCCH_LCHAN 4 -#define TRX_NR_TS 8 #define TS_MAX_LCHAN 8 #define HARDCODED_ARFCN 123 @@ -713,66 +713,6 @@ struct gsm_lchan lchan[TS_MAX_LCHAN]; }; -/* One TRX in a BTS */ -struct gsm_bts_trx { - /* list header in bts->trx_list */ - struct llist_head list; - - struct gsm_bts *bts; - /* number of this TRX in the BTS */ - uint8_t nr; - /* human readable name / description */ - char *description; - /* how do we talk RSL with this TRX? */ - struct gsm_e1_subslot rsl_e1_link; - uint8_t rsl_tei; - struct e1inp_sign_link *rsl_link; - - /* Timeout for initiating the RSL connection. */ - struct osmo_timer_list rsl_connect_timeout; - - /* Some BTS (specifically Ericsson RBS) have a per-TRX OML Link */ - struct e1inp_sign_link *oml_link; - - struct gsm_abis_mo mo; - struct tlv_parsed nm_attr; - struct { - struct gsm_abis_mo mo; - } bb_transc; - - uint16_t arfcn; - int nominal_power; /* in dBm */ - unsigned int max_power_red; /* in actual dB */ - - union { - struct { - struct { - struct gsm_abis_mo mo; - } bbsig; - struct { - struct gsm_abis_mo mo; - } pa; - } bs11; - struct { - unsigned int test_state; - uint8_t test_nr; - struct rxlev_stats rxlev_stat; - } ipaccess; - struct { - struct { - struct om2k_mo om2k_mo; - } trxc; - struct { - struct om2k_mo om2k_mo; - } rx; - struct { - struct om2k_mo om2k_mo; - } tx; - } rbs2000; - }; - struct gsm_bts_trx_ts ts[TRX_NR_TS]; -}; - #define GSM_LCHAN_SI(lchan, i) (void *)((lchan)->si.buf[i][0]) /* @@ -962,8 +902,6 @@ const struct gsm0808_cell_id *cell_id, int match_idx); -struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts); - extern const struct value_string gsm_chreq_descs[]; extern const struct value_string gsm_pchant_names[]; extern const struct value_string gsm_pchant_descs[]; @@ -974,7 +912,6 @@ enum gsm_phys_chan_config gsm_pchan_parse(const char *name); const char *gsm_lchant_name(enum gsm_chan_t c); const char *gsm_chreq_name(enum gsm_chreq_reason_t c); -char *gsm_trx_name(const struct gsm_bts_trx *trx); char *gsm_ts_name(const struct gsm_bts_trx_ts *ts); char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts); char *gsm_lchan_name_compute(const struct gsm_lchan *lchan); @@ -1007,9 +944,6 @@ uint8_t gsm_ts_tsc(const struct gsm_bts_trx_ts *ts); -struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr, - int *rc); - enum gsm_phys_chan_config ts_pchan(struct gsm_bts_trx_ts *ts); uint8_t pchan_subslots(enum gsm_phys_chan_config pchan); bool ts_is_tch(struct gsm_bts_trx_ts *ts); @@ -1255,7 +1189,6 @@ void set_ts_e1link(struct gsm_bts_trx_ts *ts, uint8_t e1_nr, uint8_t e1_ts, uint8_t e1_ts_ss); -void gsm_trx_lock_rf(struct gsm_bts_trx *trx, bool locked, const char *reason); int gsm_bts_trx_set_system_infos(struct gsm_bts_trx *trx); int gsm_bts_set_system_infos(struct gsm_bts *bts); @@ -1265,17 +1198,11 @@ /* control interface handling */ int bsc_base_ctrl_cmds_install(void); -bool trx_is_usable(const struct gsm_bts_trx *trx); bool ts_is_usable(const struct gsm_bts_trx_ts *ts); int gsm_lchan_type_by_pchan(enum gsm_phys_chan_config pchan); enum gsm_phys_chan_config gsm_pchan_by_lchan_type(enum gsm_chan_t type); -void gsm_trx_all_ts_dispatch(struct gsm_bts_trx *trx, uint32_t ts_ev, void *data); -int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan); - -bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx); - enum gsm48_rr_cause bsc_gsm48_rr_cause_from_gsm0808_cause(enum gsm0808_cause c); enum gsm48_rr_cause bsc_gsm48_rr_cause_from_rsl_cause(uint8_t c); diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am index 273530c..a1812a9 100644 --- a/src/ipaccess/Makefile.am +++ b/src/ipaccess/Makefile.am @@ -47,6 +47,7 @@ # FIXME: resolve the bogus dependencies patched around here: ipaccess_config_LDADD = \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ @@ -61,7 +62,9 @@ $(NULL) ipaccess_proxy_LDADD = \ + $(top_builddir)/src/osmo-bsc/abis_nm.o \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(OSMO_LIBS) \ $(NULL) diff --git a/src/ipaccess/network_listen.c b/src/ipaccess/network_listen.c index bbaf798..e9f5c93 100644 --- a/src/ipaccess/network_listen.c +++ b/src/ipaccess/network_listen.c @@ -34,6 +34,7 @@ #include #include +#include #include #include #include diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am index f66421a..231707c 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -44,6 +44,7 @@ bsc_subscriber.c \ bsc_vty.c \ bts.c \ + bts_trx.c \ bts_ericsson_rbs2000.c \ bts_init.c \ bts_ipaccess_nanobts.c \ diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 19eed8c..d88ce24 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -3020,26 +3020,6 @@ memcpy(&_buf->rac, &ci, sizeof(ci)); } -void gsm_trx_lock_rf(struct gsm_bts_trx *trx, bool locked, const char *reason) -{ - uint8_t new_state = locked ? NM_STATE_LOCKED : NM_STATE_UNLOCKED; - - - if (!trx->bts || !trx->bts->oml_link) { - /* Set initial state which will be sent when BTS connects. */ - trx->mo.nm_state.administrative = new_state; - return; - } - - LOG_TRX(trx, DNM, LOGL_NOTICE, "Requesting administrative state change %s -> %s [%s]\n", - get_value_string(abis_nm_adm_state_names, trx->mo.nm_state.administrative), - get_value_string(abis_nm_adm_state_names, new_state), reason); - - abis_nm_chg_adm_state(trx->bts, NM_OC_RADIO_CARRIER, - trx->bts->bts_nr, trx->nr, 0xff, - new_state); -} - static const struct value_string ipacc_testres_names[] = { { NM_IPACC_TESTRES_SUCCESS, "SUCCESS" }, { NM_IPACC_TESTRES_TIMEOUT, "TIMEOUT" }, diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 72f2474..9b1fb3f 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c new file mode 100644 index 0000000..15d5b59 --- /dev/null +++ b/src/osmo-bsc/bts_trx.c @@ -0,0 +1,288 @@ +/* (C) 2008-2018 by Harald Welte + * (C) 2020 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include + +#include +#include +#include +#include +#include +#include +#include + +struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts) +{ + struct gsm_bts_trx *trx = talloc_zero(bts, struct gsm_bts_trx); + int k; + + if (!trx) + return NULL; + + trx->bts = bts; + trx->nr = bts->num_trx++; + trx->mo.nm_state.administrative = NM_STATE_UNLOCKED; + + gsm_mo_init(&trx->mo, bts, NM_OC_RADIO_CARRIER, + bts->nr, trx->nr, 0xff); + gsm_mo_init(&trx->bb_transc.mo, bts, NM_OC_BASEB_TRANSC, + bts->nr, trx->nr, 0xff); + + for (k = 0; k < TRX_NR_TS; k++) { + struct gsm_bts_trx_ts *ts = &trx->ts[k]; + int l; + + + ts->trx = trx; + ts->nr = k; + ts->pchan_from_config = ts->pchan_on_init = ts->pchan_is = GSM_PCHAN_NONE; + ts->tsc = -1; + + ts_fsm_alloc(ts); + + gsm_mo_init(&ts->mo, bts, NM_OC_CHANNEL, + bts->nr, trx->nr, ts->nr); + + ts->hopping.arfcns.data_len = sizeof(ts->hopping.arfcns_data); + ts->hopping.arfcns.data = ts->hopping.arfcns_data; + ts->hopping.ma.data_len = sizeof(ts->hopping.ma_data); + ts->hopping.ma.data = ts->hopping.ma_data; + + for (l = 0; l < TS_MAX_LCHAN; l++) { + struct gsm_lchan *lchan; + char *name; + lchan = &ts->lchan[l]; + + lchan->ts = ts; + lchan->nr = l; + lchan->type = GSM_LCHAN_NONE; + + name = gsm_lchan_name_compute(lchan); + lchan->name = talloc_strdup(trx, name); + } + } + + if (trx->nr != 0) + trx->nominal_power = bts->c0->nominal_power; + + llist_add_tail(&trx->list, &bts->trx_list); + + return trx; +} + +static char ts2str[255]; + +char *gsm_trx_name(const struct gsm_bts_trx *trx) +{ + if (!trx) + snprintf(ts2str, sizeof(ts2str), "(trx=NULL)"); + else + snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d)", + trx->bts->nr, trx->nr); + + return ts2str; +} + +/* determine logical channel based on TRX and channel number IE */ +struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr, + int *rc) +{ + uint8_t ts_nr = chan_nr & 0x07; + uint8_t cbits = chan_nr >> 3; + uint8_t lch_idx; + struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr]; + bool ok; + + if (rc) + *rc = -EINVAL; + + if (cbits == 0x01) { + lch_idx = 0; /* TCH/F */ + ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_TCH_F) + || ts->pchan_on_init == GSM_PCHAN_PDCH; /* PDCH? really? */ + } else if ((cbits & 0x1e) == 0x02) { + lch_idx = cbits & 0x1; /* TCH/H */ + ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_TCH_H); + } else if ((cbits & 0x1c) == 0x04) { + lch_idx = cbits & 0x3; /* SDCCH/4 */ + ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_CCCH_SDCCH4); + } else if ((cbits & 0x18) == 0x08) { + lch_idx = cbits & 0x7; /* SDCCH/8 */ + ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_SDCCH8_SACCH8C); + } else if (cbits == 0x10 || cbits == 0x11 || cbits == 0x12) { + lch_idx = 0; /* CCCH? */ + ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_CCCH); + /* FIXME: we should not return first sdcch4 !!! */ + } else if ((chan_nr & RSL_CHAN_NR_MASK) == RSL_CHAN_OSMO_PDCH) { + lch_idx = 0; + ok = (ts->pchan_on_init == GSM_PCHAN_TCH_F_TCH_H_PDCH); + } else + return NULL; + + if (rc && ok) + *rc = 0; + + return &ts->lchan[lch_idx]; +} + +void gsm_trx_lock_rf(struct gsm_bts_trx *trx, bool locked, const char *reason) +{ + uint8_t new_state = locked ? NM_STATE_LOCKED : NM_STATE_UNLOCKED; + + + if (!trx->bts || !trx->bts->oml_link) { + /* Set initial state which will be sent when BTS connects. */ + trx->mo.nm_state.administrative = new_state; + return; + } + + LOG_TRX(trx, DNM, LOGL_NOTICE, "Requesting administrative state change %s -> %s [%s]\n", + get_value_string(abis_nm_adm_state_names, trx->mo.nm_state.administrative), + get_value_string(abis_nm_adm_state_names, new_state), reason); + + abis_nm_chg_adm_state(trx->bts, NM_OC_RADIO_CARRIER, + trx->bts->bts_nr, trx->nr, 0xff, + new_state); +} + +bool trx_is_usable(const struct gsm_bts_trx *trx) +{ + /* FIXME: How does this behave for BS-11 ? */ + if (is_ipaccess_bts(trx->bts)) { + if (!nm_is_running(&trx->mo.nm_state) || + !nm_is_running(&trx->bb_transc.mo.nm_state)) + return false; + } else if (is_ericsson_bts(trx->bts)) { + /* The OM2000 -> 12.21 mapping we do doesn't have separate bb_transc MO */ + if (!nm_is_running(&trx->mo.nm_state)) + return false; + } + + return true; +} + + +void gsm_trx_all_ts_dispatch(struct gsm_bts_trx *trx, uint32_t ts_ev, void *data) +{ + int i; + for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + osmo_fsm_inst_dispatch(ts->fi, ts_ev, data); + } +} + +int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan) +{ + struct gsm_bts_trx_ts *ts; + struct gsm_lchan *lchan; + int j; + int count = 0; + + if (!trx_is_usable(trx)) + return 0; + + for (j = 0; j < ARRAY_SIZE(trx->ts); j++) { + ts = &trx->ts[j]; + if (!ts_is_usable(ts)) + continue; + + if (ts->pchan_is == GSM_PCHAN_PDCH) { + /* Dynamic timeslots in PDCH mode will become TCH if needed. */ + switch (ts->pchan_on_init) { + case GSM_PCHAN_TCH_F_PDCH: + if (pchan == GSM_PCHAN_TCH_F) + count++; + continue; + + case GSM_PCHAN_TCH_F_TCH_H_PDCH: + if (pchan == GSM_PCHAN_TCH_F) + count++; + else if (pchan == GSM_PCHAN_TCH_H) + count += 2; + continue; + + default: + /* Not dynamic, not applicable. */ + continue; + } + } + + if (ts->pchan_is != pchan) + continue; + + ts_for_each_lchan(lchan, ts) { + if (lchan_state_is(lchan, LCHAN_ST_UNUSED)) + count++; + } + } + + return count; +} + +bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx) +{ + bool combined = false; + bool result = true; + unsigned int i; + + /* Iterate over all timeslots */ + for (i = 0; i < 8; i++) { + const struct gsm_bts_trx_ts *ts = &trx->ts[i]; + + switch (ts->pchan_from_config) { + case GSM_PCHAN_CCCH_SDCCH4_CBCH: + case GSM_PCHAN_CCCH_SDCCH4: + /* CCCH+SDCCH4 can only be configured on TS0 */ + if (i > 0) { + LOGP(DNM, LOGL_ERROR, "Combined CCCH is not allowed " + "on TS%u > 0\n", i); + result = false; + } + if (i == 0) + combined = true; + /* fall-through */ + case GSM_PCHAN_CCCH: + /* 3GPP TS 45.002, Table 3, CCCH: TS (0, 2, 4, 6) */ + if (i % 2 != 0) { + LOGP(DNM, LOGL_ERROR, "%s is not allowed on odd TS%u\n", + gsm_pchan_name(ts->pchan_from_config), i); + result = false; + } + + /* There can be no more CCCHs if TS0/C0 is combined */ + if (i > 0 && combined) { + LOGP(DNM, LOGL_ERROR, "%s is not allowed on TS%u, " + "because TS0 is using combined channel configuration\n", + gsm_pchan_name(ts->pchan_from_config), i); + result = false; + } + break; + + default: + /* CCCH on TS0 is mandatory for C0 */ + if (trx->bts->c0 == trx && i == 0) { + LOGP(DNM, LOGL_ERROR, "TS0 on C0 must be CCCH/BCCH\n"); + result = false; + } + } + } + + return result; +} diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 5daee26..c0c8cf6 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -290,79 +290,8 @@ return NULL; } -struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts) -{ - struct gsm_bts_trx *trx = talloc_zero(bts, struct gsm_bts_trx); - int k; - - if (!trx) - return NULL; - - trx->bts = bts; - trx->nr = bts->num_trx++; - trx->mo.nm_state.administrative = NM_STATE_UNLOCKED; - - gsm_mo_init(&trx->mo, bts, NM_OC_RADIO_CARRIER, - bts->nr, trx->nr, 0xff); - gsm_mo_init(&trx->bb_transc.mo, bts, NM_OC_BASEB_TRANSC, - bts->nr, trx->nr, 0xff); - - for (k = 0; k < TRX_NR_TS; k++) { - struct gsm_bts_trx_ts *ts = &trx->ts[k]; - int l; - - - ts->trx = trx; - ts->nr = k; - ts->pchan_from_config = ts->pchan_on_init = ts->pchan_is = GSM_PCHAN_NONE; - ts->tsc = -1; - - ts_fsm_alloc(ts); - - gsm_mo_init(&ts->mo, bts, NM_OC_CHANNEL, - bts->nr, trx->nr, ts->nr); - - ts->hopping.arfcns.data_len = sizeof(ts->hopping.arfcns_data); - ts->hopping.arfcns.data = ts->hopping.arfcns_data; - ts->hopping.ma.data_len = sizeof(ts->hopping.ma_data); - ts->hopping.ma.data = ts->hopping.ma_data; - - for (l = 0; l < TS_MAX_LCHAN; l++) { - struct gsm_lchan *lchan; - char *name; - lchan = &ts->lchan[l]; - - lchan->ts = ts; - lchan->nr = l; - lchan->type = GSM_LCHAN_NONE; - - name = gsm_lchan_name_compute(lchan); - lchan->name = talloc_strdup(trx, name); - } - } - - if (trx->nr != 0) - trx->nominal_power = bts->c0->nominal_power; - - llist_add_tail(&trx->list, &bts->trx_list); - - return trx; -} - static char ts2str[255]; -char *gsm_trx_name(const struct gsm_bts_trx *trx) -{ - if (!trx) - snprintf(ts2str, sizeof(ts2str), "(trx=NULL)"); - else - snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d)", - trx->bts->nr, trx->nr); - - return ts2str; -} - - char *gsm_ts_name(const struct gsm_bts_trx_ts *ts) { snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d,ts=%d)", @@ -620,48 +549,6 @@ return gsm_pchan2chan_nr(lchan->ts->pchan_is, lchan->ts->nr, lchan->nr); } -/* determine logical channel based on TRX and channel number IE */ -struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr, - int *rc) -{ - uint8_t ts_nr = chan_nr & 0x07; - uint8_t cbits = chan_nr >> 3; - uint8_t lch_idx; - struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr]; - bool ok; - - if (rc) - *rc = -EINVAL; - - if (cbits == 0x01) { - lch_idx = 0; /* TCH/F */ - ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_TCH_F) - || ts->pchan_on_init == GSM_PCHAN_PDCH; /* PDCH? really? */ - } else if ((cbits & 0x1e) == 0x02) { - lch_idx = cbits & 0x1; /* TCH/H */ - ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_TCH_H); - } else if ((cbits & 0x1c) == 0x04) { - lch_idx = cbits & 0x3; /* SDCCH/4 */ - ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_CCCH_SDCCH4); - } else if ((cbits & 0x18) == 0x08) { - lch_idx = cbits & 0x7; /* SDCCH/8 */ - ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_SDCCH8_SACCH8C); - } else if (cbits == 0x10 || cbits == 0x11 || cbits == 0x12) { - lch_idx = 0; /* CCCH? */ - ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_CCCH); - /* FIXME: we should not return first sdcch4 !!! */ - } else if ((chan_nr & RSL_CHAN_NR_MASK) == RSL_CHAN_OSMO_PDCH) { - lch_idx = 0; - ok = (ts->pchan_on_init == GSM_PCHAN_TCH_F_TCH_H_PDCH); - } else - return NULL; - - if (rc && ok) - *rc = 0; - - return &ts->lchan[lch_idx]; -} - static const uint8_t subslots_per_pchan[] = { [GSM_PCHAN_NONE] = 0, [GSM_PCHAN_CCCH] = 0, @@ -708,31 +595,6 @@ return conn->lchan->ts->trx->bts; } -bool trx_is_usable(const struct gsm_bts_trx *trx) -{ - /* FIXME: How does this behave for BS-11 ? */ - if (is_ipaccess_bts(trx->bts)) { - if (!nm_is_running(&trx->mo.nm_state) || - !nm_is_running(&trx->bb_transc.mo.nm_state)) - return false; - } else if (is_ericsson_bts(trx->bts)) { - /* The OM2000 -> 12.21 mapping we do doesn't have separate bb_transc MO */ - if (!nm_is_running(&trx->mo.nm_state)) - return false; - } - - return true; -} - -void gsm_trx_all_ts_dispatch(struct gsm_bts_trx *trx, uint32_t ts_ev, void *data) -{ - int i; - for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { - struct gsm_bts_trx_ts *ts = &trx->ts[i]; - osmo_fsm_inst_dispatch(ts->fi, ts_ev, data); - } -} - static void _chan_desc_fill_tail(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan) { if (!lchan->ts->hopping.enabled) { @@ -950,54 +812,6 @@ } } -int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan) -{ - struct gsm_bts_trx_ts *ts; - struct gsm_lchan *lchan; - int j; - int count = 0; - - if (!trx_is_usable(trx)) - return 0; - - for (j = 0; j < ARRAY_SIZE(trx->ts); j++) { - ts = &trx->ts[j]; - if (!ts_is_usable(ts)) - continue; - - if (ts->pchan_is == GSM_PCHAN_PDCH) { - /* Dynamic timeslots in PDCH mode will become TCH if needed. */ - switch (ts->pchan_on_init) { - case GSM_PCHAN_TCH_F_PDCH: - if (pchan == GSM_PCHAN_TCH_F) - count++; - continue; - - case GSM_PCHAN_TCH_F_TCH_H_PDCH: - if (pchan == GSM_PCHAN_TCH_F) - count++; - else if (pchan == GSM_PCHAN_TCH_H) - count += 2; - continue; - - default: - /* Not dynamic, not applicable. */ - continue; - } - } - - if (ts->pchan_is != pchan) - continue; - - ts_for_each_lchan(lchan, ts) { - if (lchan_state_is(lchan, LCHAN_ST_UNUSED)) - count++; - } - } - - return count; -} - bool ts_is_usable(const struct gsm_bts_trx_ts *ts) { if (!trx_is_usable(ts->trx)) { @@ -1095,57 +909,6 @@ {} }; -bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx) -{ - bool combined = false; - bool result = true; - unsigned int i; - - /* Iterate over all timeslots */ - for (i = 0; i < 8; i++) { - const struct gsm_bts_trx_ts *ts = &trx->ts[i]; - - switch (ts->pchan_from_config) { - case GSM_PCHAN_CCCH_SDCCH4_CBCH: - case GSM_PCHAN_CCCH_SDCCH4: - /* CCCH+SDCCH4 can only be configured on TS0 */ - if (i > 0) { - LOGP(DNM, LOGL_ERROR, "Combined CCCH is not allowed " - "on TS%u > 0\n", i); - result = false; - } - if (i == 0) - combined = true; - /* fall-through */ - case GSM_PCHAN_CCCH: - /* 3GPP TS 45.002, Table 3, CCCH: TS (0, 2, 4, 6) */ - if (i % 2 != 0) { - LOGP(DNM, LOGL_ERROR, "%s is not allowed on odd TS%u\n", - gsm_pchan_name(ts->pchan_from_config), i); - result = false; - } - - /* There can be no more CCCHs if TS0/C0 is combined */ - if (i > 0 && combined) { - LOGP(DNM, LOGL_ERROR, "%s is not allowed on TS%u, " - "because TS0 is using combined channel configuration\n", - gsm_pchan_name(ts->pchan_from_config), i); - result = false; - } - break; - - default: - /* CCCH on TS0 is mandatory for C0 */ - if (trx->bts->c0 == trx && i == 0) { - LOGP(DNM, LOGL_ERROR, "TS0 on C0 must be CCCH/BCCH\n"); - result = false; - } - } - } - - return result; -} - /* This may be specific to RR Channel Release, and the mappings were chosen by pure naive guessing without a proper * specification available. */ enum gsm48_rr_cause bsc_gsm48_rr_cause_from_gsm0808_cause(enum gsm0808_cause c) diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 6696679..653ed97 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -49,6 +49,7 @@ bs11_config_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/bts_siemens_bs11.o \ $(top_builddir)/src/osmo-bsc/e1_config.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ @@ -118,7 +119,9 @@ $(NULL) meas_json_LDADD = \ + $(top_builddir)/src/osmo-bsc/abis_nm.o \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am index a01f56a..5f81ceb 100644 --- a/tests/abis/Makefile.am +++ b/tests/abis/Makefile.am @@ -27,6 +27,7 @@ abis_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(top_builddir)/src/osmo-bsc/net_init.o \ $(LIBOSMOCORE_LIBS) \ diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am index 7ea002e..012bd79 100644 --- a/tests/bsc/Makefile.am +++ b/tests/bsc/Makefile.am @@ -38,6 +38,7 @@ $(top_builddir)/src/osmo-bsc/osmo_bsc_filter.o \ $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(top_builddir)/src/osmo-bsc/handover_cfg.o \ $(top_builddir)/src/osmo-bsc/handover_logic.o \ diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am index 21b7873..790f3aa 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -23,9 +23,11 @@ $(NULL) gsm0408_test_LDADD = \ + $(top_builddir)/src/osmo-bsc/abis_nm.o \ $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(top_builddir)/src/osmo-bsc/net_init.o \ $(top_builddir)/src/osmo-bsc/rest_octets.o \ diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am index 571b7a9..661b3d2 100644 --- a/tests/handover/Makefile.am +++ b/tests/handover/Makefile.am @@ -58,6 +58,7 @@ $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \ $(top_builddir)/src/osmo-bsc/bsc_vty.o \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ $(top_builddir)/src/osmo-bsc/bts_unknown.o \ diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am index 93fdbe8..5a627ff 100644 --- a/tests/nanobts_omlattr/Makefile.am +++ b/tests/nanobts_omlattr/Makefile.am @@ -26,6 +26,7 @@ $(top_builddir)/src/osmo-bsc/abis_nm.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I11758ca3d255d849d77bd068f24bb68bde1f89a5 Gerrit-Change-Number: 19298 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:45:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:45:34 +0000 Subject: Change in osmo-bsc[master]: Move gsm_bts_{trx_}set_system_infos APIs to bts{_trx}.* In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19299 ) Change subject: Move gsm_bts_{trx_}set_system_infos APIs to bts{_trx}.* ...................................................................... Move gsm_bts_{trx_}set_system_infos APIs to bts{_trx}.* Change-Id: I2aa83b499d6e5d06a0fa1001fee3111f7e639c94 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/bts_trx.h M include/osmocom/bsc/gsm_data.h M src/ipaccess/ipaccess-config.c M src/ipaccess/ipaccess-proxy.c M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bts.c M src/osmo-bsc/bts_trx.c M src/utils/bs11_config.c M src/utils/meas_json.c M tests/abis/abis_test.c M tests/bsc/bsc_test.c M tests/gsm0408/gsm0408_test.c M tests/nanobts_omlattr/nanobts_omlattr_test.c 14 files changed, 200 insertions(+), 170 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 9b89f4f..730dee9 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -622,6 +622,8 @@ int bts_count_free_ts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan); +int gsm_bts_set_system_infos(struct gsm_bts *bts); + int gsm_bts_model_register(struct gsm_bts_model *model); struct gsm_bts_model *bts_model_find(enum gsm_bts_type type); diff --git a/include/osmocom/bsc/bts_trx.h b/include/osmocom/bsc/bts_trx.h index 7e64439..3a635ba 100644 --- a/include/osmocom/bsc/bts_trx.h +++ b/include/osmocom/bsc/bts_trx.h @@ -90,3 +90,5 @@ void gsm_trx_all_ts_dispatch(struct gsm_bts_trx *trx, uint32_t ts_ev, void *data); int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan); bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx); + +int gsm_bts_trx_set_system_infos(struct gsm_bts_trx *trx); diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index e85be70..a8b495f 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1189,9 +1189,6 @@ void set_ts_e1link(struct gsm_bts_trx_ts *ts, uint8_t e1_nr, uint8_t e1_ts, uint8_t e1_ts_ss); -int gsm_bts_trx_set_system_infos(struct gsm_bts_trx *trx); -int gsm_bts_set_system_infos(struct gsm_bts *bts); - /* generic E1 line operations for all ISDN-based BTS. */ extern struct e1inp_line_ops bts_isdn_e1inp_line_ops; diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 34ad57f..c9264d7 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -1133,18 +1133,12 @@ /* Stub */ int osmo_bsc_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *msg) -{ - return 0; -} - -/* Stub */ +{ return 0; } int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) -{ - return 0; -} - -/* Stub */ -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) -{ - return 0; -} +{ return 0; } +int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } +void pcu_info_update(struct gsm_bts *bts) {}; +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } +int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) +{ return 0; } +int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index 05a6f63..d5dd8d4 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -1254,7 +1254,9 @@ } /* Stub */ -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) -{ - return 0; -} +int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } +void pcu_info_update(struct gsm_bts *bts) {}; +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } +int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) +{ return 0; } +int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c index 4fc0ab1..e45b5e8 100644 --- a/src/osmo-bsc/bsc_init.c +++ b/src/osmo-bsc/bsc_init.c @@ -69,155 +69,6 @@ return 0; } -static int rsl_si(struct gsm_bts_trx *trx, enum osmo_sysinfo_type i, int si_len) -{ - struct gsm_bts *bts = trx->bts; - int rc, j; - - if (si_len) { - DEBUGP(DRR, "SI%s: %s\n", get_value_string(osmo_sitype_strs, i), - osmo_hexdump(GSM_BTS_SI(bts, i), GSM_MACBLOCK_LEN)); - } else - DEBUGP(DRR, "SI%s: OFF\n", get_value_string(osmo_sitype_strs, i)); - - switch (i) { - case SYSINFO_TYPE_5: - case SYSINFO_TYPE_5bis: - case SYSINFO_TYPE_5ter: - case SYSINFO_TYPE_6: - rc = rsl_sacch_filling(trx, osmo_sitype2rsl(i), - si_len ? GSM_BTS_SI(bts, i) : NULL, si_len); - break; - case SYSINFO_TYPE_2quater: - if (si_len == 0) { - rc = rsl_bcch_info(trx, i, NULL, 0); - break; - } - rc = 0; - for (j = 0; j <= bts->si2q_count; j++) - rc = rsl_bcch_info(trx, i, (const uint8_t *)GSM_BTS_SI2Q(bts, j), GSM_MACBLOCK_LEN); - break; - default: - rc = rsl_bcch_info(trx, i, si_len ? GSM_BTS_SI(bts, i) : NULL, si_len); - break; - } - - return rc; -} - -/* set all system information types for a TRX */ -int gsm_bts_trx_set_system_infos(struct gsm_bts_trx *trx) -{ - int i, rc; - struct gsm_bts *bts = trx->bts; - uint8_t gen_si[_MAX_SYSINFO_TYPE], n_si = 0, n; - int si_len[_MAX_SYSINFO_TYPE]; - - bts->si_common.cell_sel_par.ms_txpwr_max_ccch = - ms_pwr_ctl_lvl(bts->band, bts->ms_max_power); - bts->si_common.cell_sel_par.neci = bts->network->neci; - - /* Zero/forget the state of the dynamically computed SIs, leeping the static ones */ - bts->si_valid = bts->si_mode_static; - - /* First, we determine which of the SI messages we actually need */ - - if (trx == bts->c0) { - /* 1...4 are always present on a C0 TRX */ - gen_si[n_si++] = SYSINFO_TYPE_1; - gen_si[n_si++] = SYSINFO_TYPE_2; - gen_si[n_si++] = SYSINFO_TYPE_2bis; - gen_si[n_si++] = SYSINFO_TYPE_2ter; - gen_si[n_si++] = SYSINFO_TYPE_2quater; - gen_si[n_si++] = SYSINFO_TYPE_3; - gen_si[n_si++] = SYSINFO_TYPE_4; - - /* 13 is always present on a C0 TRX of a GPRS BTS */ - if (bts->gprs.mode != BTS_GPRS_NONE) - gen_si[n_si++] = SYSINFO_TYPE_13; - } - - /* 5 and 6 are always present on every TRX */ - gen_si[n_si++] = SYSINFO_TYPE_5; - gen_si[n_si++] = SYSINFO_TYPE_5bis; - gen_si[n_si++] = SYSINFO_TYPE_5ter; - gen_si[n_si++] = SYSINFO_TYPE_6; - - /* Second, we generate the selected SI via RSL */ - - for (n = 0; n < n_si; n++) { - i = gen_si[n]; - /* Only generate SI if this SI is not in "static" (user-defined) mode */ - if (!(bts->si_mode_static & (1 << i))) { - /* Set SI as being valid. gsm_generate_si() might unset - * it, if SI is not required. */ - bts->si_valid |= (1 << i); - rc = gsm_generate_si(bts, i); - if (rc < 0) - goto err_out; - si_len[i] = rc; - } else { - if (i == SYSINFO_TYPE_5 || i == SYSINFO_TYPE_5bis - || i == SYSINFO_TYPE_5ter) - si_len[i] = 18; - else if (i == SYSINFO_TYPE_6) - si_len[i] = 11; - else - si_len[i] = 23; - } - } - - /* Third, we send the selected SI via RSL */ - - for (n = 0; n < n_si; n++) { - i = gen_si[n]; - /* 3GPP TS 08.58 ?8.5.1 BCCH INFORMATION. If we don't currently - * have this SI, we send a zero-length RSL BCCH FILLING / - * SACCH FILLING in order to deactivate the SI, in case it - * might have previously been active */ - if (!GSM_BTS_HAS_SI(bts, i)) { - if (bts->si_unused_send_empty) - rc = rsl_si(trx, i, 0); - else - rc = 0; /* some nanoBTS fw don't like receiving empty unsupported SI */ - } else - rc = rsl_si(trx, i, si_len[i]); - if (rc < 0) - return rc; - } - - /* Make sure the PCU is aware (in case anything GPRS related has - * changed in SI */ - pcu_info_update(bts); - - return 0; -err_out: - LOGP(DRR, LOGL_ERROR, "Cannot generate SI%s for BTS %u: error <%s>, " - "most likely a problem with neighbor cell list generation\n", - get_value_string(osmo_sitype_strs, i), bts->nr, strerror(-rc)); - return rc; -} - -/* set all system information types for a BTS */ -int gsm_bts_set_system_infos(struct gsm_bts *bts) -{ - struct gsm_bts_trx *trx; - - /* Generate a new ID */ - bts->bcch_change_mark += 1; - bts->bcch_change_mark %= 0x7; - - llist_for_each_entry(trx, &bts->trx_list, list) { - int rc; - - rc = gsm_bts_trx_set_system_infos(trx); - if (rc != 0) - return rc; - } - - return 0; -} - /* XXX hard-coded for now */ #define T3122_CHAN_LOAD_SAMPLE_INTERVAL 1 /* in seconds */ diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index c943684..055cc47 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -750,3 +750,23 @@ return count; } + +/* set all system information types for a BTS */ +int gsm_bts_set_system_infos(struct gsm_bts *bts) +{ + struct gsm_bts_trx *trx; + + /* Generate a new ID */ + bts->bcch_change_mark += 1; + bts->bcch_change_mark %= 0x7; + + llist_for_each_entry(trx, &bts->trx_list, list) { + int rc; + + rc = gsm_bts_trx_set_system_infos(trx); + if (rc != 0) + return rc; + } + + return 0; +} diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c index 15d5b59..25a3fc7 100644 --- a/src/osmo-bsc/bts_trx.c +++ b/src/osmo-bsc/bts_trx.c @@ -25,7 +25,10 @@ #include #include #include +#include #include +#include +#include #include struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts) @@ -286,3 +289,132 @@ return result; } + +static int rsl_si(struct gsm_bts_trx *trx, enum osmo_sysinfo_type i, int si_len) +{ + struct gsm_bts *bts = trx->bts; + int rc, j; + + if (si_len) { + DEBUGP(DRR, "SI%s: %s\n", get_value_string(osmo_sitype_strs, i), + osmo_hexdump(GSM_BTS_SI(bts, i), GSM_MACBLOCK_LEN)); + } else + DEBUGP(DRR, "SI%s: OFF\n", get_value_string(osmo_sitype_strs, i)); + + switch (i) { + case SYSINFO_TYPE_5: + case SYSINFO_TYPE_5bis: + case SYSINFO_TYPE_5ter: + case SYSINFO_TYPE_6: + rc = rsl_sacch_filling(trx, osmo_sitype2rsl(i), + si_len ? GSM_BTS_SI(bts, i) : NULL, si_len); + break; + case SYSINFO_TYPE_2quater: + if (si_len == 0) { + rc = rsl_bcch_info(trx, i, NULL, 0); + break; + } + rc = 0; + for (j = 0; j <= bts->si2q_count; j++) + rc = rsl_bcch_info(trx, i, (const uint8_t *)GSM_BTS_SI2Q(bts, j), GSM_MACBLOCK_LEN); + break; + default: + rc = rsl_bcch_info(trx, i, si_len ? GSM_BTS_SI(bts, i) : NULL, si_len); + break; + } + + return rc; +} + +/* set all system information types for a TRX */ +int gsm_bts_trx_set_system_infos(struct gsm_bts_trx *trx) +{ + int i, rc; + struct gsm_bts *bts = trx->bts; + uint8_t gen_si[_MAX_SYSINFO_TYPE], n_si = 0, n; + int si_len[_MAX_SYSINFO_TYPE]; + + bts->si_common.cell_sel_par.ms_txpwr_max_ccch = + ms_pwr_ctl_lvl(bts->band, bts->ms_max_power); + bts->si_common.cell_sel_par.neci = bts->network->neci; + + /* Zero/forget the state of the dynamically computed SIs, leeping the static ones */ + bts->si_valid = bts->si_mode_static; + + /* First, we determine which of the SI messages we actually need */ + + if (trx == bts->c0) { + /* 1...4 are always present on a C0 TRX */ + gen_si[n_si++] = SYSINFO_TYPE_1; + gen_si[n_si++] = SYSINFO_TYPE_2; + gen_si[n_si++] = SYSINFO_TYPE_2bis; + gen_si[n_si++] = SYSINFO_TYPE_2ter; + gen_si[n_si++] = SYSINFO_TYPE_2quater; + gen_si[n_si++] = SYSINFO_TYPE_3; + gen_si[n_si++] = SYSINFO_TYPE_4; + + /* 13 is always present on a C0 TRX of a GPRS BTS */ + if (bts->gprs.mode != BTS_GPRS_NONE) + gen_si[n_si++] = SYSINFO_TYPE_13; + } + + /* 5 and 6 are always present on every TRX */ + gen_si[n_si++] = SYSINFO_TYPE_5; + gen_si[n_si++] = SYSINFO_TYPE_5bis; + gen_si[n_si++] = SYSINFO_TYPE_5ter; + gen_si[n_si++] = SYSINFO_TYPE_6; + + /* Second, we generate the selected SI via RSL */ + + for (n = 0; n < n_si; n++) { + i = gen_si[n]; + /* Only generate SI if this SI is not in "static" (user-defined) mode */ + if (!(bts->si_mode_static & (1 << i))) { + /* Set SI as being valid. gsm_generate_si() might unset + * it, if SI is not required. */ + bts->si_valid |= (1 << i); + rc = gsm_generate_si(bts, i); + if (rc < 0) + goto err_out; + si_len[i] = rc; + } else { + if (i == SYSINFO_TYPE_5 || i == SYSINFO_TYPE_5bis + || i == SYSINFO_TYPE_5ter) + si_len[i] = 18; + else if (i == SYSINFO_TYPE_6) + si_len[i] = 11; + else + si_len[i] = 23; + } + } + + /* Third, we send the selected SI via RSL */ + + for (n = 0; n < n_si; n++) { + i = gen_si[n]; + /* 3GPP TS 08.58 ?8.5.1 BCCH INFORMATION. If we don't currently + * have this SI, we send a zero-length RSL BCCH FILLING / + * SACCH FILLING in order to deactivate the SI, in case it + * might have previously been active */ + if (!GSM_BTS_HAS_SI(bts, i)) { + if (bts->si_unused_send_empty) + rc = rsl_si(trx, i, 0); + else + rc = 0; /* some nanoBTS fw don't like receiving empty unsupported SI */ + } else + rc = rsl_si(trx, i, si_len[i]); + if (rc < 0) + return rc; + } + + /* Make sure the PCU is aware (in case anything GPRS related has + * changed in SI */ + pcu_info_update(bts); + + return 0; +err_out: + LOGP(DRR, LOGL_ERROR, "Cannot generate SI%s for BTS %u: error <%s>, " + "most likely a problem with neighbor cell list generation\n", + get_value_string(osmo_sitype_strs, i), bts->nr, strerror(-rc)); + return rc; +} diff --git a/src/utils/bs11_config.c b/src/utils/bs11_config.c index c43c008..c279179 100644 --- a/src/utils/bs11_config.c +++ b/src/utils/bs11_config.c @@ -990,3 +990,8 @@ void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} int abis_rsl_rcvmsg(struct msgb *msg) { return 0; } int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } +void pcu_info_update(struct gsm_bts *bts) {}; +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } +int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) +{ return 0; } +int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/src/utils/meas_json.c b/src/utils/meas_json.c index 0fd99c0..b44a300 100644 --- a/src/utils/meas_json.c +++ b/src/utils/meas_json.c @@ -205,3 +205,8 @@ void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} int abis_rsl_rcvmsg(struct msgb *msg) { return 0; } int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } +void pcu_info_update(struct gsm_bts *bts) {}; +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } +int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) +{ return 0; } +int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/tests/abis/abis_test.c b/tests/abis/abis_test.c index 767a9fb..9d26edd 100644 --- a/tests/abis/abis_test.c +++ b/tests/abis/abis_test.c @@ -191,3 +191,8 @@ bool on_gsm_ts_init(struct gsm_bts_trx_ts *ts) { return true; } void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } +void pcu_info_update(struct gsm_bts *bts) {}; +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } +int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) +{ return 0; } +int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/tests/bsc/bsc_test.c b/tests/bsc/bsc_test.c index 164f78f..dd2b1bb 100644 --- a/tests/bsc/bsc_test.c +++ b/tests/bsc/bsc_test.c @@ -240,3 +240,8 @@ bool neighbor_ident_bts_entry_exists(uint8_t from_bts) { return false; } const char *handover_status(struct gsm_subscriber_connection *conn) { return "x"; } int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } +void pcu_info_update(struct gsm_bts *bts) {}; +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } +int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) +{ return 0; } +int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index b3e8b11..e53b83a 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -969,3 +969,8 @@ int rsl_encryption_cmd(struct msgb *msg) { return 0; } int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } + +void pcu_info_update(struct gsm_bts *bts) {}; +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } +int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) +{ return 0; } diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c index 4180f4a..ea98409 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.c +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c @@ -320,3 +320,8 @@ void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } +void pcu_info_update(struct gsm_bts *bts) {}; +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } +int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) +{ return 0; } +int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2aa83b499d6e5d06a0fa1001fee3111f7e639c94 Gerrit-Change-Number: 19299 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 18 21:45:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 18 Jul 2020 21:45:34 +0000 Subject: Change in osmo-bsc[master]: Move acc_ramp_init inside gsm_bts_alloc In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19300 ) Change subject: Move acc_ramp_init inside gsm_bts_alloc ...................................................................... Move acc_ramp_init inside gsm_bts_alloc The function initializes the struct owned by a bts, so it makes sense to have it done there instead of somewhere else later. It was most probably put in bsc_vty when it was initially introduced because of all the data structure and object file mess I untangled during last set of patches. Change-Id: I66c4b208583e92070793183b83b3a7b7edf6ba00 --- M src/ipaccess/Makefile.am M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/utils/Makefile.am M tests/abis/Makefile.am M tests/bsc/Makefile.am M tests/gsm0408/Makefile.am M tests/nanobts_omlattr/Makefile.am 8 files changed, 10 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am index a1812a9..a11b295 100644 --- a/src/ipaccess/Makefile.am +++ b/src/ipaccess/Makefile.am @@ -49,6 +49,7 @@ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/acc_ramp.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ @@ -63,6 +64,7 @@ ipaccess_proxy_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/acc_ramp.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index aa08e8b..11e51be 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -2153,11 +2153,6 @@ bts = bsc_bts_alloc_register(gsmnet, GSM_BTS_TYPE_UNKNOWN, HARDCODED_BSIC); osmo_stat_item_inc(gsmnet->bsc_statg->items[BSC_STAT_NUM_BTS_TOTAL], 1); - /* - * Initialize bts->acc_ramp here. Else we could segfault while - * processing a configuration file with ACC ramping settings. - */ - acc_ramp_init(&bts->acc_ramp, bts); } else bts = gsm_bts_num(gsmnet, bts_nr); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 055cc47..7794024 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -387,6 +387,8 @@ bts_init_cbch_state(&bts->cbch_basic, bts); bts_init_cbch_state(&bts->cbch_extended, bts); + acc_ramp_init(&bts->acc_ramp, bts); + return bts; } diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 653ed97..683c227 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -48,6 +48,7 @@ bs11_config_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/acc_ramp.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/bts_siemens_bs11.o \ @@ -120,6 +121,7 @@ meas_json_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/acc_ramp.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am index 5f81ceb..031d689 100644 --- a/tests/abis/Makefile.am +++ b/tests/abis/Makefile.am @@ -26,6 +26,7 @@ abis_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/acc_ramp.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am index 012bd79..282f603 100644 --- a/tests/bsc/Makefile.am +++ b/tests/bsc/Makefile.am @@ -34,6 +34,7 @@ bsc_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/acc_ramp.o \ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ $(top_builddir)/src/osmo-bsc/osmo_bsc_filter.o \ $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \ diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am index 790f3aa..4e22392 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -24,6 +24,7 @@ gsm0408_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/acc_ramp.o \ $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ $(top_builddir)/src/osmo-bsc/bts.o \ diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am index 5a627ff..67d059f 100644 --- a/tests/nanobts_omlattr/Makefile.am +++ b/tests/nanobts_omlattr/Makefile.am @@ -24,6 +24,7 @@ nanobts_omlattr_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/acc_ramp.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I66c4b208583e92070793183b83b3a7b7edf6ba00 Gerrit-Change-Number: 19300 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Jul 19 01:38:04 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 19 Jul 2020 01:38:04 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Leap_15.1_ARM/aarch64 In-Reply-To: References: Message-ID: <5f13a40115859_1cad2af0727426007003d9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Leap_15.1_ARM/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Leap_15.1_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 139s] + /usr/bin/rm -rf /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.191.bd5b-lp151.1.1.aarch64 [ 139s] + exit 0 [ 139s] ... checking for files with abuild user/group [ 139s] ... running 00-check-install-rpms [ 139s] ... installing all built rpms [ 139s] Preparing packages... [ 139s] osmo-bsc-meas-utils-1.6.0.191.bd5b-lp151.1.1.aarch64 [ 139s] osmo-bsc-abisip-find-1.6.0.191.bd5b-lp151.1.1.aarch64 [ 139s] osmo-bsc-bs11-utils-1.6.0.191.bd5b-lp151.1.1.aarch64 [ 139s] osmo-bsc-1.6.0.191.bd5b-lp151.1.1.aarch64 [ 140s] osmo-bsc-ipaccess-utils-1.6.0.191.bd5b-lp151.1.1.aarch64 [ 140s] ... running 50-check-binary-kernel-log [ 140s] ... running 50-check-core-files [ 140s] ... checking for core files [ 140s] ... running 50-check-debuginfo [ 140s] ... testing for empty debuginfo packages [ 140s] ... running 50-check-filelist [ 140s] ... checking filelist [ 140s] osmo-bsc-1.6.0.191.bd5b-lp151.1.1.aarch64.rpm: directories not owned by a package: [ 140s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson [ 140s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia [ 140s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens [ 140s] ### VM INTERACTION START ### [ 143s] [ 129.587485] sysrq: SysRq : Power Off [ 143s] [ 129.592232] reboot: Power down [ 143s] ### VM INTERACTION END ### [ 143s] [ 143s] obs-arm-2 failed "build osmo-bsc.spec" at Sun Jul 19 01:38:02 UTC 2020. [ 143s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 19 01:40:03 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 19 Jul 2020 01:40:03 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <5f13a47aa4c78_1cad2af072742600700620@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 54s] + exit 0 [ 54s] ... checking for files with abuild user/group [ 54s] ... running 00-check-install-rpms [ 54s] ... installing all built rpms [ 54s] Verifying packages... [ 54s] Preparing packages... [ 54s] osmo-bsc-1.6.0.191.bd5b-1.1.i586 [ 54s] osmo-bsc-bs11-utils-1.6.0.191.bd5b-1.1.i586 [ 54s] osmo-bsc-meas-utils-1.6.0.191.bd5b-1.1.i586 [ 54s] osmo-bsc-ipaccess-utils-1.6.0.191.bd5b-1.1.i586 [ 54s] osmo-bsc-abisip-find-1.6.0.191.bd5b-1.1.i586 [ 54s] ... running 50-check-binary-kernel-log [ 54s] ... running 50-check-core-files [ 54s] ... checking for core files [ 54s] ... running 50-check-debuginfo [ 54s] ... testing for empty debuginfo packages [ 54s] ... running 50-check-filelist [ 54s] ... checking filelist [ 54s] osmo-bsc-1.6.0.191.bd5b-1.1.i586.rpm: directories not owned by a package: [ 54s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson [ 54s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia [ 54s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens [ 54s] ### VM INTERACTION START ### [ 57s] [ 51.269610] sysrq: Power Off [ 57s] [ 51.295008] reboot: Power down [ 57s] ### VM INTERACTION END ### [ 57s] [ 57s] goat11 failed "build osmo-bsc.spec" at Sun Jul 19 01:39:49 UTC 2020. [ 57s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 19 01:41:29 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 19 Jul 2020 01:41:29 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Factory_ARM/aarch64 In-Reply-To: References: Message-ID: <5f13a4d5f34ef_1cad2af0727426007010cd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Factory_ARM/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Factory_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 88s] + exit 0 [ 89s] ... checking for files with abuild user/group [ 89s] ... running 00-check-install-rpms [ 89s] ... installing all built rpms [ 89s] Verifying packages... [ 89s] Preparing packages... [ 89s] osmo-bsc-meas-utils-1.6.0.191.bd5b-1.1.aarch64 [ 89s] osmo-bsc-ipaccess-utils-1.6.0.191.bd5b-1.1.aarch64 [ 89s] osmo-bsc-abisip-find-1.6.0.191.bd5b-1.1.aarch64 [ 89s] osmo-bsc-bs11-utils-1.6.0.191.bd5b-1.1.aarch64 [ 89s] osmo-bsc-1.6.0.191.bd5b-1.1.aarch64 [ 89s] ... running 50-check-binary-kernel-log [ 89s] ... running 50-check-core-files [ 89s] ... checking for core files [ 89s] ... running 50-check-debuginfo [ 89s] ... testing for empty debuginfo packages [ 89s] ... running 50-check-filelist [ 89s] ... checking filelist [ 89s] osmo-bsc-1.6.0.191.bd5b-1.1.aarch64.rpm: directories not owned by a package: [ 89s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson [ 89s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia [ 89s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens [ 89s] ### VM INTERACTION START ### [ 92s] [ 81.961247] sysrq: Power Off [ 92s] [ 81.963067] reboot: Power down [ 92s] ### VM INTERACTION END ### [ 92s] [ 92s] obs-arm-9 failed "build osmo-bsc.spec" at Sun Jul 19 01:41:22 UTC 2020. [ 92s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 19 01:48:38 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 19 Jul 2020 01:48:38 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <5f13a67bec3f5_1cad2af0727426007039de@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 71s] + /usr/bin/rm -rf /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.191.bd5b-lp151.1.1.x86_64 [ 71s] + exit 0 [ 71s] ... checking for files with abuild user/group [ 71s] ... running 00-check-install-rpms [ 71s] ... installing all built rpms [ 71s] Preparing packages... [ 71s] osmo-bsc-meas-utils-1.6.0.191.bd5b-lp151.1.1.x86_64 [ 71s] osmo-bsc-abisip-find-1.6.0.191.bd5b-lp151.1.1.x86_64 [ 71s] osmo-bsc-1.6.0.191.bd5b-lp151.1.1.x86_64 [ 71s] osmo-bsc-ipaccess-utils-1.6.0.191.bd5b-lp151.1.1.x86_64 [ 71s] osmo-bsc-bs11-utils-1.6.0.191.bd5b-lp151.1.1.x86_64 [ 71s] ... running 50-check-binary-kernel-log [ 72s] ... running 50-check-core-files [ 72s] ... checking for core files [ 72s] ... running 50-check-debuginfo [ 72s] ... testing for empty debuginfo packages [ 72s] ... running 50-check-filelist [ 72s] ... checking filelist [ 72s] osmo-bsc-1.6.0.191.bd5b-lp151.1.1.x86_64.rpm: directories not owned by a package: [ 72s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson [ 72s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia [ 72s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens [ 72s] ### VM INTERACTION START ### [ 75s] [ 67.528440] sysrq: SysRq : Power Off [ 75s] [ 67.532807] reboot: Power down [ 75s] ### VM INTERACTION END ### [ 75s] [ 75s] lamb19 failed "build osmo-bsc.spec" at Sun Jul 19 01:48:29 UTC 2020. [ 75s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 19 01:53:46 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 19 Jul 2020 01:53:46 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <5f13a7c1de315_1cad2af072742600705928@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 61s] + /usr/bin/rm -rf /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.191.bd5b-lp152.1.1.x86_64 [ 61s] + exit 0 [ 61s] ... checking for files with abuild user/group [ 62s] ... running 00-check-install-rpms [ 62s] ... installing all built rpms [ 62s] Preparing packages... [ 62s] osmo-bsc-bs11-utils-1.6.0.191.bd5b-lp152.1.1.x86_64 [ 62s] osmo-bsc-1.6.0.191.bd5b-lp152.1.1.x86_64 [ 62s] osmo-bsc-abisip-find-1.6.0.191.bd5b-lp152.1.1.x86_64 [ 62s] osmo-bsc-meas-utils-1.6.0.191.bd5b-lp152.1.1.x86_64 [ 62s] osmo-bsc-ipaccess-utils-1.6.0.191.bd5b-lp152.1.1.x86_64 [ 62s] ... running 50-check-binary-kernel-log [ 62s] ... running 50-check-core-files [ 62s] ... checking for core files [ 62s] ... running 50-check-debuginfo [ 62s] ... testing for empty debuginfo packages [ 62s] ... running 50-check-filelist [ 62s] ... checking filelist [ 62s] osmo-bsc-1.6.0.191.bd5b-lp152.1.1.x86_64.rpm: directories not owned by a package: [ 62s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson [ 62s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia [ 62s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens [ 62s] ### VM INTERACTION START ### [ 65s] [ 58.670593] sysrq: Power Off [ 65s] [ 58.677552] reboot: Power down [ 65s] ### VM INTERACTION END ### [ 65s] [ 65s] lamb70 failed "build osmo-bsc.spec" at Sun Jul 19 01:53:31 UTC 2020. [ 65s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 19 01:54:20 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 19 Jul 2020 01:54:20 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Tumbleweed/x86_64 In-Reply-To: References: Message-ID: <5f13a7df6490b_1cad2af07274260070629e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 54s] + exit 0 [ 55s] ... checking for files with abuild user/group [ 55s] ... running 00-check-install-rpms [ 55s] ... installing all built rpms [ 55s] Verifying packages... [ 55s] Preparing packages... [ 55s] osmo-bsc-1.6.0.191.bd5b-1.1.x86_64 [ 55s] osmo-bsc-bs11-utils-1.6.0.191.bd5b-1.1.x86_64 [ 55s] osmo-bsc-ipaccess-utils-1.6.0.191.bd5b-1.1.x86_64 [ 55s] osmo-bsc-meas-utils-1.6.0.191.bd5b-1.1.x86_64 [ 55s] osmo-bsc-abisip-find-1.6.0.191.bd5b-1.1.x86_64 [ 55s] ... running 50-check-binary-kernel-log [ 55s] ... running 50-check-core-files [ 55s] ... checking for core files [ 55s] ... running 50-check-debuginfo [ 55s] ... testing for empty debuginfo packages [ 55s] ... running 50-check-filelist [ 55s] ... checking filelist [ 55s] osmo-bsc-1.6.0.191.bd5b-1.1.x86_64.rpm: directories not owned by a package: [ 55s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson [ 55s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia [ 55s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens [ 55s] ### VM INTERACTION START ### [ 58s] [ 51.642787] sysrq: Power Off [ 58s] [ 51.646941] reboot: Power down [ 58s] ### VM INTERACTION END ### [ 58s] [ 58s] sheep88 failed "build osmo-bsc.spec" at Sun Jul 19 01:54:13 UTC 2020. [ 58s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 19 03:06:03 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 19 Jul 2020 03:06:03 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Leap_15.1_ARM/armv7l In-Reply-To: References: Message-ID: <5f13b8a5dcf58_1cad2af072742600715175@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Leap_15.1_ARM/armv7l Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Leap_15.1_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 152s] + /usr/bin/rm -rf /home/abuild/rpmbuild/BUILDROOT/osmo-bsc-1.6.0.191.bd5b-lp151.1.1.arm [ 152s] + exit 0 [ 152s] ... checking for files with abuild user/group [ 153s] ... running 00-check-install-rpms [ 153s] ... installing all built rpms [ 153s] Preparing packages... [ 153s] osmo-bsc-ipaccess-utils-1.6.0.191.bd5b-lp151.1.1.armv7hl [ 153s] osmo-bsc-abisip-find-1.6.0.191.bd5b-lp151.1.1.armv7hl [ 153s] osmo-bsc-1.6.0.191.bd5b-lp151.1.1.armv7hl [ 153s] osmo-bsc-bs11-utils-1.6.0.191.bd5b-lp151.1.1.armv7hl [ 153s] osmo-bsc-meas-utils-1.6.0.191.bd5b-lp151.1.1.armv7hl [ 153s] ... running 50-check-binary-kernel-log [ 153s] ... running 50-check-core-files [ 153s] ... checking for core files [ 153s] ... running 50-check-debuginfo [ 153s] ... testing for empty debuginfo packages [ 153s] ... running 50-check-filelist [ 153s] ... checking filelist [ 153s] osmo-bsc-1.6.0.191.bd5b-lp151.1.1.armv7hl.rpm: directories not owned by a package: [ 153s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson [ 153s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia [ 153s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens [ 153s] ### VM INTERACTION START ### [ 156s] [ 146.151659] sysrq: SysRq : Power Off [ 156s] [ 146.265545] reboot: Power down [ 157s] ### VM INTERACTION END ### [ 157s] [ 157s] armbuild24 failed "build osmo-bsc.spec" at Sun Jul 19 03:05:46 UTC 2020. [ 157s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 19 03:51:29 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 19 Jul 2020 03:51:29 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Factory_ARM/armv7l In-Reply-To: References: Message-ID: <5f13c34bcf8e7_1cad2af0727426007177b4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Factory_ARM/armv7l Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 275s] + exit 0 [ 275s] ... checking for files with abuild user/group [ 275s] ... running 00-check-install-rpms [ 275s] ... installing all built rpms [ 275s] Verifying packages... [ 275s] Preparing packages... [ 275s] osmo-bsc-1.6.0.191.bd5b-1.1.armv7hl [ 276s] osmo-bsc-bs11-utils-1.6.0.191.bd5b-1.1.armv7hl [ 276s] osmo-bsc-ipaccess-utils-1.6.0.191.bd5b-1.1.armv7hl [ 276s] osmo-bsc-abisip-find-1.6.0.191.bd5b-1.1.armv7hl [ 276s] osmo-bsc-meas-utils-1.6.0.191.bd5b-1.1.armv7hl [ 276s] ... running 50-check-binary-kernel-log [ 276s] ... running 50-check-core-files [ 276s] ... checking for core files [ 276s] ... running 50-check-debuginfo [ 276s] ... testing for empty debuginfo packages [ 276s] ... running 50-check-filelist [ 276s] ... checking filelist [ 276s] osmo-bsc-1.6.0.191.bd5b-1.1.armv7hl.rpm: directories not owned by a package: [ 276s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson [ 276s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia [ 276s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens [ 276s] ### VM INTERACTION START ### [ 279s] [ 256.784333] sysrq: Power Off [ 279s] [ 256.785834] reboot: Power down [ 279s] ### VM INTERACTION END ### [ 279s] [ 279s] armbuild15 failed "build osmo-bsc.spec" at Sun Jul 19 03:51:11 UTC 2020. [ 279s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Jul 19 07:54:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jul 2020 07:54:45 +0000 Subject: Change in osmo-remsim[master]: remsim-client-shell: Terminate if STDIN has been closed References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/19315 ) Change subject: remsim-client-shell: Terminate if STDIN has been closed ...................................................................... remsim-client-shell: Terminate if STDIN has been closed Change-Id: I39937224b06b6bb6f23c002023141882797ee6a6 --- M src/client/user_shell.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/15/19315/1 diff --git a/src/client/user_shell.c b/src/client/user_shell.c index c8f1b5f..b22ee9a 100644 --- a/src/client/user_shell.c +++ b/src/client/user_shell.c @@ -134,6 +134,10 @@ rc = read(ofd->fd, cur, msgb_tailroom(ss->rx_msg)); if (rc < 0) return rc; + if (rc == 0) { + fprintf(stderr, "STDIN was closed, terminating"); + exit(0); + } msgb_put(ss->rx_msg, rc); for (i = 0; i < rc; i++) { -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/19315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I39937224b06b6bb6f23c002023141882797ee6a6 Gerrit-Change-Number: 19315 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 08:19:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 19 Jul 2020 08:19:30 +0000 Subject: Change in osmo-remsim[master]: remsim-client-shell: Terminate if STDIN has been closed In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/19315 ) Change subject: remsim-client-shell: Terminate if STDIN has been closed ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/19315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I39937224b06b6bb6f23c002023141882797ee6a6 Gerrit-Change-Number: 19315 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 19 Jul 2020 08:19:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 10:26:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jul 2020 10:26:33 +0000 Subject: Change in osmo-remsim[master]: remsim-client-shell: Terminate if STDIN has been closed In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/19315 ) Change subject: remsim-client-shell: Terminate if STDIN has been closed ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/19315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I39937224b06b6bb6f23c002023141882797ee6a6 Gerrit-Change-Number: 19315 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 19 Jul 2020 10:26:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 10:26:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jul 2020 10:26:37 +0000 Subject: Change in osmo-remsim[master]: remsim-client-shell: Terminate if STDIN has been closed In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/19315 ) Change subject: remsim-client-shell: Terminate if STDIN has been closed ...................................................................... remsim-client-shell: Terminate if STDIN has been closed Change-Id: I39937224b06b6bb6f23c002023141882797ee6a6 --- M src/client/user_shell.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/client/user_shell.c b/src/client/user_shell.c index c8f1b5f..b22ee9a 100644 --- a/src/client/user_shell.c +++ b/src/client/user_shell.c @@ -134,6 +134,10 @@ rc = read(ofd->fd, cur, msgb_tailroom(ss->rx_msg)); if (rc < 0) return rc; + if (rc == 0) { + fprintf(stderr, "STDIN was closed, terminating"); + exit(0); + } msgb_put(ss->rx_msg, rc); for (i = 0; i < rc; i++) { -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/19315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I39937224b06b6bb6f23c002023141882797ee6a6 Gerrit-Change-Number: 19315 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 10:46:14 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 19 Jul 2020 10:46:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: introduce and use as_pcuif_check_pdch_mask() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19317 ) Change subject: BTS_Tests: introduce and use as_pcuif_check_pdch_mask() ...................................................................... BTS_Tests: introduce and use as_pcuif_check_pdch_mask() This altstep would reduce code duplication. Change-Id: Ic66598e3d2706da7caca7b27b9880562b0fcb9bd --- M bts/BTS_Tests.ttcn 1 file changed, 17 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/19317/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 574d47b..1c8127b 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5438,9 +5438,21 @@ * Osmocom Style Dynamic Timeslot Support ***********************************************************************/ -private function f_dyn_osmo_pdch_act(integer pcu_conn_id, integer bts_nr, integer trx_nr) +private altstep as_pcuif_check_pdch_mask(integer pcu_conn_id, BIT1 exp, + integer bts_nr, integer trx_nr) runs on ConnHdlr { var PCUIF_send_data sd; + + [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd { + var bitstring pdch_mask := sd.data.u.info_ind.trx[trx_nr].pdch_mask; + if (substr(pdch_mask, g_chan_nr.tn, 1) != exp) { + repeat; + } + } +} + +private function f_dyn_osmo_pdch_act(integer pcu_conn_id, integer bts_nr, integer trx_nr) +runs on ConnHdlr { /* Expect BTS to immediately acknowledge activation as PDCH */ PCU.clear; f_rsl_chan_act(g_pars.chan_mode); @@ -5448,13 +5460,7 @@ timer T_wait := 2.0; T_wait.start; alt { - [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd { - if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '1'B) { - log("PCUIF_INFO_IND PDCH_MASK not yet '1' after PDCH ACT on TS", g_chan_nr.tn, - " mask:", sd.data.u.info_ind.trx[trx_nr].pdch_mask); - repeat; - } - } + [] as_pcuif_check_pdch_mask(pcu_conn_id, '1'B, bts_nr, trx_nr); [] PCU.receive { repeat; } [] T_wait.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, @@ -5468,7 +5474,6 @@ private function f_dyn_osmo_pdch_deact(integer pcu_conn_id, integer bts_nr, integer trx_nr) runs on ConnHdlr { - var PCUIF_send_data sd; /* Send RSL CHAN REL (deactivate) */ PCU.clear; RSL.send(ts_RSL_RF_CHAN_REL(g_chan_nr)); @@ -5476,13 +5481,7 @@ timer T_wait := 2.0; T_wait.start; alt { - [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd { - if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '0'B) { - log("PCUIF_INFO_IND PDCH_MASK not yet '0' after PDCH DEACT on TS", g_chan_nr.tn, - " mask:", sd.data.u.info_ind.trx[trx_nr].pdch_mask); - repeat; - } - } + [] as_pcuif_check_pdch_mask(pcu_conn_id, '0'B, bts_nr, trx_nr); [] PCU.receive { repeat; } [] T_wait.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, @@ -5638,7 +5637,6 @@ private function f_dyn_ipa_pdch_act(integer pcu_conn_id, integer bts_nr, integer trx_nr) runs on ConnHdlr { - var PCUIF_send_data sd; /* Expect BTS to immediately acknowledge activation as PDCH */ PCU.clear; RSL.send(ts_RSL_IPA_PDCH_ACT(g_chan_nr)); @@ -5646,13 +5644,7 @@ timer T_wait := 2.0; T_wait.start; alt { - [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd { - if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '1'B) { - log("PCUIF_INFO_IND PDCH_MASK not yet '1' after PDCH ACT on TS", g_chan_nr.tn, - " mask:", sd.data.u.info_ind.trx[trx_nr].pdch_mask); - repeat; - } - } + [] as_pcuif_check_pdch_mask(pcu_conn_id, '1'B, bts_nr, trx_nr); [] PCU.receive { repeat; } [] T_wait.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, @@ -5668,7 +5660,6 @@ private function f_dyn_ipa_pdch_deact(integer pcu_conn_id, integer bts_nr, integer trx_nr) runs on ConnHdlr { - var PCUIF_send_data sd; /* Send RSL CHAN REL (deactivate) */ RSL.send(ts_RSL_IPA_PDCH_DEACT(g_chan_nr)); PCU.clear; @@ -5676,13 +5667,7 @@ timer T_wait := 2.0; T_wait.start; alt { - [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd { - if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '0'B) { - log("PCUIF_INFO_IND PDCH_MASK not yet '0' after PDCH DEACT on TS", g_chan_nr.tn, - " mask:", sd.data.u.info_ind.trx[trx_nr].pdch_mask); - repeat; - } - } + [] as_pcuif_check_pdch_mask(pcu_conn_id, '0'B, bts_nr, trx_nr); [] PCU.receive { repeat; } [] T_wait.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic66598e3d2706da7caca7b27b9880562b0fcb9bd Gerrit-Change-Number: 19317 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 10:46:14 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 19 Jul 2020 10:46:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests_NS: use ts_PCUIF_INFO_default from PCU_Tests References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19318 ) Change subject: PCU_Tests_NS: use ts_PCUIF_INFO_default from PCU_Tests ...................................................................... PCU_Tests_NS: use ts_PCUIF_INFO_default from PCU_Tests Change-Id: I80b33b10603e8e8c1beee17acce65f5d3873a9b2 --- M pcu/PCU_Tests.ttcn M pcu/PCU_Tests_NS.ttcn 2 files changed, 1 insertion(+), 38 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/19318/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 42f3f2b..09d91a0 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -59,7 +59,7 @@ /* FIXME: make sure to use parameters from mp_gb_cfg.cell_id in the PCU INFO IND */ -private template (value) PCUIF_info_ind ts_PCUIF_INFO_default := { +friend template (value) PCUIF_info_ind ts_PCUIF_INFO_default := { version := PCU_IF_VERSION, flags := c_PCUIF_Flags_default, trx := valueof(ts_PCUIF_InfoTrxs_def), diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn index 9ea5149..b1c8f38 100644 --- a/pcu/PCU_Tests_NS.ttcn +++ b/pcu/PCU_Tests_NS.ttcn @@ -51,43 +51,6 @@ } } -/* FIXME: make sure to use parameters from mp_gb_cfg.cell_id in the PCU INFO IND */ -private template (value) PCUIF_info_ind ts_PCUIF_INFO_default := { - version := PCU_IF_VERSION, - flags := c_PCUIF_Flags_default, - trx := valueof(ts_PCUIF_InfoTrxs_def), - bsic := 7, - mcc := 262, - mnc := 42, - mnc_3_digits := 0, - lac := 13135, - rac := 0, - nsei := mp_nsconfig.nsei, - nse_timer := { 3, 3, 3, 3, 30, 3, 10 }, - cell_timer := { 3, 3, 3, 3, 3, 10, 3, 10, 3, 10, 3 }, - cell_id := 20960, - repeat_time := 5 * 50, - repeat_count := 3, - bvci := mp_gb_cfg.bvci, - t3142 := 20, - t3169 := 5, - t3191 := 5, - t3193_10ms := 160, - t3195 := 5, - t3101 := 10, - t3103 := 4, - t3105 := 8, - cv_countdown := 15, - dl_tbf_ext := 250 * 10, /* ms */ - ul_tbf_ext := 250 * 10, /* ms */ - initial_cs := 2, - initial_mcs := 6, - nsvci := { mp_nsconfig.nsvci, 0 }, - local_pprt := { mp_nsconfig.remote_udp_port, 0 }, - remote_port := { mp_nsconfig.local_udp_port, 0 }, - remote_ip := { f_inet_haddr(mp_nsconfig.local_ip) , '00000000'O } -} - function f_init_pcuif() runs on RAW_PCU_CT { var PCUIF_info_ind info_ind; map(self:PCU, system:PCU); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I80b33b10603e8e8c1beee17acce65f5d3873a9b2 Gerrit-Change-Number: 19318 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 10:48:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jul 2020 10:48:08 +0000 Subject: Change in osmo-bsc[master]: osmo-bsc.spec.in: Add missing directories to package References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19319 ) Change subject: osmo-bsc.spec.in: Add missing directories to package ...................................................................... osmo-bsc.spec.in: Add missing directories to package CentOS is happy with the spec file as-is, but OpenSuSE is more strict: [ 62s] osmo-bsc-1.6.0.191.bd5b-lp152.1.1.x86_64.rpm: directories not owned by a package: [ 62s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson [ 62s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia [ 62s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens Change-Id: I40ad5d38b968db847cf5f733f82163ecac1151e0 --- M contrib/osmo-bsc.spec.in 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/19/19319/1 diff --git a/contrib/osmo-bsc.spec.in b/contrib/osmo-bsc.spec.in index 1120bf7..8293c51 100644 --- a/contrib/osmo-bsc.spec.in +++ b/contrib/osmo-bsc.spec.in @@ -124,6 +124,9 @@ %{_docdir}/%{name}/examples/osmo-bsc/osmo-bsc.cfg %{_docdir}/%{name}/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg %{_docdir}/%{name}/examples/osmo-bsc/osmo-bsc-minimal.cfg +%dir %{_docdir}/%{name}/examples/osmo-bsc/ericsson +%dir %{_docdir}/%{name}/examples/osmo-bsc/nokia +%dir %{_docdir}/%{name}/examples/osmo-bsc/siemens %{_docdir}/%{name}/examples/osmo-bsc/*/osmo-bsc*.cfg %dir %{_sysconfdir}/osmocom %config(noreplace) %{_sysconfdir}/osmocom/osmo-bsc.cfg -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I40ad5d38b968db847cf5f733f82163ecac1151e0 Gerrit-Change-Number: 19319 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 11:26:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jul 2020 11:26:20 +0000 Subject: Change in osmo-bsc[master]: osmo-bsc.spec.in: Add missing directories to package In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19319 ) Change subject: osmo-bsc.spec.in: Add missing directories to package ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I40ad5d38b968db847cf5f733f82163ecac1151e0 Gerrit-Change-Number: 19319 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 19 Jul 2020 11:26:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 11:26:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jul 2020 11:26:24 +0000 Subject: Change in osmo-bsc[master]: osmo-bsc.spec.in: Add missing directories to package In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19319 ) Change subject: osmo-bsc.spec.in: Add missing directories to package ...................................................................... osmo-bsc.spec.in: Add missing directories to package CentOS is happy with the spec file as-is, but OpenSuSE is more strict: [ 62s] osmo-bsc-1.6.0.191.bd5b-lp152.1.1.x86_64.rpm: directories not owned by a package: [ 62s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/ericsson [ 62s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/nokia [ 62s] - /usr/share/doc/packages/osmo-bsc/examples/osmo-bsc/siemens Change-Id: I40ad5d38b968db847cf5f733f82163ecac1151e0 --- M contrib/osmo-bsc.spec.in 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/osmo-bsc.spec.in b/contrib/osmo-bsc.spec.in index 1120bf7..8293c51 100644 --- a/contrib/osmo-bsc.spec.in +++ b/contrib/osmo-bsc.spec.in @@ -124,6 +124,9 @@ %{_docdir}/%{name}/examples/osmo-bsc/osmo-bsc.cfg %{_docdir}/%{name}/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg %{_docdir}/%{name}/examples/osmo-bsc/osmo-bsc-minimal.cfg +%dir %{_docdir}/%{name}/examples/osmo-bsc/ericsson +%dir %{_docdir}/%{name}/examples/osmo-bsc/nokia +%dir %{_docdir}/%{name}/examples/osmo-bsc/siemens %{_docdir}/%{name}/examples/osmo-bsc/*/osmo-bsc*.cfg %dir %{_sysconfdir}/osmocom %config(noreplace) %{_sysconfdir}/osmocom/osmo-bsc.cfg -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I40ad5d38b968db847cf5f733f82163ecac1151e0 Gerrit-Change-Number: 19319 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 11:26:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jul 2020 11:26:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: introduce and use as_pcuif_check_pdch_mask() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19317 ) Change subject: BTS_Tests: introduce and use as_pcuif_check_pdch_mask() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic66598e3d2706da7caca7b27b9880562b0fcb9bd Gerrit-Change-Number: 19317 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 19 Jul 2020 11:26:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 11:27:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jul 2020 11:27:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests_NS: use ts_PCUIF_INFO_default from PCU_Tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19318 ) Change subject: PCU_Tests_NS: use ts_PCUIF_INFO_default from PCU_Tests ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I80b33b10603e8e8c1beee17acce65f5d3873a9b2 Gerrit-Change-Number: 19318 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 19 Jul 2020 11:27:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 11:27:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jul 2020 11:27:45 +0000 Subject: Change in osmo-pcu[master]: bts: cosmetic: use DUMMY_VEC for padding where possible In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19308 ) Change subject: bts: cosmetic: use DUMMY_VEC for padding where possible ...................................................................... bts: cosmetic: use DUMMY_VEC for padding where possible Change-Id: I725a7bd1b0c4d2b0d73f1b6d1f16543bf3d9d9fe --- M src/bts.cpp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/bts.cpp b/src/bts.cpp index 617cd78..22b4c08 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -884,7 +884,7 @@ send_imm_ass_rej: /* Allocate a bit-vector for RR Immediate Assignment [Reject] */ struct bitvec *bv = bitvec_alloc(22, tall_pcu_ctx); /* without plen */ - bitvec_unhex(bv, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"); + bitvec_unhex(bv, DUMMY_VEC); /* standard '2B'O padding */ if (rc != 0) { LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment Reject on AGCH\n"); @@ -970,7 +970,7 @@ LOGPTBF(tbf, LOGL_INFO, "TX: START Immediate Assignment Downlink (PCH)\n"); bitvec *immediate_assignment = bitvec_alloc(22, tall_pcu_ctx); /* without plen */ - bitvec_unhex(immediate_assignment, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"); + bitvec_unhex(immediate_assignment, DUMMY_VEC); /* standard '2B'O padding */ /* use request reference that has maximum distance to current time, * so the assignment will not conflict with possible RACH requests. */ LOGP(DRLCMAC, LOGL_DEBUG, " - TRX=%d (%d) TS=%d TA=%d pollFN=%d\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I725a7bd1b0c4d2b0d73f1b6d1f16543bf3d9d9fe Gerrit-Change-Number: 19308 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 11:30:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jul 2020 11:30:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: replace istemplatekind with valueof In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19301 ) Change subject: MSC_ConnectionHandler: replace istemplatekind with valueof ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19301/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19301/1//COMMIT_MSG at 1 PS1, Line 1: Parent: 6bff328d (BSC_Tests: extend TC_chan_act_ack_noest with emergency call) we match against istemplatekind("omit") in many places of our test suites and it would be a serious problem if that stopped to work for some reason. Please clarify the problem in detail. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I77272214301bc4982d8bcac64e09a0c679f038bb Gerrit-Change-Number: 19301 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 19 Jul 2020 11:30:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 17:10:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jul 2020 17:10:59 +0000 Subject: Change in osmo-el2tpd[master]: add warning about hard-coded IP References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-el2tpd/+/19320 ) Change subject: add warning about hard-coded IP ...................................................................... add warning about hard-coded IP Change-Id: I6e0128072a7f4a51df19aaee2d08ecef05cee2be --- M README.md 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-el2tpd refs/changes/20/19320/1 diff --git a/README.md b/README.md index 39d781a..ed9a490 100644 --- a/README.md +++ b/README.md @@ -9,3 +9,7 @@ assistance from Ericsson, merely by observing protocol traces between the SIU 02 and whatever is the Ericsson-provided server side implementation next to the BSC. + +Warning: The code currently hard-codes 172.30.42.3 as the IP address +of the host running L2TPD. Making this configurable is likely the +first thing you need to do before using it... -- To view, visit https://gerrit.osmocom.org/c/osmo-el2tpd/+/19320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-el2tpd Gerrit-Branch: master Gerrit-Change-Id: I6e0128072a7f4a51df19aaee2d08ecef05cee2be Gerrit-Change-Number: 19320 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 17:19:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jul 2020 17:19:05 +0000 Subject: Change in osmo-el2tpd[master]: add warning about hard-coded IP In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-el2tpd/+/19320 ) Change subject: add warning about hard-coded IP ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-el2tpd/+/19320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-el2tpd Gerrit-Branch: master Gerrit-Change-Id: I6e0128072a7f4a51df19aaee2d08ecef05cee2be Gerrit-Change-Number: 19320 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 19 Jul 2020 17:19:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 17:19:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 19 Jul 2020 17:19:08 +0000 Subject: Change in osmo-el2tpd[master]: add warning about hard-coded IP In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-el2tpd/+/19320 ) Change subject: add warning about hard-coded IP ...................................................................... add warning about hard-coded IP Change-Id: I6e0128072a7f4a51df19aaee2d08ecef05cee2be --- M README.md 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/README.md b/README.md index 39d781a..ed9a490 100644 --- a/README.md +++ b/README.md @@ -9,3 +9,7 @@ assistance from Ericsson, merely by observing protocol traces between the SIU 02 and whatever is the Ericsson-provided server side implementation next to the BSC. + +Warning: The code currently hard-codes 172.30.42.3 as the IP address +of the host running L2TPD. Making this configurable is likely the +first thing you need to do before using it... -- To view, visit https://gerrit.osmocom.org/c/osmo-el2tpd/+/19320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-el2tpd Gerrit-Branch: master Gerrit-Change-Id: I6e0128072a7f4a51df19aaee2d08ecef05cee2be Gerrit-Change-Number: 19320 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 17:23:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 19 Jul 2020 17:23:24 +0000 Subject: Change in osmo-pcu[master]: encoding: drop log_alert_exit(), use OSMO_ASSERT() instead In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19309 ) Change subject: encoding: drop log_alert_exit(), use OSMO_ASSERT() instead ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id5ef1c3c08dc7f264ad801e519d727d86f5ae5b8 Gerrit-Change-Number: 19309 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 19 Jul 2020 17:23:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 17:25:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 19 Jul 2020 17:25:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests_NS: use ts_PCUIF_INFO_default from PCU_Tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19318 ) Change subject: PCU_Tests_NS: use ts_PCUIF_INFO_default from PCU_Tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I80b33b10603e8e8c1beee17acce65f5d3873a9b2 Gerrit-Change-Number: 19318 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 19 Jul 2020 17:25:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 20:46:05 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 19 Jul 2020 20:46:05 +0000 Subject: Change in osmo-pcu[master]: encoding: drop log_alert_exit(), use OSMO_ASSERT() instead In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19309 ) Change subject: encoding: drop log_alert_exit(), use OSMO_ASSERT() instead ...................................................................... encoding: drop log_alert_exit(), use OSMO_ASSERT() instead Change-Id: Id5ef1c3c08dc7f264ad801e519d727d86f5ae5b8 --- M src/encoding.cpp 1 file changed, 2 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/encoding.cpp b/src/encoding.cpp index 92944f0..2564575 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -433,13 +433,6 @@ return plen; } -static inline void log_alert_exit(const char * error) -{ - LOGP(DRLCMACUL, LOGL_ERROR, "%s", error); - pcu_tx_txt_ind(PCU_OML_ALERT, error); - exit(1); -} - /* * Immediate assignment, sent on the CCCH/AGCH * see GSM 04.08, 9.1.18 and GSM 44.018, 9.1.18 + 10.5.2.16 @@ -494,9 +487,7 @@ // A zero-length LV. Just write L=0. bitvec_write_field(dest, &wp,0,8); - if ((wp % 8)) - log_alert_exit("Length of IMM.ASS without rest octets is not " - "multiple of 8 bits, PLEASE FIX!\n"); + OSMO_ASSERT(wp % 8 == 0); plen = wp / 8; @@ -748,9 +739,7 @@ bitvec_set_bytes(dest, mi, mi_len); // Mobile Identity wp += mi_len * 8; - if ((wp % 8)) - log_alert_exit("Length of PAG.REQ without rest octets is not " - "multiple of 8 bits, PLEASE FIX!\n"); + OSMO_ASSERT(wp % 8 == 0); plen = wp / 8; bitvec_write_field(dest, &wp,0x0,1); // "L" Notification List Number; NLN(PCH) = off -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id5ef1c3c08dc7f264ad801e519d727d86f5ae5b8 Gerrit-Change-Number: 19309 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 21:05:54 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 19 Jul 2020 21:05:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: introduce and use as_pcuif_check_pdch_mask() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19317 ) Change subject: BTS_Tests: introduce and use as_pcuif_check_pdch_mask() ...................................................................... BTS_Tests: introduce and use as_pcuif_check_pdch_mask() This altstep would reduce code duplication. Change-Id: Ic66598e3d2706da7caca7b27b9880562b0fcb9bd --- M bts/BTS_Tests.ttcn 1 file changed, 17 insertions(+), 32 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 574d47b..1c8127b 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5438,9 +5438,21 @@ * Osmocom Style Dynamic Timeslot Support ***********************************************************************/ -private function f_dyn_osmo_pdch_act(integer pcu_conn_id, integer bts_nr, integer trx_nr) +private altstep as_pcuif_check_pdch_mask(integer pcu_conn_id, BIT1 exp, + integer bts_nr, integer trx_nr) runs on ConnHdlr { var PCUIF_send_data sd; + + [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd { + var bitstring pdch_mask := sd.data.u.info_ind.trx[trx_nr].pdch_mask; + if (substr(pdch_mask, g_chan_nr.tn, 1) != exp) { + repeat; + } + } +} + +private function f_dyn_osmo_pdch_act(integer pcu_conn_id, integer bts_nr, integer trx_nr) +runs on ConnHdlr { /* Expect BTS to immediately acknowledge activation as PDCH */ PCU.clear; f_rsl_chan_act(g_pars.chan_mode); @@ -5448,13 +5460,7 @@ timer T_wait := 2.0; T_wait.start; alt { - [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd { - if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '1'B) { - log("PCUIF_INFO_IND PDCH_MASK not yet '1' after PDCH ACT on TS", g_chan_nr.tn, - " mask:", sd.data.u.info_ind.trx[trx_nr].pdch_mask); - repeat; - } - } + [] as_pcuif_check_pdch_mask(pcu_conn_id, '1'B, bts_nr, trx_nr); [] PCU.receive { repeat; } [] T_wait.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, @@ -5468,7 +5474,6 @@ private function f_dyn_osmo_pdch_deact(integer pcu_conn_id, integer bts_nr, integer trx_nr) runs on ConnHdlr { - var PCUIF_send_data sd; /* Send RSL CHAN REL (deactivate) */ PCU.clear; RSL.send(ts_RSL_RF_CHAN_REL(g_chan_nr)); @@ -5476,13 +5481,7 @@ timer T_wait := 2.0; T_wait.start; alt { - [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd { - if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '0'B) { - log("PCUIF_INFO_IND PDCH_MASK not yet '0' after PDCH DEACT on TS", g_chan_nr.tn, - " mask:", sd.data.u.info_ind.trx[trx_nr].pdch_mask); - repeat; - } - } + [] as_pcuif_check_pdch_mask(pcu_conn_id, '0'B, bts_nr, trx_nr); [] PCU.receive { repeat; } [] T_wait.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, @@ -5638,7 +5637,6 @@ private function f_dyn_ipa_pdch_act(integer pcu_conn_id, integer bts_nr, integer trx_nr) runs on ConnHdlr { - var PCUIF_send_data sd; /* Expect BTS to immediately acknowledge activation as PDCH */ PCU.clear; RSL.send(ts_RSL_IPA_PDCH_ACT(g_chan_nr)); @@ -5646,13 +5644,7 @@ timer T_wait := 2.0; T_wait.start; alt { - [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd { - if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '1'B) { - log("PCUIF_INFO_IND PDCH_MASK not yet '1' after PDCH ACT on TS", g_chan_nr.tn, - " mask:", sd.data.u.info_ind.trx[trx_nr].pdch_mask); - repeat; - } - } + [] as_pcuif_check_pdch_mask(pcu_conn_id, '1'B, bts_nr, trx_nr); [] PCU.receive { repeat; } [] T_wait.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, @@ -5668,7 +5660,6 @@ private function f_dyn_ipa_pdch_deact(integer pcu_conn_id, integer bts_nr, integer trx_nr) runs on ConnHdlr { - var PCUIF_send_data sd; /* Send RSL CHAN REL (deactivate) */ RSL.send(ts_RSL_IPA_PDCH_DEACT(g_chan_nr)); PCU.clear; @@ -5676,13 +5667,7 @@ timer T_wait := 2.0; T_wait.start; alt { - [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd { - if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '0'B) { - log("PCUIF_INFO_IND PDCH_MASK not yet '0' after PDCH DEACT on TS", g_chan_nr.tn, - " mask:", sd.data.u.info_ind.trx[trx_nr].pdch_mask); - repeat; - } - } + [] as_pcuif_check_pdch_mask(pcu_conn_id, '0'B, bts_nr, trx_nr); [] PCU.receive { repeat; } [] T_wait.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic66598e3d2706da7caca7b27b9880562b0fcb9bd Gerrit-Change-Number: 19317 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 21:05:56 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 19 Jul 2020 21:05:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests_NS: use ts_PCUIF_INFO_default from PCU_Tests In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19318 ) Change subject: PCU_Tests_NS: use ts_PCUIF_INFO_default from PCU_Tests ...................................................................... PCU_Tests_NS: use ts_PCUIF_INFO_default from PCU_Tests Change-Id: I80b33b10603e8e8c1beee17acce65f5d3873a9b2 --- M pcu/PCU_Tests.ttcn M pcu/PCU_Tests_NS.ttcn 2 files changed, 1 insertion(+), 38 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 42f3f2b..09d91a0 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -59,7 +59,7 @@ /* FIXME: make sure to use parameters from mp_gb_cfg.cell_id in the PCU INFO IND */ -private template (value) PCUIF_info_ind ts_PCUIF_INFO_default := { +friend template (value) PCUIF_info_ind ts_PCUIF_INFO_default := { version := PCU_IF_VERSION, flags := c_PCUIF_Flags_default, trx := valueof(ts_PCUIF_InfoTrxs_def), diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn index 9ea5149..b1c8f38 100644 --- a/pcu/PCU_Tests_NS.ttcn +++ b/pcu/PCU_Tests_NS.ttcn @@ -51,43 +51,6 @@ } } -/* FIXME: make sure to use parameters from mp_gb_cfg.cell_id in the PCU INFO IND */ -private template (value) PCUIF_info_ind ts_PCUIF_INFO_default := { - version := PCU_IF_VERSION, - flags := c_PCUIF_Flags_default, - trx := valueof(ts_PCUIF_InfoTrxs_def), - bsic := 7, - mcc := 262, - mnc := 42, - mnc_3_digits := 0, - lac := 13135, - rac := 0, - nsei := mp_nsconfig.nsei, - nse_timer := { 3, 3, 3, 3, 30, 3, 10 }, - cell_timer := { 3, 3, 3, 3, 3, 10, 3, 10, 3, 10, 3 }, - cell_id := 20960, - repeat_time := 5 * 50, - repeat_count := 3, - bvci := mp_gb_cfg.bvci, - t3142 := 20, - t3169 := 5, - t3191 := 5, - t3193_10ms := 160, - t3195 := 5, - t3101 := 10, - t3103 := 4, - t3105 := 8, - cv_countdown := 15, - dl_tbf_ext := 250 * 10, /* ms */ - ul_tbf_ext := 250 * 10, /* ms */ - initial_cs := 2, - initial_mcs := 6, - nsvci := { mp_nsconfig.nsvci, 0 }, - local_pprt := { mp_nsconfig.remote_udp_port, 0 }, - remote_port := { mp_nsconfig.local_udp_port, 0 }, - remote_ip := { f_inet_haddr(mp_nsconfig.local_ip) , '00000000'O } -} - function f_init_pcuif() runs on RAW_PCU_CT { var PCUIF_info_ind info_ind; map(self:PCU, system:PCU); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I80b33b10603e8e8c1beee17acce65f5d3873a9b2 Gerrit-Change-Number: 19318 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 21:08:38 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 19 Jul 2020 21:08:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: also match MobileAllocation in tr_IMM_TBF_ASS() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19321 ) Change subject: library/GSM_RR_Types: also match MobileAllocation in tr_IMM_TBF_ASS() ...................................................................... library/GSM_RR_Types: also match MobileAllocation in tr_IMM_TBF_ASS() Change-Id: Icb13b8414d4a784eccaae2daa85232f066f92f08 --- M library/GSM_RR_Types.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/21/19321/1 diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index bf650b2..66e49fa 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -989,6 +989,7 @@ template GsmFrameNumber fn := ?, template TimingAdvance ta := ?, template PacketChannelDescription ch_desc := ?, + template MobileAllocation ma := ?, template IaRestOctets rest := ?) := { header := t_RrHeader(IMMEDIATE_ASSIGNMENT, ?), payload := { @@ -1004,7 +1005,7 @@ pkt_chan_desc := ch_desc, req_ref := tr_compute_ReqRef(ra, fn), timing_advance := ta, - mobile_allocation := ?, + mobile_allocation := ma, rest_octets := rest } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icb13b8414d4a784eccaae2daa85232f066f92f08 Gerrit-Change-Number: 19321 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 21:08:39 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 19 Jul 2020 21:08:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: make PCUIF version configurable References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19322 ) Change subject: library/PCUIF_Types: make PCUIF version configurable ...................................................................... library/PCUIF_Types: make PCUIF version configurable When changing the PCUIF, we have to maintain backwards compatibility with the release versions of both osmo-pcu and osmo-bts, not only with the recent master. In order to achieve that, let's introduce 'mp_pcuif_version', so the PCUIF version can be adjusted. Change-Id: I3cf7f908e606b91dd2cbddc168827dd074aed052 Related: SYS#4868, OS#4547 --- M library/PCUIF_Types.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/22/19322/1 diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 8ce41c4..089403c 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -14,8 +14,13 @@ import from General_Types all; import from Osmocom_Types all; +modulepar { + /* PCUIF version supported by the IUT */ + PCUIF_Version mp_pcuif_version := 9; +}; + const charstring PCU_SOCK_DEFAULT := "/tmp/pcu_bts"; -const uint32_t PCU_IF_VERSION := 9; +type integer PCUIF_Version (9); /* supported versions */ type enumerated PCUIF_MsgType { PCU_IF_MSG_DATA_REQ ('00'O), @@ -698,7 +703,7 @@ } template PCUIF_Message tr_PCUIF_INFO_IND(template uint8_t bts_nr := ?, template PCUIF_Flags flags := ?, - template uint32_t version := PCU_IF_VERSION) := { + template uint32_t version := mp_pcuif_version) := { msg_type := PCU_IF_MSG_INFO_IND, bts_nr := bts_nr, spare := ?, diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 09d91a0..20e3582 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -60,7 +60,7 @@ /* FIXME: make sure to use parameters from mp_gb_cfg.cell_id in the PCU INFO IND */ friend template (value) PCUIF_info_ind ts_PCUIF_INFO_default := { - version := PCU_IF_VERSION, + version := PCUIF_Types.mp_pcuif_version, flags := c_PCUIF_Flags_default, trx := valueof(ts_PCUIF_InfoTrxs_def), bsic := 7, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3cf7f908e606b91dd2cbddc168827dd074aed052 Gerrit-Change-Number: 19322 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 21:08:39 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 19 Jul 2020 21:08:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: add frequency hopping parameters References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19323 ) Change subject: library/PCUIF_Types: version 10: add frequency hopping parameters ...................................................................... library/PCUIF_Types: version 10: add frequency hopping parameters Change-Id: Idf11bc4ba3ff0b00b32f2beab8fd020c67119d05 Related: SYS#4868, OS#4547 --- M bts/BTS_Tests.ttcn M library/PCUIF_Types.ttcn M pcu/PCU_Tests.ttcn 3 files changed, 108 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/23/19323/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 1c8127b..dfda043 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5444,7 +5444,7 @@ var PCUIF_send_data sd; [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd { - var bitstring pdch_mask := sd.data.u.info_ind.trx[trx_nr].pdch_mask; + var bitstring pdch_mask := f_PCUIF_ver_INFO_PDCHMask(sd.data.u.info_ind, trx_nr); if (substr(pdch_mask, g_chan_nr.tn, 1) != exp) { repeat; } diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 089403c..2b1646b 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -16,11 +16,11 @@ modulepar { /* PCUIF version supported by the IUT */ - PCUIF_Version mp_pcuif_version := 9; + PCUIF_Version mp_pcuif_version := 10; }; const charstring PCU_SOCK_DEFAULT := "/tmp/pcu_bts"; -type integer PCUIF_Version (9); /* supported versions */ +type integer PCUIF_Version (9..10); /* supported versions */ type enumerated PCUIF_MsgType { PCU_IF_MSG_DATA_REQ ('00'O), @@ -140,14 +140,39 @@ uint8_t ts_nr } with { variant "" }; -type record PCUIF_InfoTrx { +private type record PCUIF_InfoTrxTs { + uint8_t tsc, + uint8_t hopping, + uint8_t hsn, + uint8_t maio, + bitstring ma length(64) +} with { variant (ma) "BITORDER(lsb)" }; +private type record length(8) of PCUIF_InfoTrxTs PCUIF_InfoTrxTsList; + +/* Version >= 10 specific coding */ +private type record PCUIF_InfoV10Trx { + uint16_t arfcn, + BIT8 pdch_mask, + OCT1 spare, + uint32_t hLayer1, + PCUIF_InfoTrxTsList ts +} with { variant (pdch_mask) "BITORDER(msb)" }; +private type record length(8) of PCUIF_InfoV10Trx PCUIF_InfoV10TrxList; + +/* Version <= 9 specific coding */ +private type record PCUIF_InfoV09Trx { uint16_t arfcn, BIT8 pdch_mask, OCT1 spare, OCT8 tsc, uint32_t hLayer1 } with { variant (pdch_mask) "BITORDER(msb)" }; -type record length(8) of PCUIF_InfoTrx PCUIF_InfoTrxs; +private type record length(8) of PCUIF_InfoV09Trx PCUIF_InfoV09TrxList; + +type union PCUIF_InfoTrxs { + PCUIF_InfoV09TrxList v09, + PCUIF_InfoV10TrxList v10 +} with { variant "" }; type record PCUIF_info_ind { uint32_t version, @@ -187,7 +212,11 @@ record length(2) of uint16_t local_pprt, record length(2) of uint16_t remote_port, record length(2) of OCT4 remote_ip -} with { variant "" } +} with { + /* NOTE: TITAN is not smart enough to handle 'version < 10' and 'version > 9', + * so we cannot support more than two versions at the same time here. Sigh. */ + variant (trx) "CROSSTAG(v09, version = 9; v10, version = 10)" +}; type record PCUIF_act_req { uint8_t is_activate, @@ -676,9 +705,40 @@ spare2 := '000'B }; -template (value) PCUIF_InfoTrx ts_PCUIF_InfoTrx(template (value) uint16_t arfcn := 871, - template (value) BIT8 pdch_mask := '00000001'B, - OCT1 tsc := '07'O) := { +template (value) PCUIF_InfoTrxTs ts_PCUIF_InfoTrxTsH0(template (value) uint3_t tsc := 7) := { + tsc := tsc, + hopping := 0, + hsn := 0, maio := 0, + ma := '0000000000000000000000000000000000000000000000000000000000000000'B +}; + +template (value) PCUIF_InfoTrxTs ts_PCUIF_InfoTrxTsH1(template (value) uint3_t tsc := 7, + template (value) uint6_t hsn := 0, + template (value) uint6_t maio := 0) +modifies ts_PCUIF_InfoTrxTsH0 := { + hopping := 1, + hsn := hsn, + maio := maio +}; + +template (value) PCUIF_InfoV10Trx ts_PCUIF_InfoV10Trx(template (value) uint16_t arfcn := 871, + template (value) BIT8 pdch_mask := '00000001'B, + template (value) uint3_t tsc := 7) := { + arfcn := arfcn, + pdch_mask := pdch_mask, + spare := '00'O, + hLayer1 := 0, + ts := { + ts_PCUIF_InfoTrxTsH0(tsc), ts_PCUIF_InfoTrxTsH0(tsc), + ts_PCUIF_InfoTrxTsH0(tsc), ts_PCUIF_InfoTrxTsH0(tsc), + ts_PCUIF_InfoTrxTsH0(tsc), ts_PCUIF_InfoTrxTsH0(tsc), + ts_PCUIF_InfoTrxTsH0(tsc), ts_PCUIF_InfoTrxTsH0(tsc) + } +}; + +template (value) PCUIF_InfoV09Trx ts_PCUIF_InfoV09Trx(template (value) uint16_t arfcn := 871, + template (value) BIT8 pdch_mask := '00000001'B, + OCT1 tsc := '07'O) := { arfcn := arfcn, pdch_mask := pdch_mask, spare := '00'O, @@ -686,11 +746,25 @@ hLayer1 := 0 } -template (value) PCUIF_InfoTrx ts_PCUIF_InfoTrxNULL := ts_PCUIF_InfoTrx(0, '00000000'B, '00'O); +template (value) PCUIF_InfoV09Trx ts_PCUIF_InfoV09TrxNULL := ts_PCUIF_InfoV09Trx(0, '00000000'B, '00'O); -template (value) PCUIF_InfoTrxs ts_PCUIF_InfoTrxs_def := { - ts_PCUIF_InfoTrx, ts_PCUIF_InfoTrxNULL, ts_PCUIF_InfoTrxNULL, ts_PCUIF_InfoTrxNULL, - ts_PCUIF_InfoTrxNULL, ts_PCUIF_InfoTrxNULL, ts_PCUIF_InfoTrxNULL, ts_PCUIF_InfoTrxNULL }; +template (value) PCUIF_InfoTrxs ts_PCUIF_InfoV09Trxs_def := { + v09 := { + ts_PCUIF_InfoV09Trx, ts_PCUIF_InfoV09TrxNULL, + ts_PCUIF_InfoV09TrxNULL, ts_PCUIF_InfoV09TrxNULL, + ts_PCUIF_InfoV09TrxNULL, ts_PCUIF_InfoV09TrxNULL, + ts_PCUIF_InfoV09TrxNULL, ts_PCUIF_InfoV09TrxNULL + } +}; + +template (value) PCUIF_InfoTrxs ts_PCUIF_InfoV10Trxs_def := { + v10 := { + ts_PCUIF_InfoV10Trx, ts_PCUIF_InfoV10Trx, + ts_PCUIF_InfoV10Trx, ts_PCUIF_InfoV10Trx, + ts_PCUIF_InfoV10Trx, ts_PCUIF_InfoV10Trx, + ts_PCUIF_InfoV10Trx, ts_PCUIF_InfoV10Trx + } +}; template (value) PCUIF_Message ts_PCUIF_INFO_IND(template (value) uint8_t bts_nr, template (value) PCUIF_info_ind info_ind) := { @@ -830,4 +904,24 @@ } +/* TODO: remove this as soon as we drop version 9 support */ +function f_PCUIF_ver_INFO_Trxs() +return PCUIF_InfoTrxs { + if (PCUIF_Types.mp_pcuif_version >= 10) { + return valueof(ts_PCUIF_InfoV10Trxs_def); + } else { + return valueof(ts_PCUIF_InfoV09Trxs_def); + } +} + +function f_PCUIF_ver_INFO_PDCHMask(in PCUIF_info_ind info, uint8_t trx_nr) +return bitstring { + if (PCUIF_Types.mp_pcuif_version >= 10) { + return info.trx.v10[trx_nr].pdch_mask; + } else { + return info.trx.v09[trx_nr].pdch_mask; + } +} + + } with { encode "RAW" variant "BYTEORDER(first)" }; diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 20e3582..9fc5ab6 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -62,7 +62,7 @@ friend template (value) PCUIF_info_ind ts_PCUIF_INFO_default := { version := PCUIF_Types.mp_pcuif_version, flags := c_PCUIF_Flags_default, - trx := valueof(ts_PCUIF_InfoTrxs_def), + trx := f_PCUIF_ver_INFO_Trxs(), bsic := 7, mcc := 262, mnc := 42, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idf11bc4ba3ff0b00b32f2beab8fd020c67119d05 Gerrit-Change-Number: 19323 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 21:08:40 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 19 Jul 2020 21:08:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: verify handling of frequency hopping parameters References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 ) Change subject: PCU_Tests: verify handling of frequency hopping parameters ...................................................................... PCU_Tests: verify handling of frequency hopping parameters Change-Id: I1beda9224998848f9243237413e5ae3e0ddab8a5 Related: SYS#4868, OS#4547 --- M pcu/PCU_Tests.ttcn 1 file changed, 52 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/19324/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 9fc5ab6..794780c 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -2069,6 +2069,52 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Make sure that Immediate (UL TBF) Assignment contains hopping parameters */ +testcase TC_pcuif_fh_imm_ass_ul() runs on RAW_PCU_Test_CT { + var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; + var uint8_t ra8 := bit2int(chan_req_def); + + info_ind.trx.v10[0].ts[7] := ts_PCUIF_InfoTrxTsH1(hsn := 0, maio := 0); + info_ind.trx.v10[0].ts[7].ma := oct2bit(f_pad_oct('F0'O, 8, '00'O)); + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + BTS.send(ts_PCUIF_RACH_IND(bts_nr := 0, trx_nr := 0, ts_nr := 0, + ra := ra8, is_11bit := 0, + burst_type := BURST_TYPE_0, + fn := 1337, arfcn := 871)); + + var template PacketChannelDescription ch_desc := { + channel_Type_spare := ?, + tn := 7, tsc := 7, + presence := '1'B, + zero := omit, + one := { + maio := 0, + hsn := 0 + } + }; + + var template MobileAllocation ma := { + len := 1, + ma := '11110000'B + }; + + var GsmRrMessage rr_msg := f_pcuif_rx_imm_ass(); + if (not match(rr_msg, tr_IMM_TBF_ASS(dl := false, ra := ra8, fn := 1337, + ch_desc := ch_desc, ma := ma))) { + setverdict(fail, "Immediate Assignment does not match"); + } + + f_shutdown(__BFILE__, __LINE__, final := true); +} + +/* Make sure that Immediate (DL TBF) Assignment contains hopping parameters */ +testcase TC_pcuif_fh_imm_ass_dl() runs on RAW_PCU_Test_CT { + /* TODO */ +} + control { execute( TC_pcuif_suspend() ); execute( TC_ta_ptcch_idle() ); @@ -2109,6 +2155,12 @@ execute( TC_egprs_pkt_chan_req_reject_exhaustion() ); execute( TC_mo_ping_pong_with_ul_racap_egprs_only() ); + + /* Frequency hopping specific test cases */ + if (PCUIF_Types.mp_pcuif_version >= 10) { + execute( TC_pcuif_fh_imm_ass_ul() ); + execute( TC_pcuif_fh_imm_ass_dl() ); + } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1beda9224998848f9243237413e5ae3e0ddab8a5 Gerrit-Change-Number: 19324 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 19 21:34:50 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 19 Jul 2020 21:34:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: fix bit/byte order in MobileAllocation References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19325 ) Change subject: library/GSM_RR_Types: fix bit/byte order in MobileAllocation ...................................................................... library/GSM_RR_Types: fix bit/byte order in MobileAllocation For more details, see 3GPP TS 44.018, figure 10.5.2.21.1. Change-Id: I70b1baf01859d0cf3b8cec1aed04d73fc097a9b1 Related: SYS#4868, OS#4547 --- M library/GSM_RR_Types.ttcn 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/19325/1 diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index 66e49fa..a0d8349 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -277,7 +277,10 @@ type record MobileAllocation { uint8_t len, bitstring ma - } with { variant (len) "LENGTHTO(ma)" }; + } with { + variant (len) "LENGTHTO(ma)" + variant (ma) "BYTEORDER(last), BITORDER(msb)" + }; /* 10.5.2.25a */ type record PktChDesc0Ind { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I70b1baf01859d0cf3b8cec1aed04d73fc097a9b1 Gerrit-Change-Number: 19325 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 06:54:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 06:54:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: also match MobileAllocation in tr_IMM_TBF_ASS() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19321 ) Change subject: library/GSM_RR_Types: also match MobileAllocation in tr_IMM_TBF_ASS() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icb13b8414d4a784eccaae2daa85232f066f92f08 Gerrit-Change-Number: 19321 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jul 2020 06:54:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 06:54:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 06:54:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: fix bit/byte order in MobileAllocation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19325 ) Change subject: library/GSM_RR_Types: fix bit/byte order in MobileAllocation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I70b1baf01859d0cf3b8cec1aed04d73fc097a9b1 Gerrit-Change-Number: 19325 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jul 2020 06:54:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 06:54:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 06:54:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: make PCUIF version configurable In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19322 ) Change subject: library/PCUIF_Types: make PCUIF version configurable ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3cf7f908e606b91dd2cbddc168827dd074aed052 Gerrit-Change-Number: 19322 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jul 2020 06:54:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 06:54:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 06:54:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: also match MobileAllocation in tr_IMM_TBF_ASS() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19321 ) Change subject: library/GSM_RR_Types: also match MobileAllocation in tr_IMM_TBF_ASS() ...................................................................... library/GSM_RR_Types: also match MobileAllocation in tr_IMM_TBF_ASS() Change-Id: Icb13b8414d4a784eccaae2daa85232f066f92f08 --- M library/GSM_RR_Types.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index bf650b2..66e49fa 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -989,6 +989,7 @@ template GsmFrameNumber fn := ?, template TimingAdvance ta := ?, template PacketChannelDescription ch_desc := ?, + template MobileAllocation ma := ?, template IaRestOctets rest := ?) := { header := t_RrHeader(IMMEDIATE_ASSIGNMENT, ?), payload := { @@ -1004,7 +1005,7 @@ pkt_chan_desc := ch_desc, req_ref := tr_compute_ReqRef(ra, fn), timing_advance := ta, - mobile_allocation := ?, + mobile_allocation := ma, rest_octets := rest } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icb13b8414d4a784eccaae2daa85232f066f92f08 Gerrit-Change-Number: 19321 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 06:54:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 06:54:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSM_RR_Types: fix bit/byte order in MobileAllocation In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19325 ) Change subject: library/GSM_RR_Types: fix bit/byte order in MobileAllocation ...................................................................... library/GSM_RR_Types: fix bit/byte order in MobileAllocation For more details, see 3GPP TS 44.018, figure 10.5.2.21.1. Change-Id: I70b1baf01859d0cf3b8cec1aed04d73fc097a9b1 Related: SYS#4868, OS#4547 --- M library/GSM_RR_Types.ttcn 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index 66e49fa..a0d8349 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -277,7 +277,10 @@ type record MobileAllocation { uint8_t len, bitstring ma - } with { variant (len) "LENGTHTO(ma)" }; + } with { + variant (len) "LENGTHTO(ma)" + variant (ma) "BYTEORDER(last), BITORDER(msb)" + }; /* 10.5.2.25a */ type record PktChDesc0Ind { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I70b1baf01859d0cf3b8cec1aed04d73fc097a9b1 Gerrit-Change-Number: 19325 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 06:54:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 06:54:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: make PCUIF version configurable In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19322 ) Change subject: library/PCUIF_Types: make PCUIF version configurable ...................................................................... library/PCUIF_Types: make PCUIF version configurable When changing the PCUIF, we have to maintain backwards compatibility with the release versions of both osmo-pcu and osmo-bts, not only with the recent master. In order to achieve that, let's introduce 'mp_pcuif_version', so the PCUIF version can be adjusted. Change-Id: I3cf7f908e606b91dd2cbddc168827dd074aed052 Related: SYS#4868, OS#4547 --- M library/PCUIF_Types.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 8 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 8ce41c4..089403c 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -14,8 +14,13 @@ import from General_Types all; import from Osmocom_Types all; +modulepar { + /* PCUIF version supported by the IUT */ + PCUIF_Version mp_pcuif_version := 9; +}; + const charstring PCU_SOCK_DEFAULT := "/tmp/pcu_bts"; -const uint32_t PCU_IF_VERSION := 9; +type integer PCUIF_Version (9); /* supported versions */ type enumerated PCUIF_MsgType { PCU_IF_MSG_DATA_REQ ('00'O), @@ -698,7 +703,7 @@ } template PCUIF_Message tr_PCUIF_INFO_IND(template uint8_t bts_nr := ?, template PCUIF_Flags flags := ?, - template uint32_t version := PCU_IF_VERSION) := { + template uint32_t version := mp_pcuif_version) := { msg_type := PCU_IF_MSG_INFO_IND, bts_nr := bts_nr, spare := ?, diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 09d91a0..20e3582 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -60,7 +60,7 @@ /* FIXME: make sure to use parameters from mp_gb_cfg.cell_id in the PCU INFO IND */ friend template (value) PCUIF_info_ind ts_PCUIF_INFO_default := { - version := PCU_IF_VERSION, + version := PCUIF_Types.mp_pcuif_version, flags := c_PCUIF_Flags_default, trx := valueof(ts_PCUIF_InfoTrxs_def), bsic := 7, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3cf7f908e606b91dd2cbddc168827dd074aed052 Gerrit-Change-Number: 19322 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 11:13:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 11:13:10 +0000 Subject: Change in osmo-bsc[master]: configure.ac: Fix trailing whitespace References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19326 ) Change subject: configure.ac: Fix trailing whitespace ...................................................................... configure.ac: Fix trailing whitespace Change-Id: Id57b953cbeea4ac5c384c0b77cff079c13248a0e --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/26/19326/1 diff --git a/configure.ac b/configure.ac index 6555f87..d25925b 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PROG_INSTALL LT_INIT -dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang +dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang AS_CASE(["$LD"],[*clang*], [AS_CASE(["${host_os}"], [*linux*],[archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'])]) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id57b953cbeea4ac5c384c0b77cff079c13248a0e Gerrit-Change-Number: 19326 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 11:13:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 11:13:11 +0000 Subject: Change in osmo-bsc[master]: doc: Copy {bsc, bts}.adoc from osmo-gsm-manuals References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19327 ) Change subject: doc: Copy {bsc,bts}.adoc from osmo-gsm-manuals ...................................................................... doc: Copy {bsc,bts}.adoc from osmo-gsm-manuals Those adoc files are only used by osmo-bsc.git and openbsc.git (osmo-nitb), and the later is deprecated and no longer maintained, which means new features are only added to BSC. Hence it makes no sense to keep the doc shared between both. Change-Id: I20aa60d2f4111d66e922f3e2a73a20352ec1f7e4 --- A doc/manuals/chapters/bsc.adoc A doc/manuals/chapters/bts.adoc M doc/manuals/osmobsc-usermanual.adoc 3 files changed, 627 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/27/19327/1 diff --git a/doc/manuals/chapters/bsc.adoc b/doc/manuals/chapters/bsc.adoc new file mode 100644 index 0000000..49d25e5 --- /dev/null +++ b/doc/manuals/chapters/bsc.adoc @@ -0,0 +1,120 @@ +== BSC level configuration + +The BSC component is shared between OsmoBSC and OsmoNITB. This chapter +describes some of the configuration options related to this shared BSC +component. + +=== Hand-over + +==== Hand-over in GSM + +Hand-over is the process of changing a MS with a currently active +dedicated channel from one BTS to another BTS. As opposed to idle mode, +where the MS autonomously performs cell re-selection, in dedicated mode +this happens under network control. + +In order to determine when to perform hand-over, and to which cells, the +network requests the MS to perform measurements on a list of neighbor +cell channels, which the MS then reports back to the network in the form +of GSM RR 'Measurement Result' messages. Those messages contain the +downlink measurements as determined by the MS. + +Furthermore, the BTS also performs measurements on the uplink, and +communicates those by means of RSL to the BSC. + +The hand-over decision is made by an algorithm that processes those +measurement results and determines when to perform the hand-over. + +==== Configuration of hand-over in OsmoBSC/OsmoNITB + +OsmoBSC (like the internal BSC component of OsmoNITB) only support +so-called intra-BSC hand-over, where the hand-over is performed between +two BTSs within the same BSC. + +Hand-over is enabled and configured by the use of a set of `handover` +commands. Using those, you can tune the key parameters of the hand-over +algorithm and adapt it to your specific environment. + +.Example handover configuration snippet +---- + handover 1 <1> + handover window rxlev averaging 10 <2> + handover window rxqual averaging 1 <3> + handover window rxlev neighbor averaging 10 <4> + handover power budget interval 6 <5> + handover power budget hysteresis 3 <6> + handover maximum distance 9999 <7> +---- +<1> Enable hand-over +<2> Set the RxLev averaging window for the serving cell to 10 measurements +<3> Set the RxQual averaging window for the serving cell to 1 + measurement (no window) +<4> Set the RxLev averaging for neighbor cells to 10 measurements +<5> Check for the conditions of a power budget hand-over every 6 SACCH + frames +<6> A neighbor cell must be at least 3 dB stronger than the serving cell + to be considered a candidate for hand-over +<7> Perform a maximum distance hand-over if TA is larger 9999 (i.e. never) + +//TODO: Move all to BSC node + +=== Timer Configuration + +The GSM specification specifies a variety of timers both on the network +as well as on the mobile station side. + +Those timers can be configured using the `timer tXXXX` command. + +.Configurable Timers +|=== +|node|timer|default|description +|network|t3101|10|Timeout for 'Immediate Assignment' (sec) +|network|t3103|?|Timeout for Handover (sec) +|network|t3105|40|Repetition of 'Physical Information' (sec) +|network|t3107|?|? +|network|t3109|?|RSL SACCH deactivation timeout (sec) +|network|t3111|?|RSL timeout to wait before releasing the RF channel (sec) +|network|t3113|60|Time to try paging for a subscriber (sec) +|network|t3115|?|? +|network|t3117|?|? +|network|t3119|?|? +|network|t3122|10|Waiting time after 'Immediate Assignment Reject' +|network|t3141|?|? +|=== + +//TODO: split between BSC and MSC timers + +=== Discontinuous Transmission (DTX) + +GSM provides a full-duplex voice call service. However, in any +civilized communication between human beings, only one of the +participants is speaking at any given point in time. This means that +most of the time, one of the two directions of the radio link is +transmitting so-called 'silence frames'. + +During such periods of quiescence in one of the two directions, it is +possible to suppress transmission of most of the radio bursts, as there +is no voice signal to transport. GSM calls this feature 'Discontinuous +Transmission'. It exists separately for uplink (DTXu) and downlink +(DTXd). + +Downlink DTX is only permitted on non-primary transceivers (!= TRX0), as +TRX0 must always transmit at constant output power to ensure it is +detected during cell selection. + +Uplink DTX is possible on any TRX, and serves primarily two uses: + +possible on any TRX, and serves primarily two uses: + +. reducing the MS battery consumption by transmitting at a lower duty cycle +. reducing the uplink interference caused in surrounding cells that + re-use the same ARFCN. + +DTS for both uplink and downlink is implemented in the BTS. Not all BTS +models support it. + +The Osmocom BSC component can instruct the BTS to enable or disable +uplink and/or downlink DTX by means of A-bis OML. + +//TODO: Test/implement, at least for uplink +//TODO: Move to BSC diff --git a/doc/manuals/chapters/bts.adoc b/doc/manuals/chapters/bts.adoc new file mode 100644 index 0000000..223cec1 --- /dev/null +++ b/doc/manuals/chapters/bts.adoc @@ -0,0 +1,505 @@ +[[bts]] +== Reviewing and Provisioning BTS configuration + +The main functionality of the BSC component is to manage BTSs. As such, +provisioning BTSs within the BSC is one of the most common tasks during +BSC operation. Just like about anything else in OsmoBSC, they are +configured using the VTY. + +BTSs are internally numbered with integer numbers starting from "0" for +the first BTS. BTS numbers have to be contiguous, so you cannot +configure 0,1,2 and then 5. + + +=== Reviewing current BTS status and configuration + +In order to view the status and properties of a BTS, you can issue the +`show bts` command. If used without any BTS number, it will display +information about all provisioned BTS numbers. + +---- +OsmoBSC> show bts 0 +BTS 0 is of nanobts type in band DCS1800, has CI 0 LAC 1, BSIC 63, TSC 7 and 1 TRX +Description: (null) +MS Max power: 15 dBm +Minimum Rx Level for Access: -110 dBm +Cell Reselection Hysteresis: 4 dBm +RACH TX-Integer: 9 +RACH Max transmissions: 7 +System Information present: 0x0000007e, static: 0x00000000 + Unit ID: 200/0/0, OML Stream ID 0xff + NM State: Oper 'Enabled', Admin 2, Avail 'OK' + Site Mgr NM State: Oper 'Enabled', Admin 0, Avail 'OK' + Paging: 0 pending requests, 0 free slots + OML Link state: connected. + Current Channel Load: + TCH/F: 0% (0/5) + SDCCH8: 0% (0/8) +---- + +You can also review the status of the TRXs configured within the BTSs of +this BSC by using `show trx`: + +---- +OsmoBSC> show trx 0 0 +TRX 0 of BTS 0 is on ARFCN 871 +Description: (null) + RF Nominal Power: 23 dBm, reduced by 0 dB, resulting BS power: 23 dBm + NM State: Oper 'Enabled', Admin 2, Avail 'OK' + Baseband Transceiver NM State: Oper 'Enabled', Admin 2, Avail 'OK' + ip.access stream ID: 0x00 +---- + +The output can be restricted to the TRXs of one specified BTS number +(`show trx 0`) or even that of a single specified TRX within a +specified BTS (`show trx 0 0`). + +Furthermore, information on the individual timeslots can be shown by +means of `show timeslot`. The output can be restricted to the +timeslots of a single BTS (`show timeslot 0`) or that of a single +TRX (`show timeslot 0 0`). Finally, you can restrict the output to +a single timeslot by specifying the BTS, TRX and TS numbers (`show +timeslot 0 0 4`). + +---- +OsmoBSC> show timeslot 0 0 0 +BTS 0, TRX 0, Timeslot 0, phys cfg CCCH, TSC 7 + NM State: Oper 'Enabled', Admin 2, Avail 'OK' +OsmoBSC> show timeslot 0 0 1 +BTS 0, TRX 0, Timeslot 1, phys cfg SDCCH8, TSC 7 + NM State: Oper 'Enabled', Admin 2, Avail 'OK' +---- + + +=== Provisioning a new BTS + +In order to provision BTSs, you have to enter the BTS config node of the +VTY. In order to configure BTS 0, you can issue the following sequence +of commands: + +---- +OsmoBSC> enable +OsmoBSC# configure terminal +OsmoBSC(config)# network +OsmoBSC(config-net)# bts 0 +OsmoBSC(config-net-bts)# +---- + +At this point, you have a plethora of commands, in fact an entire +hierarchy of commands to configure all aspects of the BTS, as well as +each of its TRX and each timeslot within each TRX. For a full +reference, please consult the telnet VTY integrated help or the respective +chapter in the VTY reference. + +BTS configuration depends quite a bit on the specific BTS vendor and +model. The section below provides just one possible example for the +case of a sysmoBTS. + +Note that from the `configure terminal` command onwards, the telnet VTY +commands above are identical to configuration file settings, for details see +<>. + +Starting with `network` as above, your complete sysmoBTS configuration may look +like this: + +---- +network + bts 0 + type sysmobts + band DCS1800 + description The new BTS in Baikonur + location_area_code 2342 + cell_identity 5 + base_station_id_code 63 + ip.access unit_id 8888 0 + ms max power 40 + trx 0 + arfcn 871 + nominal power 23 + max_power_red 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config TCH/F + timeslot 2 + phys_chan_config TCH/F + timeslot 3 + phys_chan_config TCH/F + timeslot 4 + phys_chan_config TCH/F + timeslot 5 + phys_chan_config TCH/F + timeslot 6 + phys_chan_config TCH/F + timeslot 7 + phys_chan_config PDCH +---- + + +=== System Information configuration + +A GSM BTS periodically transmits a series of 'SYSTEM INFORMATION' +messages to mobile stations, both via the BCCH in idle mode, was well as +via the SACCH in dedicated mode. There are many different types of such +messages. For their detailed contents and encoding, please see _3GPP TS +24.008_ <<3gpp-ts-24-008>>. + +For each of the 'SYSTEM INFORMATION' message types, you can configure to +have the BSC generate it automatically ('computed'), or you can specify +the respective binary message as a string of hexadecimal digits. + +The default configuration is to compute all (required) 'SYSTEM +INFORMATION' messages automatically. + +Please see the _OsmoBSC VTY Reference Manual_ <> for +further information, particularly on the following commands: + +* `system-information (1|2|3|4|5|6|7|8|9|10|13|16|17|18|19|20|2bis|2ter|2quater|5bis|5ter) mode (static|computed)` +* `system-information (1|2|3|4|5|6|7|8|9|10|13|16|17|18|19|20|2bis|2ter|2quater|5bis|5ter) static HEXSTRING` + + +=== Neighbor List configuration + +Every BTS sends a list of ARFCNs of neighbor cells +. within its 'SYSTEM INFORMATION 2' (and 2bis/2ter) messages on the BCCH +. within its 'SYSTEM INFORMATION 5' messages on SACCH in dedicated mode + +For every BTS config node in the VTY, you can specify the behavior of +the neighbor list using the `neighbor list mode` VTY command: + +automatic:: + Automatically generate a list of neighbor cells using all other + BTSs configured in the VTY +manual:: + Manually specify the neighbor list by means of `neighbor-list +(add|del) arfcn <0-1023>` commands, having identical neighbor lists on +BCCH (SI2) and SACCH (SI5) + +manual-si5:: + Manually specify the neighbor list by means of `neighbor-list +(add|del) arfcn <0-1023>` for BCCH (SI2) and a separate neighbor list by +means of `si5 neighbor-list (add|del) arfcn <0-1023>` for SACCH (SI5). + + +=== Configuring GPRS PCU parameters of a BTS + +In the case of BTS models using Abis/IP (IPA), the GPRS PCU is located +inside the BTS. The BTS then establishes a Gb connection to the SGSN. + +All the BTS-internal PCU configuration is performed via A-bis OML by +means of configuring the 'CELL', 'NSVC' (NS Virtual Connection and 'NSE' +(NS Entity). + +There is one 'CELL' node and one 'NSE' node, but there are two 'NSVC' +nodes. At the time of this writing, only the NSVC 0 is supported by +OsmoBTS, while both NSVC are supported by the ip.access nanoBTS. + +The respective VTY configuration parameters are described below. They +all exist beneath each BTS VTY config node. + +But let's first start with a small example + +.Example configuration of GPRS PCU parameters at VTY BTS node +---- +OsmoBSC(config-net-bts)# gprs mode gprs +OsmoBSC(config-net-bts)# gprs routing area 1 +OsmoBSC(config-net-bts)# gprs cell bvci 1234 +OsmoBSC(config-net-bts)# gprs nsei 1234 +OsmoBSC(config-net-bts)# gprs nsvc 0 nsvci 1234 +OsmoBSC(config-net-bts)# gprs nsvc 0 local udp port 23000 +OsmoBSC(config-net-bts)# gprs nsvc 0 remote udp port 23000 +OsmoBSC(config-net-bts)# gprs nsvc 0 remote ip 192.168.100.239 +---- + + +=== More explanation about the PCU config parameters + +//FIXME: should this go into VTY additions? + +==== `gprs mode (none|gprs|egprs)` + +This command determines if GPRS (or EGPRS) services are to be enabled in +this cell at all. + + +==== `gprs cell bvci <2-65535>` + +Configures the 'BSSGP Virtual Circuit Identifier'. It must be unique +between all BGSGP connections to one SGSN. + +NOTE: It is up to the system administrator to ensure all PCUs are +allocated an unique bvci. OsmoBSC will not ensure this policy. + + +==== `gprs nsei <0-65535>` + +Configures the 'NS Entity Identifier'. It must be unique between all NS +connections to one SGSN. + +NOTE: It is up to the system administrator to ensure all PCUs are +allocated an unique bvci. OsmoBSC will not ensure this policy. + + +==== `gprs nsvc <0-1> nsvci <0-65535>` + +Configures the 'NS Virtual Connection Identifier'. It must be unique +between all NS virtual connections to one SGSN. + +NOTE: It is up to the system administrator to ensure all PCUs are +allocated an unique nsvci. OsmoBSC will not ensure this policy. + + +==== `gprs nsvc <0-1> local udp port <0-65535>` + +Configures the local (PCU side) UDP port for the NS-over-UDP link. + + +==== `gprs nsvc <0-1> remote udp port <0-65535>` + +Configures the remote (SGSN side) UDP port for the NS-over-UDP link. + + +==== `gprs nsvc <0-1> remote ip A.B.C.D` + +Configures the remote (SGSN side) UDP port for the NS-over-UDP link. + + +==== `gprs ns timer (tns-block|tns-block-retries|tns-reset|tns-reset-retries|tns-test|tns-alive|tns-alive-retries)` <0-255> + +Configures the various GPRS NS related timers. Please check the GPRS NS +specification for the detailed meaning of those timers. + + +=== Dynamic Timeslot Configuration (TCH / PDCH) + +A dynamic timeslot is in principle a voice timeslot (TCH) that is used to serve +GPRS data (PDCH) when no voice call is active on it. This enhances GPRS +bandwidth while no voice calls are active, which is dynamically scaled down as +voice calls need to be served. This is a tremendous improvement in service over +statically assigning a fixed number of timeslots for voice and data. + +The causality is as follows: to establish a voice call, the +MSC requests a logical channel of a given TCH kind from the BSC. The BSC +assigns such a channel from a BTS' TRX's timeslot of its choice. The knowledge +that a given timeslot is dynamic exists only on the BSC level. When the MSC +asks for a logical channel, the BSC may switch off PDCH on a dynamic timeslot +and then assign a logical TCH channel on it. Hence, though compatibility with +the BTS needs to be ensured, any MSC is compatible with dynamic timeslots by +definition. + +OsmoBSC and OsmoNITB support two kinds of dynamic timeslot handling, configured +via the `network` / `bts` / `trx` / `timeslot` / `phys_chan_config` +configuration. Not all BTS models support dynamic channels. + +[[dyn_ts_compat]] +.Dynamic timeslot support by various BTS models +[cols="50%,25%,25%"] +|=== +| |`TCH/F_TCH/H_PDCH` |`TCH/F_PDCH` +|ip.access nanoBTS |- |supported +|Ericsson RBS |supported |- +|sysmoBTS using _osmo-bts-sysmo_ |supported |supported +|various SDR platforms using _osmo-bts-trx_ |supported |supported +|Nutaq Litecell 1.5 using _osmo-bts-litecell15_ |supported |supported +|Octasic OctBTS using _osmo-bts-octphy_ | supported | supported +|=== + +The _OsmoBTS Abis Protocol Specification_ <> describes the +non-standard RSL messages used for these timeslot kinds. + +NOTE: Same as for dedicated PDCH timeslots, you need to enable GPRS and operate +a PCU, SGSN and GGSN to provide the actual data service. + +==== Osmocom Style Dynamic Timeslots (TCH/F_TCH/H_PDCH) + +Timeslots of the `TCH/F_TCH/H_PDCH` type dynamically switch between TCH/F, +TCH/H and PDCH, depending on the channel kind requested by the MSC. The RSL +messaging for `TCH/F_TCH/H_PDCH` timeslots is compatible with Ericsson RBS. + +BTS models supporting this timeslot kind are shown in <>. + +In the lack of transcoding capabilities, this timeslot type may cause +mismatching codecs to be selected for two parties of the same call, which would +cause call routing to fail ("`Cannot patch through call with different channel +types: local = TCH_F, remote = TCH_H`"). A workaround is to disable TCH/F on +this timeslot type, i.e. to allow only TCH/H. To disable TCH/F on Osmocom +style dynamic timeslots, use a configuration of + +---- +network + dyn_ts_allow_tch_f 0 +---- + +In OsmoNITB, disabling TCH/F on Osmocom dynamic timeslots is the default. In +OsmoBSC, the default is to allow both. + +==== ip.access Style Dynamic Timeslots (TCH/F_PDCH) + +Timeslots of the `TCH/F_PDCH` type dynamically switch between TCH/F and PDCH. +The RSL messaging for `TCH/F_PDCH` timeslots is compatible with ip.access +nanoBTS. + +BTS models supporting this timeslot kind are shown in <>. + +==== Avoid PDCH Exhaustion + +To avoid disrupting GPRS, configure at least one timeslot as dedicated PDCH. +With only dynamic timeslots, a given number of voice calls would convert all +timeslots to TCH, and no PDCH timeslots would be left for GPRS service. + +==== Dynamic Timeslot Configuration Examples + +This is an extract of an `osmo-bsc` or `osmo-nitb` config file. A timeslot +configuration with five Osmocom style dynamic timeslots and one dedicated PDCH +may look like this: + +---- +network + bts 0 + trx 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config SDCCH8 + timeslot 2 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 3 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 5 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 6 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 7 + phys_chan_config PDCH +---- + +With the ip.access nanoBTS, only `TCH/F_PDCH` dynamic timeslots are supported, +and hence a nanoBTS configuration may look like this: + +---- +network + bts 0 + trx 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config SDCCH8 + timeslot 2 + phys_chan_config TCH/F_PDCH + timeslot 3 + phys_chan_config TCH/F_PDCH + timeslot 4 + phys_chan_config TCH/F_PDCH + timeslot 5 + phys_chan_config TCH/F_PDCH + timeslot 6 + phys_chan_config TCH/F_PDCH + timeslot 7 + phys_chan_config PDCH +---- + +=== Tuning Access to the BTS + +OsmoBSC offers several configuration options to fine-tune access to the BTS. +It can allow only a portion of the subscribers access to the network. +This can also be used to ramp up access to the network on startup by slowly +letting in more and more subscribers. This is especially useful for isolated +cells with a huge number of subscribers. + +Other options control the behaviour of the MS when it needs to access the +random access channel before a dedicated channel is established. + +If the BTS is connected to the BSC via a high-latency connection the MS should +wait longer for an answer to a RACH request. If it does not the network will +have to deal with an increased load due to duplicate RACH requests. However, +in order to minimize the delay when a RACH request or response gets lost the +MS should not wait too long before retransmitting. + +==== Load Management + +Every SIM card is member of one of the ten regular ACCs (0-9). Access to the +BTS can be restricted to SIMs that are members of certain ACCs. + +Since the ACCs are distributed uniformly across all SIMs allowing only ACCs +0-4 to connect to the BTS should reduce its load by 50%. + +The default is to allow all ACCs to connect. + +.Example: Restrict access to the BTS by ACC +---- +network + bts 0 + rach access-control-class 1 barred <1> + rach access-control-class 9 allowed <2> +---- +<1> Disallow SIMs with access-class 1 from connecting to the BTS +<2> Permit SIMs with access-class 9 to connect to the BTS. + + +Smaller cells with lots of subscribers can be overwhelmed with traffic after +the network is turned on. This is especially true in areas with little to no +reception from other networks. To manage the load OsmoBSC has an option to +enable one Access Class at a time so initial access to the network is +distributed across a longer time. + +.Example: Ramp up access to the BTS after startup +---- +network + bts 0 + access-control-class-ramping <1> + access-control-class-ramping-step-interval 30 <2> + access-control-class-ramping-step-size 1 <3> +---- +<1> Turn on access-control-class ramping +<2> Enable more ACCs every 30 seconds +<3> At each step enable one more ACC + + +==== RACH Parameter Configuration + +The following parameters allow control over how the MS can access the random +access channel (RACH). It is possible to set a minimum receive level under +which the MS will not even attempt to access the network. + +The RACH is a shared channel which means multiple MS can choose to send a +request at the same time. To minimize the risk of a collision each MS will +choose a random number of RACH slots to wait before trying to send a RACH +request. + +On very busy networks the range this number is chosen from should be +high to avoid collisions, but a lower range reduces the overall delay when +trying to establish a channel. + +The option `rach tx integer N` controls the range from which this number X +is chosen. It is `0 <= X < max(8,N)`. + +After sending a RACH request the MS will wait a random amount of slots before +retransmitting its RACH request. The range it will wait is also determined by +the option `rach tx integer N`, but calculating it is not so straightforward. +It is defined as `S <= X < S+N` where `S` is determined from a table. + +In particular `S` is lowest when `N` is one of 3, 8, 14 or 50 and highest when +`N` is 7, 12 or 32. + +For more information see _3GPP TA 44.018_ <<3gpp-ts-44-018>> Ch. 3.3.1.1.2 and +Table 3.3.1.1.2.1 in particular. + +The amount of times the MS attempts to retransmit RACH requests can also be +changed. A higher number means more load on the RACH while a lower number can +cause channel establishment to fail due to collisions or bad reception. + +.Example: Configure RACH Access Parameters +---- +network + bts 0 + rxlev access min 20 <1> + rach tx integer 50<2> + rach max transmission <3> +---- +<1> Allow access to the network if the MS receives the BCCH of the cell at +-90dBm or better (20dB above -110dBm). +<2> This number affects how long the MS waits before (re-)transmitting RACH +requests. +<3> How often to retransmit the RACH request. diff --git a/doc/manuals/osmobsc-usermanual.adoc b/doc/manuals/osmobsc-usermanual.adoc index 862c8f9..cb939cc 100644 --- a/doc/manuals/osmobsc-usermanual.adoc +++ b/doc/manuals/osmobsc-usermanual.adoc @@ -18,11 +18,11 @@ include::./common/chapters/cs7-config.adoc[] -include::./common/chapters/bts.adoc[] +include::{srcdir}/chapters/bts.adoc[] include::{srcdir}/chapters/bts-examples.adoc[] -include::./common/chapters/bsc.adoc[] +include::{srcdir}/chapters/bsc.adoc[] include::{srcdir}/chapters/handover.adoc[] -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I20aa60d2f4111d66e922f3e2a73a20352ec1f7e4 Gerrit-Change-Number: 19327 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 11:13:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 11:13:11 +0000 Subject: Change in osmo-bsc[master]: {bts, bsc}.adoc: Drop deprecated OsmoNITB references References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19328 ) Change subject: {bts,bsc}.adoc: Drop deprecated OsmoNITB references ...................................................................... {bts,bsc}.adoc: Drop deprecated OsmoNITB references dyn_ts_allow_tch_f is also deprecated and should not be used, so drop that too. Change-Id: Icc91dd41a237531cb512fa36d8b18d4d8d5ca8ed --- A bts.adoc M doc/manuals/chapters/bsc.adoc 2 files changed, 507 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/28/19328/1 diff --git a/bts.adoc b/bts.adoc new file mode 100644 index 0000000..b85f7d4 --- /dev/null +++ b/bts.adoc @@ -0,0 +1,504 @@ +[[bts]] +== Reviewing and Provisioning BTS configuration + +The main functionality of the BSC component is to manage BTSs. As such, +provisioning BTSs within the BSC is one of the most common tasks during +BSC operation. Just like about anything else in OsmoBSC, they are +configured using the VTY. + +BTSs are internally numbered with integer numbers starting from "0" for +the first BTS. BTS numbers have to be contiguous, so you cannot +configure 0,1,2 and then 5. + + +=== Reviewing current BTS status and configuration + +In order to view the status and properties of a BTS, you can issue the +`show bts` command. If used without any BTS number, it will display +information about all provisioned BTS numbers. + +---- +OsmoBSC> show bts 0 +BTS 0 is of nanobts type in band DCS1800, has CI 0 LAC 1, BSIC 63, TSC 7 and 1 TRX +Description: (null) +MS Max power: 15 dBm +Minimum Rx Level for Access: -110 dBm +Cell Reselection Hysteresis: 4 dBm +RACH TX-Integer: 9 +RACH Max transmissions: 7 +System Information present: 0x0000007e, static: 0x00000000 + Unit ID: 200/0/0, OML Stream ID 0xff + NM State: Oper 'Enabled', Admin 2, Avail 'OK' + Site Mgr NM State: Oper 'Enabled', Admin 0, Avail 'OK' + Paging: 0 pending requests, 0 free slots + OML Link state: connected. + Current Channel Load: + TCH/F: 0% (0/5) + SDCCH8: 0% (0/8) +---- + +You can also review the status of the TRXs configured within the BTSs of +this BSC by using `show trx`: + +---- +OsmoBSC> show trx 0 0 +TRX 0 of BTS 0 is on ARFCN 871 +Description: (null) + RF Nominal Power: 23 dBm, reduced by 0 dB, resulting BS power: 23 dBm + NM State: Oper 'Enabled', Admin 2, Avail 'OK' + Baseband Transceiver NM State: Oper 'Enabled', Admin 2, Avail 'OK' + ip.access stream ID: 0x00 +---- + +The output can be restricted to the TRXs of one specified BTS number +(`show trx 0`) or even that of a single specified TRX within a +specified BTS (`show trx 0 0`). + +Furthermore, information on the individual timeslots can be shown by +means of `show timeslot`. The output can be restricted to the +timeslots of a single BTS (`show timeslot 0`) or that of a single +TRX (`show timeslot 0 0`). Finally, you can restrict the output to +a single timeslot by specifying the BTS, TRX and TS numbers (`show +timeslot 0 0 4`). + +---- +OsmoBSC> show timeslot 0 0 0 +BTS 0, TRX 0, Timeslot 0, phys cfg CCCH, TSC 7 + NM State: Oper 'Enabled', Admin 2, Avail 'OK' +OsmoBSC> show timeslot 0 0 1 +BTS 0, TRX 0, Timeslot 1, phys cfg SDCCH8, TSC 7 + NM State: Oper 'Enabled', Admin 2, Avail 'OK' +---- + + +=== Provisioning a new BTS + +In order to provision BTSs, you have to enter the BTS config node of the +VTY. In order to configure BTS 0, you can issue the following sequence +of commands: + +---- +OsmoBSC> enable +OsmoBSC# configure terminal +OsmoBSC(config)# network +OsmoBSC(config-net)# bts 0 +OsmoBSC(config-net-bts)# +---- + +At this point, you have a plethora of commands, in fact an entire +hierarchy of commands to configure all aspects of the BTS, as well as +each of its TRX and each timeslot within each TRX. For a full +reference, please consult the telnet VTY integrated help or the respective +chapter in the VTY reference. + +BTS configuration depends quite a bit on the specific BTS vendor and +model. The section below provides just one possible example for the +case of a sysmoBTS. + +Note that from the `configure terminal` command onwards, the telnet VTY +commands above are identical to configuration file settings, for details see +<>. + +Starting with `network` as above, your complete sysmoBTS configuration may look +like this: + +---- +network + bts 0 + type sysmobts + band DCS1800 + description The new BTS in Baikonur + location_area_code 2342 + cell_identity 5 + base_station_id_code 63 + ip.access unit_id 8888 0 + ms max power 40 + trx 0 + arfcn 871 + nominal power 23 + max_power_red 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config TCH/F + timeslot 2 + phys_chan_config TCH/F + timeslot 3 + phys_chan_config TCH/F + timeslot 4 + phys_chan_config TCH/F + timeslot 5 + phys_chan_config TCH/F + timeslot 6 + phys_chan_config TCH/F + timeslot 7 + phys_chan_config PDCH +---- + + +=== System Information configuration + +A GSM BTS periodically transmits a series of 'SYSTEM INFORMATION' +messages to mobile stations, both via the BCCH in idle mode, was well as +via the SACCH in dedicated mode. There are many different types of such +messages. For their detailed contents and encoding, please see _3GPP TS +24.008_ <<3gpp-ts-24-008>>. + +For each of the 'SYSTEM INFORMATION' message types, you can configure to +have the BSC generate it automatically ('computed'), or you can specify +the respective binary message as a string of hexadecimal digits. + +The default configuration is to compute all (required) 'SYSTEM +INFORMATION' messages automatically. + +Please see the _OsmoBSC VTY Reference Manual_ <> for +further information, particularly on the following commands: + +* `system-information (1|2|3|4|5|6|7|8|9|10|13|16|17|18|19|20|2bis|2ter|2quater|5bis|5ter) mode (static|computed)` +* `system-information (1|2|3|4|5|6|7|8|9|10|13|16|17|18|19|20|2bis|2ter|2quater|5bis|5ter) static HEXSTRING` + + +=== Neighbor List configuration + +Every BTS sends a list of ARFCNs of neighbor cells +. within its 'SYSTEM INFORMATION 2' (and 2bis/2ter) messages on the BCCH +. within its 'SYSTEM INFORMATION 5' messages on SACCH in dedicated mode + +For every BTS config node in the VTY, you can specify the behavior of +the neighbor list using the `neighbor list mode` VTY command: + +automatic:: + Automatically generate a list of neighbor cells using all other + BTSs configured in the VTY +manual:: + Manually specify the neighbor list by means of `neighbor-list +(add|del) arfcn <0-1023>` commands, having identical neighbor lists on +BCCH (SI2) and SACCH (SI5) + +manual-si5:: + Manually specify the neighbor list by means of `neighbor-list +(add|del) arfcn <0-1023>` for BCCH (SI2) and a separate neighbor list by +means of `si5 neighbor-list (add|del) arfcn <0-1023>` for SACCH (SI5). + + +=== Configuring GPRS PCU parameters of a BTS + +In the case of BTS models using Abis/IP (IPA), the GPRS PCU is located +inside the BTS. The BTS then establishes a Gb connection to the SGSN. + +All the BTS-internal PCU configuration is performed via A-bis OML by +means of configuring the 'CELL', 'NSVC' (NS Virtual Connection and 'NSE' +(NS Entity). + +There is one 'CELL' node and one 'NSE' node, but there are two 'NSVC' +nodes. At the time of this writing, only the NSVC 0 is supported by +OsmoBTS, while both NSVC are supported by the ip.access nanoBTS. + +The respective VTY configuration parameters are described below. They +all exist beneath each BTS VTY config node. + +But let's first start with a small example + +.Example configuration of GPRS PCU parameters at VTY BTS node +---- +OsmoBSC(config-net-bts)# gprs mode gprs +OsmoBSC(config-net-bts)# gprs routing area 1 +OsmoBSC(config-net-bts)# gprs cell bvci 1234 +OsmoBSC(config-net-bts)# gprs nsei 1234 +OsmoBSC(config-net-bts)# gprs nsvc 0 nsvci 1234 +OsmoBSC(config-net-bts)# gprs nsvc 0 local udp port 23000 +OsmoBSC(config-net-bts)# gprs nsvc 0 remote udp port 23000 +OsmoBSC(config-net-bts)# gprs nsvc 0 remote ip 192.168.100.239 +---- + + +=== More explanation about the PCU config parameters + +//FIXME: should this go into VTY additions? + +==== `gprs mode (none|gprs|egprs)` + +This command determines if GPRS (or EGPRS) services are to be enabled in +this cell at all. + + +==== `gprs cell bvci <2-65535>` + +Configures the 'BSSGP Virtual Circuit Identifier'. It must be unique +between all BGSGP connections to one SGSN. + +NOTE: It is up to the system administrator to ensure all PCUs are +allocated an unique bvci. OsmoBSC will not ensure this policy. + + +==== `gprs nsei <0-65535>` + +Configures the 'NS Entity Identifier'. It must be unique between all NS +connections to one SGSN. + +NOTE: It is up to the system administrator to ensure all PCUs are +allocated an unique bvci. OsmoBSC will not ensure this policy. + + +==== `gprs nsvc <0-1> nsvci <0-65535>` + +Configures the 'NS Virtual Connection Identifier'. It must be unique +between all NS virtual connections to one SGSN. + +NOTE: It is up to the system administrator to ensure all PCUs are +allocated an unique nsvci. OsmoBSC will not ensure this policy. + + +==== `gprs nsvc <0-1> local udp port <0-65535>` + +Configures the local (PCU side) UDP port for the NS-over-UDP link. + + +==== `gprs nsvc <0-1> remote udp port <0-65535>` + +Configures the remote (SGSN side) UDP port for the NS-over-UDP link. + + +==== `gprs nsvc <0-1> remote ip A.B.C.D` + +Configures the remote (SGSN side) UDP port for the NS-over-UDP link. + + +==== `gprs ns timer (tns-block|tns-block-retries|tns-reset|tns-reset-retries|tns-test|tns-alive|tns-alive-retries)` <0-255> + +Configures the various GPRS NS related timers. Please check the GPRS NS +specification for the detailed meaning of those timers. + + +=== Dynamic Timeslot Configuration (TCH / PDCH) + +A dynamic timeslot is in principle a voice timeslot (TCH) that is used to serve +GPRS data (PDCH) when no voice call is active on it. This enhances GPRS +bandwidth while no voice calls are active, which is dynamically scaled down as +voice calls need to be served. This is a tremendous improvement in service over +statically assigning a fixed number of timeslots for voice and data. + +The causality is as follows: to establish a voice call, the +MSC requests a logical channel of a given TCH kind from the BSC. The BSC +assigns such a channel from a BTS' TRX's timeslot of its choice. The knowledge +that a given timeslot is dynamic exists only on the BSC level. When the MSC +asks for a logical channel, the BSC may switch off PDCH on a dynamic timeslot +and then assign a logical TCH channel on it. Hence, though compatibility with +the BTS needs to be ensured, any MSC is compatible with dynamic timeslots by +definition. + +OsmoBSC support two kinds of dynamic timeslot handling, configured +via the `network` / `bts` / `trx` / `timeslot` / `phys_chan_config` +configuration. Not all BTS models support dynamic channels. + +[[dyn_ts_compat]] +.Dynamic timeslot support by various BTS models +[cols="50%,25%,25%"] +|=== +| |`TCH/F_TCH/H_PDCH` |`TCH/F_PDCH` +|ip.access nanoBTS |- |supported +|Ericsson RBS |supported |- +|sysmoBTS using _osmo-bts-sysmo_ |supported |supported +|various SDR platforms using _osmo-bts-trx_ |supported |supported +|Nutaq Litecell 1.5 using _osmo-bts-litecell15_ |supported |supported +|Octasic OctBTS using _osmo-bts-octphy_ | supported | supported +|=== + +The _OsmoBTS Abis Protocol Specification_ <> describes the +non-standard RSL messages used for these timeslot kinds. + +NOTE: Same as for dedicated PDCH timeslots, you need to enable GPRS and operate +a PCU, SGSN and GGSN to provide the actual data service. + +==== Osmocom Style Dynamic Timeslots (TCH/F_TCH/H_PDCH) + +Timeslots of the `TCH/F_TCH/H_PDCH` type dynamically switch between TCH/F, +TCH/H and PDCH, depending on the channel kind requested by the MSC. The RSL +messaging for `TCH/F_TCH/H_PDCH` timeslots is compatible with Ericsson RBS. + +BTS models supporting this timeslot kind are shown in <>. + +In the lack of transcoding capabilities, this timeslot type may cause +mismatching codecs to be selected for two parties of the same call, which would +cause call routing to fail ("`Cannot patch through call with different channel +types: local = TCH_F, remote = TCH_H`"). A workaround is to disable TCH/F on +this timeslot type, i.e. to allow only TCH/H. To disable TCH/F on Osmocom +style dynamic timeslots, use a configuration of + +---- +network + dyn_ts_allow_tch_f 0 +---- + +In OsmoNITB, disabling TCH/F on Osmocom dynamic timeslots is the default. In +OsmoBSC, the default is to allow both. + +==== ip.access Style Dynamic Timeslots (TCH/F_PDCH) + +Timeslots of the `TCH/F_PDCH` type dynamically switch between TCH/F and PDCH. +The RSL messaging for `TCH/F_PDCH` timeslots is compatible with ip.access +nanoBTS. + +BTS models supporting this timeslot kind are shown in <>. + +==== Avoid PDCH Exhaustion + +To avoid disrupting GPRS, configure at least one timeslot as dedicated PDCH. +With only dynamic timeslots, a given number of voice calls would convert all +timeslots to TCH, and no PDCH timeslots would be left for GPRS service. + +==== Dynamic Timeslot Configuration Examples + +This is an extract of an `osmo-bsc`` config file. A timeslot configuration with +five Osmocom style dynamic timeslots and one dedicated PDCH may look like this: + +---- +network + bts 0 + trx 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config SDCCH8 + timeslot 2 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 3 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 5 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 6 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 7 + phys_chan_config PDCH +---- + +With the ip.access nanoBTS, only `TCH/F_PDCH` dynamic timeslots are supported, +and hence a nanoBTS configuration may look like this: + +---- +network + bts 0 + trx 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config SDCCH8 + timeslot 2 + phys_chan_config TCH/F_PDCH + timeslot 3 + phys_chan_config TCH/F_PDCH + timeslot 4 + phys_chan_config TCH/F_PDCH + timeslot 5 + phys_chan_config TCH/F_PDCH + timeslot 6 + phys_chan_config TCH/F_PDCH + timeslot 7 + phys_chan_config PDCH +---- + +=== Tuning Access to the BTS + +OsmoBSC offers several configuration options to fine-tune access to the BTS. +It can allow only a portion of the subscribers access to the network. +This can also be used to ramp up access to the network on startup by slowly +letting in more and more subscribers. This is especially useful for isolated +cells with a huge number of subscribers. + +Other options control the behaviour of the MS when it needs to access the +random access channel before a dedicated channel is established. + +If the BTS is connected to the BSC via a high-latency connection the MS should +wait longer for an answer to a RACH request. If it does not the network will +have to deal with an increased load due to duplicate RACH requests. However, +in order to minimize the delay when a RACH request or response gets lost the +MS should not wait too long before retransmitting. + +==== Load Management + +Every SIM card is member of one of the ten regular ACCs (0-9). Access to the +BTS can be restricted to SIMs that are members of certain ACCs. + +Since the ACCs are distributed uniformly across all SIMs allowing only ACCs +0-4 to connect to the BTS should reduce its load by 50%. + +The default is to allow all ACCs to connect. + +.Example: Restrict access to the BTS by ACC +---- +network + bts 0 + rach access-control-class 1 barred <1> + rach access-control-class 9 allowed <2> +---- +<1> Disallow SIMs with access-class 1 from connecting to the BTS +<2> Permit SIMs with access-class 9 to connect to the BTS. + + +Smaller cells with lots of subscribers can be overwhelmed with traffic after +the network is turned on. This is especially true in areas with little to no +reception from other networks. To manage the load OsmoBSC has an option to +enable one Access Class at a time so initial access to the network is +distributed across a longer time. + +.Example: Ramp up access to the BTS after startup +---- +network + bts 0 + access-control-class-ramping <1> + access-control-class-ramping-step-interval 30 <2> + access-control-class-ramping-step-size 1 <3> +---- +<1> Turn on access-control-class ramping +<2> Enable more ACCs every 30 seconds +<3> At each step enable one more ACC + + +==== RACH Parameter Configuration + +The following parameters allow control over how the MS can access the random +access channel (RACH). It is possible to set a minimum receive level under +which the MS will not even attempt to access the network. + +The RACH is a shared channel which means multiple MS can choose to send a +request at the same time. To minimize the risk of a collision each MS will +choose a random number of RACH slots to wait before trying to send a RACH +request. + +On very busy networks the range this number is chosen from should be +high to avoid collisions, but a lower range reduces the overall delay when +trying to establish a channel. + +The option `rach tx integer N` controls the range from which this number X +is chosen. It is `0 <= X < max(8,N)`. + +After sending a RACH request the MS will wait a random amount of slots before +retransmitting its RACH request. The range it will wait is also determined by +the option `rach tx integer N`, but calculating it is not so straightforward. +It is defined as `S <= X < S+N` where `S` is determined from a table. + +In particular `S` is lowest when `N` is one of 3, 8, 14 or 50 and highest when +`N` is 7, 12 or 32. + +For more information see _3GPP TA 44.018_ <<3gpp-ts-44-018>> Ch. 3.3.1.1.2 and +Table 3.3.1.1.2.1 in particular. + +The amount of times the MS attempts to retransmit RACH requests can also be +changed. A higher number means more load on the RACH while a lower number can +cause channel establishment to fail due to collisions or bad reception. + +.Example: Configure RACH Access Parameters +---- +network + bts 0 + rxlev access min 20 <1> + rach tx integer 50<2> + rach max transmission <3> +---- +<1> Allow access to the network if the MS receives the BCCH of the cell at +-90dBm or better (20dB above -110dBm). +<2> This number affects how long the MS waits before (re-)transmitting RACH +requests. +<3> How often to retransmit the RACH request. diff --git a/doc/manuals/chapters/bsc.adoc b/doc/manuals/chapters/bsc.adoc index 49d25e5..0d3ded5 100644 --- a/doc/manuals/chapters/bsc.adoc +++ b/doc/manuals/chapters/bsc.adoc @@ -1,9 +1,5 @@ == BSC level configuration -The BSC component is shared between OsmoBSC and OsmoNITB. This chapter -describes some of the configuration options related to this shared BSC -component. - === Hand-over ==== Hand-over in GSM @@ -25,11 +21,10 @@ The hand-over decision is made by an algorithm that processes those measurement results and determines when to perform the hand-over. -==== Configuration of hand-over in OsmoBSC/OsmoNITB +==== Configuration of hand-over in OsmoBSC -OsmoBSC (like the internal BSC component of OsmoNITB) only support -so-called intra-BSC hand-over, where the hand-over is performed between -two BTSs within the same BSC. +OsmoBSC only support so-called intra-BSC hand-over, where the hand-over is +performed between two BTSs within the same BSC. Hand-over is enabled and configured by the use of a set of `handover` commands. Using those, you can tune the key parameters of the hand-over -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icc91dd41a237531cb512fa36d8b18d4d8d5ca8ed Gerrit-Change-Number: 19328 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 11:16:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 11:16:57 +0000 Subject: Change in openbsc[master]: doc: Copy {bsc, bts}.adoc from osmo-gsm-manuals References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/openbsc/+/19329 ) Change subject: doc: Copy {bsc,bts}.adoc from osmo-gsm-manuals ...................................................................... doc: Copy {bsc,bts}.adoc from osmo-gsm-manuals Those adoc files are only used by osmo-bsc.git and openbsc.git (osmo-nitb), and the later is deprecated and no longer maintained, which means new features are only added to BSC. Hence it makes no sense to keep the doc shared between both. As a result, they will be dropped from osmo-gsm-manuals.git and we keep an unmodified copy here. Change-Id: Ic3b4192238be3147f61779845521eae84511fb7e --- A manuals/OsmoNITB/chapters/bsc.adoc A manuals/OsmoNITB/chapters/bts.adoc M manuals/OsmoNITB/osmonitb-usermanual.adoc 3 files changed, 611 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/29/19329/1 diff --git a/manuals/OsmoNITB/chapters/bsc.adoc b/manuals/OsmoNITB/chapters/bsc.adoc new file mode 100644 index 0000000..49d25e5 --- /dev/null +++ b/manuals/OsmoNITB/chapters/bsc.adoc @@ -0,0 +1,120 @@ +== BSC level configuration + +The BSC component is shared between OsmoBSC and OsmoNITB. This chapter +describes some of the configuration options related to this shared BSC +component. + +=== Hand-over + +==== Hand-over in GSM + +Hand-over is the process of changing a MS with a currently active +dedicated channel from one BTS to another BTS. As opposed to idle mode, +where the MS autonomously performs cell re-selection, in dedicated mode +this happens under network control. + +In order to determine when to perform hand-over, and to which cells, the +network requests the MS to perform measurements on a list of neighbor +cell channels, which the MS then reports back to the network in the form +of GSM RR 'Measurement Result' messages. Those messages contain the +downlink measurements as determined by the MS. + +Furthermore, the BTS also performs measurements on the uplink, and +communicates those by means of RSL to the BSC. + +The hand-over decision is made by an algorithm that processes those +measurement results and determines when to perform the hand-over. + +==== Configuration of hand-over in OsmoBSC/OsmoNITB + +OsmoBSC (like the internal BSC component of OsmoNITB) only support +so-called intra-BSC hand-over, where the hand-over is performed between +two BTSs within the same BSC. + +Hand-over is enabled and configured by the use of a set of `handover` +commands. Using those, you can tune the key parameters of the hand-over +algorithm and adapt it to your specific environment. + +.Example handover configuration snippet +---- + handover 1 <1> + handover window rxlev averaging 10 <2> + handover window rxqual averaging 1 <3> + handover window rxlev neighbor averaging 10 <4> + handover power budget interval 6 <5> + handover power budget hysteresis 3 <6> + handover maximum distance 9999 <7> +---- +<1> Enable hand-over +<2> Set the RxLev averaging window for the serving cell to 10 measurements +<3> Set the RxQual averaging window for the serving cell to 1 + measurement (no window) +<4> Set the RxLev averaging for neighbor cells to 10 measurements +<5> Check for the conditions of a power budget hand-over every 6 SACCH + frames +<6> A neighbor cell must be at least 3 dB stronger than the serving cell + to be considered a candidate for hand-over +<7> Perform a maximum distance hand-over if TA is larger 9999 (i.e. never) + +//TODO: Move all to BSC node + +=== Timer Configuration + +The GSM specification specifies a variety of timers both on the network +as well as on the mobile station side. + +Those timers can be configured using the `timer tXXXX` command. + +.Configurable Timers +|=== +|node|timer|default|description +|network|t3101|10|Timeout for 'Immediate Assignment' (sec) +|network|t3103|?|Timeout for Handover (sec) +|network|t3105|40|Repetition of 'Physical Information' (sec) +|network|t3107|?|? +|network|t3109|?|RSL SACCH deactivation timeout (sec) +|network|t3111|?|RSL timeout to wait before releasing the RF channel (sec) +|network|t3113|60|Time to try paging for a subscriber (sec) +|network|t3115|?|? +|network|t3117|?|? +|network|t3119|?|? +|network|t3122|10|Waiting time after 'Immediate Assignment Reject' +|network|t3141|?|? +|=== + +//TODO: split between BSC and MSC timers + +=== Discontinuous Transmission (DTX) + +GSM provides a full-duplex voice call service. However, in any +civilized communication between human beings, only one of the +participants is speaking at any given point in time. This means that +most of the time, one of the two directions of the radio link is +transmitting so-called 'silence frames'. + +During such periods of quiescence in one of the two directions, it is +possible to suppress transmission of most of the radio bursts, as there +is no voice signal to transport. GSM calls this feature 'Discontinuous +Transmission'. It exists separately for uplink (DTXu) and downlink +(DTXd). + +Downlink DTX is only permitted on non-primary transceivers (!= TRX0), as +TRX0 must always transmit at constant output power to ensure it is +detected during cell selection. + +Uplink DTX is possible on any TRX, and serves primarily two uses: + +possible on any TRX, and serves primarily two uses: + +. reducing the MS battery consumption by transmitting at a lower duty cycle +. reducing the uplink interference caused in surrounding cells that + re-use the same ARFCN. + +DTS for both uplink and downlink is implemented in the BTS. Not all BTS +models support it. + +The Osmocom BSC component can instruct the BTS to enable or disable +uplink and/or downlink DTX by means of A-bis OML. + +//TODO: Test/implement, at least for uplink +//TODO: Move to BSC diff --git a/manuals/OsmoNITB/chapters/bts.adoc b/manuals/OsmoNITB/chapters/bts.adoc new file mode 100644 index 0000000..2c09dc3 --- /dev/null +++ b/manuals/OsmoNITB/chapters/bts.adoc @@ -0,0 +1,489 @@ +[[bts]] +== Reviewing and Provisioning BTS configuration + +The main functionality of the BSC component is to manage BTSs. As such, +provisioning BTSs within the BSC is one of the most common tasks during +BSC operation. Just like about anything else in OsmoBSC, they are +configured using the VTY. + +BTSs are internally numbered with integer numbers starting from "0" for +the first BTS. BTS numbers have to be contiguous, so you cannot +configure 0,1,2 and then 5. + + +=== Reviewing current BTS status and configuration + +In order to view the status and properties of a BTS, you can issue the +`show bts` command. If used without any BTS number, it will display +information about all provisioned BTS numbers. + +---- +OsmoBSC> show bts 0 +BTS 0 is of nanobts type in band DCS1800, has CI 0 LAC 1, BSIC 63, TSC 7 and 1 TRX +Description: (null) +MS Max power: 15 dBm +Minimum Rx Level for Access: -110 dBm +Cell Reselection Hysteresis: 4 dBm +RACH TX-Integer: 9 +RACH Max transmissions: 7 +System Information present: 0x0000007e, static: 0x00000000 + Unit ID: 200/0/0, OML Stream ID 0xff + NM State: Oper 'Enabled', Admin 2, Avail 'OK' + Site Mgr NM State: Oper 'Enabled', Admin 0, Avail 'OK' + Paging: 0 pending requests, 0 free slots + OML Link state: connected. + Current Channel Load: + TCH/F: 0% (0/5) + SDCCH8: 0% (0/8) +---- + +You can also review the status of the TRXs configured within the BTSs of +this BSC by using `show trx`: + +---- +OsmoBSC> show trx 0 0 +TRX 0 of BTS 0 is on ARFCN 871 +Description: (null) + RF Nominal Power: 23 dBm, reduced by 0 dB, resulting BS power: 23 dBm + NM State: Oper 'Enabled', Admin 2, Avail 'OK' + Baseband Transceiver NM State: Oper 'Enabled', Admin 2, Avail 'OK' + ip.access stream ID: 0x00 +---- + +The output can be restricted to the TRXs of one specified BTS number +(`show trx 0`) or even that of a single specified TRX within a +specified BTS (`show trx 0 0`). + +Furthermore, information on the individual timeslots can be shown by +means of `show timeslot`. The output can be restricted to the +timeslots of a single BTS (`show timeslot 0`) or that of a single +TRX (`show timeslot 0 0`). Finally, you can restrict the output to +a single timeslot by specifying the BTS, TRX and TS numbers (`show +timeslot 0 0 4`). + +---- +OsmoBSC> show timeslot 0 0 0 +BTS 0, TRX 0, Timeslot 0, phys cfg CCCH, TSC 7 + NM State: Oper 'Enabled', Admin 2, Avail 'OK' +OsmoBSC> show timeslot 0 0 1 +BTS 0, TRX 0, Timeslot 1, phys cfg SDCCH8, TSC 7 + NM State: Oper 'Enabled', Admin 2, Avail 'OK' +---- + + +=== Provisioning a new BTS + +In order to provision BTSs, you have to enter the BTS config node of the +VTY. In order to configure BTS 0, you can issue the following sequence +of commands: + +---- +OsmoBSC> enable +OsmoBSC# configure terminal +OsmoBSC(config)# network +OsmoBSC(config-net)# bts 0 +OsmoBSC(config-net-bts)# +---- + +At this point, you have a plethora of commands, in fact an entire +hierarchy of commands to configure all aspects of the BTS, as well as +each of its TRX and each timeslot within each TRX. For a full +reference, please consult the telnet VTY integrated help or the respective +chapter in the VTY reference. + +BTS configuration depends quite a bit on the specific BTS vendor and +model. The section below provides just one possible example for the +case of a sysmoBTS. + +Note that from the `configure terminal` command onwards, the telnet VTY +commands above are identical to configuration file settings, for details see +<>. + +Starting with `network` as above, your complete sysmoBTS configuration may look +like this: + +---- +network + bts 0 + type sysmobts + band DCS1800 + description The new BTS in Baikonur + location_area_code 2342 + cell_identity 5 + base_station_id_code 63 + ip.access unit_id 8888 0 + ms max power 40 + trx 0 + arfcn 871 + nominal power 23 + max_power_red 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config TCH/F + timeslot 2 + phys_chan_config TCH/F + timeslot 3 + phys_chan_config TCH/F + timeslot 4 + phys_chan_config TCH/F + timeslot 5 + phys_chan_config TCH/F + timeslot 6 + phys_chan_config TCH/F + timeslot 7 + phys_chan_config PDCH +---- + + +=== System Information configuration + +A GSM BTS periodically transmits a series of 'SYSTEM INFORMATION' +messages to mobile stations, both via the BCCH in idle mode, was well as +via the SACCH in dedicated mode. There are many different types of such +messages. For their detailed contents and encoding, please see _3GPP TS +24.008_ <<3gpp-ts-24-008>>. + +For each of the 'SYSTEM INFORMATION' message types, you can configure to +have the BSC generate it automatically ('computed'), or you can specify +the respective binary message as a string of hexadecimal digits. + +The default configuration is to compute all (required) 'SYSTEM +INFORMATION' messages automatically. + +Please see the _OsmoBSC VTY Reference Manual_ <> for +further information, particularly on the following commands: + +* `system-information (1|2|3|4|5|6|7|8|9|10|13|16|17|18|19|20|2bis|2ter|2quater|5bis|5ter) mode (static|computed)` +* `system-information (1|2|3|4|5|6|7|8|9|10|13|16|17|18|19|20|2bis|2ter|2quater|5bis|5ter) static HEXSTRING` + + +=== Neighbor List configuration + +Every BTS sends a list of ARFCNs of neighbor cells +. within its 'SYSTEM INFORMATION 2' (and 2bis/2ter) messages on the BCCH +. within its 'SYSTEM INFORMATION 5' messages on SACCH in dedicated mode + +For every BTS config node in the VTY, you can specify the behavior of +the neighbor list using the `neighbor list mode` VTY command: + +automatic:: + Automatically generate a list of neighbor cells using all other + BTSs configured in the VTY +manual:: + Manually specify the neighbor list by means of `neighbor-list +(add|del) arfcn <0-1023>` commands, having identical neighbor lists on +BCCH (SI2) and SACCH (SI5) + +manual-si5:: + Manually specify the neighbor list by means of `neighbor-list +(add|del) arfcn <0-1023>` for BCCH (SI2) and a separate neighbor list by +means of `si5 neighbor-list (add|del) arfcn <0-1023>` for SACCH (SI5). + + +=== Configuring GPRS PCU parameters of a BTS + +In the case of BTS models using Abis/IP (IPA), the GPRS PCU is located +inside the BTS. The BTS then establishes a Gb connection to the SGSN. + +All the BTS-internal PCU configuration is performed via A-bis OML by +means of configuring the 'CELL', 'NSVC' (NS Virtual Connection and 'NSE' +(NS Entity). + +There is one 'CELL' node and one 'NSE' node, but there are two 'NSVC' +nodes. At the time of this writing, only the NSVC 0 is supported by +OsmoBTS, while both NSVC are supported by the ip.access nanoBTS. + +The respective VTY configuration parameters are described below. They +all exist beneath each BTS VTY config node. + +But let's first start with a small example + +.Example configuration of GPRS PCU parameters at VTY BTS node +---- +OsmoBSC(config-net-bts)# gprs mode gprs +OsmoBSC(config-net-bts)# gprs routing area 1 +OsmoBSC(config-net-bts)# gprs cell bvci 1234 +OsmoBSC(config-net-bts)# gprs nsei 1234 +OsmoBSC(config-net-bts)# gprs nsvc 0 nsvci 1234 +OsmoBSC(config-net-bts)# gprs nsvc 0 local udp port 23000 +OsmoBSC(config-net-bts)# gprs nsvc 0 remote udp port 23000 +OsmoBSC(config-net-bts)# gprs nsvc 0 remote ip 192.168.100.239 +---- + + +=== More explanation about the PCU config parameters + +//FIXME: should this go into VTY additions? + +==== `gprs mode (none|gprs|egprs)` + +This command determines if GPRS (or EGPRS) services are to be enabled in +this cell at all. + + +==== `gprs cell bvci <2-65535>` + +Configures the 'BSSGP Virtual Circuit Identifier'. It must be unique +between all BGSGP connections to one SGSN. + +NOTE: It is up to the system administrator to ensure all PCUs are +allocated an unique bvci. OsmoBSC will not ensure this policy. + + +==== `gprs nsei <0-65535>` + +Configures the 'NS Entity Identifier'. It must be unique between all NS +connections to one SGSN. + +NOTE: It is up to the system administrator to ensure all PCUs are +allocated an unique bvci. OsmoBSC will not ensure this policy. + + +==== `gprs nsvc <0-1> nsvci <0-65535>` + +Configures the 'NS Virtual Connection Identifier'. It must be unique +between all NS virtual connections to one SGSN. + +NOTE: It is up to the system administrator to ensure all PCUs are +allocated an unique nsvci. OsmoBSC will not ensure this policy. + + +==== `gprs nsvc <0-1> local udp port <0-65535>` + +Configures the local (PCU side) UDP port for the NS-over-UDP link. + + +==== `gprs nsvc <0-1> remote udp port <0-65535>` + +Configures the remote (SGSN side) UDP port for the NS-over-UDP link. + + +==== `gprs nsvc <0-1> remote ip A.B.C.D` + +Configures the remote (SGSN side) UDP port for the NS-over-UDP link. + + +==== `gprs ns timer (tns-block|tns-block-retries|tns-reset|tns-reset-retries|tns-test|tns-alive|tns-alive-retries)` <0-255> + +Configures the various GPRS NS related timers. Please check the GPRS NS +specification for the detailed meaning of those timers. + + +=== Dynamic Timeslot Configuration (TCH / PDCH) + +A dynamic timeslot is in principle a voice timeslot (TCH) that is used to serve +GPRS data (PDCH) when no voice call is active on it. This enhances GPRS +bandwidth while no voice calls are active, which is dynamically scaled down as +voice calls need to be served. This is a tremendous improvement in service over +statically assigning a fixed number of timeslots for voice and data. + +The causality is as follows: to establish a voice call, the +MSC requests a logical channel of a given TCH kind from the BSC. The BSC +assigns such a channel from a BTS' TRX's timeslot of its choice. The knowledge +that a given timeslot is dynamic exists only on the BSC level. When the MSC +asks for a logical channel, the BSC may switch off PDCH on a dynamic timeslot +and then assign a logical TCH channel on it. Hence, though compatibility with +the BTS needs to be ensured, any MSC is compatible with dynamic timeslots by +definition. + +OsmoBSC support two kinds of dynamic timeslot handling, configured +via the `network` / `bts` / `trx` / `timeslot` / `phys_chan_config` +configuration. Not all BTS models support dynamic channels. + +[[dyn_ts_compat]] +.Dynamic timeslot support by various BTS models +[cols="50%,25%,25%"] +|=== +| |`TCH/F_TCH/H_PDCH` |`TCH/F_PDCH` +|ip.access nanoBTS |- |supported +|Ericsson RBS |supported |- +|sysmoBTS using _osmo-bts-sysmo_ |supported |supported +|various SDR platforms using _osmo-bts-trx_ |supported |supported +|Nutaq Litecell 1.5 using _osmo-bts-litecell15_ |supported |supported +|Octasic OctBTS using _osmo-bts-octphy_ | supported | supported +|=== + +The _OsmoBTS Abis Protocol Specification_ <> describes the +non-standard RSL messages used for these timeslot kinds. + +NOTE: Same as for dedicated PDCH timeslots, you need to enable GPRS and operate +a PCU, SGSN and GGSN to provide the actual data service. + +==== Osmocom Style Dynamic Timeslots (TCH/F_TCH/H_PDCH) + +Timeslots of the `TCH/F_TCH/H_PDCH` type dynamically switch between TCH/F, +TCH/H and PDCH, depending on the channel kind requested by the MSC. The RSL +messaging for `TCH/F_TCH/H_PDCH` timeslots is compatible with Ericsson RBS. + +BTS models supporting this timeslot kind are shown in <>. + +==== ip.access Style Dynamic Timeslots (TCH/F_PDCH) + +Timeslots of the `TCH/F_PDCH` type dynamically switch between TCH/F and PDCH. +The RSL messaging for `TCH/F_PDCH` timeslots is compatible with ip.access +nanoBTS. + +BTS models supporting this timeslot kind are shown in <>. + +==== Avoid PDCH Exhaustion + +To avoid disrupting GPRS, configure at least one timeslot as dedicated PDCH. +With only dynamic timeslots, a given number of voice calls would convert all +timeslots to TCH, and no PDCH timeslots would be left for GPRS service. + +==== Dynamic Timeslot Configuration Examples + +This is an extract of an `osmo-bsc`` config file. A timeslot configuration with +five Osmocom style dynamic timeslots and one dedicated PDCH may look like this: + +---- +network + bts 0 + trx 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config SDCCH8 + timeslot 2 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 3 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 5 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 6 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 7 + phys_chan_config PDCH +---- + +With the ip.access nanoBTS, only `TCH/F_PDCH` dynamic timeslots are supported, +and hence a nanoBTS configuration may look like this: + +---- +network + bts 0 + trx 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config SDCCH8 + timeslot 2 + phys_chan_config TCH/F_PDCH + timeslot 3 + phys_chan_config TCH/F_PDCH + timeslot 4 + phys_chan_config TCH/F_PDCH + timeslot 5 + phys_chan_config TCH/F_PDCH + timeslot 6 + phys_chan_config TCH/F_PDCH + timeslot 7 + phys_chan_config PDCH +---- + +=== Tuning Access to the BTS + +OsmoBSC offers several configuration options to fine-tune access to the BTS. +It can allow only a portion of the subscribers access to the network. +This can also be used to ramp up access to the network on startup by slowly +letting in more and more subscribers. This is especially useful for isolated +cells with a huge number of subscribers. + +Other options control the behaviour of the MS when it needs to access the +random access channel before a dedicated channel is established. + +If the BTS is connected to the BSC via a high-latency connection the MS should +wait longer for an answer to a RACH request. If it does not the network will +have to deal with an increased load due to duplicate RACH requests. However, +in order to minimize the delay when a RACH request or response gets lost the +MS should not wait too long before retransmitting. + +==== Load Management + +Every SIM card is member of one of the ten regular ACCs (0-9). Access to the +BTS can be restricted to SIMs that are members of certain ACCs. + +Since the ACCs are distributed uniformly across all SIMs allowing only ACCs +0-4 to connect to the BTS should reduce its load by 50%. + +The default is to allow all ACCs to connect. + +.Example: Restrict access to the BTS by ACC +---- +network + bts 0 + rach access-control-class 1 barred <1> + rach access-control-class 9 allowed <2> +---- +<1> Disallow SIMs with access-class 1 from connecting to the BTS +<2> Permit SIMs with access-class 9 to connect to the BTS. + + +Smaller cells with lots of subscribers can be overwhelmed with traffic after +the network is turned on. This is especially true in areas with little to no +reception from other networks. To manage the load OsmoBSC has an option to +enable one Access Class at a time so initial access to the network is +distributed across a longer time. + +.Example: Ramp up access to the BTS after startup +---- +network + bts 0 + access-control-class-ramping <1> + access-control-class-ramping-step-interval 30 <2> + access-control-class-ramping-step-size 1 <3> +---- +<1> Turn on access-control-class ramping +<2> Enable more ACCs every 30 seconds +<3> At each step enable one more ACC + + +==== RACH Parameter Configuration + +The following parameters allow control over how the MS can access the random +access channel (RACH). It is possible to set a minimum receive level under +which the MS will not even attempt to access the network. + +The RACH is a shared channel which means multiple MS can choose to send a +request at the same time. To minimize the risk of a collision each MS will +choose a random number of RACH slots to wait before trying to send a RACH +request. + +On very busy networks the range this number is chosen from should be +high to avoid collisions, but a lower range reduces the overall delay when +trying to establish a channel. + +The option `rach tx integer N` controls the range from which this number X +is chosen. It is `0 <= X < max(8,N)`. + +After sending a RACH request the MS will wait a random amount of slots before +retransmitting its RACH request. The range it will wait is also determined by +the option `rach tx integer N`, but calculating it is not so straightforward. +It is defined as `S <= X < S+N` where `S` is determined from a table. + +In particular `S` is lowest when `N` is one of 3, 8, 14 or 50 and highest when +`N` is 7, 12 or 32. + +For more information see _3GPP TA 44.018_ <<3gpp-ts-44-018>> Ch. 3.3.1.1.2 and +Table 3.3.1.1.2.1 in particular. + +The amount of times the MS attempts to retransmit RACH requests can also be +changed. A higher number means more load on the RACH while a lower number can +cause channel establishment to fail due to collisions or bad reception. + +.Example: Configure RACH Access Parameters +---- +network + bts 0 + rxlev access min 20 <1> + rach tx integer 50<2> + rach max transmission <3> +---- +<1> Allow access to the network if the MS receives the BCCH of the cell at +-90dBm or better (20dB above -110dBm). +<2> This number affects how long the MS waits before (re-)transmitting RACH +requests. +<3> How often to retransmit the RACH request. diff --git a/manuals/OsmoNITB/osmonitb-usermanual.adoc b/manuals/OsmoNITB/osmonitb-usermanual.adoc index 543e836..5058d02 100644 --- a/manuals/OsmoNITB/osmonitb-usermanual.adoc +++ b/manuals/OsmoNITB/osmonitb-usermanual.adoc @@ -24,9 +24,9 @@ include::{srcdir}/chapters/net.adoc[] -include::./common/chapters/bsc.adoc[] +include::{srcdir}/chapters/bsc.adoc[] -include::./common/chapters/bts.adoc[] +include::{srcdir}/chapters/bts.adoc[] include::{srcdir}/chapters/bts-examples.adoc[] @@ -49,4 +49,3 @@ include::./common/chapters/glossary.adoc[] include::./common/chapters/gfdl.adoc[] - -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/19329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ic3b4192238be3147f61779845521eae84511fb7e Gerrit-Change-Number: 19329 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 11:20:02 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 11:20:02 +0000 Subject: Change in osmo-gsm-manuals[master]: Drop common/chapters/{bts, bsc}.adoc References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19330 ) Change subject: Drop common/chapters/{bts,bsc}.adoc ...................................................................... Drop common/chapters/{bts,bsc}.adoc Those files were only used by osmo-bsc.git and openbsc.git, the later being depreacted and not maintained. Hence, new features are added to the first one only, and documentation diverges over time, so it makes no sense to keep it shared. Files were copied over in: openbsc.git Change-Id Ic3b4192238be3147f61779845521eae84511fb7e osmo-bsc.git Change-Id I20aa60d2f4111d66e922f3e2a73a20352ec1f7e4 Change-Id: I4d98049f6b49871bf5aabe4392da7a608fbc1fe9 --- D common/chapters/bsc.adoc D common/chapters/bts.adoc 2 files changed, 0 insertions(+), 625 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/30/19330/1 diff --git a/common/chapters/bsc.adoc b/common/chapters/bsc.adoc deleted file mode 100644 index 49d25e5..0000000 --- a/common/chapters/bsc.adoc +++ /dev/null @@ -1,120 +0,0 @@ -== BSC level configuration - -The BSC component is shared between OsmoBSC and OsmoNITB. This chapter -describes some of the configuration options related to this shared BSC -component. - -=== Hand-over - -==== Hand-over in GSM - -Hand-over is the process of changing a MS with a currently active -dedicated channel from one BTS to another BTS. As opposed to idle mode, -where the MS autonomously performs cell re-selection, in dedicated mode -this happens under network control. - -In order to determine when to perform hand-over, and to which cells, the -network requests the MS to perform measurements on a list of neighbor -cell channels, which the MS then reports back to the network in the form -of GSM RR 'Measurement Result' messages. Those messages contain the -downlink measurements as determined by the MS. - -Furthermore, the BTS also performs measurements on the uplink, and -communicates those by means of RSL to the BSC. - -The hand-over decision is made by an algorithm that processes those -measurement results and determines when to perform the hand-over. - -==== Configuration of hand-over in OsmoBSC/OsmoNITB - -OsmoBSC (like the internal BSC component of OsmoNITB) only support -so-called intra-BSC hand-over, where the hand-over is performed between -two BTSs within the same BSC. - -Hand-over is enabled and configured by the use of a set of `handover` -commands. Using those, you can tune the key parameters of the hand-over -algorithm and adapt it to your specific environment. - -.Example handover configuration snippet ----- - handover 1 <1> - handover window rxlev averaging 10 <2> - handover window rxqual averaging 1 <3> - handover window rxlev neighbor averaging 10 <4> - handover power budget interval 6 <5> - handover power budget hysteresis 3 <6> - handover maximum distance 9999 <7> ----- -<1> Enable hand-over -<2> Set the RxLev averaging window for the serving cell to 10 measurements -<3> Set the RxQual averaging window for the serving cell to 1 - measurement (no window) -<4> Set the RxLev averaging for neighbor cells to 10 measurements -<5> Check for the conditions of a power budget hand-over every 6 SACCH - frames -<6> A neighbor cell must be at least 3 dB stronger than the serving cell - to be considered a candidate for hand-over -<7> Perform a maximum distance hand-over if TA is larger 9999 (i.e. never) - -//TODO: Move all to BSC node - -=== Timer Configuration - -The GSM specification specifies a variety of timers both on the network -as well as on the mobile station side. - -Those timers can be configured using the `timer tXXXX` command. - -.Configurable Timers -|=== -|node|timer|default|description -|network|t3101|10|Timeout for 'Immediate Assignment' (sec) -|network|t3103|?|Timeout for Handover (sec) -|network|t3105|40|Repetition of 'Physical Information' (sec) -|network|t3107|?|? -|network|t3109|?|RSL SACCH deactivation timeout (sec) -|network|t3111|?|RSL timeout to wait before releasing the RF channel (sec) -|network|t3113|60|Time to try paging for a subscriber (sec) -|network|t3115|?|? -|network|t3117|?|? -|network|t3119|?|? -|network|t3122|10|Waiting time after 'Immediate Assignment Reject' -|network|t3141|?|? -|=== - -//TODO: split between BSC and MSC timers - -=== Discontinuous Transmission (DTX) - -GSM provides a full-duplex voice call service. However, in any -civilized communication between human beings, only one of the -participants is speaking at any given point in time. This means that -most of the time, one of the two directions of the radio link is -transmitting so-called 'silence frames'. - -During such periods of quiescence in one of the two directions, it is -possible to suppress transmission of most of the radio bursts, as there -is no voice signal to transport. GSM calls this feature 'Discontinuous -Transmission'. It exists separately for uplink (DTXu) and downlink -(DTXd). - -Downlink DTX is only permitted on non-primary transceivers (!= TRX0), as -TRX0 must always transmit at constant output power to ensure it is -detected during cell selection. - -Uplink DTX is possible on any TRX, and serves primarily two uses: - -possible on any TRX, and serves primarily two uses: - -. reducing the MS battery consumption by transmitting at a lower duty cycle -. reducing the uplink interference caused in surrounding cells that - re-use the same ARFCN. - -DTS for both uplink and downlink is implemented in the BTS. Not all BTS -models support it. - -The Osmocom BSC component can instruct the BTS to enable or disable -uplink and/or downlink DTX by means of A-bis OML. - -//TODO: Test/implement, at least for uplink -//TODO: Move to BSC diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc deleted file mode 100644 index 223cec1..0000000 --- a/common/chapters/bts.adoc +++ /dev/null @@ -1,505 +0,0 @@ -[[bts]] -== Reviewing and Provisioning BTS configuration - -The main functionality of the BSC component is to manage BTSs. As such, -provisioning BTSs within the BSC is one of the most common tasks during -BSC operation. Just like about anything else in OsmoBSC, they are -configured using the VTY. - -BTSs are internally numbered with integer numbers starting from "0" for -the first BTS. BTS numbers have to be contiguous, so you cannot -configure 0,1,2 and then 5. - - -=== Reviewing current BTS status and configuration - -In order to view the status and properties of a BTS, you can issue the -`show bts` command. If used without any BTS number, it will display -information about all provisioned BTS numbers. - ----- -OsmoBSC> show bts 0 -BTS 0 is of nanobts type in band DCS1800, has CI 0 LAC 1, BSIC 63, TSC 7 and 1 TRX -Description: (null) -MS Max power: 15 dBm -Minimum Rx Level for Access: -110 dBm -Cell Reselection Hysteresis: 4 dBm -RACH TX-Integer: 9 -RACH Max transmissions: 7 -System Information present: 0x0000007e, static: 0x00000000 - Unit ID: 200/0/0, OML Stream ID 0xff - NM State: Oper 'Enabled', Admin 2, Avail 'OK' - Site Mgr NM State: Oper 'Enabled', Admin 0, Avail 'OK' - Paging: 0 pending requests, 0 free slots - OML Link state: connected. - Current Channel Load: - TCH/F: 0% (0/5) - SDCCH8: 0% (0/8) ----- - -You can also review the status of the TRXs configured within the BTSs of -this BSC by using `show trx`: - ----- -OsmoBSC> show trx 0 0 -TRX 0 of BTS 0 is on ARFCN 871 -Description: (null) - RF Nominal Power: 23 dBm, reduced by 0 dB, resulting BS power: 23 dBm - NM State: Oper 'Enabled', Admin 2, Avail 'OK' - Baseband Transceiver NM State: Oper 'Enabled', Admin 2, Avail 'OK' - ip.access stream ID: 0x00 ----- - -The output can be restricted to the TRXs of one specified BTS number -(`show trx 0`) or even that of a single specified TRX within a -specified BTS (`show trx 0 0`). - -Furthermore, information on the individual timeslots can be shown by -means of `show timeslot`. The output can be restricted to the -timeslots of a single BTS (`show timeslot 0`) or that of a single -TRX (`show timeslot 0 0`). Finally, you can restrict the output to -a single timeslot by specifying the BTS, TRX and TS numbers (`show -timeslot 0 0 4`). - ----- -OsmoBSC> show timeslot 0 0 0 -BTS 0, TRX 0, Timeslot 0, phys cfg CCCH, TSC 7 - NM State: Oper 'Enabled', Admin 2, Avail 'OK' -OsmoBSC> show timeslot 0 0 1 -BTS 0, TRX 0, Timeslot 1, phys cfg SDCCH8, TSC 7 - NM State: Oper 'Enabled', Admin 2, Avail 'OK' ----- - - -=== Provisioning a new BTS - -In order to provision BTSs, you have to enter the BTS config node of the -VTY. In order to configure BTS 0, you can issue the following sequence -of commands: - ----- -OsmoBSC> enable -OsmoBSC# configure terminal -OsmoBSC(config)# network -OsmoBSC(config-net)# bts 0 -OsmoBSC(config-net-bts)# ----- - -At this point, you have a plethora of commands, in fact an entire -hierarchy of commands to configure all aspects of the BTS, as well as -each of its TRX and each timeslot within each TRX. For a full -reference, please consult the telnet VTY integrated help or the respective -chapter in the VTY reference. - -BTS configuration depends quite a bit on the specific BTS vendor and -model. The section below provides just one possible example for the -case of a sysmoBTS. - -Note that from the `configure terminal` command onwards, the telnet VTY -commands above are identical to configuration file settings, for details see -<>. - -Starting with `network` as above, your complete sysmoBTS configuration may look -like this: - ----- -network - bts 0 - type sysmobts - band DCS1800 - description The new BTS in Baikonur - location_area_code 2342 - cell_identity 5 - base_station_id_code 63 - ip.access unit_id 8888 0 - ms max power 40 - trx 0 - arfcn 871 - nominal power 23 - max_power_red 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - timeslot 1 - phys_chan_config TCH/F - timeslot 2 - phys_chan_config TCH/F - timeslot 3 - phys_chan_config TCH/F - timeslot 4 - phys_chan_config TCH/F - timeslot 5 - phys_chan_config TCH/F - timeslot 6 - phys_chan_config TCH/F - timeslot 7 - phys_chan_config PDCH ----- - - -=== System Information configuration - -A GSM BTS periodically transmits a series of 'SYSTEM INFORMATION' -messages to mobile stations, both via the BCCH in idle mode, was well as -via the SACCH in dedicated mode. There are many different types of such -messages. For their detailed contents and encoding, please see _3GPP TS -24.008_ <<3gpp-ts-24-008>>. - -For each of the 'SYSTEM INFORMATION' message types, you can configure to -have the BSC generate it automatically ('computed'), or you can specify -the respective binary message as a string of hexadecimal digits. - -The default configuration is to compute all (required) 'SYSTEM -INFORMATION' messages automatically. - -Please see the _OsmoBSC VTY Reference Manual_ <> for -further information, particularly on the following commands: - -* `system-information (1|2|3|4|5|6|7|8|9|10|13|16|17|18|19|20|2bis|2ter|2quater|5bis|5ter) mode (static|computed)` -* `system-information (1|2|3|4|5|6|7|8|9|10|13|16|17|18|19|20|2bis|2ter|2quater|5bis|5ter) static HEXSTRING` - - -=== Neighbor List configuration - -Every BTS sends a list of ARFCNs of neighbor cells -. within its 'SYSTEM INFORMATION 2' (and 2bis/2ter) messages on the BCCH -. within its 'SYSTEM INFORMATION 5' messages on SACCH in dedicated mode - -For every BTS config node in the VTY, you can specify the behavior of -the neighbor list using the `neighbor list mode` VTY command: - -automatic:: - Automatically generate a list of neighbor cells using all other - BTSs configured in the VTY -manual:: - Manually specify the neighbor list by means of `neighbor-list -(add|del) arfcn <0-1023>` commands, having identical neighbor lists on -BCCH (SI2) and SACCH (SI5) - -manual-si5:: - Manually specify the neighbor list by means of `neighbor-list -(add|del) arfcn <0-1023>` for BCCH (SI2) and a separate neighbor list by -means of `si5 neighbor-list (add|del) arfcn <0-1023>` for SACCH (SI5). - - -=== Configuring GPRS PCU parameters of a BTS - -In the case of BTS models using Abis/IP (IPA), the GPRS PCU is located -inside the BTS. The BTS then establishes a Gb connection to the SGSN. - -All the BTS-internal PCU configuration is performed via A-bis OML by -means of configuring the 'CELL', 'NSVC' (NS Virtual Connection and 'NSE' -(NS Entity). - -There is one 'CELL' node and one 'NSE' node, but there are two 'NSVC' -nodes. At the time of this writing, only the NSVC 0 is supported by -OsmoBTS, while both NSVC are supported by the ip.access nanoBTS. - -The respective VTY configuration parameters are described below. They -all exist beneath each BTS VTY config node. - -But let's first start with a small example - -.Example configuration of GPRS PCU parameters at VTY BTS node ----- -OsmoBSC(config-net-bts)# gprs mode gprs -OsmoBSC(config-net-bts)# gprs routing area 1 -OsmoBSC(config-net-bts)# gprs cell bvci 1234 -OsmoBSC(config-net-bts)# gprs nsei 1234 -OsmoBSC(config-net-bts)# gprs nsvc 0 nsvci 1234 -OsmoBSC(config-net-bts)# gprs nsvc 0 local udp port 23000 -OsmoBSC(config-net-bts)# gprs nsvc 0 remote udp port 23000 -OsmoBSC(config-net-bts)# gprs nsvc 0 remote ip 192.168.100.239 ----- - - -=== More explanation about the PCU config parameters - -//FIXME: should this go into VTY additions? - -==== `gprs mode (none|gprs|egprs)` - -This command determines if GPRS (or EGPRS) services are to be enabled in -this cell at all. - - -==== `gprs cell bvci <2-65535>` - -Configures the 'BSSGP Virtual Circuit Identifier'. It must be unique -between all BGSGP connections to one SGSN. - -NOTE: It is up to the system administrator to ensure all PCUs are -allocated an unique bvci. OsmoBSC will not ensure this policy. - - -==== `gprs nsei <0-65535>` - -Configures the 'NS Entity Identifier'. It must be unique between all NS -connections to one SGSN. - -NOTE: It is up to the system administrator to ensure all PCUs are -allocated an unique bvci. OsmoBSC will not ensure this policy. - - -==== `gprs nsvc <0-1> nsvci <0-65535>` - -Configures the 'NS Virtual Connection Identifier'. It must be unique -between all NS virtual connections to one SGSN. - -NOTE: It is up to the system administrator to ensure all PCUs are -allocated an unique nsvci. OsmoBSC will not ensure this policy. - - -==== `gprs nsvc <0-1> local udp port <0-65535>` - -Configures the local (PCU side) UDP port for the NS-over-UDP link. - - -==== `gprs nsvc <0-1> remote udp port <0-65535>` - -Configures the remote (SGSN side) UDP port for the NS-over-UDP link. - - -==== `gprs nsvc <0-1> remote ip A.B.C.D` - -Configures the remote (SGSN side) UDP port for the NS-over-UDP link. - - -==== `gprs ns timer (tns-block|tns-block-retries|tns-reset|tns-reset-retries|tns-test|tns-alive|tns-alive-retries)` <0-255> - -Configures the various GPRS NS related timers. Please check the GPRS NS -specification for the detailed meaning of those timers. - - -=== Dynamic Timeslot Configuration (TCH / PDCH) - -A dynamic timeslot is in principle a voice timeslot (TCH) that is used to serve -GPRS data (PDCH) when no voice call is active on it. This enhances GPRS -bandwidth while no voice calls are active, which is dynamically scaled down as -voice calls need to be served. This is a tremendous improvement in service over -statically assigning a fixed number of timeslots for voice and data. - -The causality is as follows: to establish a voice call, the -MSC requests a logical channel of a given TCH kind from the BSC. The BSC -assigns such a channel from a BTS' TRX's timeslot of its choice. The knowledge -that a given timeslot is dynamic exists only on the BSC level. When the MSC -asks for a logical channel, the BSC may switch off PDCH on a dynamic timeslot -and then assign a logical TCH channel on it. Hence, though compatibility with -the BTS needs to be ensured, any MSC is compatible with dynamic timeslots by -definition. - -OsmoBSC and OsmoNITB support two kinds of dynamic timeslot handling, configured -via the `network` / `bts` / `trx` / `timeslot` / `phys_chan_config` -configuration. Not all BTS models support dynamic channels. - -[[dyn_ts_compat]] -.Dynamic timeslot support by various BTS models -[cols="50%,25%,25%"] -|=== -| |`TCH/F_TCH/H_PDCH` |`TCH/F_PDCH` -|ip.access nanoBTS |- |supported -|Ericsson RBS |supported |- -|sysmoBTS using _osmo-bts-sysmo_ |supported |supported -|various SDR platforms using _osmo-bts-trx_ |supported |supported -|Nutaq Litecell 1.5 using _osmo-bts-litecell15_ |supported |supported -|Octasic OctBTS using _osmo-bts-octphy_ | supported | supported -|=== - -The _OsmoBTS Abis Protocol Specification_ <> describes the -non-standard RSL messages used for these timeslot kinds. - -NOTE: Same as for dedicated PDCH timeslots, you need to enable GPRS and operate -a PCU, SGSN and GGSN to provide the actual data service. - -==== Osmocom Style Dynamic Timeslots (TCH/F_TCH/H_PDCH) - -Timeslots of the `TCH/F_TCH/H_PDCH` type dynamically switch between TCH/F, -TCH/H and PDCH, depending on the channel kind requested by the MSC. The RSL -messaging for `TCH/F_TCH/H_PDCH` timeslots is compatible with Ericsson RBS. - -BTS models supporting this timeslot kind are shown in <>. - -In the lack of transcoding capabilities, this timeslot type may cause -mismatching codecs to be selected for two parties of the same call, which would -cause call routing to fail ("`Cannot patch through call with different channel -types: local = TCH_F, remote = TCH_H`"). A workaround is to disable TCH/F on -this timeslot type, i.e. to allow only TCH/H. To disable TCH/F on Osmocom -style dynamic timeslots, use a configuration of - ----- -network - dyn_ts_allow_tch_f 0 ----- - -In OsmoNITB, disabling TCH/F on Osmocom dynamic timeslots is the default. In -OsmoBSC, the default is to allow both. - -==== ip.access Style Dynamic Timeslots (TCH/F_PDCH) - -Timeslots of the `TCH/F_PDCH` type dynamically switch between TCH/F and PDCH. -The RSL messaging for `TCH/F_PDCH` timeslots is compatible with ip.access -nanoBTS. - -BTS models supporting this timeslot kind are shown in <>. - -==== Avoid PDCH Exhaustion - -To avoid disrupting GPRS, configure at least one timeslot as dedicated PDCH. -With only dynamic timeslots, a given number of voice calls would convert all -timeslots to TCH, and no PDCH timeslots would be left for GPRS service. - -==== Dynamic Timeslot Configuration Examples - -This is an extract of an `osmo-bsc` or `osmo-nitb` config file. A timeslot -configuration with five Osmocom style dynamic timeslots and one dedicated PDCH -may look like this: - ----- -network - bts 0 - trx 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - timeslot 1 - phys_chan_config SDCCH8 - timeslot 2 - phys_chan_config TCH/F_TCH/H_PDCH - timeslot 3 - phys_chan_config TCH/F_TCH/H_PDCH - timeslot 4 - phys_chan_config TCH/F_TCH/H_PDCH - timeslot 5 - phys_chan_config TCH/F_TCH/H_PDCH - timeslot 6 - phys_chan_config TCH/F_TCH/H_PDCH - timeslot 7 - phys_chan_config PDCH ----- - -With the ip.access nanoBTS, only `TCH/F_PDCH` dynamic timeslots are supported, -and hence a nanoBTS configuration may look like this: - ----- -network - bts 0 - trx 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - timeslot 1 - phys_chan_config SDCCH8 - timeslot 2 - phys_chan_config TCH/F_PDCH - timeslot 3 - phys_chan_config TCH/F_PDCH - timeslot 4 - phys_chan_config TCH/F_PDCH - timeslot 5 - phys_chan_config TCH/F_PDCH - timeslot 6 - phys_chan_config TCH/F_PDCH - timeslot 7 - phys_chan_config PDCH ----- - -=== Tuning Access to the BTS - -OsmoBSC offers several configuration options to fine-tune access to the BTS. -It can allow only a portion of the subscribers access to the network. -This can also be used to ramp up access to the network on startup by slowly -letting in more and more subscribers. This is especially useful for isolated -cells with a huge number of subscribers. - -Other options control the behaviour of the MS when it needs to access the -random access channel before a dedicated channel is established. - -If the BTS is connected to the BSC via a high-latency connection the MS should -wait longer for an answer to a RACH request. If it does not the network will -have to deal with an increased load due to duplicate RACH requests. However, -in order to minimize the delay when a RACH request or response gets lost the -MS should not wait too long before retransmitting. - -==== Load Management - -Every SIM card is member of one of the ten regular ACCs (0-9). Access to the -BTS can be restricted to SIMs that are members of certain ACCs. - -Since the ACCs are distributed uniformly across all SIMs allowing only ACCs -0-4 to connect to the BTS should reduce its load by 50%. - -The default is to allow all ACCs to connect. - -.Example: Restrict access to the BTS by ACC ----- -network - bts 0 - rach access-control-class 1 barred <1> - rach access-control-class 9 allowed <2> ----- -<1> Disallow SIMs with access-class 1 from connecting to the BTS -<2> Permit SIMs with access-class 9 to connect to the BTS. - - -Smaller cells with lots of subscribers can be overwhelmed with traffic after -the network is turned on. This is especially true in areas with little to no -reception from other networks. To manage the load OsmoBSC has an option to -enable one Access Class at a time so initial access to the network is -distributed across a longer time. - -.Example: Ramp up access to the BTS after startup ----- -network - bts 0 - access-control-class-ramping <1> - access-control-class-ramping-step-interval 30 <2> - access-control-class-ramping-step-size 1 <3> ----- -<1> Turn on access-control-class ramping -<2> Enable more ACCs every 30 seconds -<3> At each step enable one more ACC - - -==== RACH Parameter Configuration - -The following parameters allow control over how the MS can access the random -access channel (RACH). It is possible to set a minimum receive level under -which the MS will not even attempt to access the network. - -The RACH is a shared channel which means multiple MS can choose to send a -request at the same time. To minimize the risk of a collision each MS will -choose a random number of RACH slots to wait before trying to send a RACH -request. - -On very busy networks the range this number is chosen from should be -high to avoid collisions, but a lower range reduces the overall delay when -trying to establish a channel. - -The option `rach tx integer N` controls the range from which this number X -is chosen. It is `0 <= X < max(8,N)`. - -After sending a RACH request the MS will wait a random amount of slots before -retransmitting its RACH request. The range it will wait is also determined by -the option `rach tx integer N`, but calculating it is not so straightforward. -It is defined as `S <= X < S+N` where `S` is determined from a table. - -In particular `S` is lowest when `N` is one of 3, 8, 14 or 50 and highest when -`N` is 7, 12 or 32. - -For more information see _3GPP TA 44.018_ <<3gpp-ts-44-018>> Ch. 3.3.1.1.2 and -Table 3.3.1.1.2.1 in particular. - -The amount of times the MS attempts to retransmit RACH requests can also be -changed. A higher number means more load on the RACH while a lower number can -cause channel establishment to fail due to collisions or bad reception. - -.Example: Configure RACH Access Parameters ----- -network - bts 0 - rxlev access min 20 <1> - rach tx integer 50<2> - rach max transmission <3> ----- -<1> Allow access to the network if the MS receives the BCCH of the cell at --90dBm or better (20dB above -110dBm). -<2> This number affects how long the MS waits before (re-)transmitting RACH -requests. -<3> How often to retransmit the RACH request. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I4d98049f6b49871bf5aabe4392da7a608fbc1fe9 Gerrit-Change-Number: 19330 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 11:56:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 11:56:30 +0000 Subject: Change in openbsc[master]: doc: Copy {bsc, bts}.adoc from osmo-gsm-manuals In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/19329 ) Change subject: doc: Copy {bsc,bts}.adoc from osmo-gsm-manuals ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/19329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ic3b4192238be3147f61779845521eae84511fb7e Gerrit-Change-Number: 19329 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jul 2020 11:56:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 11:56:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 11:56:48 +0000 Subject: Change in openbsc[master]: doc: Copy {bsc, bts}.adoc from osmo-gsm-manuals In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/openbsc/+/19329 ) Change subject: doc: Copy {bsc,bts}.adoc from osmo-gsm-manuals ...................................................................... doc: Copy {bsc,bts}.adoc from osmo-gsm-manuals Those adoc files are only used by osmo-bsc.git and openbsc.git (osmo-nitb), and the later is deprecated and no longer maintained, which means new features are only added to BSC. Hence it makes no sense to keep the doc shared between both. As a result, they will be dropped from osmo-gsm-manuals.git and we keep an unmodified copy here. Change-Id: Ic3b4192238be3147f61779845521eae84511fb7e --- A manuals/OsmoNITB/chapters/bsc.adoc A manuals/OsmoNITB/chapters/bts.adoc M manuals/OsmoNITB/osmonitb-usermanual.adoc 3 files changed, 611 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/manuals/OsmoNITB/chapters/bsc.adoc b/manuals/OsmoNITB/chapters/bsc.adoc new file mode 100644 index 0000000..49d25e5 --- /dev/null +++ b/manuals/OsmoNITB/chapters/bsc.adoc @@ -0,0 +1,120 @@ +== BSC level configuration + +The BSC component is shared between OsmoBSC and OsmoNITB. This chapter +describes some of the configuration options related to this shared BSC +component. + +=== Hand-over + +==== Hand-over in GSM + +Hand-over is the process of changing a MS with a currently active +dedicated channel from one BTS to another BTS. As opposed to idle mode, +where the MS autonomously performs cell re-selection, in dedicated mode +this happens under network control. + +In order to determine when to perform hand-over, and to which cells, the +network requests the MS to perform measurements on a list of neighbor +cell channels, which the MS then reports back to the network in the form +of GSM RR 'Measurement Result' messages. Those messages contain the +downlink measurements as determined by the MS. + +Furthermore, the BTS also performs measurements on the uplink, and +communicates those by means of RSL to the BSC. + +The hand-over decision is made by an algorithm that processes those +measurement results and determines when to perform the hand-over. + +==== Configuration of hand-over in OsmoBSC/OsmoNITB + +OsmoBSC (like the internal BSC component of OsmoNITB) only support +so-called intra-BSC hand-over, where the hand-over is performed between +two BTSs within the same BSC. + +Hand-over is enabled and configured by the use of a set of `handover` +commands. Using those, you can tune the key parameters of the hand-over +algorithm and adapt it to your specific environment. + +.Example handover configuration snippet +---- + handover 1 <1> + handover window rxlev averaging 10 <2> + handover window rxqual averaging 1 <3> + handover window rxlev neighbor averaging 10 <4> + handover power budget interval 6 <5> + handover power budget hysteresis 3 <6> + handover maximum distance 9999 <7> +---- +<1> Enable hand-over +<2> Set the RxLev averaging window for the serving cell to 10 measurements +<3> Set the RxQual averaging window for the serving cell to 1 + measurement (no window) +<4> Set the RxLev averaging for neighbor cells to 10 measurements +<5> Check for the conditions of a power budget hand-over every 6 SACCH + frames +<6> A neighbor cell must be at least 3 dB stronger than the serving cell + to be considered a candidate for hand-over +<7> Perform a maximum distance hand-over if TA is larger 9999 (i.e. never) + +//TODO: Move all to BSC node + +=== Timer Configuration + +The GSM specification specifies a variety of timers both on the network +as well as on the mobile station side. + +Those timers can be configured using the `timer tXXXX` command. + +.Configurable Timers +|=== +|node|timer|default|description +|network|t3101|10|Timeout for 'Immediate Assignment' (sec) +|network|t3103|?|Timeout for Handover (sec) +|network|t3105|40|Repetition of 'Physical Information' (sec) +|network|t3107|?|? +|network|t3109|?|RSL SACCH deactivation timeout (sec) +|network|t3111|?|RSL timeout to wait before releasing the RF channel (sec) +|network|t3113|60|Time to try paging for a subscriber (sec) +|network|t3115|?|? +|network|t3117|?|? +|network|t3119|?|? +|network|t3122|10|Waiting time after 'Immediate Assignment Reject' +|network|t3141|?|? +|=== + +//TODO: split between BSC and MSC timers + +=== Discontinuous Transmission (DTX) + +GSM provides a full-duplex voice call service. However, in any +civilized communication between human beings, only one of the +participants is speaking at any given point in time. This means that +most of the time, one of the two directions of the radio link is +transmitting so-called 'silence frames'. + +During such periods of quiescence in one of the two directions, it is +possible to suppress transmission of most of the radio bursts, as there +is no voice signal to transport. GSM calls this feature 'Discontinuous +Transmission'. It exists separately for uplink (DTXu) and downlink +(DTXd). + +Downlink DTX is only permitted on non-primary transceivers (!= TRX0), as +TRX0 must always transmit at constant output power to ensure it is +detected during cell selection. + +Uplink DTX is possible on any TRX, and serves primarily two uses: + +possible on any TRX, and serves primarily two uses: + +. reducing the MS battery consumption by transmitting at a lower duty cycle +. reducing the uplink interference caused in surrounding cells that + re-use the same ARFCN. + +DTS for both uplink and downlink is implemented in the BTS. Not all BTS +models support it. + +The Osmocom BSC component can instruct the BTS to enable or disable +uplink and/or downlink DTX by means of A-bis OML. + +//TODO: Test/implement, at least for uplink +//TODO: Move to BSC diff --git a/manuals/OsmoNITB/chapters/bts.adoc b/manuals/OsmoNITB/chapters/bts.adoc new file mode 100644 index 0000000..2c09dc3 --- /dev/null +++ b/manuals/OsmoNITB/chapters/bts.adoc @@ -0,0 +1,489 @@ +[[bts]] +== Reviewing and Provisioning BTS configuration + +The main functionality of the BSC component is to manage BTSs. As such, +provisioning BTSs within the BSC is one of the most common tasks during +BSC operation. Just like about anything else in OsmoBSC, they are +configured using the VTY. + +BTSs are internally numbered with integer numbers starting from "0" for +the first BTS. BTS numbers have to be contiguous, so you cannot +configure 0,1,2 and then 5. + + +=== Reviewing current BTS status and configuration + +In order to view the status and properties of a BTS, you can issue the +`show bts` command. If used without any BTS number, it will display +information about all provisioned BTS numbers. + +---- +OsmoBSC> show bts 0 +BTS 0 is of nanobts type in band DCS1800, has CI 0 LAC 1, BSIC 63, TSC 7 and 1 TRX +Description: (null) +MS Max power: 15 dBm +Minimum Rx Level for Access: -110 dBm +Cell Reselection Hysteresis: 4 dBm +RACH TX-Integer: 9 +RACH Max transmissions: 7 +System Information present: 0x0000007e, static: 0x00000000 + Unit ID: 200/0/0, OML Stream ID 0xff + NM State: Oper 'Enabled', Admin 2, Avail 'OK' + Site Mgr NM State: Oper 'Enabled', Admin 0, Avail 'OK' + Paging: 0 pending requests, 0 free slots + OML Link state: connected. + Current Channel Load: + TCH/F: 0% (0/5) + SDCCH8: 0% (0/8) +---- + +You can also review the status of the TRXs configured within the BTSs of +this BSC by using `show trx`: + +---- +OsmoBSC> show trx 0 0 +TRX 0 of BTS 0 is on ARFCN 871 +Description: (null) + RF Nominal Power: 23 dBm, reduced by 0 dB, resulting BS power: 23 dBm + NM State: Oper 'Enabled', Admin 2, Avail 'OK' + Baseband Transceiver NM State: Oper 'Enabled', Admin 2, Avail 'OK' + ip.access stream ID: 0x00 +---- + +The output can be restricted to the TRXs of one specified BTS number +(`show trx 0`) or even that of a single specified TRX within a +specified BTS (`show trx 0 0`). + +Furthermore, information on the individual timeslots can be shown by +means of `show timeslot`. The output can be restricted to the +timeslots of a single BTS (`show timeslot 0`) or that of a single +TRX (`show timeslot 0 0`). Finally, you can restrict the output to +a single timeslot by specifying the BTS, TRX and TS numbers (`show +timeslot 0 0 4`). + +---- +OsmoBSC> show timeslot 0 0 0 +BTS 0, TRX 0, Timeslot 0, phys cfg CCCH, TSC 7 + NM State: Oper 'Enabled', Admin 2, Avail 'OK' +OsmoBSC> show timeslot 0 0 1 +BTS 0, TRX 0, Timeslot 1, phys cfg SDCCH8, TSC 7 + NM State: Oper 'Enabled', Admin 2, Avail 'OK' +---- + + +=== Provisioning a new BTS + +In order to provision BTSs, you have to enter the BTS config node of the +VTY. In order to configure BTS 0, you can issue the following sequence +of commands: + +---- +OsmoBSC> enable +OsmoBSC# configure terminal +OsmoBSC(config)# network +OsmoBSC(config-net)# bts 0 +OsmoBSC(config-net-bts)# +---- + +At this point, you have a plethora of commands, in fact an entire +hierarchy of commands to configure all aspects of the BTS, as well as +each of its TRX and each timeslot within each TRX. For a full +reference, please consult the telnet VTY integrated help or the respective +chapter in the VTY reference. + +BTS configuration depends quite a bit on the specific BTS vendor and +model. The section below provides just one possible example for the +case of a sysmoBTS. + +Note that from the `configure terminal` command onwards, the telnet VTY +commands above are identical to configuration file settings, for details see +<>. + +Starting with `network` as above, your complete sysmoBTS configuration may look +like this: + +---- +network + bts 0 + type sysmobts + band DCS1800 + description The new BTS in Baikonur + location_area_code 2342 + cell_identity 5 + base_station_id_code 63 + ip.access unit_id 8888 0 + ms max power 40 + trx 0 + arfcn 871 + nominal power 23 + max_power_red 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config TCH/F + timeslot 2 + phys_chan_config TCH/F + timeslot 3 + phys_chan_config TCH/F + timeslot 4 + phys_chan_config TCH/F + timeslot 5 + phys_chan_config TCH/F + timeslot 6 + phys_chan_config TCH/F + timeslot 7 + phys_chan_config PDCH +---- + + +=== System Information configuration + +A GSM BTS periodically transmits a series of 'SYSTEM INFORMATION' +messages to mobile stations, both via the BCCH in idle mode, was well as +via the SACCH in dedicated mode. There are many different types of such +messages. For their detailed contents and encoding, please see _3GPP TS +24.008_ <<3gpp-ts-24-008>>. + +For each of the 'SYSTEM INFORMATION' message types, you can configure to +have the BSC generate it automatically ('computed'), or you can specify +the respective binary message as a string of hexadecimal digits. + +The default configuration is to compute all (required) 'SYSTEM +INFORMATION' messages automatically. + +Please see the _OsmoBSC VTY Reference Manual_ <> for +further information, particularly on the following commands: + +* `system-information (1|2|3|4|5|6|7|8|9|10|13|16|17|18|19|20|2bis|2ter|2quater|5bis|5ter) mode (static|computed)` +* `system-information (1|2|3|4|5|6|7|8|9|10|13|16|17|18|19|20|2bis|2ter|2quater|5bis|5ter) static HEXSTRING` + + +=== Neighbor List configuration + +Every BTS sends a list of ARFCNs of neighbor cells +. within its 'SYSTEM INFORMATION 2' (and 2bis/2ter) messages on the BCCH +. within its 'SYSTEM INFORMATION 5' messages on SACCH in dedicated mode + +For every BTS config node in the VTY, you can specify the behavior of +the neighbor list using the `neighbor list mode` VTY command: + +automatic:: + Automatically generate a list of neighbor cells using all other + BTSs configured in the VTY +manual:: + Manually specify the neighbor list by means of `neighbor-list +(add|del) arfcn <0-1023>` commands, having identical neighbor lists on +BCCH (SI2) and SACCH (SI5) + +manual-si5:: + Manually specify the neighbor list by means of `neighbor-list +(add|del) arfcn <0-1023>` for BCCH (SI2) and a separate neighbor list by +means of `si5 neighbor-list (add|del) arfcn <0-1023>` for SACCH (SI5). + + +=== Configuring GPRS PCU parameters of a BTS + +In the case of BTS models using Abis/IP (IPA), the GPRS PCU is located +inside the BTS. The BTS then establishes a Gb connection to the SGSN. + +All the BTS-internal PCU configuration is performed via A-bis OML by +means of configuring the 'CELL', 'NSVC' (NS Virtual Connection and 'NSE' +(NS Entity). + +There is one 'CELL' node and one 'NSE' node, but there are two 'NSVC' +nodes. At the time of this writing, only the NSVC 0 is supported by +OsmoBTS, while both NSVC are supported by the ip.access nanoBTS. + +The respective VTY configuration parameters are described below. They +all exist beneath each BTS VTY config node. + +But let's first start with a small example + +.Example configuration of GPRS PCU parameters at VTY BTS node +---- +OsmoBSC(config-net-bts)# gprs mode gprs +OsmoBSC(config-net-bts)# gprs routing area 1 +OsmoBSC(config-net-bts)# gprs cell bvci 1234 +OsmoBSC(config-net-bts)# gprs nsei 1234 +OsmoBSC(config-net-bts)# gprs nsvc 0 nsvci 1234 +OsmoBSC(config-net-bts)# gprs nsvc 0 local udp port 23000 +OsmoBSC(config-net-bts)# gprs nsvc 0 remote udp port 23000 +OsmoBSC(config-net-bts)# gprs nsvc 0 remote ip 192.168.100.239 +---- + + +=== More explanation about the PCU config parameters + +//FIXME: should this go into VTY additions? + +==== `gprs mode (none|gprs|egprs)` + +This command determines if GPRS (or EGPRS) services are to be enabled in +this cell at all. + + +==== `gprs cell bvci <2-65535>` + +Configures the 'BSSGP Virtual Circuit Identifier'. It must be unique +between all BGSGP connections to one SGSN. + +NOTE: It is up to the system administrator to ensure all PCUs are +allocated an unique bvci. OsmoBSC will not ensure this policy. + + +==== `gprs nsei <0-65535>` + +Configures the 'NS Entity Identifier'. It must be unique between all NS +connections to one SGSN. + +NOTE: It is up to the system administrator to ensure all PCUs are +allocated an unique bvci. OsmoBSC will not ensure this policy. + + +==== `gprs nsvc <0-1> nsvci <0-65535>` + +Configures the 'NS Virtual Connection Identifier'. It must be unique +between all NS virtual connections to one SGSN. + +NOTE: It is up to the system administrator to ensure all PCUs are +allocated an unique nsvci. OsmoBSC will not ensure this policy. + + +==== `gprs nsvc <0-1> local udp port <0-65535>` + +Configures the local (PCU side) UDP port for the NS-over-UDP link. + + +==== `gprs nsvc <0-1> remote udp port <0-65535>` + +Configures the remote (SGSN side) UDP port for the NS-over-UDP link. + + +==== `gprs nsvc <0-1> remote ip A.B.C.D` + +Configures the remote (SGSN side) UDP port for the NS-over-UDP link. + + +==== `gprs ns timer (tns-block|tns-block-retries|tns-reset|tns-reset-retries|tns-test|tns-alive|tns-alive-retries)` <0-255> + +Configures the various GPRS NS related timers. Please check the GPRS NS +specification for the detailed meaning of those timers. + + +=== Dynamic Timeslot Configuration (TCH / PDCH) + +A dynamic timeslot is in principle a voice timeslot (TCH) that is used to serve +GPRS data (PDCH) when no voice call is active on it. This enhances GPRS +bandwidth while no voice calls are active, which is dynamically scaled down as +voice calls need to be served. This is a tremendous improvement in service over +statically assigning a fixed number of timeslots for voice and data. + +The causality is as follows: to establish a voice call, the +MSC requests a logical channel of a given TCH kind from the BSC. The BSC +assigns such a channel from a BTS' TRX's timeslot of its choice. The knowledge +that a given timeslot is dynamic exists only on the BSC level. When the MSC +asks for a logical channel, the BSC may switch off PDCH on a dynamic timeslot +and then assign a logical TCH channel on it. Hence, though compatibility with +the BTS needs to be ensured, any MSC is compatible with dynamic timeslots by +definition. + +OsmoBSC support two kinds of dynamic timeslot handling, configured +via the `network` / `bts` / `trx` / `timeslot` / `phys_chan_config` +configuration. Not all BTS models support dynamic channels. + +[[dyn_ts_compat]] +.Dynamic timeslot support by various BTS models +[cols="50%,25%,25%"] +|=== +| |`TCH/F_TCH/H_PDCH` |`TCH/F_PDCH` +|ip.access nanoBTS |- |supported +|Ericsson RBS |supported |- +|sysmoBTS using _osmo-bts-sysmo_ |supported |supported +|various SDR platforms using _osmo-bts-trx_ |supported |supported +|Nutaq Litecell 1.5 using _osmo-bts-litecell15_ |supported |supported +|Octasic OctBTS using _osmo-bts-octphy_ | supported | supported +|=== + +The _OsmoBTS Abis Protocol Specification_ <> describes the +non-standard RSL messages used for these timeslot kinds. + +NOTE: Same as for dedicated PDCH timeslots, you need to enable GPRS and operate +a PCU, SGSN and GGSN to provide the actual data service. + +==== Osmocom Style Dynamic Timeslots (TCH/F_TCH/H_PDCH) + +Timeslots of the `TCH/F_TCH/H_PDCH` type dynamically switch between TCH/F, +TCH/H and PDCH, depending on the channel kind requested by the MSC. The RSL +messaging for `TCH/F_TCH/H_PDCH` timeslots is compatible with Ericsson RBS. + +BTS models supporting this timeslot kind are shown in <>. + +==== ip.access Style Dynamic Timeslots (TCH/F_PDCH) + +Timeslots of the `TCH/F_PDCH` type dynamically switch between TCH/F and PDCH. +The RSL messaging for `TCH/F_PDCH` timeslots is compatible with ip.access +nanoBTS. + +BTS models supporting this timeslot kind are shown in <>. + +==== Avoid PDCH Exhaustion + +To avoid disrupting GPRS, configure at least one timeslot as dedicated PDCH. +With only dynamic timeslots, a given number of voice calls would convert all +timeslots to TCH, and no PDCH timeslots would be left for GPRS service. + +==== Dynamic Timeslot Configuration Examples + +This is an extract of an `osmo-bsc`` config file. A timeslot configuration with +five Osmocom style dynamic timeslots and one dedicated PDCH may look like this: + +---- +network + bts 0 + trx 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config SDCCH8 + timeslot 2 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 3 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 5 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 6 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 7 + phys_chan_config PDCH +---- + +With the ip.access nanoBTS, only `TCH/F_PDCH` dynamic timeslots are supported, +and hence a nanoBTS configuration may look like this: + +---- +network + bts 0 + trx 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config SDCCH8 + timeslot 2 + phys_chan_config TCH/F_PDCH + timeslot 3 + phys_chan_config TCH/F_PDCH + timeslot 4 + phys_chan_config TCH/F_PDCH + timeslot 5 + phys_chan_config TCH/F_PDCH + timeslot 6 + phys_chan_config TCH/F_PDCH + timeslot 7 + phys_chan_config PDCH +---- + +=== Tuning Access to the BTS + +OsmoBSC offers several configuration options to fine-tune access to the BTS. +It can allow only a portion of the subscribers access to the network. +This can also be used to ramp up access to the network on startup by slowly +letting in more and more subscribers. This is especially useful for isolated +cells with a huge number of subscribers. + +Other options control the behaviour of the MS when it needs to access the +random access channel before a dedicated channel is established. + +If the BTS is connected to the BSC via a high-latency connection the MS should +wait longer for an answer to a RACH request. If it does not the network will +have to deal with an increased load due to duplicate RACH requests. However, +in order to minimize the delay when a RACH request or response gets lost the +MS should not wait too long before retransmitting. + +==== Load Management + +Every SIM card is member of one of the ten regular ACCs (0-9). Access to the +BTS can be restricted to SIMs that are members of certain ACCs. + +Since the ACCs are distributed uniformly across all SIMs allowing only ACCs +0-4 to connect to the BTS should reduce its load by 50%. + +The default is to allow all ACCs to connect. + +.Example: Restrict access to the BTS by ACC +---- +network + bts 0 + rach access-control-class 1 barred <1> + rach access-control-class 9 allowed <2> +---- +<1> Disallow SIMs with access-class 1 from connecting to the BTS +<2> Permit SIMs with access-class 9 to connect to the BTS. + + +Smaller cells with lots of subscribers can be overwhelmed with traffic after +the network is turned on. This is especially true in areas with little to no +reception from other networks. To manage the load OsmoBSC has an option to +enable one Access Class at a time so initial access to the network is +distributed across a longer time. + +.Example: Ramp up access to the BTS after startup +---- +network + bts 0 + access-control-class-ramping <1> + access-control-class-ramping-step-interval 30 <2> + access-control-class-ramping-step-size 1 <3> +---- +<1> Turn on access-control-class ramping +<2> Enable more ACCs every 30 seconds +<3> At each step enable one more ACC + + +==== RACH Parameter Configuration + +The following parameters allow control over how the MS can access the random +access channel (RACH). It is possible to set a minimum receive level under +which the MS will not even attempt to access the network. + +The RACH is a shared channel which means multiple MS can choose to send a +request at the same time. To minimize the risk of a collision each MS will +choose a random number of RACH slots to wait before trying to send a RACH +request. + +On very busy networks the range this number is chosen from should be +high to avoid collisions, but a lower range reduces the overall delay when +trying to establish a channel. + +The option `rach tx integer N` controls the range from which this number X +is chosen. It is `0 <= X < max(8,N)`. + +After sending a RACH request the MS will wait a random amount of slots before +retransmitting its RACH request. The range it will wait is also determined by +the option `rach tx integer N`, but calculating it is not so straightforward. +It is defined as `S <= X < S+N` where `S` is determined from a table. + +In particular `S` is lowest when `N` is one of 3, 8, 14 or 50 and highest when +`N` is 7, 12 or 32. + +For more information see _3GPP TA 44.018_ <<3gpp-ts-44-018>> Ch. 3.3.1.1.2 and +Table 3.3.1.1.2.1 in particular. + +The amount of times the MS attempts to retransmit RACH requests can also be +changed. A higher number means more load on the RACH while a lower number can +cause channel establishment to fail due to collisions or bad reception. + +.Example: Configure RACH Access Parameters +---- +network + bts 0 + rxlev access min 20 <1> + rach tx integer 50<2> + rach max transmission <3> +---- +<1> Allow access to the network if the MS receives the BCCH of the cell at +-90dBm or better (20dB above -110dBm). +<2> This number affects how long the MS waits before (re-)transmitting RACH +requests. +<3> How often to retransmit the RACH request. diff --git a/manuals/OsmoNITB/osmonitb-usermanual.adoc b/manuals/OsmoNITB/osmonitb-usermanual.adoc index 543e836..5058d02 100644 --- a/manuals/OsmoNITB/osmonitb-usermanual.adoc +++ b/manuals/OsmoNITB/osmonitb-usermanual.adoc @@ -24,9 +24,9 @@ include::{srcdir}/chapters/net.adoc[] -include::./common/chapters/bsc.adoc[] +include::{srcdir}/chapters/bsc.adoc[] -include::./common/chapters/bts.adoc[] +include::{srcdir}/chapters/bts.adoc[] include::{srcdir}/chapters/bts-examples.adoc[] @@ -49,4 +49,3 @@ include::./common/chapters/glossary.adoc[] include::./common/chapters/gfdl.adoc[] - -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/19329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ic3b4192238be3147f61779845521eae84511fb7e Gerrit-Change-Number: 19329 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 11:57:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 11:57:29 +0000 Subject: Change in osmo-bsc[master]: {bts, bsc}.adoc: Drop deprecated OsmoNITB references In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19328 ) Change subject: {bts,bsc}.adoc: Drop deprecated OsmoNITB references ...................................................................... Patch Set 1: Code-Review-1 I don't think you wanted to add the file in this commit -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icc91dd41a237531cb512fa36d8b18d4d8d5ca8ed Gerrit-Change-Number: 19328 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jul 2020 11:57:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 11:57:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 11:57:42 +0000 Subject: Change in osmo-bsc[master]: configure.ac: Fix trailing whitespace In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19326 ) Change subject: configure.ac: Fix trailing whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id57b953cbeea4ac5c384c0b77cff079c13248a0e Gerrit-Change-Number: 19326 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jul 2020 11:57:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 11:57:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 11:57:45 +0000 Subject: Change in osmo-bsc[master]: configure.ac: Fix trailing whitespace In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19326 ) Change subject: configure.ac: Fix trailing whitespace ...................................................................... configure.ac: Fix trailing whitespace Change-Id: Id57b953cbeea4ac5c384c0b77cff079c13248a0e --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 6555f87..d25925b 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PROG_INSTALL LT_INIT -dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang +dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang AS_CASE(["$LD"],[*clang*], [AS_CASE(["${host_os}"], [*linux*],[archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'])]) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id57b953cbeea4ac5c384c0b77cff079c13248a0e Gerrit-Change-Number: 19326 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 12:05:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 12:05:20 +0000 Subject: Change in osmo-bsc[master]: {bts, bsc}.adoc: Drop deprecated OsmoNITB references In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19328 to look at the new patch set (#2). Change subject: {bts,bsc}.adoc: Drop deprecated OsmoNITB references ...................................................................... {bts,bsc}.adoc: Drop deprecated OsmoNITB references dyn_ts_allow_tch_f is also deprecated and should not be used, so drop that too. Change-Id: Icc91dd41a237531cb512fa36d8b18d4d8d5ca8ed --- M doc/manuals/chapters/bsc.adoc M doc/manuals/chapters/bts.adoc 2 files changed, 8 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/28/19328/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icc91dd41a237531cb512fa36d8b18d4d8d5ca8ed Gerrit-Change-Number: 19328 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 12:13:38 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 20 Jul 2020 12:13:38 +0000 Subject: Change in libosmo-abis[master]: e1_input: Use osmo_use_count in e1inp_line In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19256 ) Change subject: e1_input: Use osmo_use_count in e1inp_line ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0658b2e9c452598025cc0f1d0b060076171767cc Gerrit-Change-Number: 19256 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jul 2020 12:13:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 12:16:42 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 20 Jul 2020 12:16:42 +0000 Subject: Change in osmo-bsc[master]: {bts, bsc}.adoc: Drop deprecated OsmoNITB references In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19328 ) Change subject: {bts,bsc}.adoc: Drop deprecated OsmoNITB references ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icc91dd41a237531cb512fa36d8b18d4d8d5ca8ed Gerrit-Change-Number: 19328 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jul 2020 12:16:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 12:17:36 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 20 Jul 2020 12:17:36 +0000 Subject: Change in osmo-gsm-manuals[master]: Drop common/chapters/{bts, bsc}.adoc In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19330 ) Change subject: Drop common/chapters/{bts,bsc}.adoc ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I4d98049f6b49871bf5aabe4392da7a608fbc1fe9 Gerrit-Change-Number: 19330 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 20 Jul 2020 12:17:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 12:18:02 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 20 Jul 2020 12:18:02 +0000 Subject: Change in osmo-bsc[master]: doc: Copy {bsc, bts}.adoc from osmo-gsm-manuals In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19327 ) Change subject: doc: Copy {bsc,bts}.adoc from osmo-gsm-manuals ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I20aa60d2f4111d66e922f3e2a73a20352ec1f7e4 Gerrit-Change-Number: 19327 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 20 Jul 2020 12:18:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 12:52:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 12:52:56 +0000 Subject: Change in libosmo-abis[master]: e1_input: Use osmo_use_count in e1inp_line In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19256 ) Change subject: e1_input: Use osmo_use_count in e1inp_line ...................................................................... Patch Set 3: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0658b2e9c452598025cc0f1d0b060076171767cc Gerrit-Change-Number: 19256 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jul 2020 12:52:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 13:24:51 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Mon, 20 Jul 2020 13:24:51 +0000 Subject: Change in osmo-gsm-tester[master]: srsenb_drb.conf.tmpl: add QCI8 config References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19331 ) Change subject: srsenb_drb.conf.tmpl: add QCI8 config ...................................................................... srsenb_drb.conf.tmpl: add QCI8 config add QCI config with RLC UM and PDCP SDU discard set to infinity Change-Id: If946f569f7bbb98fc754f30ff5627fa5ca4afe68 --- M src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl 1 file changed, 37 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/31/19331/1 diff --git a/src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl index 32b6e93..5167dab 100644 --- a/src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl @@ -1,4 +1,3 @@ - // All times are in ms. Use -1 for infinity, where available qci_config = ( @@ -6,30 +5,53 @@ { qci=7; pdcp_config = { - discard_timer = 100; - pdcp_sn_size = 12; + discard_timer = 100; + pdcp_sn_size = 12; } rlc_config = { ul_um = { - sn_field_length = 10; + sn_field_length = 10; }; dl_um = { - sn_field_length = 10; - t_reordering = 45; + sn_field_length = 10; + t_reordering = 45; }; }; logical_channel_config = { - priority = 13; - prioritized_bit_rate = -1; - bucket_size_duration = 100; - log_chan_group = 2; + priority = 13; + prioritized_bit_rate = -1; + bucket_size_duration = 100; + log_chan_group = 2; + }; +}, +// QCI 8 is a modified QCI 7 with PDCP discard timer set to infinity to avoid SDU drops at PDCP +{ + qci=8; + pdcp_config = { + discard_timer = -1; + pdcp_sn_size = 12; + } + rlc_config = { + ul_um = { + sn_field_length = 10; + }; + dl_um = { + sn_field_length = 10; + t_reordering = 45; + }; + }; + logical_channel_config = { + priority = 13; + prioritized_bit_rate = -1; + bucket_size_duration = 100; + log_chan_group = 2; }; }, { qci=9; pdcp_config = { discard_timer = -1; - status_report_required = true; + status_report_required = false; } rlc_config = { ul_am = { @@ -44,10 +66,10 @@ }; }; logical_channel_config = { - priority = 11; - prioritized_bit_rate = -1; - bucket_size_duration = 100; - log_chan_group = 3; + priority = 11; + prioritized_bit_rate = -1; + bucket_size_duration = 100; + log_chan_group = 3; }; } -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: If946f569f7bbb98fc754f30ff5627fa5ca4afe68 Gerrit-Change-Number: 19331 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 13:24:52 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Mon, 20 Jul 2020 13:24:52 +0000 Subject: Change in osmo-gsm-tester[master]: report: fix runtime error when suite.duration is None References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19332 ) Change subject: report: fix runtime error when suite.duration is None ...................................................................... report: fix runtime error when suite.duration is None report generation failed when duration was not set correctly and None was returned. Use 0 as duration in that case and continue. Change-Id: I7696350edf801e181e6804ecdbfe83545a912dc3 --- M src/osmo_gsm_tester/core/report.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/32/19332/1 diff --git a/src/osmo_gsm_tester/core/report.py b/src/osmo_gsm_tester/core/report.py index d2c68c5..42a21d8 100644 --- a/src/osmo_gsm_tester/core/report.py +++ b/src/osmo_gsm_tester/core/report.py @@ -115,7 +115,7 @@ num_tests += int(testsuite.get('tests')) num_failures += int(testsuite.get('failures')) num_errors += int(testsuite.get('errors')) - time += suite.duration + time += suite.duration if suite.duration is not None else 0 testsuites.set('tests', str(num_tests)) testsuites.set('errors', str(num_errors)) testsuites.set('failures', str(num_failures)) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I7696350edf801e181e6804ecdbfe83545a912dc3 Gerrit-Change-Number: 19332 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 13:26:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jul 2020 13:26:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/Osmocom_Types: add f_rnd_bitstring() and f_pad_bit() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19333 ) Change subject: library/Osmocom_Types: add f_rnd_bitstring() and f_pad_bit() ...................................................................... library/Osmocom_Types: add f_rnd_bitstring() and f_pad_bit() Change-Id: I9be55f6979c8ce1cbf5b2ef317c998ae30488e0e --- M library/Osmocom_Types.ttcn 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/19333/1 diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index 16395df..e55f1d6 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -74,6 +74,12 @@ return ret; } + /* return bitstring composed of random bits */ + function f_rnd_bitstring(in integer len) return bitstring { + var octetstring oct := f_rnd_octstring(len / 8 + 1); + return substr(oct2bit(oct), 0, len); + } + function f_rnd_imsi(in hexstring prefix) return hexstring { return prefix & f_rnd_hexstring(15 - lengthof(prefix), 9); } @@ -175,6 +181,14 @@ return str; } +function f_pad_bit(bitstring str, integer len, BIT1 pad) return bitstring { + var integer strlen := lengthof(str); + for (var integer i := 0; i < len-strlen; i := i+1) { + str := str & pad; + } + return str; +} + function f_pad_bcd_number(hexstring number) return hexstring { if (lengthof(number) mod 2 != 0) { return number & 'F'H; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9be55f6979c8ce1cbf5b2ef317c998ae30488e0e Gerrit-Change-Number: 19333 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 13:31:21 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jul 2020 13:31:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: verify handling of frequency hopping parameters In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 ) Change subject: PCU_Tests: verify handling of frequency hopping parameters ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1beda9224998848f9243237413e5ae3e0ddab8a5 Gerrit-Change-Number: 19324 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 20 Jul 2020 13:31:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 13:36:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jul 2020 13:36:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: verify handling of frequency hopping parameters In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 ) Change subject: PCU_Tests: verify handling of frequency hopping parameters ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324/2/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324/2/pcu/PCU_Tests.ttcn at 2077 PS2, Line 2077: 0, maio := 0 > I would probably test with non-zero values given that we initialize everything to zero... [?] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1beda9224998848f9243237413e5ae3e0ddab8a5 Gerrit-Change-Number: 19324 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 20 Jul 2020 13:36:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 14:10:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 14:10:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/Osmocom_Types: add f_rnd_bitstring() and f_pad_bit() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19333 ) Change subject: library/Osmocom_Types: add f_rnd_bitstring() and f_pad_bit() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9be55f6979c8ce1cbf5b2ef317c998ae30488e0e Gerrit-Change-Number: 19333 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jul 2020 14:10:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 14:13:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 14:13:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: verify handling of frequency hopping parameters In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 ) Change subject: PCU_Tests: verify handling of frequency hopping parameters ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1beda9224998848f9243237413e5ae3e0ddab8a5 Gerrit-Change-Number: 19324 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 20 Jul 2020 14:13:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 14:29:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 14:29:10 +0000 Subject: Change in osmo-gsm-tester[master]: srsenb_drb.conf.tmpl: add QCI8 config In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19331 ) Change subject: srsenb_drb.conf.tmpl: add QCI8 config ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: If946f569f7bbb98fc754f30ff5627fa5ca4afe68 Gerrit-Change-Number: 19331 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jul 2020 14:29:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 14:31:43 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 14:31:43 +0000 Subject: Change in osmo-gsm-tester[master]: report: fix runtime error when suite.duration is None In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19332 ) Change subject: report: fix runtime error when suite.duration is None ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19332/1/src/osmo_gsm_tester/core/report.py File src/osmo_gsm_tester/core/report.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19332/1/src/osmo_gsm_tester/core/report.py at 118 PS1, Line 118: time += suite.duration if suite.duration is not None else 0 I think it makes more sense to simply set self.duration = 0 instead of None in suite.py __init__(). Agree? please update patch with that change instead. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I7696350edf801e181e6804ecdbfe83545a912dc3 Gerrit-Change-Number: 19332 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 20 Jul 2020 14:31:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 14:33:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 14:33:33 +0000 Subject: Change in osmo-bsc[master]: rename files acc_ramp.* -> acc.c* References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19334 ) Change subject: rename files acc_ramp.* -> acc.c* ...................................................................... rename files acc_ramp.* -> acc.c* With upcoming next commit, the file will contain far more code that simply ramping, so rename it to be more generic. Change-Id: I8c368ab87e264439dea4ccf556821a44664cdbb0 --- M include/osmocom/bsc/Makefile.am R include/osmocom/bsc/acc.h M include/osmocom/bsc/gsm_data.h M src/ipaccess/Makefile.am M src/osmo-bsc/Makefile.am R src/osmo-bsc/acc.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/system_information.c M src/utils/Makefile.am M tests/abis/Makefile.am M tests/bsc/Makefile.am M tests/gsm0408/Makefile.am M tests/handover/Makefile.am M tests/nanobts_omlattr/Makefile.am 14 files changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/19334/1 diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am index c2a82ce..1ee96ed 100644 --- a/include/osmocom/bsc/Makefile.am +++ b/include/osmocom/bsc/Makefile.am @@ -3,7 +3,7 @@ abis_nm.h \ abis_om2000.h \ abis_rsl.h \ - acc_ramp.h \ + acc.h \ arfcn_range_encode.h \ assignment_fsm.h \ bsc_rll.h \ diff --git a/include/osmocom/bsc/acc_ramp.h b/include/osmocom/bsc/acc.h similarity index 100% rename from include/osmocom/bsc/acc_ramp.h rename to include/osmocom/bsc/acc.h diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index a8b495f..cfed1f8 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am index a11b295..717a6a1 100644 --- a/src/ipaccess/Makefile.am +++ b/src/ipaccess/Makefile.am @@ -49,7 +49,7 @@ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ - $(top_builddir)/src/osmo-bsc/acc_ramp.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ @@ -64,7 +64,7 @@ ipaccess_proxy_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ - $(top_builddir)/src/osmo-bsc/acc_ramp.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am index 231707c..c19d01b 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -32,7 +32,7 @@ abis_om2000.c \ abis_om2000_vty.c \ abis_rsl.c \ - acc_ramp.c \ + acc.c \ arfcn_range_encode.c \ assignment_fsm.c \ bsc_ctrl_commands.c \ diff --git a/src/osmo-bsc/acc_ramp.c b/src/osmo-bsc/acc.c similarity index 99% rename from src/osmo-bsc/acc_ramp.c rename to src/osmo-bsc/acc.c index 761ab09..a1941e4 100644 --- a/src/osmo-bsc/acc_ramp.c +++ b/src/osmo-bsc/acc.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 11e51be..9cc7673 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -64,7 +64,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 13d0f46..fe78e8e 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 683c227..fd03cb3 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -48,7 +48,7 @@ bs11_config_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ - $(top_builddir)/src/osmo-bsc/acc_ramp.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/bts_siemens_bs11.o \ @@ -121,7 +121,7 @@ meas_json_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ - $(top_builddir)/src/osmo-bsc/acc_ramp.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am index 031d689..a245b51 100644 --- a/tests/abis/Makefile.am +++ b/tests/abis/Makefile.am @@ -26,7 +26,7 @@ abis_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ - $(top_builddir)/src/osmo-bsc/acc_ramp.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am index 282f603..468c032 100644 --- a/tests/bsc/Makefile.am +++ b/tests/bsc/Makefile.am @@ -34,7 +34,7 @@ bsc_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ - $(top_builddir)/src/osmo-bsc/acc_ramp.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ $(top_builddir)/src/osmo-bsc/osmo_bsc_filter.o \ $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \ diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am index 4e22392..66e4072 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -24,7 +24,7 @@ gsm0408_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ - $(top_builddir)/src/osmo-bsc/acc_ramp.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ $(top_builddir)/src/osmo-bsc/bts.o \ diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am index 661b3d2..87981d9 100644 --- a/tests/handover/Makefile.am +++ b/tests/handover/Makefile.am @@ -47,7 +47,7 @@ $(top_builddir)/src/osmo-bsc/abis_om2000.o \ $(top_builddir)/src/osmo-bsc/abis_om2000_vty.o \ $(top_builddir)/src/osmo-bsc/abis_rsl.o \ - $(top_builddir)/src/osmo-bsc/acc_ramp.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ $(top_builddir)/src/osmo-bsc/assignment_fsm.o \ $(top_builddir)/src/osmo-bsc/bsc_ctrl_commands.o \ diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am index 67d059f..1cdcc50 100644 --- a/tests/nanobts_omlattr/Makefile.am +++ b/tests/nanobts_omlattr/Makefile.am @@ -24,7 +24,7 @@ nanobts_omlattr_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ - $(top_builddir)/src/osmo-bsc/acc_ramp.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8c368ab87e264439dea4ccf556821a44664cdbb0 Gerrit-Change-Number: 19334 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 14:33:44 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 14:33:44 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC subset rotation In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19303 ) Change subject: Introduce support for ACC subset rotation ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I952c9eeae02809c7184078c655574ec817902e06 Gerrit-Change-Number: 19303 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jul 2020 14:33:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 14:58:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 14:58:53 +0000 Subject: Change in osmo-bts[master]: tx_power_test: Disable using color in log output References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19335 ) Change subject: tx_power_test: Disable using color in log output ...................................................................... tx_power_test: Disable using color in log output It's really not used and only adds unneeded variabilities to output. Change-Id: I5aa95997c8df4ce5ba8271acae99c45f68b96e11 --- M tests/tx_power/tx_power_test.c M tests/tx_power/tx_power_test.err 2 files changed, 37 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/35/19335/1 diff --git a/tests/tx_power/tx_power_test.c b/tests/tx_power/tx_power_test.c index 02c940f..12c51c6 100644 --- a/tests/tx_power/tx_power_test.c +++ b/tests/tx_power/tx_power_test.c @@ -215,6 +215,7 @@ osmo_init_logging2(tall_bts_ctx, &bts_log_info); osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; log_set_print_filename(osmo_stderr_target, 0); + log_set_use_color(osmo_stderr_target, 0); bts = gsm_bts_alloc(tall_bts_ctx, 0); if (!bts) { diff --git a/tests/tx_power/tx_power_test.err b/tests/tx_power/tx_power_test.err index 03130b2..344fa16 100644 --- a/tests/tx_power/tx_power_test.err +++ b/tests/tx_power/tx_power_test.err @@ -1,38 +1,37 @@ (bts=0,trx=1) power_ramp_start(cur=0, tgt=40000) -(bts=0,trx=1) Asked to ramp power up to 40000 mdBm, which exceeds P_max_out (33000) -(bts=0,trx=1) power_ramp_start(cur=0, tgt=33000) -(bts=0,trx=1) ramp_timer_cb(cur_pout=2000, tgt_pout=33000, ramp_att=31000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to -8000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=4000, tgt_pout=33000, ramp_att=29000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to -6000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=6000, tgt_pout=33000, ramp_att=27000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to -4000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=8000, tgt_pout=33000, ramp_att=25000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to -2000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=10000, tgt_pout=33000, ramp_att=23000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 0 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=12000, tgt_pout=33000, ramp_att=21000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 2000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=14000, tgt_pout=33000, ramp_att=19000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 4000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=16000, tgt_pout=33000, ramp_att=17000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 6000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=18000, tgt_pout=33000, ramp_att=15000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 8000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=20000, tgt_pout=33000, ramp_att=13000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 10000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=22000, tgt_pout=33000, ramp_att=11000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 12000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=24000, tgt_pout=33000, ramp_att=9000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 14000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=26000, tgt_pout=33000, ramp_att=7000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 16000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=28000, tgt_pout=33000, ramp_att=5000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 18000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=30000, tgt_pout=33000, ramp_att=3000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 20000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=32000, tgt_pout=33000, ramp_att=1000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 22000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=33000, tgt_pout=33000, ramp_att=0, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 23000 mdBm. - \ No newline at end of file +(bts=0,trx=1) Asked to ramp power up to 40000 mdBm, which exceeds P_max_out (33000) +(bts=0,trx=1) power_ramp_start(cur=0, tgt=33000) +(bts=0,trx=1) ramp_timer_cb(cur_pout=2000, tgt_pout=33000, ramp_att=31000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to -8000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=4000, tgt_pout=33000, ramp_att=29000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to -6000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=6000, tgt_pout=33000, ramp_att=27000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to -4000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=8000, tgt_pout=33000, ramp_att=25000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to -2000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=10000, tgt_pout=33000, ramp_att=23000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 0 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=12000, tgt_pout=33000, ramp_att=21000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 2000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=14000, tgt_pout=33000, ramp_att=19000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 4000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=16000, tgt_pout=33000, ramp_att=17000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 6000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=18000, tgt_pout=33000, ramp_att=15000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 8000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=20000, tgt_pout=33000, ramp_att=13000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 10000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=22000, tgt_pout=33000, ramp_att=11000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 12000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=24000, tgt_pout=33000, ramp_att=9000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 14000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=26000, tgt_pout=33000, ramp_att=7000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 16000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=28000, tgt_pout=33000, ramp_att=5000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 18000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=30000, tgt_pout=33000, ramp_att=3000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 20000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=32000, tgt_pout=33000, ramp_att=1000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 22000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=33000, tgt_pout=33000, ramp_att=0, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 23000 mdBm. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5aa95997c8df4ce5ba8271acae99c45f68b96e11 Gerrit-Change-Number: 19335 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 15:01:17 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 15:01:17 +0000 Subject: Change in libosmocore[master]: logging: Avoid printing OSMO_LOGCOLOR_END if no color was used References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19336 ) Change subject: logging: Avoid printing OSMO_LOGCOLOR_END if no color was used ...................................................................... logging: Avoid printing OSMO_LOGCOLOR_END if no color was used There's no point in printing that code if no color was used in first place, and looks strange when using logging with color enabled but no color assigned to the category printing lines. Only affected unit test output by this fix is osmo-bts'x tx_power_test.c, which has been fixed in osmo-bts.git Change-Id I5aa95997c8df4ce5ba8271acae99c45f68b96e11. Change-Id: Ie38cc639d7f4acd908f357e5bfb3ced07147583e --- M src/logging.c M tests/fsm/fsm_test.err 2 files changed, 45 insertions(+), 45 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/36/19336/1 diff --git a/src/logging.c b/src/logging.c index c14e696..1c3e5ce 100644 --- a/src/logging.c +++ b/src/logging.c @@ -500,7 +500,7 @@ } } - if (target->use_color) { + if (target->use_color && c_subsys) { ret = snprintf(buf + offset, rem, OSMO_LOGCOLOR_END); if (ret < 0) goto err; diff --git a/tests/fsm/fsm_test.err b/tests/fsm/fsm_test.err index 13cbacd..4cc5ca4 100644 --- a/tests/fsm/fsm_test.err +++ b/tests/fsm/fsm_test.err @@ -1,18 +1,18 @@ Checking FSM allocation -Test_FSM(my_id){NULL}: Allocated -Test_FSM(my_id){NULL}: Received Event EV_B -Test_FSM(my_id){NULL}: Event EV_B not permitted -Test_FSM(my_id){NULL}: Received Event EV_A -Test_FSM(my_id){NULL}: State change to ONE (no timeout) -Test_FSM(my_id){ONE}: Received Event EV_B -Test_FSM(my_id){ONE}: State change to TWO (T2342, 1s) -Test_FSM(my_id){TWO}: Timeout of T2342 -Timer -Test_FSM(my_id){TWO}: Deallocated - +Test_FSM(my_id){NULL}: Allocated +Test_FSM(my_id){NULL}: Received Event EV_B +Test_FSM(my_id){NULL}: Event EV_B not permitted +Test_FSM(my_id){NULL}: Received Event EV_A +Test_FSM(my_id){NULL}: State change to ONE (no timeout) +Test_FSM(my_id){ONE}: Received Event EV_B +Test_FSM(my_id){ONE}: State change to TWO (T2342, 1s) +Test_FSM(my_id){TWO}: Timeout of T2342 +Timer +Test_FSM(my_id){TWO}: Deallocated + --- test_id_api() Test_FSM{NULL}: Allocated - osmo_fsm_inst_name() == "Test_FSM" + osmo_fsm_inst_name() == "Test_FSM" osmo_fsm_inst_find_by_name("Test_FSM") == fi osmo_fsm_inst_update_id("my_id") rc == 0, ok @@ -39,23 +39,23 @@ osmo_fsm_inst_find_by_id("arbitrary_id") == fi osmo_fsm_inst_update_id("") Attempting to set illegal id for FSM instance of type 'Test_FSM': "" - rc == -22, ok + rc == -22, ok osmo_fsm_inst_name() == "Test_FSM(arbitrary_id)" osmo_fsm_inst_find_by_name("Test_FSM(arbitrary_id)") == fi osmo_fsm_inst_update_id("invalid.id") Attempting to set illegal id for FSM instance of type 'Test_FSM': "invalid.id" - rc == -22, ok + rc == -22, ok osmo_fsm_inst_name() == "Test_FSM(arbitrary_id)" osmo_fsm_inst_find_by_name("Test_FSM(arbitrary_id)") == fi --- id format tests... osmo_fsm_inst_update_id_f("format%cid", '.') Attempting to set illegal id for FSM instance of type 'Test_FSM': "format.id" - rc == -22, ok + rc == -22, ok osmo_fsm_inst_name() == "Test_FSM(arbitrary_id)" osmo_fsm_inst_find_by_name("Test_FSM(arbitrary_id)") == fi osmo_fsm_inst_update_id_f("%s", "") Attempting to set illegal id for FSM instance of type 'Test_FSM': "" - rc == -22, ok + rc == -22, ok osmo_fsm_inst_name() == "Test_FSM(arbitrary_id)" osmo_fsm_inst_find_by_name("Test_FSM(arbitrary_id)") == fi osmo_fsm_inst_update_id_f("format%xid%d", 0x23, 42) @@ -78,41 +78,41 @@ --- test_id_api() done Test_FSM(arbitrary_id){NULL}: Terminating (cause = OSMO_FSM_TERM_REQUEST) -Test_FSM(arbitrary_id){NULL}: Freeing instance -Test_FSM(arbitrary_id){NULL}: Deallocated - +Test_FSM(arbitrary_id){NULL}: Freeing instance +Test_FSM(arbitrary_id){NULL}: Deallocated + --- test_state_chg_keep_timer() Test_FSM{NULL}: Allocated -Test_FSM{NULL}: State change to ONE (no timeout) -Test_FSM{ONE}: State change to TWO (no timeout) -Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) -Test_FSM{TWO}: Freeing instance -Test_FSM{TWO}: Deallocated -Total time passed: 0.000000 s +Test_FSM{NULL}: State change to ONE (no timeout) +Test_FSM{ONE}: State change to TWO (no timeout) +Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +Test_FSM{TWO}: Freeing instance +Test_FSM{TWO}: Deallocated +Total time passed: 0.000000 s Test_FSM{NULL}: Allocated -Test_FSM{NULL}: State change to ONE (T10, 10s) -Total time passed: 2.000342 s +Test_FSM{NULL}: State change to ONE (T10, 10s) +Total time passed: 2.000342 s Test_FSM{ONE}: State change to TWO (keeping T10, 7.999s remaining) -Total time passed: 2.000342 s +Total time passed: 2.000342 s Total time passed: 9.999999 s Total time passed: 10.000000 s Test_FSM{TWO}: Timeout of T10 -Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) -Test_FSM{TWO}: Freeing instance -Test_FSM{TWO}: Deallocated ---- test_state_chg_keep_timer() done +Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +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 change to ONE (T42, 23s) -Test_FSM{ONE}: State change to TWO (no timeout) -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 change to ONE (T42, 23s) -Test_FSM{ONE}: State change to TWO (no timeout) -Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) -Test_FSM{TWO}: Freeing instance -Test_FSM{TWO}: Deallocated ---- test_state_chg_T() done +Test_FSM{NULL}: State change to ONE (T42, 23s) +Test_FSM{ONE}: State change to TWO (no timeout) +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 change to ONE (T42, 23s) +Test_FSM{ONE}: State change to TWO (no timeout) +Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +Test_FSM{TWO}: Freeing instance +Test_FSM{TWO}: Deallocated +--- test_state_chg_T() done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie38cc639d7f4acd908f357e5bfb3ced07147583e Gerrit-Change-Number: 19336 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 15:01:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 15:01:27 +0000 Subject: Change in libosmocore[master]: tests/fsm_test.c: Disable use color in logging output References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19337 ) Change subject: tests/fsm_test.c: Disable use color in logging output ...................................................................... tests/fsm_test.c: Disable use color in logging output This should avoid other problems in the future. Change-Id: I81368578c0830477d381566a54671fdde6067b23 --- M tests/fsm/fsm_test.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/19337/1 diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c index 911aad8..fe48b2b 100644 --- a/tests/fsm/fsm_test.c +++ b/tests/fsm/fsm_test.c @@ -413,6 +413,7 @@ stderr_target = log_target_create_stderr(); log_add_target(stderr_target); log_set_print_filename(stderr_target, 0); + log_set_use_color(stderr_target, 0); g_ctrl = ctrl_handle_alloc(NULL, NULL, NULL); g_ctx = NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I81368578c0830477d381566a54671fdde6067b23 Gerrit-Change-Number: 19337 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 15:22:07 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 20 Jul 2020 15:22:07 +0000 Subject: Change in libosmo-abis[master]: ipacces: Fix e1inp_line reference put in ipaccess_close In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19258 ) Change subject: ipacces: Fix e1inp_line reference put in ipaccess_close ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If23cc722106a9f70c998e591369a4acafa52c519 Gerrit-Change-Number: 19258 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 20 Jul 2020 15:22:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 15:23:01 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 20 Jul 2020 15:23:01 +0000 Subject: Change in libosmo-abis[master]: ipaccess_recvmsg: Clean up release steps upon error condition In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19260 ) Change subject: ipaccess_recvmsg: Clean up release steps upon error condition ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I47a3e477d6861620a741193d3d3d3e286836fd44 Gerrit-Change-Number: 19260 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jul 2020 15:23:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 15:25:17 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 15:25:17 +0000 Subject: Change in libosmo-abis[master]: ipacces: Fix e1inp_line reference put in ipaccess_close In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19258 ) Change subject: ipacces: Fix e1inp_line reference put in ipaccess_close ...................................................................... Patch Set 3: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If23cc722106a9f70c998e591369a4acafa52c519 Gerrit-Change-Number: 19258 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 20 Jul 2020 15:25:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 15:25:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 15:25:28 +0000 Subject: Change in libosmo-abis[master]: ipaccess_recvmsg: Clean up release steps upon error condition In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19260 ) Change subject: ipaccess_recvmsg: Clean up release steps upon error condition ...................................................................... Patch Set 3: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I47a3e477d6861620a741193d3d3d3e286836fd44 Gerrit-Change-Number: 19260 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jul 2020 15:25:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 15:26:50 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 20 Jul 2020 15:26:50 +0000 Subject: Change in libosmo-abis[master]: ipaccess_recvmsg: Untangle code updating line In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19262 ) Change subject: ipaccess_recvmsg: Untangle code updating line ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I947f64f8fa20f87fdc84538402623a6bcf35fdf9 Gerrit-Change-Number: 19262 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jul 2020 15:26:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 15:27:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 15:27:23 +0000 Subject: Change in libosmo-abis[master]: ipaccess_recvmsg: Untangle code updating line In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19262 ) Change subject: ipaccess_recvmsg: Untangle code updating line ...................................................................... Patch Set 3: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I947f64f8fa20f87fdc84538402623a6bcf35fdf9 Gerrit-Change-Number: 19262 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jul 2020 15:27:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 15:27:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 15:27:30 +0000 Subject: Change in libosmo-abis[master]: e1_input: Use osmo_use_count in e1inp_line In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19256 ) Change subject: e1_input: Use osmo_use_count in e1inp_line ...................................................................... e1_input: Use osmo_use_count in e1inp_line osmo_use_count is available since libosmocore 1.1.0 release, so bump required libosmocore version in autotools and packages. struct e1inp_line field refcnt is kept in order to keep ABI compatibility accessing struct fields. The new use_count is added at the end. Size of struct changing is fine since it is allocated through an API and a pointer should be used by clients. e1inp_line_clone API is changed but it's not used by anyone outside libosmo-abis, so it's fine. Related: OS#4624 Change-Id: I0658b2e9c452598025cc0f1d0b060076171767cc --- M TODO-RELEASE M configure.ac M contrib/libosmo-abis.spec.in M debian/control M include/osmocom/abis/e1_input.h M src/e1_input.c M src/input/ipaccess.c 7 files changed, 85 insertions(+), 54 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 85b16a7..aa278ec 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -10,3 +10,4 @@ libosmo-abis API change major: add parameter to struct e1inp_line libosmo-trau API change add new function osmo_rtp_socket_set_dscp() libosmo-abis API change major: add parameter to struct lapd_instance +libosmo-abis Field added struct e1inp_line "use_count". REMINDER: Upon LIBVERSION c bump, take the chance to drop struct e1inp_line "refcnt" field. diff --git a/configure.ac b/configure.ac index f095cf5..04ffca6 100644 --- a/configure.ac +++ b/configure.ac @@ -64,9 +64,9 @@ dnl Generate the output AM_CONFIG_HEADER(config.h) -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(LIBOSMOCORE, libosmocore >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.1.0) PKG_CHECK_MODULES(ORTP, ortp >= 0.22.0) AC_ARG_ENABLE([dahdi], diff --git a/contrib/libosmo-abis.spec.in b/contrib/libosmo-abis.spec.in index 3ad36b1..da0c2d8 100644 --- a/contrib/libosmo-abis.spec.in +++ b/contrib/libosmo-abis.spec.in @@ -27,9 +27,9 @@ BuildRequires: libtool >= 2 BuildRequires: pkgconfig >= 0.20 BuildRequires: xz -BuildRequires: pkgconfig(libosmocore) >= 1.0.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.0.0 -BuildRequires: pkgconfig(libosmovty) >= 1.0.0 +BuildRequires: pkgconfig(libosmocore) >= 1.1.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.1.0 +BuildRequires: pkgconfig(libosmovty) >= 1.1.0 BuildRequires: pkgconfig(ortp) >= 0.22 BuildRequires: pkgconfig(talloc) diff --git a/debian/control b/debian/control index b9e2078..7039bfe 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ dh-autoreconf, libdpkg-perl, git, - libosmocore-dev (>= 1.0.0), + libosmocore-dev (>= 1.1.0), pkg-config, libortp-dev Standards-Version: 3.9.7 diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index ee33ae6..44708bb 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -191,7 +192,7 @@ struct e1inp_line { struct llist_head list; - int refcnt; + int refcnt; /* unusued, kept for ABI compat, use_count is used instead */ unsigned int num; const char *name; @@ -215,6 +216,8 @@ struct e1inp_driver *driver; void *driver_data; + + struct osmo_use_count use_count; }; #define e1inp_line_ipa_oml_ts(line) (&line->ts[0]) #define e1inp_line_ipa_rsl_ts(line, trx_id) (&line->ts[1 + (trx_id)]) @@ -245,13 +248,17 @@ struct e1inp_line *e1inp_line_create(uint8_t e1_nr, const char *driver_name); /* clone one existing E1 input line */ -struct e1inp_line *e1inp_line_clone(void *ctx, struct e1inp_line *line); +struct e1inp_line *e1inp_line_clone(void *ctx, struct e1inp_line *line, const char *use); /* increment refcount use of E1 input line */ -void e1inp_line_get(struct e1inp_line *line); +void e1inp_line_get(struct e1inp_line *line) OSMO_DEPRECATED("Use e1inp_line_get2() instead"); /* decrement refcount use of E1 input line, release if unused */ -void e1inp_line_put(struct e1inp_line *line); +void e1inp_line_put(struct e1inp_line *line) OSMO_DEPRECATED("Use e1inp_line_put2() instead"); + +/* Convenience macros for struct foo instances. These are strict about use count errors. */ +#define e1inp_line_get2(line, USE) OSMO_ASSERT( osmo_use_count_get_put(&(line)->use_count, USE, 1) == 0 ); +#define e1inp_line_put2(line, USE) OSMO_ASSERT( osmo_use_count_get_put(&(line)->use_count, USE, -1) == 0 ); /* bind operations to one E1 input line */ void e1inp_line_bind_ops(struct e1inp_line *line, const struct e1inp_line_ops *ops); diff --git a/src/e1_input.c b/src/e1_input.c index 9ea4f17..fc0370d 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -366,6 +367,48 @@ return 0; } +static int e1inp_line_use_cb(struct osmo_use_count_entry *use_count_entry, int32_t old_use_count, + const char *file, int file_line) +{ + char buf[512]; + struct osmo_use_count *uc = use_count_entry->use_count; + struct e1inp_line *line = uc->talloc_object; + + LOGPSRC(DLINP, LOGL_INFO, file, file_line, + "E1L(%u) Line (%p) reference count %s changed %" PRId32 " -> %" PRId32 " [%s]\n", + (line)->num, line, use_count_entry->use, + old_use_count, use_count_entry->count, + osmo_use_count_name_buf(buf, sizeof(buf), uc)); + + if (!use_count_entry->count) + osmo_use_count_free(use_count_entry); + + if (osmo_use_count_total(uc) > 0) + return 0; + + /* Remove our counter group from libosmocore's global counter + * list if we are freeing the last remaining talloc context. + * Otherwise we get a use-after-free when libosmocore's timer + * ticks again and attempts to update these counters (OS#3011). + * + * Note that talloc internally counts "secondary" references + * _in addition to_ the initial allocation context, so yes, + * we must check for *zero* remaining secondary contexts here. */ + if (talloc_reference_count(line->rate_ctr) == 0) { + rate_ctr_group_free(line->rate_ctr); + } else { + /* We are not freeing the last talloc context. + * Instead of calling talloc_free(), unlink this 'line' pointer + * which serves as one of several talloc contexts for the rate + * counters and driver private state. */ + talloc_unlink(line, line->rate_ctr); + if (line->driver_data) + talloc_unlink(line, line->driver_data); + } + talloc_free(line); + return 0; +} + struct e1inp_line *e1inp_line_find(uint8_t e1_nr) { struct e1inp_line *e1i_line; @@ -417,14 +460,18 @@ line->ts[i].num = i+1; line->ts[i].line = line; } - line->refcnt++; + + line->use_count.talloc_object = line; + line->use_count.use_cb = e1inp_line_use_cb; + e1inp_line_get2(line, "ctor"); + llist_add_tail(&line->list, &e1inp_line_list); return line; } struct e1inp_line * -e1inp_line_clone(void *ctx, struct e1inp_line *line) +e1inp_line_clone(void *ctx, struct e1inp_line *line, const char *use) { struct e1inp_line *clone; @@ -453,47 +500,23 @@ if (line->driver_data) clone->driver_data = talloc_reference(clone, line->driver_data); - clone->refcnt = 1; + clone->use_count = (struct osmo_use_count) { + .talloc_object = clone, + .use_cb = e1inp_line_use_cb, + .use_counts = {0}, + }; + e1inp_line_get2(clone, use); /* Clone is used internally for bfd */ return clone; } void e1inp_line_get(struct e1inp_line *line) { - int old_refcnt = line->refcnt++; - - LOGPIL(line, DLINP, LOGL_DEBUG, "Line '%s' (%p) reference count get: %d -> %d\n", - line->name, line, old_refcnt, line->refcnt); + e1inp_line_get2(line, "unknown"); } void e1inp_line_put(struct e1inp_line *line) { - int old_refcnt = line->refcnt--; - - LOGPIL(line, DLINP, LOGL_DEBUG, "Line '%s' (%p) reference count put: %d -> %d\n", - line->name, line, old_refcnt, line->refcnt); - - if (line->refcnt == 0) { - /* Remove our counter group from libosmocore's global counter - * list if we are freeing the last remaining talloc context. - * Otherwise we get a use-after-free when libosmocore's timer - * ticks again and attempts to update these counters (OS#3011). - * - * Note that talloc internally counts "secondary" references - * _in addition to_ the initial allocation context, so yes, - * we must check for *zero* remaining secondary contexts here. */ - if (talloc_reference_count(line->rate_ctr) == 0) { - rate_ctr_group_free(line->rate_ctr); - } else { - /* We are not freeing the last talloc context. - * Instead of calling talloc_free(), unlink this 'line' pointer - * which serves as one of several talloc contexts for the rate - * counters and driver private state. */ - talloc_unlink(line, line->rate_ctr); - if (line->driver_data) - talloc_unlink(line, line->driver_data); - } - talloc_free(line); - } + e1inp_line_put2(line, "unknown"); } void @@ -586,7 +609,7 @@ link->tei = tei; link->sapi = sapi; - e1inp_line_get(link->ts->line); + e1inp_line_get2(link->ts->line, "e1inp_sign_link"); llist_add_tail(&link->list, &ts->sign.sign_links); @@ -609,7 +632,7 @@ if (link->ts->line->driver->close) link->ts->line->driver->close(link); - e1inp_line_put(link->ts->line); + e1inp_line_put2(link->ts->line, "e1inp_sign_link"); talloc_free(link); } diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 917a195..5d17839 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -293,7 +293,7 @@ /* Finally, we know which OML link is associated with * this RSL link, attach it to this socket. */ bfd->data = new_line = sign_link->ts->line; - e1inp_line_get(new_line); + e1inp_line_get2(new_line, "ipa_bfd"); ts = e1inp_line_ipa_rsl_ts(new_line, unit_data.trx_id); newbfd = &ts->driver.ipaccess.fd; @@ -310,7 +310,7 @@ goto err; } /* now we can release the dummy RSL line. */ - e1inp_line_put(line); + e1inp_line_put2(line, "ipa_bfd"); e1i_ts = ipaccess_line_ts(newbfd, new_line); ipaccess_bsc_keepalive_fsm_alloc(e1i_ts, newbfd, "rsl_bsc_to_bts"); @@ -328,7 +328,7 @@ close(bfd->fd); bfd->fd = -1; } - e1inp_line_put(line); + e1inp_line_put2(line, "ipa_bfd"); return -1; } @@ -603,7 +603,7 @@ struct osmo_fd *bfd; /* clone virtual E1 line for this new OML link. */ - line = e1inp_line_clone(tall_ipa_ctx, link->line); + line = e1inp_line_clone(tall_ipa_ctx, link->line, "ipa_bfd"); if (line == NULL) { LOGP(DLINP, LOGL_ERROR, "could not clone E1 line\n"); return -ENOMEM; @@ -642,7 +642,7 @@ err_line: close(bfd->fd); bfd->fd = -1; - e1inp_line_put(line); + e1inp_line_put2(line, "ipa_bfd"); return ret; } @@ -655,7 +655,7 @@ /* We don't know yet which OML link to associate it with. Thus, we * allocate a temporary E1 line until we have received ID. */ - line = e1inp_line_clone(tall_ipa_ctx, link->line); + line = e1inp_line_clone(tall_ipa_ctx, link->line, "ipa_bfd"); if (line == NULL) { LOGP(DLINP, LOGL_ERROR, "could not clone E1 line\n"); return -ENOMEM; @@ -692,7 +692,7 @@ err_line: close(bfd->fd); bfd->fd = -1; - e1inp_line_put(line); + e1inp_line_put2(line, "ipa_bfd"); return ret; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0658b2e9c452598025cc0f1d0b060076171767cc Gerrit-Change-Number: 19256 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 15:27:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 15:27:31 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Drop e1inp_line reference in ipacess_drop() In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19257 ) Change subject: ipaccess: Drop e1inp_line reference in ipacess_drop() ...................................................................... ipaccess: Drop e1inp_line reference in ipacess_drop() the bfd->data handles a reference to the e1np_line (obtained through e1inp_line_get() during bfd setup), so remember to drop it under this condition. Related: OS#4624 Change-Id: I418064df04872befe2e936e21768b6ea01263120 --- M src/input/ipaccess.c 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 5d17839..08b34a4 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -92,6 +92,13 @@ osmo_fd_unregister(bfd); close(bfd->fd); bfd->fd = -1; + /* This is BSC code, ipaccess_drop() is only called for + accepted() sockets, hence the bfd holds a reference to + e1inp_line in ->data that needs to be released */ + OSMO_ASSERT(bfd->data == line); + bfd->data = NULL; + e1inp_line_put2(line, "ipa_bfd"); + ret = -ENOENT; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I418064df04872befe2e936e21768b6ea01263120 Gerrit-Change-Number: 19257 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 15:27:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 15:27:31 +0000 Subject: Change in libosmo-abis[master]: ipacces: Fix e1inp_line reference put in ipaccess_close In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19258 ) Change subject: ipacces: Fix e1inp_line reference put in ipaccess_close ...................................................................... ipacces: Fix e1inp_line reference put in ipaccess_close Drop the function e1inp_close_socket since it's only used by the caller at hand, and it's only exported through "internal.h", so no app is using it. Remove it because there's only a caller, and furthermore because keeping it (and putting bfd->data==line) would introduce a layer violation because the bfd->data==line is only used for ipaccess so far. Triggering path: handle_ts1_read ret=0 "Sign link vanished" ipaccess_drop line->ops->sign_link_down (osmo-bsc) ipaccess_drop_oml e1inp_sign_link_destroy link->ts->line->driver->close ipaccess_close Related: OS#4624 Change-Id: If23cc722106a9f70c998e591369a4acafa52c519 --- M include/internal.h M src/e1_input.c M src/input/ipaccess.c 3 files changed, 15 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/internal.h b/include/internal.h index c931d4f..8a5aa2e 100644 --- a/include/internal.h +++ b/include/internal.h @@ -20,13 +20,7 @@ struct msgb; struct msgb *ipa_msg_alloc(int headroom); -/* - * helper for internal drivers, not public - */ -void e1inp_close_socket(struct e1inp_ts *ts, - struct e1inp_sign_link *sign_link, - struct osmo_fd *bfd); - +int e1inp_int_snd_event(struct e1inp_ts *ts, struct e1inp_sign_link *link, int evt); #endif diff --git a/src/e1_input.c b/src/e1_input.c index fc0370d..df61c7b 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -816,8 +816,7 @@ return msg; } -static int e1inp_int_snd_event(struct e1inp_ts *ts, - struct e1inp_sign_link *link, int evt) +int e1inp_int_snd_event(struct e1inp_ts *ts, struct e1inp_sign_link *link, int evt) { struct input_signal_data isd; isd.line = ts->line; @@ -844,19 +843,6 @@ return e1inp_int_snd_event(ts, link, evt); } -void e1inp_close_socket(struct e1inp_ts *ts, - struct e1inp_sign_link *sign_link, - struct osmo_fd *bfd) -{ - e1inp_int_snd_event(ts, sign_link, S_L_INP_TEI_DN); - /* the first e1inp_sign_link_destroy call closes the socket. */ - if (bfd->fd != -1) { - osmo_fd_unregister(bfd); - close(bfd->fd); - bfd->fd = -1; - } -} - /* register a driver with the E1 core */ int e1inp_driver_register(struct e1inp_driver *drv) { diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 08b34a4..4d55e71 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -431,7 +431,19 @@ } - return e1inp_close_socket(e1i_ts, sign_link, bfd); + e1inp_int_snd_event(e1i_ts, sign_link, S_L_INP_TEI_DN); + /* the first e1inp_sign_link_destroy call closes the socket. */ + if (bfd->fd != -1) { + osmo_fd_unregister(bfd); + close(bfd->fd); + bfd->fd = -1; + /* If The bfd holds a reference to e1inp_line in ->data (BSC + * accepted() sockets), then release it */ + if (bfd->data == line) { + bfd->data = NULL; + e1inp_line_put2(line, "ipa_bfd"); + } + } } static void timeout_ts1_write(void *data) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If23cc722106a9f70c998e591369a4acafa52c519 Gerrit-Change-Number: 19258 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 15:27:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 15:27:32 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Set bfd->data to NULL before releasing its reference In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19259 ) Change subject: ipaccess: Set bfd->data to NULL before releasing its reference ...................................................................... ipaccess: Set bfd->data to NULL before releasing its reference Since the reference is dropped, make sure no one accesses it through that pointer anymore. It must be done before calling the put() method, otherwise it may already be released when put() returns. Change-Id: Ic3f261b2a995efcbc8eece9669ee3ae63af7b5c0 --- M src/input/ipaccess.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 4d55e71..3ff59f4 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -661,6 +661,7 @@ err_line: close(bfd->fd); bfd->fd = -1; + bfd->data = NULL; e1inp_line_put2(line, "ipa_bfd"); return ret; } @@ -711,6 +712,7 @@ err_line: close(bfd->fd); bfd->fd = -1; + bfd->data = NULL; e1inp_line_put2(line, "ipa_bfd"); return ret; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic3f261b2a995efcbc8eece9669ee3ae63af7b5c0 Gerrit-Change-Number: 19259 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 15:27:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 15:27:32 +0000 Subject: Change in libosmo-abis[master]: ipaccess_recvmsg: Clean up release steps upon error condition In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19260 ) Change subject: ipaccess_recvmsg: Clean up release steps upon error condition ...................................................................... ipaccess_recvmsg: Clean up release steps upon error condition Related: OS#4624 Change-Id: I47a3e477d6861620a741193d3d3d3e286836fd44 --- M src/input/ipaccess.c 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 3ff59f4..8a7142d 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -330,12 +330,15 @@ } return 0; err: - osmo_fd_unregister(bfd); if (bfd->fd != -1) { + osmo_fd_unregister(bfd); close(bfd->fd); bfd->fd = -1; + /* This is a BSC accepted socket, bfd->data holds a reference to line, drop it */ + OSMO_ASSERT(bfd->data == line); + bfd->data = NULL; + e1inp_line_put2(line, "ipa_bfd"); } - e1inp_line_put2(line, "ipa_bfd"); return -1; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I47a3e477d6861620a741193d3d3d3e286836fd44 Gerrit-Change-Number: 19260 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 15:27:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 15:27:34 +0000 Subject: Change in libosmo-abis[master]: ipaccess_recvmsg: Assert the new bfd from new line differs from the o... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19261 ) Change subject: ipaccess_recvmsg: Assert the new bfd from new line differs from the old one ...................................................................... ipaccess_recvmsg: Assert the new bfd from new line differs from the old one Related: OS#4624 Change-Id: I45818e04af0da7b1109d909642a1ea378a85a636 --- M src/input/ipaccess.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 8a7142d..02a5028 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -303,6 +303,7 @@ e1inp_line_get2(new_line, "ipa_bfd"); ts = e1inp_line_ipa_rsl_ts(new_line, unit_data.trx_id); newbfd = &ts->driver.ipaccess.fd; + OSMO_ASSERT(newbfd != bfd); /* get rid of our old temporary bfd */ /* preserve 'newbfd->when' flags potentially set by sign_link_up() */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I45818e04af0da7b1109d909642a1ea378a85a636 Gerrit-Change-Number: 19261 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 15:27:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 15:27:35 +0000 Subject: Change in libosmo-abis[master]: ipaccess_recvmsg: Untangle code updating line In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19262 ) Change subject: ipaccess_recvmsg: Untangle code updating line ...................................................................... ipaccess_recvmsg: Untangle code updating line This patch untangles the code a bit by changing the order where actions are taken and variables are assigned. The only real changes in behavour are the introduced assert, and that bfd->data is set to NULL before releasing the related line. Related: OS#4624 Change-Id: I947f64f8fa20f87fdc84538402623a6bcf35fdf9 --- M src/input/ipaccess.c 1 file changed, 13 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 02a5028..d81191c 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -288,37 +288,42 @@ "closing socket.\n"); goto err; } + /* Finally, we know which OML link is associated with + * this RSL link, attach it to this socket. */ + new_line = sign_link->ts->line; /* this is a bugtrap, the BSC should be using the * virtual E1 line used by OML for this RSL link. */ - if (sign_link->ts->line == line) { + if (new_line == line) { LOGP(DLINP, LOGL_ERROR, "Fix your BSC, you should use the " "E1 line used by the OML link for " "your RSL link.\n"); return 0; } - /* Finally, we know which OML link is associated with - * this RSL link, attach it to this socket. */ - bfd->data = new_line = sign_link->ts->line; e1inp_line_get2(new_line, "ipa_bfd"); ts = e1inp_line_ipa_rsl_ts(new_line, unit_data.trx_id); newbfd = &ts->driver.ipaccess.fd; OSMO_ASSERT(newbfd != bfd); - /* get rid of our old temporary bfd */ /* preserve 'newbfd->when' flags potentially set by sign_link_up() */ osmo_fd_setup(newbfd, bfd->fd, newbfd->when | bfd->when, bfd->cb, - bfd->data, E1INP_SIGN_RSL + unit_data.trx_id); + new_line, E1INP_SIGN_RSL + unit_data.trx_id); + + + /* now we can release the dummy RSL line (old temporary bfd). */ osmo_fd_unregister(bfd); bfd->fd = -1; + /* bfd->data holds a reference to line, drop it */ + OSMO_ASSERT(bfd->data == line); + bfd->data = NULL; + e1inp_line_put2(line, "ipa_bfd"); + ret = osmo_fd_register(newbfd); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "could not register FD\n"); goto err; } - /* now we can release the dummy RSL line. */ - e1inp_line_put2(line, "ipa_bfd"); e1i_ts = ipaccess_line_ts(newbfd, new_line); ipaccess_bsc_keepalive_fsm_alloc(e1i_ts, newbfd, "rsl_bsc_to_bts"); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I947f64f8fa20f87fdc84538402623a6bcf35fdf9 Gerrit-Change-Number: 19262 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 15:27:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 15:27:35 +0000 Subject: Change in libosmo-abis[master]: cosmetic: lapd: Fix trailing whitespace In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19280 ) Change subject: cosmetic: lapd: Fix trailing whitespace ...................................................................... cosmetic: lapd: Fix trailing whitespace Change-Id: I7a6af2f417f6f924a3f27cfa12462158f2c2a1c6 --- M src/input/lapd.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/input/lapd.c b/src/input/lapd.c index 5c0a6b6..5359a64 100644 --- a/src/input/lapd.c +++ b/src/input/lapd.c @@ -647,7 +647,7 @@ container_of(dl, struct lapd_sap, dl); struct lapd_instance *li; uint8_t tei, sapi; - char *op = (dp->oph.operation == PRIM_OP_INDICATION) ? "indication" + char *op = (dp->oph.operation == PRIM_OP_INDICATION) ? "indication" : "confirm"; li = sap->tei->li; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7a6af2f417f6f924a3f27cfa12462158f2c2a1c6 Gerrit-Change-Number: 19280 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 15:27:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 15:27:36 +0000 Subject: Change in libosmo-abis[master]: lapd: Use lapd_dl_init2 instead of deprecated lapd_dl_init In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19281 ) Change subject: lapd: Use lapd_dl_init2 instead of deprecated lapd_dl_init ...................................................................... lapd: Use lapd_dl_init2 instead of deprecated lapd_dl_init Change-Id: If25957d10bf9e32d2fe601111a9c1311aee21094 --- M TODO-RELEASE M src/input/lapd.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index aa278ec..bf3ef84 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -11,3 +11,4 @@ libosmo-trau API change add new function osmo_rtp_socket_set_dscp() libosmo-abis API change major: add parameter to struct lapd_instance libosmo-abis Field added struct e1inp_line "use_count". REMINDER: Upon LIBVERSION c bump, take the chance to drop struct e1inp_line "refcnt" field. +libosmo-abis libosmogsm dep Use of lapd_dl_init2() requires libosmocore > 1.3.0 (not yet released, 00b2faf8217338d4d7d1f4d27331af3151447350) diff --git a/src/input/lapd.c b/src/input/lapd.c index 5359a64..d8c67e4 100644 --- a/src/input/lapd.c +++ b/src/input/lapd.c @@ -259,8 +259,7 @@ LOGP(DLLAPD, LOGL_NOTICE, "%s: k=%d N200=%d N201=%d T200=%d.%d T203=%d.%d\n", name, k, profile->n200, profile->n201, profile->t200_sec, profile->t200_usec, profile->t203_sec, profile->t203_usec); - lapd_dl_init(dl, k, 128, profile->n201); - lapd_dl_set_name(dl, name); + lapd_dl_init2(dl, k, 128, profile->n201, name); dl->use_sabme = 1; /* use SABME instead of SABM (GSM) */ dl->send_ph_data_req = send_ph_data_req; dl->send_dlsap = send_dlsap; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If25957d10bf9e32d2fe601111a9c1311aee21094 Gerrit-Change-Number: 19281 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 15:27:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 15:27:36 +0000 Subject: Change in libosmo-abis[master]: tests: Use API e1inp_line_put2 instead of deprecated e1inp_line_put In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19282 ) Change subject: tests: Use API e1inp_line_put2 instead of deprecated e1inp_line_put ...................................................................... tests: Use API e1inp_line_put2 instead of deprecated e1inp_line_put Change-Id: If3fb68fda1c109f6aa15aa68c5bce285054efda7 --- M tests/e1inp_ipa_bsc_test.c M tests/e1inp_ipa_bts_test.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/e1inp_ipa_bsc_test.c b/tests/e1inp_ipa_bsc_test.c index a7317f8..12c436b 100644 --- a/tests/e1inp_ipa_bsc_test.c +++ b/tests/e1inp_ipa_bsc_test.c @@ -205,7 +205,7 @@ static void sighandler(int foo) { - e1inp_line_put(line); + e1inp_line_put2(line, "ctor"); exit(EXIT_SUCCESS); } diff --git a/tests/e1inp_ipa_bts_test.c b/tests/e1inp_ipa_bts_test.c index 10fe0e8..d6c3772 100644 --- a/tests/e1inp_ipa_bts_test.c +++ b/tests/e1inp_ipa_bts_test.c @@ -244,7 +244,7 @@ static void sighandler(int foo) { - e1inp_line_put(line); + e1inp_line_put2(line, "ctor"); exit(EXIT_SUCCESS); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19282 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If3fb68fda1c109f6aa15aa68c5bce285054efda7 Gerrit-Change-Number: 19282 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Jul 20 16:12:36 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 20 Jul 2020 16:12:36 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f15c28fd88aa_1cad2af072742600979744@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Testing/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 59s] /usr/src/packages/BUILD/src/ulfius.c: In function 'ulfius_run_mhd_daemon': [ 59s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 59s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 59s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 59s] | | [ 59s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 59s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 59s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 59s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 59s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 59s] 2425 | MHD_start_daemon (unsigned int flags, [ 59s] | ^~~~~~~~~~~~~~~~ [ 59s] cc1: all warnings being treated as errors [ 59s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 59s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 59s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 59s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 59s] make[1]: *** [Makefile:166: all] Error 2 [ 59s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 59s] dh_auto_build: error: cd build && make -j3 "INSTALL=install --strip-program=true" returned exit code 2 [ 59s] make: *** [debian/rules:9: build] Error 25 [ 59s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 59s] ### VM INTERACTION START ### [ 62s] [ 54.821852] sysrq: SysRq : Power Off [ 62s] [ 54.823103] reboot: Power down [ 62s] ### VM INTERACTION END ### [ 62s] [ 62s] build75 failed "build ulfius_2.5.2-4.1.dsc" at Mon Jul 20 16:12:20 UTC 2020. [ 62s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jul 20 16:13:27 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 20 Jul 2020 16:13:27 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f15c2b0303e3_1cad2af07274260097995a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Testing/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 60s] /usr/src/packages/BUILD/src/ulfius.c: In function 'ulfius_run_mhd_daemon': [ 60s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 60s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 60s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 60s] | | [ 60s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 60s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 60s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 60s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 60s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 60s] 2425 | MHD_start_daemon (unsigned int flags, [ 60s] | ^~~~~~~~~~~~~~~~ [ 60s] cc1: all warnings being treated as errors [ 60s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 60s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 60s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 60s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 60s] make[1]: *** [Makefile:166: all] Error 2 [ 60s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 60s] dh_auto_build: error: cd build && make -j3 "INSTALL=install --strip-program=true" returned exit code 2 [ 60s] make: *** [debian/rules:9: build] Error 25 [ 60s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 60s] ### VM INTERACTION START ### [ 63s] [ 56.004642] sysrq: SysRq : Power Off [ 63s] [ 56.005886] reboot: Power down [ 63s] ### VM INTERACTION END ### [ 63s] [ 63s] build72 failed "build ulfius_2.5.2-4.1.dsc" at Mon Jul 20 16:13:15 UTC 2020. [ 63s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Jul 20 17:49:43 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 20 Jul 2020 17:49:43 +0000 Subject: Change in osmo-mgw[master]: mgcp_endp: add function to claim an endpoint In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19166 ) Change subject: mgcp_endp: add function to claim an endpoint ...................................................................... Abandoned Its probably a bit early for this. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I402ac43dffd2c85789e4f0308a540e227063cc28 Gerrit-Change-Number: 19166 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-CC: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 20:31:26 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jul 2020 20:31:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: verify handling of frequency hopping parameters In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 to look at the new patch set (#4). Change subject: PCU_Tests: verify handling of frequency hopping parameters ...................................................................... PCU_Tests: verify handling of frequency hopping parameters Change-Id: I1beda9224998848f9243237413e5ae3e0ddab8a5 Related: SYS#4868, OS#4547 --- M pcu/PCU_Tests.ttcn 1 file changed, 128 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/19324/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1beda9224998848f9243237413e5ae3e0ddab8a5 Gerrit-Change-Number: 19324 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 20:31:28 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jul 2020 20:31:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: make use of 'LENGTHTO(...)+N' syntax References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19338 ) Change subject: library/RLCMAC_CSN1_Types: make use of 'LENGTHTO(...)+N' syntax ...................................................................... library/RLCMAC_CSN1_Types: make use of 'LENGTHTO(...)+N' syntax Thanks to LaF0rge, this syntax is now supported by TITAN. Change-Id: I16ddc3e9f57dffba3e0f2ea80eeb63be3468da06 Related: SYS#4868, OS#4547 --- M library/RLCMAC_CSN1_Types.ttcn 1 file changed, 2 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/19338/1 diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index 20c2d81..a14577a 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -757,9 +757,7 @@ uint4_t ma_freq_len, octetstring m1_freq_list } with { - /* FIXME: this can not be expressed in TTCN-3 ?!? */ - //variant (ma_freq_len) "LENGTHTO(m1_freq_list)+3" - variant (ma_freq_len) "LENGTHTO(m1_freq_list)" + variant (ma_freq_len) "LENGTHTO(m1_freq_list)+3" }; type record FrequencyParameters { uint3_t tsc, @@ -801,9 +799,7 @@ variant (rfl_number_list) "PRESENCE(rfl_number_list_present = '1'B)" variant (ma_length) "PRESENCE(ma_present = '0'B)" variant (ma_bitmap) "PRESENCE(ma_present = '0'B)" - /* FIXME: this can not be expressed in TTCN-3 ?!? */ - //variant (ma_length) "LENGTHTO(ma_bitmap)+1" - variant (ma_length) "LENGTHTO(ma_bitmap)" + variant (ma_length) "LENGTHTO(ma_bitmap)+1" } /* 12.11 Packet Request Reference */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I16ddc3e9f57dffba3e0f2ea80eeb63be3468da06 Gerrit-Change-Number: 19338 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 20:31:28 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jul 2020 20:31:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_Templates: make ts_RLC_UL_CTRL_ACK accept a template References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19339 ) Change subject: library/RLCMAC_Templates: make ts_RLC_UL_CTRL_ACK accept a template ...................................................................... library/RLCMAC_Templates: make ts_RLC_UL_CTRL_ACK accept a template Change-Id: Ia71401b5c0d439eeb0dc58739ef0e68b15d4123f --- M library/RLCMAC_Templates.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/39/19339/1 diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index 560074f..5ad1b4f 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -317,7 +317,7 @@ return 0; } - template (value) RlcmacUlBlock ts_RLC_UL_CTRL_ACK(RlcmacUlCtrlMsg ctrl, + template (value) RlcmacUlBlock ts_RLC_UL_CTRL_ACK(template (value) RlcmacUlCtrlMsg ctrl, MacPayloadType pt := MAC_PT_RLCMAC_NO_OPT, boolean retry := false) := { ctrl := { diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 20e3582..2208aeb 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -1140,7 +1140,7 @@ /* Send PACKET RESOURCE REQUEST to upgrade to EGPRS * (see 3GPP TS 04.60 "7.1.3.1 Initiation of the Packet resource request procedure") */ - f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(valueof(ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap))), 0); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)), 0); f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS); if (not match(ms.ul_tbf.tx_cs_mcs, exp_ul_cs_mcs)) { setverdict(fail, "Wrong CS_MCS ", ms.ul_tbf.tx_cs_mcs, " received vs exp ", exp_ul_cs_mcs); @@ -1637,7 +1637,7 @@ /* TODO: verify TBF_EST and FinalACK are both '1' above */ /* Send PACKET RESOURCE REQUEST to request a new UL TBF */ - f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(valueof(ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, omit))), sched_fn); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, omit)), sched_fn); f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS); /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia71401b5c0d439eeb0dc58739ef0e68b15d4123f Gerrit-Change-Number: 19339 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 20:31:28 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jul 2020 20:31:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_Templates: cosmetic coding style change References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19340 ) Change subject: library/RLCMAC_Templates: cosmetic coding style change ...................................................................... library/RLCMAC_Templates: cosmetic coding style change Change-Id: I76931373fe9e1cf0de4263c09e36442bad7c3ce1 --- M library/RLCMAC_Templates.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/19340/1 diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index 5ad1b4f..a217f46 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -544,7 +544,7 @@ } template RlcmacDlBlock tr_RLCMAC_UL_PACKET_ASS_GPRS(template uint3_t usf := ?, template PktUlAssGprs gprs := ?) - modifies tr_RLCMAC_UL_PACKET_ASS := { + modifies tr_RLCMAC_UL_PACKET_ASS := { ctrl := { payload := { u := { @@ -559,7 +559,7 @@ } template RlcmacDlBlock tr_RLCMAC_UL_PACKET_ASS_EGPRS(template uint3_t usf := ?, template PktUlAssEgprs egprs := ?) - modifies tr_RLCMAC_UL_PACKET_ASS := { + modifies tr_RLCMAC_UL_PACKET_ASS := { ctrl := { payload := { u := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I76931373fe9e1cf0de4263c09e36442bad7c3ce1 Gerrit-Change-Number: 19340 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 20:31:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jul 2020 20:31:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GPRS_Components: s/f_ms_rx_imm_ass_pacch/f_ms_rx_pkt_ass_pacch/g References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19341 ) Change subject: GPRS_Components: s/f_ms_rx_imm_ass_pacch/f_ms_rx_pkt_ass_pacch/g ...................................................................... GPRS_Components: s/f_ms_rx_imm_ass_pacch/f_ms_rx_pkt_ass_pacch/g Immediate Assignment is sent on AGCH/PCH, while on PACCH we have Packet Uplink/Downlink Assignment instead (see 11.2.29, 11.2.7). Change-Id: I56473ae5dfa565d2c9d26984b14685a4163bf69a --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/19341/1 diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index bba2c97..ee2c38f 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -280,14 +280,15 @@ } } -function f_ms_rx_imm_ass_pacch(inout GprsMS ms, out uint32_t poll_fn, template RlcmacDlBlock t_imm_ass := ?) +function f_ms_rx_pkt_ass_pacch(inout GprsMS ms, out uint32_t poll_fn, + template RlcmacDlBlock t_pkt_ass := ?) runs on MS_BTS_IFACE_CT return RlcmacDlBlock { var RlcmacDlBlock dl_block; var uint32_t dl_fn; f_rx_rlcmac_dl_block(dl_block, dl_fn); - if (not match(dl_block, t_imm_ass)) { - setverdict(fail, "Failed to match Packet Assignment:", t_imm_ass); + if (not match(dl_block, t_pkt_ass)) { + setverdict(fail, "Failed to match Packet Assignment:", t_pkt_ass); f_shutdown(__BFILE__, __LINE__); } diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index d2b4a21..dab87e0 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -819,7 +819,7 @@ (T3192 in MS) was started and until it fires the MS will be available on PDCH in case new data arrives from SGSN. Let's verify it: */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data)); - f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_DL_PACKET_ASS); + f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_DL_PACKET_ASS); f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); @@ -1141,7 +1141,7 @@ * (see 3GPP TS 04.60 "7.1.3.1 Initiation of the Packet resource request procedure") */ f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)), 0); - f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS); + f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS); if (not match(ms.ul_tbf.tx_cs_mcs, exp_ul_cs_mcs)) { setverdict(fail, "Wrong CS_MCS ", ms.ul_tbf.tx_cs_mcs, " received vs exp ", exp_ul_cs_mcs); f_shutdown(__BFILE__, __LINE__); @@ -1159,7 +1159,7 @@ /* Now SGSN sends some DL data, PCU will page on PACCH */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data)); - f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_DL_PACKET_ASS); + f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_DL_PACKET_ASS); /* DL Ass sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); @@ -1260,7 +1260,7 @@ f_dl_block_ack_fn(dl_block, dl_fn)); /* Expect UL ass */ - f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS); + f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS); /* Send one UL block (with TLLI since we are in One-Phase Access contention resoultion) and make sure it is ACKED fine */ @@ -1638,7 +1638,7 @@ /* Send PACKET RESOURCE REQUEST to request a new UL TBF */ f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, omit)), sched_fn); - f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS); + f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS); /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I56473ae5dfa565d2c9d26984b14685a4163bf69a Gerrit-Change-Number: 19341 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 20:31:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jul 2020 20:31:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix definition of GprsMobileAllication References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19342 ) Change subject: library/RLCMAC_CSN1_Types: fix definition of GprsMobileAllication ...................................................................... library/RLCMAC_CSN1_Types: fix definition of GprsMobileAllication Change-Id: I8f2c8c7b234605523a4fd518210b45ea3c088ff6 --- M library/RLCMAC_CSN1_Types.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/42/19342/1 diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index a14577a..3ca3653 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -799,7 +799,8 @@ variant (rfl_number_list) "PRESENCE(rfl_number_list_present = '1'B)" variant (ma_length) "PRESENCE(ma_present = '0'B)" variant (ma_bitmap) "PRESENCE(ma_present = '0'B)" - variant (ma_length) "LENGTHTO(ma_bitmap)+1" + variant (ma_length) "LENGTHTO(ma_bitmap)+1, UNIT(bits)" + variant (ma_bitmap) "BYTEORDER(first), BITORDER(msb)" } /* 12.11 Packet Request Reference */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8f2c8c7b234605523a4fd518210b45ea3c088ff6 Gerrit-Change-Number: 19342 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 20:31:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jul 2020 20:31:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fixup PCU_Tests: add TC_pcuif_fh_ass_ul References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19343 ) Change subject: fixup PCU_Tests: add TC_pcuif_fh_ass_ul ...................................................................... fixup PCU_Tests: add TC_pcuif_fh_ass_ul Change-Id: Ic57f0a8eb029a19c33ac1355bb37181dd5c69d36 --- M pcu/PCU_Tests.ttcn 1 file changed, 71 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/43/19343/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 76a2aa7..4611883 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -2190,6 +2190,77 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Make sure that Uplink Assignment contains hopping parameters */ +testcase TC_pcuif_fh_ass_ul() runs on RAW_PCU_Test_CT { + var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; + var GprsMS ms := valueof(t_GprsMS_def); + var uint32_t poll_fn; + + /* Enable frequency hopping of TRX0/TS7 */ + info_ind.trx.v10[0].ts[7] := ts_PCUIF_InfoTrxTsH1( + tsc := f_rnd_int(7), + hsn := f_rnd_int(63), + maio := f_rnd_int(63), + ma := '1010101'B); // FIXME: f_rnd_bitstring(7)); + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Establish an Uplink TBF */ + f_ms_establish_ul_tbf(ms); + + /* Send Packet Resource Request, so the network will allocate an Uplink resource */ + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, omit))); + + /* Expect an RLC/MAC block with Packet Uplink Assignment on PACCH (see 11.2.29) */ + var RlcmacDlBlock blk := f_ms_rx_pkt_ass_pacch(ms, poll_fn, tr_RLCMAC_UL_PACKET_ASS); + var PacketUlAssignment ua := blk.ctrl.payload.u.ul_assignment; + + /* 3GPP TS 44.060, section 12.8 "Frequency Parameters" */ + var template (omit) FrequencyParameters fp; + if (ua.is_egprs == '1'B) { + fp := ua.egprs.freq_par; + } else { + fp := ua.gprs.freq_par; + } + + /* This is an optional IE, so it's worth to check its presence */ + if (istemplatekind(fp, "omit")) { + setverdict(fail, "Frequency Parameters IE is not present"); + f_shutdown(__BFILE__, __LINE__); + } + + /* Table 12.8.1: Frequency Parameters information elements */ + var template (omit) FrequencyParameters tr_fp := { + tsc := info_ind.trx.v10[0].ts[7].tsc, + presence := '10'B, /* Direct encoding 1 */ + arfcn := omit, + indirect := omit, + direct1 := { + maio := info_ind.trx.v10[0].ts[7].maio, + /* Table 12.10a.1: GPRS Mobile Allocation information elements */ + mobile_allocation := { + hsn := info_ind.trx.v10[0].ts[7].hsn, + rfl_number_list_present := '0'B, + rfl_number_list := omit, + ma_present := '0'B, + ma_length := 7, /* FIXME: hard-coded */ + ma_bitmap := '1010101'B /* FIXME: hard-coded */ + } + }, + direct2 := omit + }; + + /* This is an optional IE, so it's worth to check its presence */ + if (not match(valueof(fp), tr_fp)) { + setverdict(fail, "Frequency Parameters IE does not match: ", + valueof(fp), " vs ", tr_fp); + f_shutdown(__BFILE__, __LINE__); + } + + f_shutdown(__BFILE__, __LINE__, final := true); +} + control { execute( TC_pcuif_suspend() ); execute( TC_ta_ptcch_idle() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic57f0a8eb029a19c33ac1355bb37181dd5c69d36 Gerrit-Change-Number: 19343 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 20:37:10 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jul 2020 20:37:10 +0000 Subject: Change in libosmocore[master]: tests/fsm_test.c: Disable use color in logging output In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19337 ) Change subject: tests/fsm_test.c: Disable use color in logging output ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I81368578c0830477d381566a54671fdde6067b23 Gerrit-Change-Number: 19337 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 20 Jul 2020 20:37:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 20:38:04 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jul 2020 20:38:04 +0000 Subject: Change in libosmocore[master]: logging: Avoid printing OSMO_LOGCOLOR_END if no color was used In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19336 ) Change subject: logging: Avoid printing OSMO_LOGCOLOR_END if no color was used ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie38cc639d7f4acd908f357e5bfb3ced07147583e Gerrit-Change-Number: 19336 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 20 Jul 2020 20:38:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 20:38:51 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 20 Jul 2020 20:38:51 +0000 Subject: Change in osmo-bts[master]: tx_power_test: Disable using color in log output In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19335 ) Change subject: tx_power_test: Disable using color in log output ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5aa95997c8df4ce5ba8271acae99c45f68b96e11 Gerrit-Change-Number: 19335 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 20 Jul 2020 20:38:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 20:39:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 20:39:54 +0000 Subject: Change in osmo-e1d[master]: cosmetic: create HDLC specific sub-structure within e1_ts References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19344 ) Change subject: cosmetic: create HDLC specific sub-structure within e1_ts ...................................................................... cosmetic: create HDLC specific sub-structure within e1_ts This groups all HDLC-specific members together, in preparation of adding more fields for other modes. Change-Id: Ide0577c25836252862153b4f24da550bee013687 --- M src/ctl.c M src/e1d.h M src/intf_line.c 3 files changed, 30 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/44/19344/1 diff --git a/src/ctl.c b/src/ctl.c index 4e74485..697af01 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -150,8 +150,8 @@ ts->mode = mode; if (mode == E1_TS_MODE_HDLCFCS) { - osmo_isdnhdlc_out_init(&ts->hdlc_tx, OSMO_HDLC_F_BITREVERSE); - osmo_isdnhdlc_rcv_init(&ts->hdlc_rx, OSMO_HDLC_F_BITREVERSE); + osmo_isdnhdlc_out_init(&ts->hdlc.tx, OSMO_HDLC_F_BITREVERSE); + osmo_isdnhdlc_rcv_init(&ts->hdlc.rx, OSMO_HDLC_F_BITREVERSE); } int flags = fcntl(ts->fd, F_GETFL); diff --git a/src/e1d.h b/src/e1d.h index fca7d3e..98c3ddc 100644 --- a/src/e1d.h +++ b/src/e1d.h @@ -43,13 +43,15 @@ enum e1_ts_mode mode; /* HDLC handling */ - struct osmo_isdnhdlc_vars hdlc_tx; - struct osmo_isdnhdlc_vars hdlc_rx; + struct { + struct osmo_isdnhdlc_vars tx; + struct osmo_isdnhdlc_vars rx; - uint8_t rx_buf[264]; - uint8_t tx_buf[264]; - int tx_ofs; - int tx_len; + uint8_t rx_buf[264]; + uint8_t tx_buf[264]; + int tx_ofs; + int tx_len; + } hdlc; /* Remote end */ int fd; diff --git a/src/intf_line.c b/src/intf_line.c index af0d45d..6213151 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -157,16 +157,16 @@ oi = 0; while (oi < len) { - rv = osmo_isdnhdlc_decode(&ts->hdlc_rx, + rv = osmo_isdnhdlc_decode(&ts->hdlc.rx, &buf[oi], len-oi, &cl, - ts->rx_buf, sizeof(ts->rx_buf) + ts->hdlc.rx_buf, sizeof(ts->hdlc.rx_buf) ); if (rv > 0) { int bytes_to_write = rv; LOGPTS(ts, DXFR, LOGL_DEBUG, "RX Message: %d [ %s]\n", - rv, osmo_hexdump(ts->rx_buf, rv)); - rv = write(ts->fd, ts->rx_buf, bytes_to_write); + rv, osmo_hexdump(ts->hdlc.rx_buf, rv)); + rv = write(ts->fd, ts->hdlc.rx_buf, bytes_to_write); if (rv < 0) return rv; } else if (rv < 0 && ts->id == 4) { @@ -189,44 +189,44 @@ while (oo < len) { /* Pending message ? */ - if (!ts->tx_len) { - rv = recv(ts->fd, ts->tx_buf, sizeof(ts->tx_buf), MSG_TRUNC); + if (!ts->hdlc.tx_len) { + rv = recv(ts->fd, ts->hdlc.tx_buf, sizeof(ts->hdlc.tx_buf), MSG_TRUNC); if (rv > 0) { - if (rv > sizeof(ts->tx_buf)) { + if (rv > sizeof(ts->hdlc.tx_buf)) { LOGPTS(ts, DXFR, LOGL_ERROR, "Truncated message: Client tried to " "send %d bytes but our buffer is limited to %lu\n", - rv, sizeof(ts->tx_buf)); - rv = sizeof(ts->tx_buf); + rv, sizeof(ts->hdlc.tx_buf)); + rv = sizeof(ts->hdlc.tx_buf); } LOGPTS(ts, DXFR, LOGL_DEBUG, "TX Message: %d [ %s]\n", - rv, osmo_hexdump(ts->tx_buf, rv)); - ts->tx_len = rv; - ts->tx_ofs = 0; + rv, osmo_hexdump(ts->hdlc.tx_buf, rv)); + ts->hdlc.tx_len = rv; + ts->hdlc.tx_ofs = 0; } else if (rv < 0 && errno != EAGAIN) return rv; } /* */ - rv = osmo_isdnhdlc_encode(&ts->hdlc_tx, - &ts->tx_buf[ts->tx_ofs], ts->tx_len - ts->tx_ofs, &cl, + rv = osmo_isdnhdlc_encode(&ts->hdlc.tx, + &ts->hdlc.tx_buf[ts->hdlc.tx_ofs], ts->hdlc.tx_len - ts->hdlc.tx_ofs, &cl, &buf[oo], len - oo ); if (rv < 0) LOGPTS(ts, DXFR, LOGL_ERROR, "ERR TX: %d\n", rv); - if (ts->tx_ofs < ts->tx_len) { + if (ts->hdlc.tx_ofs < ts->hdlc.tx_len) { LOGPTS(ts, DXFR, LOGL_DEBUG, "TX chunk %d/%d %d [ %s]\n", - ts->tx_ofs, ts->tx_len, cl, osmo_hexdump(&buf[ts->tx_ofs], rv)); + ts->hdlc.tx_ofs, ts->hdlc.tx_len, cl, osmo_hexdump(&buf[ts->hdlc.tx_ofs], rv)); } if (rv > 0) oo += rv; - ts->tx_ofs += cl; - if (ts->tx_ofs >= ts->tx_len) { - ts->tx_len = 0; - ts->tx_ofs = 0; + ts->hdlc.tx_ofs += cl; + if (ts->hdlc.tx_ofs >= ts->hdlc.tx_len) { + ts->hdlc.tx_len = 0; + ts->hdlc.tx_ofs = 0; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ide0577c25836252862153b4f24da550bee013687 Gerrit-Change-Number: 19344 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 20:39:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 20:39:55 +0000 Subject: Change in osmo-e1d[master]: implement buffering to chunks in E1->application direction References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19345 ) Change subject: implement buffering to chunks in E1->application direction ...................................................................... implement buffering to chunks in E1->application direction Existing applications (such as those written for DAHDI) expect to be reading data in buffer/chunk sizes. For example OsmoNITB: It doesn't want to execute an expensive read/recv syscall to receive 11 bytes, if it needs at least 160 bytes. Change-Id: I807671bc6f2acaef740ce215b8d8abcb5dce2640 --- M src/ctl.c M src/e1d.h M src/intf_line.c 3 files changed, 65 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/45/19345/1 diff --git a/src/ctl.c b/src/ctl.c index 697af01..3cd6faa 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -121,6 +121,19 @@ close(ts->fd); ts->fd = -1; } + + talloc_free(ts->raw.rx_buf); + ts->raw.rx_buf_size = 0; + ts->raw.rx_buf_used = 0; +} + +static void +_e1d_ts_raw_buf_realloc(struct e1_ts *ts, unsigned int size) +{ + ts->raw.rx_buf = talloc_realloc_size(ts->line, ts->raw.rx_buf, size); + OSMO_ASSERT(ts->raw.rx_buf); + ts->raw.rx_buf_size = size; + ts->raw.rx_buf_used = 0; } static int @@ -137,6 +150,7 @@ break; case E1_TS_MODE_RAW: sock_type = SOCK_STREAM; + _e1d_ts_raw_buf_realloc(ts, 160); /* TODO: make configurable */ break; default: return -EINVAL; diff --git a/src/e1d.h b/src/e1d.h index 98c3ddc..c35f4a8 100644 --- a/src/e1d.h +++ b/src/e1d.h @@ -53,6 +53,13 @@ int tx_len; } hdlc; + /* RAW handling */ + struct { + uint8_t *rx_buf; /* actual buffer storage */ + unsigned int rx_buf_size; /* size of 'buf' in bytes */ + unsigned int rx_buf_used; /* number of bytes used so far */ + } raw; + /* Remote end */ int fd; }; diff --git a/src/intf_line.c b/src/intf_line.c index 6213151..de15c68 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -200,7 +200,7 @@ } LOGPTS(ts, DXFR, LOGL_DEBUG, "TX Message: %d [ %s]\n", rv, osmo_hexdump(ts->hdlc.tx_buf, rv)); - ts->hdlc.tx_len = rv; + ts->hdlc.tx_len = rv; ts->hdlc.tx_ofs = 0; } else if (rv < 0 && errno != EAGAIN) return rv; @@ -338,6 +338,48 @@ return tsz; } +/* append data to the per-timeslot buffer; flush to socket every time buffer is full */ +static int +_tsbuf_append(struct e1_ts *ts, const uint8_t *buf, unsigned int len) +{ + unsigned int appended = 0; + int rv; + + OSMO_ASSERT(ts->mode == E1_TS_MODE_RAW); + + /* we don't keep a larger set of buffers but simply assume that whenever + * we received one full chunk/buffer size, we are able to push the data + * into the underlying unix domain socket. Kernel socket buffering should + * be far sufficient in terms of buffering capacity of voice data (which + * is typically consumed reasonably low latency and hence buffer size) */ + + while (appended < len) { + unsigned int ts_buf_tailroom = ts->raw.rx_buf_size - ts->raw.rx_buf_used; + unsigned int chunk_len; + + /* determine size of chunk we can write at this point */ + chunk_len = len - appended; + if (chunk_len > ts_buf_tailroom) + chunk_len = ts_buf_tailroom; + + /* actually copy the chunk */ + memcpy(ts->raw.rx_buf + ts->raw.rx_buf_used, buf + appended, chunk_len); + ts->raw.rx_buf_used += chunk_len; + appended += chunk_len; + + /* if ts_buf is full: flush + rewind */ + if (ts->raw.rx_buf_used >= ts->raw.rx_buf_size) { + rv = write(ts->fd, ts->raw.rx_buf, ts->raw.rx_buf_size); + if (rv < 0) + return rv; + /* FIXME: count overflows */ + ts->raw.rx_buf_used = 0; + } + } + + return appended; +} + /* write data to a timeslot (hardware -> application direction) */ static int _e1_ts_write(struct e1_ts *ts, const uint8_t *buf, size_t len) @@ -346,7 +388,7 @@ switch (ts->mode) { case E1_TS_MODE_RAW: - rv = write(ts->fd, buf, len); + rv = _tsbuf_append(ts, buf, len); break; case E1_TS_MODE_HDLCFCS: rv = _e1_rx_hdlcfs(ts, buf, len); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I807671bc6f2acaef740ce215b8d8abcb5dce2640 Gerrit-Change-Number: 19345 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 21:00:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 21:00:29 +0000 Subject: Change in osmo-e1d[master]: implement buffering to chunks in E1->application direction In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/19345 to look at the new patch set (#2). Change subject: implement buffering to chunks in E1->application direction ...................................................................... implement buffering to chunks in E1->application direction Existing applications (such as those written for DAHDI) expect to be reading data in buffer/chunk sizes. For example OsmoNITB: It doesn't want to execute an expensive read/recv syscall to receive 11 bytes, if it needs at least 160 bytes. Change-Id: I807671bc6f2acaef740ce215b8d8abcb5dce2640 --- M src/ctl.c M src/e1d.h M src/intf_line.c 3 files changed, 66 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/45/19345/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I807671bc6f2acaef740ce215b8d8abcb5dce2640 Gerrit-Change-Number: 19345 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 21:00:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 21:00:30 +0000 Subject: Change in osmo-e1d[master]: make RAW read buffer size configurable (instead of hard-coded 160) References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19346 ) Change subject: make RAW read buffer size configurable (instead of hard-coded 160) ...................................................................... make RAW read buffer size configurable (instead of hard-coded 160) When opening a timeslot, the client can now specify the (from application perspective) timeslot read buffer size. This breaks ABI, but then we're still at a point where only prototype hardware exists, so we can get away with it. Change-Id: I6d603778cce14c5d72fe5f54904905ea7e66d7ff --- M include/osmocom/e1d/proto.h M include/osmocom/e1d/proto_clnt.h M src/ctl.c M src/e1d-ts-pipe.c M src/proto_clnt.c 5 files changed, 19 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/46/19346/1 diff --git a/include/osmocom/e1d/proto.h b/include/osmocom/e1d/proto.h index d8bce1f..304db94 100644 --- a/include/osmocom/e1d/proto.h +++ b/include/osmocom/e1d/proto.h @@ -116,6 +116,7 @@ struct osmo_e1dp_ts_config { uint8_t mode; + uint16_t read_bufsize; } __attribute__((packed)); struct osmo_e1dp_ts_info { diff --git a/include/osmocom/e1d/proto_clnt.h b/include/osmocom/e1d/proto_clnt.h index ff2cebf..5a4f965 100644 --- a/include/osmocom/e1d/proto_clnt.h +++ b/include/osmocom/e1d/proto_clnt.h @@ -45,4 +45,4 @@ uint8_t intf, uint8_t line, enum osmo_e1dp_line_mode mode); int osmo_e1dp_client_ts_open(struct osmo_e1dp_client *clnt, uint8_t intf, uint8_t line, uint8_t ts, - enum osmo_e1dp_ts_mode mode); + enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize); diff --git a/src/ctl.c b/src/ctl.c index d62195a..fee96f8 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -138,7 +138,7 @@ } static int -_e1d_ts_start(struct e1_ts *ts, enum e1_ts_mode mode) +_e1d_ts_start(struct e1_ts *ts, enum e1_ts_mode mode, uint16_t bufsize) { int ret, sd[2]; int sock_type; @@ -151,7 +151,7 @@ break; case E1_TS_MODE_RAW: sock_type = SOCK_STREAM; - _e1d_ts_raw_buf_realloc(ts, 160); /* TODO: make configurable */ + _e1d_ts_raw_buf_realloc(ts, bufsize); break; default: return -EINVAL; @@ -383,11 +383,14 @@ return 0; } + if (cfg->read_bufsize == 0) + return 0; + /* If already open, close previous */ e1_ts_stop(ts); /* Init */ - ret = _e1d_ts_start(ts, mode); + ret = _e1d_ts_start(ts, mode, cfg->read_bufsize); if (ret < 0) return ret; diff --git a/src/e1d-ts-pipe.c b/src/e1d-ts-pipe.c index 6d3ec80..bae45de 100644 --- a/src/e1d-ts-pipe.c +++ b/src/e1d-ts-pipe.c @@ -44,9 +44,9 @@ static int ts_open(uint8_t intf_nr, uint8_t line_nr, uint8_t ts_nr, - enum osmo_e1dp_ts_mode mode) + enum osmo_e1dp_ts_mode mode, uint16_t bufsize) { - int rc = osmo_e1dp_client_ts_open(g_client, intf_nr, line_nr, ts_nr, mode); + int rc = osmo_e1dp_client_ts_open(g_client, intf_nr, line_nr, ts_nr, mode, bufsize); if (rc < 0) fprintf(stderr, "Cannot open e1d timeslot %u:%u:%u\n", intf_nr, line_nr, ts_nr); return rc; @@ -122,6 +122,7 @@ int intf_nr = -1, line_nr = -1, ts_nr = -1; enum osmo_e1dp_ts_mode mode = E1DP_TSMODE_RAW; char *path = E1DP_DEFAULT_SOCKET; + int bufsize = 160; int tsfd; int option_index, rc; @@ -141,10 +142,11 @@ { "timeslot", 1, 0, 't' }, { "mode", 1, 0, 'm' }, { "read", 1, 0, 'r' }, + { "read-bufsize", 1, 0, 'b' }, { 0,0,0,0 } }; - c = getopt_long(argc, argv, "hp:i:l:t:m:r:", long_options, &option_index); + c = getopt_long(argc, argv, "hp:i:l:t:m:r:b:", long_options, &option_index); if (c == -1) break; @@ -180,6 +182,9 @@ } infd = rc; break; + case 'b': + bufsize = atoi(optarg); + break; } } @@ -194,7 +199,7 @@ exit(1); } - tsfd = ts_open(intf_nr, line_nr, ts_nr, mode); + tsfd = ts_open(intf_nr, line_nr, ts_nr, mode, bufsize); if (tsfd < 0) exit(2); diff --git a/src/proto_clnt.c b/src/proto_clnt.c index ca62abe..69c7234 100644 --- a/src/proto_clnt.c +++ b/src/proto_clnt.c @@ -318,7 +318,7 @@ int osmo_e1dp_client_ts_open(struct osmo_e1dp_client *clnt, uint8_t intf, uint8_t line, uint8_t ts, - enum osmo_e1dp_ts_mode mode) + enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize) { struct msgb *msgb; struct osmo_e1dp_msg_hdr hdr; @@ -333,6 +333,7 @@ memset(&cfg, 0x00, sizeof(struct osmo_e1dp_ts_config)); cfg.mode = mode; + cfg.read_bufsize = read_bufsize; tsfd = -1; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I6d603778cce14c5d72fe5f54904905ea7e66d7ff Gerrit-Change-Number: 19346 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 21:09:25 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 20 Jul 2020 21:09:25 +0000 Subject: Change in libosmocore[master]: pkgconfig/osmocodec: link to libosmocore References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19347 ) Change subject: pkgconfig/osmocodec: link to libosmocore ...................................................................... pkgconfig/osmocodec: link to libosmocore find . -maxdepth 1 -iname "libosmo*so" | xargs -n1 -I\# sh -c "echo \# && nm \# | grep 'U talloc'" tells us that all libs depend on talloc, but pkgconfig omits it for codec and coding, which sometimes to linking issues with libtool and lld. Change-Id: I75a4d39a0c3d53fc4c311e25e933a22832616cea --- M libosmocodec.pc.in M libosmocoding.pc.in 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/19347/1 diff --git a/libosmocodec.pc.in b/libosmocodec.pc.in index 3030230..9e058ef 100644 --- a/libosmocodec.pc.in +++ b/libosmocodec.pc.in @@ -6,6 +6,6 @@ Name: Osmocom Codec related utilities Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} -losmocodec -Cflags: -I${includedir}/ +Libs: -L${libdir} @TALLOC_LIBS@ -losmocodec +Cflags: -I${includedir}/ @TALLOC_CFLAGS@ diff --git a/libosmocoding.pc.in b/libosmocoding.pc.in index 580b170..d1d03c4 100644 --- a/libosmocoding.pc.in +++ b/libosmocoding.pc.in @@ -6,6 +6,6 @@ Name: Osmocom L1 transcoding Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} -losmocoding -losmocodec -losmogsm -losmocore -Cflags: -I${includedir}/ +Libs: -L${libdir} @TALLOC_LIBS@ -losmocoding -losmocodec -losmogsm -losmocore +Cflags: -I${includedir}/ @TALLOC_CFLAGS@ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I75a4d39a0c3d53fc4c311e25e933a22832616cea Gerrit-Change-Number: 19347 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 21:09:49 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 20 Jul 2020 21:09:49 +0000 Subject: Change in libosmocore[master]: pkgconfig/osmocodec/osmocoding: link to libosmocore In-Reply-To: References: Message-ID: Hoernchen has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmocore/+/19347 ) Change subject: pkgconfig/osmocodec/osmocoding: link to libosmocore ...................................................................... pkgconfig/osmocodec/osmocoding: link to libosmocore find . -maxdepth 1 -iname "libosmo*so" | xargs -n1 -I\# sh -c "echo \# && nm \# | grep 'U talloc'" tells us that all libs depend on talloc, but pkgconfig omits it for codec and coding, which sometimes to linking issues with libtool and lld. Change-Id: I75a4d39a0c3d53fc4c311e25e933a22832616cea --- M libosmocodec.pc.in M libosmocoding.pc.in 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/19347/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I75a4d39a0c3d53fc4c311e25e933a22832616cea Gerrit-Change-Number: 19347 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 21:10:14 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 20 Jul 2020 21:10:14 +0000 Subject: Change in libosmocore[master]: pkgconfig/osmocodec/osmocoding: link to talloc In-Reply-To: References: Message-ID: Hoernchen has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/c/libosmocore/+/19347 ) Change subject: pkgconfig/osmocodec/osmocoding: link to talloc ...................................................................... pkgconfig/osmocodec/osmocoding: link to talloc find . -maxdepth 1 -iname "libosmo*so" | xargs -n1 -I\# sh -c "echo \# && nm \# | grep 'U talloc'" tells us that all libs depend on talloc, but pkgconfig omits it for codec and coding, which sometimes to linking issues with libtool and lld. Change-Id: I75a4d39a0c3d53fc4c311e25e933a22832616cea --- M libosmocodec.pc.in M libosmocoding.pc.in 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/19347/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I75a4d39a0c3d53fc4c311e25e933a22832616cea Gerrit-Change-Number: 19347 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 21:17:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 21:17:37 +0000 Subject: Change in osmo-bts[master]: tx_power_test: Disable using color in log output In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19335 ) Change subject: tx_power_test: Disable using color in log output ...................................................................... tx_power_test: Disable using color in log output It's really not used and only adds unneeded variabilities to output. Change-Id: I5aa95997c8df4ce5ba8271acae99c45f68b96e11 --- M tests/tx_power/tx_power_test.c M tests/tx_power/tx_power_test.err 2 files changed, 37 insertions(+), 37 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/tests/tx_power/tx_power_test.c b/tests/tx_power/tx_power_test.c index 02c940f..12c51c6 100644 --- a/tests/tx_power/tx_power_test.c +++ b/tests/tx_power/tx_power_test.c @@ -215,6 +215,7 @@ osmo_init_logging2(tall_bts_ctx, &bts_log_info); osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; log_set_print_filename(osmo_stderr_target, 0); + log_set_use_color(osmo_stderr_target, 0); bts = gsm_bts_alloc(tall_bts_ctx, 0); if (!bts) { diff --git a/tests/tx_power/tx_power_test.err b/tests/tx_power/tx_power_test.err index 03130b2..344fa16 100644 --- a/tests/tx_power/tx_power_test.err +++ b/tests/tx_power/tx_power_test.err @@ -1,38 +1,37 @@ (bts=0,trx=1) power_ramp_start(cur=0, tgt=40000) -(bts=0,trx=1) Asked to ramp power up to 40000 mdBm, which exceeds P_max_out (33000) -(bts=0,trx=1) power_ramp_start(cur=0, tgt=33000) -(bts=0,trx=1) ramp_timer_cb(cur_pout=2000, tgt_pout=33000, ramp_att=31000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to -8000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=4000, tgt_pout=33000, ramp_att=29000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to -6000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=6000, tgt_pout=33000, ramp_att=27000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to -4000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=8000, tgt_pout=33000, ramp_att=25000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to -2000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=10000, tgt_pout=33000, ramp_att=23000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 0 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=12000, tgt_pout=33000, ramp_att=21000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 2000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=14000, tgt_pout=33000, ramp_att=19000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 4000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=16000, tgt_pout=33000, ramp_att=17000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 6000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=18000, tgt_pout=33000, ramp_att=15000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 8000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=20000, tgt_pout=33000, ramp_att=13000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 10000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=22000, tgt_pout=33000, ramp_att=11000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 12000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=24000, tgt_pout=33000, ramp_att=9000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 14000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=26000, tgt_pout=33000, ramp_att=7000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 16000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=28000, tgt_pout=33000, ramp_att=5000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 18000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=30000, tgt_pout=33000, ramp_att=3000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 20000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=32000, tgt_pout=33000, ramp_att=1000, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 22000 mdBm. -(bts=0,trx=1) ramp_timer_cb(cur_pout=33000, tgt_pout=33000, ramp_att=0, therm_att=0, user_gain=0) -(bts=0,trx=1) ramping TRX board output power to 23000 mdBm. - \ No newline at end of file +(bts=0,trx=1) Asked to ramp power up to 40000 mdBm, which exceeds P_max_out (33000) +(bts=0,trx=1) power_ramp_start(cur=0, tgt=33000) +(bts=0,trx=1) ramp_timer_cb(cur_pout=2000, tgt_pout=33000, ramp_att=31000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to -8000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=4000, tgt_pout=33000, ramp_att=29000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to -6000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=6000, tgt_pout=33000, ramp_att=27000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to -4000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=8000, tgt_pout=33000, ramp_att=25000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to -2000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=10000, tgt_pout=33000, ramp_att=23000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 0 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=12000, tgt_pout=33000, ramp_att=21000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 2000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=14000, tgt_pout=33000, ramp_att=19000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 4000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=16000, tgt_pout=33000, ramp_att=17000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 6000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=18000, tgt_pout=33000, ramp_att=15000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 8000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=20000, tgt_pout=33000, ramp_att=13000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 10000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=22000, tgt_pout=33000, ramp_att=11000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 12000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=24000, tgt_pout=33000, ramp_att=9000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 14000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=26000, tgt_pout=33000, ramp_att=7000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 16000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=28000, tgt_pout=33000, ramp_att=5000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 18000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=30000, tgt_pout=33000, ramp_att=3000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 20000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=32000, tgt_pout=33000, ramp_att=1000, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 22000 mdBm. +(bts=0,trx=1) ramp_timer_cb(cur_pout=33000, tgt_pout=33000, ramp_att=0, therm_att=0, user_gain=0) +(bts=0,trx=1) ramping TRX board output power to 23000 mdBm. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5aa95997c8df4ce5ba8271acae99c45f68b96e11 Gerrit-Change-Number: 19335 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 21:18:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 21:18:27 +0000 Subject: Change in osmo-e1d[master]: cosmetic: create HDLC specific sub-structure within e1_ts In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19344 ) Change subject: cosmetic: create HDLC specific sub-structure within e1_ts ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ide0577c25836252862153b4f24da550bee013687 Gerrit-Change-Number: 19344 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Mon, 20 Jul 2020 21:18:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 21:26:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 21:26:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: make use of 'LENGTHTO(...)+N' syntax In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19338 ) Change subject: library/RLCMAC_CSN1_Types: make use of 'LENGTHTO(...)+N' syntax ...................................................................... Patch Set 1: Code-Review+1 (1 comment) I just requested the feature, https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19338/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19338/1//COMMIT_MSG at 9 PS1, Line 9: T I just requested the feature, credit goes to the TITAN developers for actually implementing it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I16ddc3e9f57dffba3e0f2ea80eeb63be3468da06 Gerrit-Change-Number: 19338 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jul 2020 21:26:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 21:26:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 21:26:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_Templates: make ts_RLC_UL_CTRL_ACK accept a template In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19339 ) Change subject: library/RLCMAC_Templates: make ts_RLC_UL_CTRL_ACK accept a template ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia71401b5c0d439eeb0dc58739ef0e68b15d4123f Gerrit-Change-Number: 19339 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jul 2020 21:26:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 21:27:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 21:27:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_Templates: cosmetic coding style change In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19340 ) Change subject: library/RLCMAC_Templates: cosmetic coding style change ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I76931373fe9e1cf0de4263c09e36442bad7c3ce1 Gerrit-Change-Number: 19340 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jul 2020 21:27:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 21:27:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 21:27:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/Osmocom_Types: add f_rnd_bitstring() and f_pad_bit() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19333 ) Change subject: library/Osmocom_Types: add f_rnd_bitstring() and f_pad_bit() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9be55f6979c8ce1cbf5b2ef317c998ae30488e0e Gerrit-Change-Number: 19333 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jul 2020 21:27:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 21:28:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 21:28:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GPRS_Components: s/f_ms_rx_imm_ass_pacch/f_ms_rx_pkt_ass_pacch/g In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19341 ) Change subject: GPRS_Components: s/f_ms_rx_imm_ass_pacch/f_ms_rx_pkt_ass_pacch/g ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I56473ae5dfa565d2c9d26984b14685a4163bf69a Gerrit-Change-Number: 19341 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jul 2020 21:28:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 21:28:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 21:28:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: verify handling of frequency hopping parameters In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 ) Change subject: PCU_Tests: verify handling of frequency hopping parameters ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1beda9224998848f9243237413e5ae3e0ddab8a5 Gerrit-Change-Number: 19324 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jul 2020 21:28:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Jul 20 21:34:06 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 20 Jul 2020 21:34:06 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f160dd7c4a2f_1cad2af0727426001020598@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 87s] /usr/src/packages/BUILD/src/ulfius.c: In function 'ulfius_run_mhd_daemon': [ 87s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 87s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 87s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 87s] | | [ 87s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 87s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 87s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 87s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 87s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 87s] 2425 | MHD_start_daemon (unsigned int flags, [ 87s] | ^~~~~~~~~~~~~~~~ [ 87s] cc1: all warnings being treated as errors [ 87s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 87s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 87s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 87s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 87s] make[1]: *** [Makefile:166: all] Error 2 [ 87s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 87s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 87s] make: *** [debian/rules:9: build] Error 25 [ 87s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 87s] ### VM INTERACTION START ### [ 90s] [ 77.693647] sysrq: SysRq : Power Off [ 90s] [ 77.697489] reboot: Power down [ 90s] ### VM INTERACTION END ### [ 90s] [ 90s] old-atreju3 failed "build ulfius_2.5.2-4.1.dsc" at Mon Jul 20 21:34:02 UTC 2020. [ 90s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Jul 20 21:34:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 20 Jul 2020 21:34:50 +0000 Subject: Change in libosmocore[master]: logging: Avoid printing OSMO_LOGCOLOR_END if no color was used In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19336 ) Change subject: logging: Avoid printing OSMO_LOGCOLOR_END if no color was used ...................................................................... Patch Set 1: Code-Review-1 that patch in osmo-bts.git is from today. Merging this will cause all older osmo-trx versions to fail passing 'make check' against modern libosmocore versions. I agree your patch is correct, but I don't want to create even more failures of https://jenkins.osmocom.org/jenkins/job/Osmocom-build-tags-against-master/ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie38cc639d7f4acd908f357e5bfb3ced07147583e Gerrit-Change-Number: 19336 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 20 Jul 2020 21:34:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Jul 20 21:34:41 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 20 Jul 2020 21:34:41 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f160e0f8b08c_1cad2af0727426001020655@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 118s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 118s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 118s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 118s] | | [ 118s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 118s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 118s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 118s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 118s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 118s] 2425 | MHD_start_daemon (unsigned int flags, [ 118s] | ^~~~~~~~~~~~~~~~ [ 118s] cc1: all warnings being treated as errors [ 118s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 118s] make[3]: *** Waiting for unfinished jobs.... [ 118s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 118s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 118s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 118s] make[1]: *** [Makefile:166: all] Error 2 [ 118s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 118s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 118s] make: *** [debian/rules:9: build] Error 25 [ 118s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 118s] ### VM INTERACTION START ### [ 121s] [ 108.977283] sysrq: SysRq : Power Off [ 121s] [ 108.984698] reboot: Power down [ 121s] ### VM INTERACTION END ### [ 122s] [ 122s] lamb67 failed "build ulfius_2.5.2-4.1.dsc" at Mon Jul 20 21:34:28 UTC 2020. [ 122s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Jul 20 21:52:35 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 20 Jul 2020 21:52:35 +0000 Subject: Change in libosmocore[master]: pkgconfig/osmocodec/osmocoding: link to talloc In-Reply-To: References: Message-ID: Hello pespin, fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19347 to look at the new patch set (#4). Change subject: pkgconfig/osmocodec/osmocoding: link to talloc ...................................................................... pkgconfig/osmocodec/osmocoding: link to talloc find . -maxdepth 1 -iname "libosmo*so" | xargs -n1 -I\# sh -c "echo \# && nm \# | grep 'U talloc'" tells us that all libs depend on talloc, but pkgconfig omits it for codec and coding, which sometimes leads to linking issues with libtool and lld. Change-Id: I75a4d39a0c3d53fc4c311e25e933a22832616cea --- M libosmocodec.pc.in M libosmocoding.pc.in 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/19347/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I75a4d39a0c3d53fc4c311e25e933a22832616cea Gerrit-Change-Number: 19347 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 20 22:24:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 20 Jul 2020 22:24:33 +0000 Subject: Change in osmo-e1d[master]: implement buffering to chunks in E1->application direction In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19345 ) Change subject: implement buffering to chunks in E1->application direction ...................................................................... Patch Set 2: Did you think about using a msgb to store the content? -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I807671bc6f2acaef740ce215b8d8abcb5dce2640 Gerrit-Change-Number: 19345 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-CC: tnt Gerrit-Comment-Date: Mon, 20 Jul 2020 22:24:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Jul 21 03:33:15 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 21 Jul 2020 03:33:15 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f166216b2d09_1cad2af0727426001038959@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 59s] /usr/src/packages/BUILD/src/ulfius.c: In function 'ulfius_run_mhd_daemon': [ 59s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 59s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 59s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 59s] | | [ 59s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 59s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 59s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 59s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 59s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 59s] 2425 | MHD_start_daemon (unsigned int flags, [ 59s] | ^~~~~~~~~~~~~~~~ [ 59s] cc1: all warnings being treated as errors [ 59s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 59s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 59s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 59s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 59s] make[1]: *** [Makefile:166: all] Error 2 [ 59s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 59s] dh_auto_build: error: cd build && make -j3 "INSTALL=install --strip-program=true" returned exit code 2 [ 59s] make: *** [debian/rules:9: build] Error 25 [ 59s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 59s] ### VM INTERACTION START ### [ 62s] [ 54.170026] sysrq: SysRq : Power Off [ 62s] [ 54.171352] reboot: Power down [ 62s] ### VM INTERACTION END ### [ 62s] [ 62s] build73 failed "build ulfius_2.5.2-4.1.dsc" at Tue Jul 21 03:33:13 UTC 2020. [ 62s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jul 21 03:35:32 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 21 Jul 2020 03:35:32 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1662917520b_1cad2af0727426001039125@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 118s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 118s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 118s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 118s] | | [ 118s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 118s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 118s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 118s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 118s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 118s] 2425 | MHD_start_daemon (unsigned int flags, [ 118s] | ^~~~~~~~~~~~~~~~ [ 119s] cc1: all warnings being treated as errors [ 119s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 119s] make[3]: *** Waiting for unfinished jobs.... [ 119s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 119s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 119s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 119s] make[1]: *** [Makefile:166: all] Error 2 [ 119s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 119s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 119s] make: *** [debian/rules:9: build] Error 25 [ 119s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 119s] ### VM INTERACTION START ### [ 122s] [ 109.435772] sysrq: SysRq : Power Off [ 122s] [ 109.441866] reboot: Power down [ 122s] ### VM INTERACTION END ### [ 122s] [ 122s] lamb04 failed "build ulfius_2.5.2-4.1.dsc" at Tue Jul 21 03:35:16 UTC 2020. [ 122s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Jul 21 05:54:55 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jul 2020 05:54:55 +0000 Subject: Change in osmo-e1d[master]: implement buffering to chunks in E1->application direction In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19345 ) Change subject: implement buffering to chunks in E1->application direction ...................................................................... Patch Set 2: > Did you think about using a msgb to store the content? Indeed I thought about it for a moment but then discarded it with "let's avoid complexity where not required". I don't have a strong preference either way. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I807671bc6f2acaef740ce215b8d8abcb5dce2640 Gerrit-Change-Number: 19345 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-CC: tnt Gerrit-Comment-Date: Tue, 21 Jul 2020 05:54:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 06:19:04 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jul 2020 06:19:04 +0000 Subject: Change in libosmocore[master]: pkgconfig/osmocodec/osmocoding: link to talloc In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19347 ) Change subject: pkgconfig/osmocodec/osmocoding: link to talloc ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I75a4d39a0c3d53fc4c311e25e933a22832616cea Gerrit-Change-Number: 19347 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jul 2020 06:19:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 07:29:30 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Tue, 21 Jul 2020 07:29:30 +0000 Subject: Change in osmo-e1d[master]: cosmetic: create HDLC specific sub-structure within e1_ts In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19344 ) Change subject: cosmetic: create HDLC specific sub-structure within e1_ts ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ide0577c25836252862153b4f24da550bee013687 Gerrit-Change-Number: 19344 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Tue, 21 Jul 2020 07:29:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 07:34:09 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Tue, 21 Jul 2020 07:34:09 +0000 Subject: Change in osmo-e1d[master]: implement buffering to chunks in E1->application direction In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19345 ) Change subject: implement buffering to chunks in E1->application direction ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Minor naming comment but not really blocking. https://gerrit.osmocom.org/c/osmo-e1d/+/19345/2/src/intf_line.c File src/intf_line.c: https://gerrit.osmocom.org/c/osmo-e1d/+/19345/2/src/intf_line.c at 391 PS2, Line 391: rv = _tsbuf_append(ts, buf, len); I would have gone with _e1_rx_raw() just for consistency with the HDLCFS case. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I807671bc6f2acaef740ce215b8d8abcb5dce2640 Gerrit-Change-Number: 19345 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 21 Jul 2020 07:34:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 07:37:50 2020 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Tue, 21 Jul 2020 07:37:50 +0000 Subject: Change in osmo-e1d[master]: make RAW read buffer size configurable (instead of hard-coded 160) In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19346 ) Change subject: make RAW read buffer size configurable (instead of hard-coded 160) ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-e1d/+/19346/1/include/osmocom/e1d/proto.h File include/osmocom/e1d/proto.h: https://gerrit.osmocom.org/c/osmo-e1d/+/19346/1/include/osmocom/e1d/proto.h at 85 PS1, Line 85: #define E1DP_MAGIC 0x00e1 So I know it's not super clear (except in my head :p) but the 0x00 was actually intended as a 'revision number' to try and make sure you don't use an incompatible server / client combination when the protocol binary changes. I didn't want the complexity of supporting multiple version at once, but just get some basic compat check. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I6d603778cce14c5d72fe5f54904905ea7e66d7ff Gerrit-Change-Number: 19346 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-CC: tnt Gerrit-Comment-Date: Tue, 21 Jul 2020 07:37:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 09:21:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jul 2020 09:21:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: make use of 'LENGTHTO(...)+N' syntax In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19338 ) Change subject: library/RLCMAC_CSN1_Types: make use of 'LENGTHTO(...)+N' syntax ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I16ddc3e9f57dffba3e0f2ea80eeb63be3468da06 Gerrit-Change-Number: 19338 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jul 2020 09:21:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 09:23:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jul 2020 09:23:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: verify handling of frequency hopping parameters In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 ) Change subject: PCU_Tests: verify handling of frequency hopping parameters ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1beda9224998848f9243237413e5ae3e0ddab8a5 Gerrit-Change-Number: 19324 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jul 2020 09:23:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 09:26:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jul 2020 09:26:03 +0000 Subject: Change in libosmocore[master]: logging: Avoid printing OSMO_LOGCOLOR_END if no color was used In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19336 ) Change subject: logging: Avoid printing OSMO_LOGCOLOR_END if no color was used ...................................................................... Patch Set 1: > Patch Set 1: Code-Review-1 > > that patch in osmo-bts.git is from today. Merging this will cause all older osmo-trx versions to fail passing 'make check' against modern libosmocore versions. > > I agree your patch is correct, but I don't want to create even more failures of https://jenkins.osmocom.org/jenkins/job/Osmocom-build-tags-against-master/ I agree with your rationale, but I think we should still get it fixed (to avoid more future issues), given that it only affects 1 project. My proposal: Do a patch release for osmo-bts on top of latest release with the osmo-bts patch fixing the test so this way last release still works with both new and old libosmocore. Agree? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie38cc639d7f4acd908f357e5bfb3ced07147583e Gerrit-Change-Number: 19336 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jul 2020 09:26:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 09:28:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jul 2020 09:28:23 +0000 Subject: Change in libosmocore[master]: pkgconfig/osmocodec/osmocoding: link to talloc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19347 ) Change subject: pkgconfig/osmocodec/osmocoding: link to talloc ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I75a4d39a0c3d53fc4c311e25e933a22832616cea Gerrit-Change-Number: 19347 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jul 2020 09:28:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 09:29:03 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 21 Jul 2020 09:29:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP_Test: fix test expectation in TC_crcx_wildcarded_exhaust In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19190 ) Change subject: MGCP_Test: fix test expectation in TC_crcx_wildcarded_exhaust ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I73344ef8793cc81df0a1815bb8d890e7849cdd20 Gerrit-Change-Number: 19190 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jul 2020 09:29:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 09:29:15 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 21 Jul 2020 09:29:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP_Test: fix test expectation in TC_crcx_wildcarded_exhaust In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19190 ) Change subject: MGCP_Test: fix test expectation in TC_crcx_wildcarded_exhaust ...................................................................... MGCP_Test: fix test expectation in TC_crcx_wildcarded_exhaust The testcase TC_crcx_wildcarded_exhaust assumes a wrong number of endpoints. Since osmo-mgw has a wrongly solved off-by-one in its endpoint allocation it allocates the wrong number of endpoints. This is now fixed, lets now also fix the test expection. (The failure of TC_crcx_wildcarded_exhaust also causes TC_crcx_dlcx_30ep to fail.) Depends: Change id I73b31e3c236a61ea0a6f76ef5ff98ce589f52c77 Change-Id: I73344ef8793cc81df0a1815bb8d890e7849cdd20 Related: OS#2659 --- M mgw/MGCP_Test.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve dexter: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index be4e634..6caef79 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -885,7 +885,7 @@ /* test valid wildcarded CRCX */ testcase TC_crcx_wildcarded_exhaust() runs on dummy_CT { - const integer n_endpoints := 32; + const integer n_endpoints := 31; var integer i; var template MgcpCommand cmd; var MgcpResponse resp; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I73344ef8793cc81df0a1815bb8d890e7849cdd20 Gerrit-Change-Number: 19190 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 09:34:43 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Tue, 21 Jul 2020 09:34:43 +0000 Subject: Change in libosmocore[master]: pkgconfig/osmocodec/osmocoding: link to talloc In-Reply-To: References: Message-ID: Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19347 ) Change subject: pkgconfig/osmocodec/osmocoding: link to talloc ...................................................................... pkgconfig/osmocodec/osmocoding: link to talloc find . -maxdepth 1 -iname "libosmo*so" | xargs -n1 -I\# sh -c "echo \# && nm \# | grep 'U talloc'" tells us that all libs depend on talloc, but pkgconfig omits it for codec and coding, which sometimes leads to linking issues with libtool and lld. Change-Id: I75a4d39a0c3d53fc4c311e25e933a22832616cea --- M libosmocodec.pc.in M libosmocoding.pc.in 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/libosmocodec.pc.in b/libosmocodec.pc.in index 3030230..9e058ef 100644 --- a/libosmocodec.pc.in +++ b/libosmocodec.pc.in @@ -6,6 +6,6 @@ Name: Osmocom Codec related utilities Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} -losmocodec -Cflags: -I${includedir}/ +Libs: -L${libdir} @TALLOC_LIBS@ -losmocodec +Cflags: -I${includedir}/ @TALLOC_CFLAGS@ diff --git a/libosmocoding.pc.in b/libosmocoding.pc.in index 580b170..d1d03c4 100644 --- a/libosmocoding.pc.in +++ b/libosmocoding.pc.in @@ -6,6 +6,6 @@ Name: Osmocom L1 transcoding Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} -losmocoding -losmocodec -losmogsm -losmocore -Cflags: -I${includedir}/ +Libs: -L${libdir} @TALLOC_LIBS@ -losmocoding -losmocodec -losmogsm -losmocore +Cflags: -I${includedir}/ @TALLOC_CFLAGS@ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I75a4d39a0c3d53fc4c311e25e933a22832616cea Gerrit-Change-Number: 19347 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Jul 21 09:39:58 2020 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 21 Jul 2020 09:39:58 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-gmr_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#3388?= Message-ID: <159327276.34.1595324398105@jenkins.osmocom.org> See Changes: ------------------------------------------ Started by upstream project "master-osmo-gmr" build number 3388 originally caused by: Started by upstream project "master-libosmocore" build number 1586 originally caused by: Started by an SCM change Running as SYSTEM Building remotely on host2-deb9build-ansible (ttcn3 osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace No credentials specified > 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-gmr # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-gmr > git --version # timeout=10 > git fetch --tags --progress -- git://git.osmocom.org/osmo-gmr +refs/heads/*:refs/remotes/origin/* # timeout=10 Checking out Revision f5bdb26c9499424518eaebf79d9c92399a1c6c9a (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f f5bdb26c9499424518eaebf79d9c92399a1c6c9a # timeout=10 Commit message: "utils: Import some utilities to actually receive and process signals" > git rev-list --no-walk f5bdb26c9499424518eaebf79d9c92399a1c6c9a # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins2078241217658217206.sh + ARTIFACT_STORE=/home/osmocom-build/jenkins_build_artifact_store + mkdir -p /home/osmocom-build/jenkins_build_artifact_store + docker run --rm=true --cap-add SYS_PTRACE -e ARTIFACT_STORE=/artifact_store -e ASCIIDOC_WARNINGS_CHECK=1 -e HOME=/build -e JOB_NAME=master-osmo-gmr/a1=default,a2=default,a3=default,a4=default,label=osmocom-master-debian9 -e MAKE=make -e OSMOPY_DEBUG_TCP_SOCKETS=1 -e PARALLEL_MAKE=-j 4 -e PATH=/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin -e PUBLISH=1 -e WITH_MANUALS=1 -w /build -i -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-build/debian-stretch-jenkins /build/contrib/jenkins.sh docker: Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running?. 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 Tue Jul 21 09:43:33 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Tue, 21 Jul 2020 09:43:33 +0000 Subject: Change in osmo-gsm-tester[master]: suite: fix runtime error when suite.duration is None References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19357 ) Change subject: suite: fix runtime error when suite.duration is None ...................................................................... suite: fix runtime error when suite.duration is None report generation failed when duration was not set correctly and None was returned. Use 0 as duration by default. Change-Id: Ia654c67bf2dcce432f84e869550c516d8d5a07a0 --- M src/osmo_gsm_tester/core/suite.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/57/19357/1 diff --git a/src/osmo_gsm_tester/core/suite.py b/src/osmo_gsm_tester/core/suite.py index a1d068e..3860d19 100644 --- a/src/osmo_gsm_tester/core/suite.py +++ b/src/osmo_gsm_tester/core/suite.py @@ -80,7 +80,7 @@ def __init__(self, trial, suite_scenario_str, suite_definition, scenarios=[]): super().__init__(log.C_TST, suite_scenario_str) self.start_timestamp = None - self.duration = None + self.duration = 0 self.reserved_resources = None self._resource_requirements = None self._resource_modifiers = None -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ia654c67bf2dcce432f84e869550c516d8d5a07a0 Gerrit-Change-Number: 19357 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Jul 21 13:16:41 2020 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 21 Jul 2020 13:16:41 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmo-gmr_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#3389?= In-Reply-To: <159327276.34.1595324398105@jenkins.osmocom.org> References: <159327276.34.1595324398105@jenkins.osmocom.org> Message-ID: <1768283648.60.1595337401617@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Jul 21 13:36:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jul 2020 13:36:24 +0000 Subject: Change in libosmocore[master]: pkgconfig/osmocodec/osmocoding: link to talloc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19347 ) Change subject: pkgconfig/osmocodec/osmocoding: link to talloc ...................................................................... Patch Set 4: I'm sorry, but I'm not convinced this is the right way to address the problem :( IMHO, external dependencies should be adressed with "Requires:". "Libs:" should only list the librries that we provide ourselves. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I75a4d39a0c3d53fc4c311e25e933a22832616cea Gerrit-Change-Number: 19347 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jul 2020 13:36:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 13:37:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jul 2020 13:37:36 +0000 Subject: Change in osmo-gsm-tester[master]: suite: fix runtime error when suite.duration is None In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19357 ) Change subject: suite: fix runtime error when suite.duration is None ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ia654c67bf2dcce432f84e869550c516d8d5a07a0 Gerrit-Change-Number: 19357 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jul 2020 13:37:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 13:42:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jul 2020 13:42:00 +0000 Subject: Change in libosmocore[master]: pkgconfig/osmocodec/osmocoding: link to talloc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19347 ) Change subject: pkgconfig/osmocodec/osmocoding: link to talloc ...................................................................... Patch Set 4: While I agree "Requrires" may be better, in that case of talloc we are already using Libs in other libosmocore.git libs, so let's add it this way here too. If we want to switch to use pkgconfig let's do it in a follow up patch. For reference: https://people.freedesktop.org/~dbn/pkg-config-guide.html -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I75a4d39a0c3d53fc4c311e25e933a22832616cea Gerrit-Change-Number: 19347 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jul 2020 13:42:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 13:46:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jul 2020 13:46:42 +0000 Subject: Change in libosmocore[master]: pkg-config: Use "Requires" for external libs such as talloc. References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19358 ) Change subject: pkg-config: Use "Requires" for external libs such as talloc. ...................................................................... pkg-config: Use "Requires" for external libs such as talloc. According to https://people.freedesktop.org/~dbn/pkg-config-guide.html we should use Requires or even Requires.private, not Libs for external dependencies. Change-Id: I2aa716125880b444e091812ab800b29a7b905b4f --- M libosmocodec.pc.in M libosmocoding.pc.in M libosmocore.pc.in M libosmoctrl.pc.in M libosmogb.pc.in M libosmogsm.pc.in M libosmosim.pc.in M libosmousb.pc.in 8 files changed, 19 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/19358/1 diff --git a/libosmocodec.pc.in b/libosmocodec.pc.in index 9e058ef..a6a9d78 100644 --- a/libosmocodec.pc.in +++ b/libosmocodec.pc.in @@ -6,6 +6,6 @@ Name: Osmocom Codec related utilities Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmocodec -Cflags: -I${includedir}/ @TALLOC_CFLAGS@ - +Requires: talloc +Libs: -L${libdir} -losmocodec +Cflags: -I${includedir}/ diff --git a/libosmocoding.pc.in b/libosmocoding.pc.in index d1d03c4..826a3f7 100644 --- a/libosmocoding.pc.in +++ b/libosmocoding.pc.in @@ -6,6 +6,6 @@ Name: Osmocom L1 transcoding Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmocoding -losmocodec -losmogsm -losmocore -Cflags: -I${includedir}/ @TALLOC_CFLAGS@ - +Requires: talloc libosmocodec libosmocgsm libosmocore +Libs: -L${libdir} -losmocoding +Cflags: -I${includedir}/ diff --git a/libosmocore.pc.in b/libosmocore.pc.in index 80f17c8..925265d 100644 --- a/libosmocore.pc.in +++ b/libosmocore.pc.in @@ -6,6 +6,7 @@ Name: Osmocom Core Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmocore +Requires: talloc +Libs: -L${libdir} -losmocore Libs.private: @PTHREAD_LIBS@ @LIBSCTP_LIBS@ -Cflags: -I${includedir}/ @TALLOC_CFLAGS@ @PTHREAD_CFLAGS@ +Cflags: -I${includedir}/ @PTHREAD_CFLAGS@ diff --git a/libosmoctrl.pc.in b/libosmoctrl.pc.in index 4676b31..c110d8e 100644 --- a/libosmoctrl.pc.in +++ b/libosmoctrl.pc.in @@ -6,6 +6,6 @@ Name: Osmocom Control Interface Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmoctrl -losmogsm -losmocore +Requires: talloc libosmogsm libosmocore +Libs: -L${libdir} -losmoctrl Cflags: -I${includedir}/ - diff --git a/libosmogb.pc.in b/libosmogb.pc.in index a163cc4..769fea4 100644 --- a/libosmogb.pc.in +++ b/libosmogb.pc.in @@ -6,6 +6,6 @@ Name: Osmocom GPRS Gb Library Description: Osmocom GPRS Gb Interface (NS/BSSGP) Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmogb -losmovty -losmocore +Requires: talloc libosmovty libosmocore +Libs: -L${libdir} -losmogb Cflags: -I${includedir}/ -fno-strict-aliasing - diff --git a/libosmogsm.pc.in b/libosmogsm.pc.in index 0160be8..956897b 100644 --- a/libosmogsm.pc.in +++ b/libosmogsm.pc.in @@ -6,6 +6,6 @@ Name: Osmocom GSM Core Library Description: GSM Core Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmogsm -losmocore +Requires: talloc libosmocore +Libs: -L${libdir} -losmogsm Cflags: -I${includedir}/ - diff --git a/libosmosim.pc.in b/libosmosim.pc.in index 83777c3..fbcdbe4 100644 --- a/libosmosim.pc.in +++ b/libosmosim.pc.in @@ -6,6 +6,6 @@ Name: Osmocom SIM card related utilities Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmosim -losmocore +Requires: talloc libosmocore +Libs: -L${libdir} -losmosim Cflags: -I${includedir}/ - diff --git a/libosmousb.pc.in b/libosmousb.pc.in index ce6d271..4027074 100644 --- a/libosmousb.pc.in +++ b/libosmousb.pc.in @@ -6,6 +6,6 @@ Name: Osmocom libusb (USB) integration Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmousb -losmocore +Requires: talloc libosmocore +Libs: -L${libdir} -losmousb Cflags: -I${includedir}/ - -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2aa716125880b444e091812ab800b29a7b905b4f Gerrit-Change-Number: 19358 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 14:04:24 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Tue, 21 Jul 2020 14:04:24 +0000 Subject: Change in libosmocore[master]: pkgconfig/osmocodec/osmocoding: link to talloc In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19347 ) Change subject: pkgconfig/osmocodec/osmocoding: link to talloc ...................................................................... Patch Set 4: Yeah, I've just fixed my problem after dealing with libtool by doing what the other libs have been doing for 10 years, which seemed to be the reasonable choice that does not waste time or break anything else. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I75a4d39a0c3d53fc4c311e25e933a22832616cea Gerrit-Change-Number: 19347 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jul 2020 14:04:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 14:36:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jul 2020 14:36:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_si_acc_rotate References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 ) Change subject: bsc: Introduce test TC_si_acc_rotate ...................................................................... bsc: Introduce test TC_si_acc_rotate Related: SYS#4911 Change-Id: I18d0243353fce547d126d62c34415628a21cb52b --- M bsc/BSC_Tests.ttcn 1 file changed, 77 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/59/19359/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index cc7346f..338dbce 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1854,6 +1854,82 @@ } } +private function f_acc09_count_allowed(AccessControlClass acc) runs on test_CT return uint8_t +{ + var uint8_t count := 0; + for (var integer i := 5; i < 16; i := i + 1) { + if (acc[i] == '0'B) { /* the list marks barred, we count allowed */ + count := count + 1; + } + } + return count; +} + +/* verify ACC rotate feature */ +testcase TC_si_acc_rotate() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + var SystemInformationConfig last_si; + var AccessControlClass acc; + var ASP_RSL_Unitdata rx_rsl_ud; + var uint8_t count; + var integer times_allowed[10] := { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + + f_init(0, guard_timeout := 60.0); + + f_bts_0_cfg(BSCVTY, {"rach access-control-class 5 barred", "access-control-rotate 3", "access-control-rotate-quantum 1"}); + + /* Init and get first sysinfo */ + f_init_bts_and_check_sysinfo(0, expect_si := ?); + + var integer i := 0; + while (i < 20) { + alt { + [] IPA_RSL[0].receive(tr_ASP_RSL_UD((tr_RSL_NO_BCCH_INFO, + tr_RSL_BCCH_INFO, + tr_RSL_NO_SACCH_FILL, + tr_RSL_SACCH_FILL))) -> value rx_rsl_ud { + f_sysinfo_seen(0, rx_rsl_ud.rsl); + } + } + + last_si := g_system_information[0]; + if (last_si.si1 == omit) { + continue; + } + + g_system_information[0].si1 := omit; + acc := last_si.si1.rach_control.acc; + count := f_acc09_count_allowed(acc); + log("RSL: GOT SI1 ACC len=", count, ": ", acc); + + if (count != 3) { + log("RSL: EXPECTED SI ACC len=3"); + setverdict(fail, "received SI does not match expectations"); + break; + } + + for (var integer j := 0; j < 10; j := j + 1) { + if (acc[16 - 1 - j] == '0'B) { /* the list marks barred, we count allowed */ + times_allowed[j] := times_allowed[j] + 1; + } + } + + i := i + 1; + } + + for (var integer j := 0; j < 10; j := j + 1) { + log("ACC", j, " allowed ", times_allowed[j], " times" ); + if (j != 5 and times_allowed[j] < 3) { + log("ACC", j, " ERROR: allowed ", times_allowed[j], " < 1 times" ); + setverdict(fail); + } else if (j == 5 and times_allowed[j] > 0) { + log("ACC", j, " ERROR: allowed ", times_allowed[j], " > 0 times" ); + setverdict(fail); + } + } + + f_bts_0_cfg(BSCVTY, {"access-control-rotate 10", "rach access-control-class 5 allowed"}); +} testcase TC_ctrl_msc_connection_status() runs on test_CT { var charstring ctrl_resp; @@ -5829,6 +5905,7 @@ execute( TC_si2quater_42_earfcns() ); execute( TC_si2quater_48_earfcns() ); execute( TC_si2quater_49_earfcns() ); + execute( TC_si_acc_rotate() ); /* RSL DCHAN Channel ACtivation / Deactivation */ execute( TC_chan_act_noreply() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I18d0243353fce547d126d62c34415628a21cb52b Gerrit-Change-Number: 19359 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 14:52:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jul 2020 14:52:25 +0000 Subject: Change in osmo-bsc[master]: doc: Copy {bsc, bts}.adoc from osmo-gsm-manuals In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19327 ) Change subject: doc: Copy {bsc,bts}.adoc from osmo-gsm-manuals ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I20aa60d2f4111d66e922f3e2a73a20352ec1f7e4 Gerrit-Change-Number: 19327 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jul 2020 14:52:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 14:52:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jul 2020 14:52:42 +0000 Subject: Change in osmo-bsc[master]: {bts, bsc}.adoc: Drop deprecated OsmoNITB references In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19328 ) Change subject: {bts,bsc}.adoc: Drop deprecated OsmoNITB references ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icc91dd41a237531cb512fa36d8b18d4d8d5ca8ed Gerrit-Change-Number: 19328 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jul 2020 14:52:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 14:52:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jul 2020 14:52:46 +0000 Subject: Change in osmo-bsc[master]: doc: Copy {bsc, bts}.adoc from osmo-gsm-manuals In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19327 ) Change subject: doc: Copy {bsc,bts}.adoc from osmo-gsm-manuals ...................................................................... doc: Copy {bsc,bts}.adoc from osmo-gsm-manuals Those adoc files are only used by osmo-bsc.git and openbsc.git (osmo-nitb), and the later is deprecated and no longer maintained, which means new features are only added to BSC. Hence it makes no sense to keep the doc shared between both. Change-Id: I20aa60d2f4111d66e922f3e2a73a20352ec1f7e4 --- A doc/manuals/chapters/bsc.adoc A doc/manuals/chapters/bts.adoc M doc/manuals/osmobsc-usermanual.adoc 3 files changed, 627 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/bsc.adoc b/doc/manuals/chapters/bsc.adoc new file mode 100644 index 0000000..49d25e5 --- /dev/null +++ b/doc/manuals/chapters/bsc.adoc @@ -0,0 +1,120 @@ +== BSC level configuration + +The BSC component is shared between OsmoBSC and OsmoNITB. This chapter +describes some of the configuration options related to this shared BSC +component. + +=== Hand-over + +==== Hand-over in GSM + +Hand-over is the process of changing a MS with a currently active +dedicated channel from one BTS to another BTS. As opposed to idle mode, +where the MS autonomously performs cell re-selection, in dedicated mode +this happens under network control. + +In order to determine when to perform hand-over, and to which cells, the +network requests the MS to perform measurements on a list of neighbor +cell channels, which the MS then reports back to the network in the form +of GSM RR 'Measurement Result' messages. Those messages contain the +downlink measurements as determined by the MS. + +Furthermore, the BTS also performs measurements on the uplink, and +communicates those by means of RSL to the BSC. + +The hand-over decision is made by an algorithm that processes those +measurement results and determines when to perform the hand-over. + +==== Configuration of hand-over in OsmoBSC/OsmoNITB + +OsmoBSC (like the internal BSC component of OsmoNITB) only support +so-called intra-BSC hand-over, where the hand-over is performed between +two BTSs within the same BSC. + +Hand-over is enabled and configured by the use of a set of `handover` +commands. Using those, you can tune the key parameters of the hand-over +algorithm and adapt it to your specific environment. + +.Example handover configuration snippet +---- + handover 1 <1> + handover window rxlev averaging 10 <2> + handover window rxqual averaging 1 <3> + handover window rxlev neighbor averaging 10 <4> + handover power budget interval 6 <5> + handover power budget hysteresis 3 <6> + handover maximum distance 9999 <7> +---- +<1> Enable hand-over +<2> Set the RxLev averaging window for the serving cell to 10 measurements +<3> Set the RxQual averaging window for the serving cell to 1 + measurement (no window) +<4> Set the RxLev averaging for neighbor cells to 10 measurements +<5> Check for the conditions of a power budget hand-over every 6 SACCH + frames +<6> A neighbor cell must be at least 3 dB stronger than the serving cell + to be considered a candidate for hand-over +<7> Perform a maximum distance hand-over if TA is larger 9999 (i.e. never) + +//TODO: Move all to BSC node + +=== Timer Configuration + +The GSM specification specifies a variety of timers both on the network +as well as on the mobile station side. + +Those timers can be configured using the `timer tXXXX` command. + +.Configurable Timers +|=== +|node|timer|default|description +|network|t3101|10|Timeout for 'Immediate Assignment' (sec) +|network|t3103|?|Timeout for Handover (sec) +|network|t3105|40|Repetition of 'Physical Information' (sec) +|network|t3107|?|? +|network|t3109|?|RSL SACCH deactivation timeout (sec) +|network|t3111|?|RSL timeout to wait before releasing the RF channel (sec) +|network|t3113|60|Time to try paging for a subscriber (sec) +|network|t3115|?|? +|network|t3117|?|? +|network|t3119|?|? +|network|t3122|10|Waiting time after 'Immediate Assignment Reject' +|network|t3141|?|? +|=== + +//TODO: split between BSC and MSC timers + +=== Discontinuous Transmission (DTX) + +GSM provides a full-duplex voice call service. However, in any +civilized communication between human beings, only one of the +participants is speaking at any given point in time. This means that +most of the time, one of the two directions of the radio link is +transmitting so-called 'silence frames'. + +During such periods of quiescence in one of the two directions, it is +possible to suppress transmission of most of the radio bursts, as there +is no voice signal to transport. GSM calls this feature 'Discontinuous +Transmission'. It exists separately for uplink (DTXu) and downlink +(DTXd). + +Downlink DTX is only permitted on non-primary transceivers (!= TRX0), as +TRX0 must always transmit at constant output power to ensure it is +detected during cell selection. + +Uplink DTX is possible on any TRX, and serves primarily two uses: + +possible on any TRX, and serves primarily two uses: + +. reducing the MS battery consumption by transmitting at a lower duty cycle +. reducing the uplink interference caused in surrounding cells that + re-use the same ARFCN. + +DTS for both uplink and downlink is implemented in the BTS. Not all BTS +models support it. + +The Osmocom BSC component can instruct the BTS to enable or disable +uplink and/or downlink DTX by means of A-bis OML. + +//TODO: Test/implement, at least for uplink +//TODO: Move to BSC diff --git a/doc/manuals/chapters/bts.adoc b/doc/manuals/chapters/bts.adoc new file mode 100644 index 0000000..223cec1 --- /dev/null +++ b/doc/manuals/chapters/bts.adoc @@ -0,0 +1,505 @@ +[[bts]] +== Reviewing and Provisioning BTS configuration + +The main functionality of the BSC component is to manage BTSs. As such, +provisioning BTSs within the BSC is one of the most common tasks during +BSC operation. Just like about anything else in OsmoBSC, they are +configured using the VTY. + +BTSs are internally numbered with integer numbers starting from "0" for +the first BTS. BTS numbers have to be contiguous, so you cannot +configure 0,1,2 and then 5. + + +=== Reviewing current BTS status and configuration + +In order to view the status and properties of a BTS, you can issue the +`show bts` command. If used without any BTS number, it will display +information about all provisioned BTS numbers. + +---- +OsmoBSC> show bts 0 +BTS 0 is of nanobts type in band DCS1800, has CI 0 LAC 1, BSIC 63, TSC 7 and 1 TRX +Description: (null) +MS Max power: 15 dBm +Minimum Rx Level for Access: -110 dBm +Cell Reselection Hysteresis: 4 dBm +RACH TX-Integer: 9 +RACH Max transmissions: 7 +System Information present: 0x0000007e, static: 0x00000000 + Unit ID: 200/0/0, OML Stream ID 0xff + NM State: Oper 'Enabled', Admin 2, Avail 'OK' + Site Mgr NM State: Oper 'Enabled', Admin 0, Avail 'OK' + Paging: 0 pending requests, 0 free slots + OML Link state: connected. + Current Channel Load: + TCH/F: 0% (0/5) + SDCCH8: 0% (0/8) +---- + +You can also review the status of the TRXs configured within the BTSs of +this BSC by using `show trx`: + +---- +OsmoBSC> show trx 0 0 +TRX 0 of BTS 0 is on ARFCN 871 +Description: (null) + RF Nominal Power: 23 dBm, reduced by 0 dB, resulting BS power: 23 dBm + NM State: Oper 'Enabled', Admin 2, Avail 'OK' + Baseband Transceiver NM State: Oper 'Enabled', Admin 2, Avail 'OK' + ip.access stream ID: 0x00 +---- + +The output can be restricted to the TRXs of one specified BTS number +(`show trx 0`) or even that of a single specified TRX within a +specified BTS (`show trx 0 0`). + +Furthermore, information on the individual timeslots can be shown by +means of `show timeslot`. The output can be restricted to the +timeslots of a single BTS (`show timeslot 0`) or that of a single +TRX (`show timeslot 0 0`). Finally, you can restrict the output to +a single timeslot by specifying the BTS, TRX and TS numbers (`show +timeslot 0 0 4`). + +---- +OsmoBSC> show timeslot 0 0 0 +BTS 0, TRX 0, Timeslot 0, phys cfg CCCH, TSC 7 + NM State: Oper 'Enabled', Admin 2, Avail 'OK' +OsmoBSC> show timeslot 0 0 1 +BTS 0, TRX 0, Timeslot 1, phys cfg SDCCH8, TSC 7 + NM State: Oper 'Enabled', Admin 2, Avail 'OK' +---- + + +=== Provisioning a new BTS + +In order to provision BTSs, you have to enter the BTS config node of the +VTY. In order to configure BTS 0, you can issue the following sequence +of commands: + +---- +OsmoBSC> enable +OsmoBSC# configure terminal +OsmoBSC(config)# network +OsmoBSC(config-net)# bts 0 +OsmoBSC(config-net-bts)# +---- + +At this point, you have a plethora of commands, in fact an entire +hierarchy of commands to configure all aspects of the BTS, as well as +each of its TRX and each timeslot within each TRX. For a full +reference, please consult the telnet VTY integrated help or the respective +chapter in the VTY reference. + +BTS configuration depends quite a bit on the specific BTS vendor and +model. The section below provides just one possible example for the +case of a sysmoBTS. + +Note that from the `configure terminal` command onwards, the telnet VTY +commands above are identical to configuration file settings, for details see +<>. + +Starting with `network` as above, your complete sysmoBTS configuration may look +like this: + +---- +network + bts 0 + type sysmobts + band DCS1800 + description The new BTS in Baikonur + location_area_code 2342 + cell_identity 5 + base_station_id_code 63 + ip.access unit_id 8888 0 + ms max power 40 + trx 0 + arfcn 871 + nominal power 23 + max_power_red 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config TCH/F + timeslot 2 + phys_chan_config TCH/F + timeslot 3 + phys_chan_config TCH/F + timeslot 4 + phys_chan_config TCH/F + timeslot 5 + phys_chan_config TCH/F + timeslot 6 + phys_chan_config TCH/F + timeslot 7 + phys_chan_config PDCH +---- + + +=== System Information configuration + +A GSM BTS periodically transmits a series of 'SYSTEM INFORMATION' +messages to mobile stations, both via the BCCH in idle mode, was well as +via the SACCH in dedicated mode. There are many different types of such +messages. For their detailed contents and encoding, please see _3GPP TS +24.008_ <<3gpp-ts-24-008>>. + +For each of the 'SYSTEM INFORMATION' message types, you can configure to +have the BSC generate it automatically ('computed'), or you can specify +the respective binary message as a string of hexadecimal digits. + +The default configuration is to compute all (required) 'SYSTEM +INFORMATION' messages automatically. + +Please see the _OsmoBSC VTY Reference Manual_ <> for +further information, particularly on the following commands: + +* `system-information (1|2|3|4|5|6|7|8|9|10|13|16|17|18|19|20|2bis|2ter|2quater|5bis|5ter) mode (static|computed)` +* `system-information (1|2|3|4|5|6|7|8|9|10|13|16|17|18|19|20|2bis|2ter|2quater|5bis|5ter) static HEXSTRING` + + +=== Neighbor List configuration + +Every BTS sends a list of ARFCNs of neighbor cells +. within its 'SYSTEM INFORMATION 2' (and 2bis/2ter) messages on the BCCH +. within its 'SYSTEM INFORMATION 5' messages on SACCH in dedicated mode + +For every BTS config node in the VTY, you can specify the behavior of +the neighbor list using the `neighbor list mode` VTY command: + +automatic:: + Automatically generate a list of neighbor cells using all other + BTSs configured in the VTY +manual:: + Manually specify the neighbor list by means of `neighbor-list +(add|del) arfcn <0-1023>` commands, having identical neighbor lists on +BCCH (SI2) and SACCH (SI5) + +manual-si5:: + Manually specify the neighbor list by means of `neighbor-list +(add|del) arfcn <0-1023>` for BCCH (SI2) and a separate neighbor list by +means of `si5 neighbor-list (add|del) arfcn <0-1023>` for SACCH (SI5). + + +=== Configuring GPRS PCU parameters of a BTS + +In the case of BTS models using Abis/IP (IPA), the GPRS PCU is located +inside the BTS. The BTS then establishes a Gb connection to the SGSN. + +All the BTS-internal PCU configuration is performed via A-bis OML by +means of configuring the 'CELL', 'NSVC' (NS Virtual Connection and 'NSE' +(NS Entity). + +There is one 'CELL' node and one 'NSE' node, but there are two 'NSVC' +nodes. At the time of this writing, only the NSVC 0 is supported by +OsmoBTS, while both NSVC are supported by the ip.access nanoBTS. + +The respective VTY configuration parameters are described below. They +all exist beneath each BTS VTY config node. + +But let's first start with a small example + +.Example configuration of GPRS PCU parameters at VTY BTS node +---- +OsmoBSC(config-net-bts)# gprs mode gprs +OsmoBSC(config-net-bts)# gprs routing area 1 +OsmoBSC(config-net-bts)# gprs cell bvci 1234 +OsmoBSC(config-net-bts)# gprs nsei 1234 +OsmoBSC(config-net-bts)# gprs nsvc 0 nsvci 1234 +OsmoBSC(config-net-bts)# gprs nsvc 0 local udp port 23000 +OsmoBSC(config-net-bts)# gprs nsvc 0 remote udp port 23000 +OsmoBSC(config-net-bts)# gprs nsvc 0 remote ip 192.168.100.239 +---- + + +=== More explanation about the PCU config parameters + +//FIXME: should this go into VTY additions? + +==== `gprs mode (none|gprs|egprs)` + +This command determines if GPRS (or EGPRS) services are to be enabled in +this cell at all. + + +==== `gprs cell bvci <2-65535>` + +Configures the 'BSSGP Virtual Circuit Identifier'. It must be unique +between all BGSGP connections to one SGSN. + +NOTE: It is up to the system administrator to ensure all PCUs are +allocated an unique bvci. OsmoBSC will not ensure this policy. + + +==== `gprs nsei <0-65535>` + +Configures the 'NS Entity Identifier'. It must be unique between all NS +connections to one SGSN. + +NOTE: It is up to the system administrator to ensure all PCUs are +allocated an unique bvci. OsmoBSC will not ensure this policy. + + +==== `gprs nsvc <0-1> nsvci <0-65535>` + +Configures the 'NS Virtual Connection Identifier'. It must be unique +between all NS virtual connections to one SGSN. + +NOTE: It is up to the system administrator to ensure all PCUs are +allocated an unique nsvci. OsmoBSC will not ensure this policy. + + +==== `gprs nsvc <0-1> local udp port <0-65535>` + +Configures the local (PCU side) UDP port for the NS-over-UDP link. + + +==== `gprs nsvc <0-1> remote udp port <0-65535>` + +Configures the remote (SGSN side) UDP port for the NS-over-UDP link. + + +==== `gprs nsvc <0-1> remote ip A.B.C.D` + +Configures the remote (SGSN side) UDP port for the NS-over-UDP link. + + +==== `gprs ns timer (tns-block|tns-block-retries|tns-reset|tns-reset-retries|tns-test|tns-alive|tns-alive-retries)` <0-255> + +Configures the various GPRS NS related timers. Please check the GPRS NS +specification for the detailed meaning of those timers. + + +=== Dynamic Timeslot Configuration (TCH / PDCH) + +A dynamic timeslot is in principle a voice timeslot (TCH) that is used to serve +GPRS data (PDCH) when no voice call is active on it. This enhances GPRS +bandwidth while no voice calls are active, which is dynamically scaled down as +voice calls need to be served. This is a tremendous improvement in service over +statically assigning a fixed number of timeslots for voice and data. + +The causality is as follows: to establish a voice call, the +MSC requests a logical channel of a given TCH kind from the BSC. The BSC +assigns such a channel from a BTS' TRX's timeslot of its choice. The knowledge +that a given timeslot is dynamic exists only on the BSC level. When the MSC +asks for a logical channel, the BSC may switch off PDCH on a dynamic timeslot +and then assign a logical TCH channel on it. Hence, though compatibility with +the BTS needs to be ensured, any MSC is compatible with dynamic timeslots by +definition. + +OsmoBSC and OsmoNITB support two kinds of dynamic timeslot handling, configured +via the `network` / `bts` / `trx` / `timeslot` / `phys_chan_config` +configuration. Not all BTS models support dynamic channels. + +[[dyn_ts_compat]] +.Dynamic timeslot support by various BTS models +[cols="50%,25%,25%"] +|=== +| |`TCH/F_TCH/H_PDCH` |`TCH/F_PDCH` +|ip.access nanoBTS |- |supported +|Ericsson RBS |supported |- +|sysmoBTS using _osmo-bts-sysmo_ |supported |supported +|various SDR platforms using _osmo-bts-trx_ |supported |supported +|Nutaq Litecell 1.5 using _osmo-bts-litecell15_ |supported |supported +|Octasic OctBTS using _osmo-bts-octphy_ | supported | supported +|=== + +The _OsmoBTS Abis Protocol Specification_ <> describes the +non-standard RSL messages used for these timeslot kinds. + +NOTE: Same as for dedicated PDCH timeslots, you need to enable GPRS and operate +a PCU, SGSN and GGSN to provide the actual data service. + +==== Osmocom Style Dynamic Timeslots (TCH/F_TCH/H_PDCH) + +Timeslots of the `TCH/F_TCH/H_PDCH` type dynamically switch between TCH/F, +TCH/H and PDCH, depending on the channel kind requested by the MSC. The RSL +messaging for `TCH/F_TCH/H_PDCH` timeslots is compatible with Ericsson RBS. + +BTS models supporting this timeslot kind are shown in <>. + +In the lack of transcoding capabilities, this timeslot type may cause +mismatching codecs to be selected for two parties of the same call, which would +cause call routing to fail ("`Cannot patch through call with different channel +types: local = TCH_F, remote = TCH_H`"). A workaround is to disable TCH/F on +this timeslot type, i.e. to allow only TCH/H. To disable TCH/F on Osmocom +style dynamic timeslots, use a configuration of + +---- +network + dyn_ts_allow_tch_f 0 +---- + +In OsmoNITB, disabling TCH/F on Osmocom dynamic timeslots is the default. In +OsmoBSC, the default is to allow both. + +==== ip.access Style Dynamic Timeslots (TCH/F_PDCH) + +Timeslots of the `TCH/F_PDCH` type dynamically switch between TCH/F and PDCH. +The RSL messaging for `TCH/F_PDCH` timeslots is compatible with ip.access +nanoBTS. + +BTS models supporting this timeslot kind are shown in <>. + +==== Avoid PDCH Exhaustion + +To avoid disrupting GPRS, configure at least one timeslot as dedicated PDCH. +With only dynamic timeslots, a given number of voice calls would convert all +timeslots to TCH, and no PDCH timeslots would be left for GPRS service. + +==== Dynamic Timeslot Configuration Examples + +This is an extract of an `osmo-bsc` or `osmo-nitb` config file. A timeslot +configuration with five Osmocom style dynamic timeslots and one dedicated PDCH +may look like this: + +---- +network + bts 0 + trx 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config SDCCH8 + timeslot 2 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 3 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 5 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 6 + phys_chan_config TCH/F_TCH/H_PDCH + timeslot 7 + phys_chan_config PDCH +---- + +With the ip.access nanoBTS, only `TCH/F_PDCH` dynamic timeslots are supported, +and hence a nanoBTS configuration may look like this: + +---- +network + bts 0 + trx 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config SDCCH8 + timeslot 2 + phys_chan_config TCH/F_PDCH + timeslot 3 + phys_chan_config TCH/F_PDCH + timeslot 4 + phys_chan_config TCH/F_PDCH + timeslot 5 + phys_chan_config TCH/F_PDCH + timeslot 6 + phys_chan_config TCH/F_PDCH + timeslot 7 + phys_chan_config PDCH +---- + +=== Tuning Access to the BTS + +OsmoBSC offers several configuration options to fine-tune access to the BTS. +It can allow only a portion of the subscribers access to the network. +This can also be used to ramp up access to the network on startup by slowly +letting in more and more subscribers. This is especially useful for isolated +cells with a huge number of subscribers. + +Other options control the behaviour of the MS when it needs to access the +random access channel before a dedicated channel is established. + +If the BTS is connected to the BSC via a high-latency connection the MS should +wait longer for an answer to a RACH request. If it does not the network will +have to deal with an increased load due to duplicate RACH requests. However, +in order to minimize the delay when a RACH request or response gets lost the +MS should not wait too long before retransmitting. + +==== Load Management + +Every SIM card is member of one of the ten regular ACCs (0-9). Access to the +BTS can be restricted to SIMs that are members of certain ACCs. + +Since the ACCs are distributed uniformly across all SIMs allowing only ACCs +0-4 to connect to the BTS should reduce its load by 50%. + +The default is to allow all ACCs to connect. + +.Example: Restrict access to the BTS by ACC +---- +network + bts 0 + rach access-control-class 1 barred <1> + rach access-control-class 9 allowed <2> +---- +<1> Disallow SIMs with access-class 1 from connecting to the BTS +<2> Permit SIMs with access-class 9 to connect to the BTS. + + +Smaller cells with lots of subscribers can be overwhelmed with traffic after +the network is turned on. This is especially true in areas with little to no +reception from other networks. To manage the load OsmoBSC has an option to +enable one Access Class at a time so initial access to the network is +distributed across a longer time. + +.Example: Ramp up access to the BTS after startup +---- +network + bts 0 + access-control-class-ramping <1> + access-control-class-ramping-step-interval 30 <2> + access-control-class-ramping-step-size 1 <3> +---- +<1> Turn on access-control-class ramping +<2> Enable more ACCs every 30 seconds +<3> At each step enable one more ACC + + +==== RACH Parameter Configuration + +The following parameters allow control over how the MS can access the random +access channel (RACH). It is possible to set a minimum receive level under +which the MS will not even attempt to access the network. + +The RACH is a shared channel which means multiple MS can choose to send a +request at the same time. To minimize the risk of a collision each MS will +choose a random number of RACH slots to wait before trying to send a RACH +request. + +On very busy networks the range this number is chosen from should be +high to avoid collisions, but a lower range reduces the overall delay when +trying to establish a channel. + +The option `rach tx integer N` controls the range from which this number X +is chosen. It is `0 <= X < max(8,N)`. + +After sending a RACH request the MS will wait a random amount of slots before +retransmitting its RACH request. The range it will wait is also determined by +the option `rach tx integer N`, but calculating it is not so straightforward. +It is defined as `S <= X < S+N` where `S` is determined from a table. + +In particular `S` is lowest when `N` is one of 3, 8, 14 or 50 and highest when +`N` is 7, 12 or 32. + +For more information see _3GPP TA 44.018_ <<3gpp-ts-44-018>> Ch. 3.3.1.1.2 and +Table 3.3.1.1.2.1 in particular. + +The amount of times the MS attempts to retransmit RACH requests can also be +changed. A higher number means more load on the RACH while a lower number can +cause channel establishment to fail due to collisions or bad reception. + +.Example: Configure RACH Access Parameters +---- +network + bts 0 + rxlev access min 20 <1> + rach tx integer 50<2> + rach max transmission <3> +---- +<1> Allow access to the network if the MS receives the BCCH of the cell at +-90dBm or better (20dB above -110dBm). +<2> This number affects how long the MS waits before (re-)transmitting RACH +requests. +<3> How often to retransmit the RACH request. diff --git a/doc/manuals/osmobsc-usermanual.adoc b/doc/manuals/osmobsc-usermanual.adoc index 862c8f9..cb939cc 100644 --- a/doc/manuals/osmobsc-usermanual.adoc +++ b/doc/manuals/osmobsc-usermanual.adoc @@ -18,11 +18,11 @@ include::./common/chapters/cs7-config.adoc[] -include::./common/chapters/bts.adoc[] +include::{srcdir}/chapters/bts.adoc[] include::{srcdir}/chapters/bts-examples.adoc[] -include::./common/chapters/bsc.adoc[] +include::{srcdir}/chapters/bsc.adoc[] include::{srcdir}/chapters/handover.adoc[] -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I20aa60d2f4111d66e922f3e2a73a20352ec1f7e4 Gerrit-Change-Number: 19327 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 14:52:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jul 2020 14:52:46 +0000 Subject: Change in osmo-bsc[master]: {bts, bsc}.adoc: Drop deprecated OsmoNITB references In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19328 ) Change subject: {bts,bsc}.adoc: Drop deprecated OsmoNITB references ...................................................................... {bts,bsc}.adoc: Drop deprecated OsmoNITB references dyn_ts_allow_tch_f is also deprecated and should not be used, so drop that too. Change-Id: Icc91dd41a237531cb512fa36d8b18d4d8d5ca8ed --- M doc/manuals/chapters/bsc.adoc M doc/manuals/chapters/bts.adoc 2 files changed, 8 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/bsc.adoc b/doc/manuals/chapters/bsc.adoc index 49d25e5..0d3ded5 100644 --- a/doc/manuals/chapters/bsc.adoc +++ b/doc/manuals/chapters/bsc.adoc @@ -1,9 +1,5 @@ == BSC level configuration -The BSC component is shared between OsmoBSC and OsmoNITB. This chapter -describes some of the configuration options related to this shared BSC -component. - === Hand-over ==== Hand-over in GSM @@ -25,11 +21,10 @@ The hand-over decision is made by an algorithm that processes those measurement results and determines when to perform the hand-over. -==== Configuration of hand-over in OsmoBSC/OsmoNITB +==== Configuration of hand-over in OsmoBSC -OsmoBSC (like the internal BSC component of OsmoNITB) only support -so-called intra-BSC hand-over, where the hand-over is performed between -two BTSs within the same BSC. +OsmoBSC only support so-called intra-BSC hand-over, where the hand-over is +performed between two BTSs within the same BSC. Hand-over is enabled and configured by the use of a set of `handover` commands. Using those, you can tune the key parameters of the hand-over diff --git a/doc/manuals/chapters/bts.adoc b/doc/manuals/chapters/bts.adoc index 223cec1..94e89a4 100644 --- a/doc/manuals/chapters/bts.adoc +++ b/doc/manuals/chapters/bts.adoc @@ -287,9 +287,9 @@ the BTS needs to be ensured, any MSC is compatible with dynamic timeslots by definition. -OsmoBSC and OsmoNITB support two kinds of dynamic timeslot handling, configured -via the `network` / `bts` / `trx` / `timeslot` / `phys_chan_config` -configuration. Not all BTS models support dynamic channels. +OsmoBSC supports two kinds of dynamic timeslot handling, configured via the +`network` / `bts` / `trx` / `timeslot` / `phys_chan_config` configuration. Not +all BTS models support dynamic channels. [[dyn_ts_compat]] .Dynamic timeslot support by various BTS models @@ -349,9 +349,8 @@ ==== Dynamic Timeslot Configuration Examples -This is an extract of an `osmo-bsc` or `osmo-nitb` config file. A timeslot -configuration with five Osmocom style dynamic timeslots and one dedicated PDCH -may look like this: +This is an extract of an `osmo-bsc`` config file. A timeslot configuration with +five Osmocom style dynamic timeslots and one dedicated PDCH may look like this: ---- network -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icc91dd41a237531cb512fa36d8b18d4d8d5ca8ed Gerrit-Change-Number: 19328 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 14:53:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jul 2020 14:53:08 +0000 Subject: Change in osmo-bsc[master]: rename files acc_ramp.* -> acc.c* In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19334 ) Change subject: rename files acc_ramp.* -> acc.c* ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8c368ab87e264439dea4ccf556821a44664cdbb0 Gerrit-Change-Number: 19334 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 21 Jul 2020 14:53:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 15:09:08 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Tue, 21 Jul 2020 15:09:08 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_{mme, enb}: make sure mcc/mnc are zero padded In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19204 ) Change subject: amarisoft_{mme,enb}: make sure mcc/mnc are zero padded ...................................................................... amarisoft_{mme,enb}: make sure mcc/mnc are zero padded same as for srsEPC this is also required for Amarisoft MME and eNB to support, i.e. 001/01 Note that the 3 digit MNC isn't covered by this. Change-Id: I80a84e01ec9530c285634452d7c18c17bdd595ce --- M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl M src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl index 7896ecb..64d16f9 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl @@ -93,7 +93,7 @@ cell_default: { /* Broadcasted PLMN identities */ plmn_list: [ - "${enb.mcc}${enb.mnc}", + "${'{0:03}'.format(int(enb.mcc))}${'{0:02}'.format(int(enb.mnc))}", ], % if int(enb.get('transmission_mode')) == 1: diff --git a/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl index fb3ec98..3c83bed 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl @@ -39,7 +39,7 @@ s1ap_bind_addr: "${epc.run_addr}", - plmn: "${epc.mcc}${epc.mnc}", + plmn: "${'{0:03}'.format(int(epc.mcc))}${'{0:02}'.format(int(epc.mnc))}", mme_group_id: 32769, mme_code: 1, -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I80a84e01ec9530c285634452d7c18c17bdd595ce Gerrit-Change-Number: 19204 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-CC: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 15:09:09 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Tue, 21 Jul 2020 15:09:09 +0000 Subject: Change in osmo-gsm-tester[master]: iperf3: increase additional wait time for iperf client In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19275 ) Change subject: iperf3: increase additional wait time for iperf client ...................................................................... iperf3: increase additional wait time for iperf client we've noticed that the Iperf client times out too soon in some experiment. It seems that this happens with ZMQ if the RAT is too slow (slower than realtime) and the eNB buffers too much data. This causes iperf to still receive DL data for example long after the configured runtime. Change-Id: I9b823ab22812c96920d54fb7342c8d4c578d5270 --- M src/osmo_gsm_tester/obj/iperf3.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/obj/iperf3.py b/src/osmo_gsm_tester/obj/iperf3.py index 252c55a..2039a9b 100644 --- a/src/osmo_gsm_tester/obj/iperf3.py +++ b/src/osmo_gsm_tester/obj/iperf3.py @@ -277,7 +277,7 @@ proc = self.prepare_test_proc_locally(netns, popen_args) else: proc = self.prepare_test_proc_remotely(netns, popen_args) - proc.set_default_wait_timeout(time_sec + 30) # leave 30 extra sec for remote run, ctrl conn establishment, etc. + proc.set_default_wait_timeout(time_sec + 120) # leave extra time for remote run, ctrl conn establishment, buffer draining, etc. return proc def prepare_test_proc_remotely(self, netns, popen_args): -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I9b823ab22812c96920d54fb7342c8d4c578d5270 Gerrit-Change-Number: 19275 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 15:09:10 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Tue, 21 Jul 2020 15:09:10 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_drb: adapt QCI 8 config for ZMQ operation In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19276 ) Change subject: amarisoft_drb: adapt QCI 8 config for ZMQ operation ...................................................................... amarisoft_drb: adapt QCI 8 config for ZMQ operation we use the otherwise unused QCI 8 as a slightly modified version of QCI 7 (default RLC UM) with a PDCP discard timer set to infinity to avoid dropping PDCP SDUs if packets arive faster than can be processed in the DL Change-Id: I06b7b583701f90827fba36564f969b5d58c9b9ad --- M src/osmo_gsm_tester/templates/amarisoft_drb.cfg.tmpl 1 file changed, 7 insertions(+), 10 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/templates/amarisoft_drb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_drb.cfg.tmpl index 38281b5..d244c8e 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_drb.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_drb.cfg.tmpl @@ -254,21 +254,18 @@ }, }, { - qci: 8, /* AM - best effort (Internet traffic) */ + qci: 8, /* Modified UM - best effort (Internet traffic) with full PDCP buffering */ pdcp_config: { discardTimer: 0, /* in ms, 0 means infinity */ - statusReportRequired: true, + pdcp_SN_Size: 12, }, rlc_config: { - ul_am: { - t_PollRetransmit: 80, /* in ms */ - pollPDU: 64, - pollByte: 125, /* in kBytes, 0 means infinity */ - maxRetxThreshold: 32, + ul_um: { + sn_FieldLength: 10, }, - dl_am: { - t_Reordering: 45, /* in ms, should be > to max_harq_tx * HARQ latency */ - t_StatusProhibit: 60, /* in ms */ + dl_um: { + sn_FieldLength: 10, + t_Reordering: 45, /* should be > to max_harq_tx * HARQ latency */ }, }, logical_channel_config: { -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I06b7b583701f90827fba36564f969b5d58c9b9ad Gerrit-Change-Number: 19276 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 15:09:10 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Tue, 21 Jul 2020 15:09:10 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_enb.cfg.tmpl: enable eNB PCAP if configured In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19277 ) Change subject: amarisoft_enb.cfg.tmpl: enable eNB PCAP if configured ...................................................................... amarisoft_enb.cfg.tmpl: enable eNB PCAP if configured enable PCAP output in eNB config Change-Id: I8482315ce854c5b21a90b77de55dbb82f3049bcd --- M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl index 64d16f9..155ad47 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl @@ -32,6 +32,10 @@ log_options: "${enb.log_options}", log_filename: "${enb.log_filename}", +% if enb.enable_pcap == 'true': + pcap: {filename:"${enb.pcap_filename}"}, +%endif + /* Enable remote API and Web interface */ com_addr: "${enb.addr}:9001", -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I8482315ce854c5b21a90b77de55dbb82f3049bcd Gerrit-Change-Number: 19277 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 15:09:11 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Tue, 21 Jul 2020 15:09:11 +0000 Subject: Change in osmo-gsm-tester[master]: srsenb_drb.conf.tmpl: add QCI8 config In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19331 ) Change subject: srsenb_drb.conf.tmpl: add QCI8 config ...................................................................... srsenb_drb.conf.tmpl: add QCI8 config add QCI config with RLC UM and PDCP SDU discard set to infinity Change-Id: If946f569f7bbb98fc754f30ff5627fa5ca4afe68 --- M src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl 1 file changed, 37 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl index 32b6e93..5167dab 100644 --- a/src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl @@ -1,4 +1,3 @@ - // All times are in ms. Use -1 for infinity, where available qci_config = ( @@ -6,30 +5,53 @@ { qci=7; pdcp_config = { - discard_timer = 100; - pdcp_sn_size = 12; + discard_timer = 100; + pdcp_sn_size = 12; } rlc_config = { ul_um = { - sn_field_length = 10; + sn_field_length = 10; }; dl_um = { - sn_field_length = 10; - t_reordering = 45; + sn_field_length = 10; + t_reordering = 45; }; }; logical_channel_config = { - priority = 13; - prioritized_bit_rate = -1; - bucket_size_duration = 100; - log_chan_group = 2; + priority = 13; + prioritized_bit_rate = -1; + bucket_size_duration = 100; + log_chan_group = 2; + }; +}, +// QCI 8 is a modified QCI 7 with PDCP discard timer set to infinity to avoid SDU drops at PDCP +{ + qci=8; + pdcp_config = { + discard_timer = -1; + pdcp_sn_size = 12; + } + rlc_config = { + ul_um = { + sn_field_length = 10; + }; + dl_um = { + sn_field_length = 10; + t_reordering = 45; + }; + }; + logical_channel_config = { + priority = 13; + prioritized_bit_rate = -1; + bucket_size_duration = 100; + log_chan_group = 2; }; }, { qci=9; pdcp_config = { discard_timer = -1; - status_report_required = true; + status_report_required = false; } rlc_config = { ul_am = { @@ -44,10 +66,10 @@ }; }; logical_channel_config = { - priority = 11; - prioritized_bit_rate = -1; - bucket_size_duration = 100; - log_chan_group = 3; + priority = 11; + prioritized_bit_rate = -1; + bucket_size_duration = 100; + log_chan_group = 3; }; } -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: If946f569f7bbb98fc754f30ff5627fa5ca4afe68 Gerrit-Change-Number: 19331 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 15:09:12 2020 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Tue, 21 Jul 2020 15:09:12 +0000 Subject: Change in osmo-gsm-tester[master]: suite: fix runtime error when suite.duration is None In-Reply-To: References: Message-ID: srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19357 ) Change subject: suite: fix runtime error when suite.duration is None ...................................................................... suite: fix runtime error when suite.duration is None report generation failed when duration was not set correctly and None was returned. Use 0 as duration by default. Change-Id: Ia654c67bf2dcce432f84e869550c516d8d5a07a0 --- M src/osmo_gsm_tester/core/suite.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/core/suite.py b/src/osmo_gsm_tester/core/suite.py index a1d068e..3860d19 100644 --- a/src/osmo_gsm_tester/core/suite.py +++ b/src/osmo_gsm_tester/core/suite.py @@ -80,7 +80,7 @@ def __init__(self, trial, suite_scenario_str, suite_definition, scenarios=[]): super().__init__(log.C_TST, suite_scenario_str) self.start_timestamp = None - self.duration = None + self.duration = 0 self.reserved_resources = None self._resource_requirements = None self._resource_modifiers = None -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ia654c67bf2dcce432f84e869550c516d8d5a07a0 Gerrit-Change-Number: 19357 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 16:09:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jul 2020 16:09:01 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC subset rotation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19303 ) Change subject: Introduce support for ACC subset rotation ...................................................................... Patch Set 3: (6 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/19303/3/doc/manuals/chapters/bts.adoc File doc/manuals/chapters/bts.adoc: https://gerrit.osmocom.org/c/osmo-bsc/+/19303/3/doc/manuals/chapters/bts.adoc at 428 PS3, Line 428: allowing only ACCs 0-4 to connect to the BTS should reduce its load by 50%. may be worth explicitly noticing "at the expense of not serving 50% of the subscribers".. https://gerrit.osmocom.org/c/osmo-bsc/+/19303/3/doc/manuals/chapters/bts.adoc at 435 PS3, Line 435: First level of management consists of an access list to flag specific ACCs as The first level... IMHO https://gerrit.osmocom.org/c/osmo-bsc/+/19303/3/doc/manuals/chapters/bts.adoc at 451 PS3, Line 451: permanently : allowed ACCs (hence restrict the amount of mobile stations allowed to reach the : BTS). However, doing so on a permanent basis would be unfair to mobile it's confusing that we resetrict the amount of _permanently_ allowed ACCs but doing so on a _permanent_ basis is unfair. Please re-word. Maybe simply remove the first _permanently_. https://gerrit.osmocom.org/c/osmo-bsc/+/19303/3/doc/manuals/chapters/bts.adoc at 456 PS3, Line 456: mobile stations probably nit-picking, but as it is a SIM property I would write 'subscribers'. https://gerrit.osmocom.org/c/osmo-bsc/+/19303/3/doc/manuals/chapters/bts.adoc at 470 PS3, Line 470: Furthermore, smaller cells with lots of subscribers may become overwhelmed with even large cells. I think "cells with large number of subscribers and limited overlappign coverage may become overwhelmed with traffic after the cell starts brodascasting" https://gerrit.osmocom.org/c/osmo-bsc/+/19303/3/include/osmocom/bsc/acc.h File include/osmocom/bsc/acc.h: https://gerrit.osmocom.org/c/osmo-bsc/+/19303/3/include/osmocom/bsc/acc.h at 38 PS3, Line 38: len_allowed_adm qty / quantity / count would be more obvious than 'len', IMHO. But only change if you agree. Not a request to change, just a thought. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I952c9eeae02809c7184078c655574ec817902e06 Gerrit-Change-Number: 19303 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 21 Jul 2020 16:09:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 16:10:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jul 2020 16:10:59 +0000 Subject: Change in osmo-hlr[master]: manual: describe subscriber import by SQL In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/19052 ) Change subject: manual: describe subscriber import by SQL ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/19052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3246e6d5364215a71c33b5aca876deab7b6cfd70 Gerrit-Change-Number: 19052 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jul 2020 16:10:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 16:12:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jul 2020 16:12:23 +0000 Subject: Change in osmo-hlr[master]: manual: describe subscriber import by SQL In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/19052 ) Change subject: manual: describe subscriber import by SQL ...................................................................... Patch Set 1: let's merge this now before it becomes one month old. we can always further improve later on. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/19052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3246e6d5364215a71c33b5aca876deab7b6cfd70 Gerrit-Change-Number: 19052 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jul 2020 16:12:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 16:12:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jul 2020 16:12:25 +0000 Subject: Change in osmo-hlr[master]: manual: describe subscriber import by SQL In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/19052 ) Change subject: manual: describe subscriber import by SQL ...................................................................... manual: describe subscriber import by SQL It seems a bad idea to cement the internal SQL structure in the user manual, but since we currently lack a safe and portable import mechanism (like CSV import in osmo-hlr-db-tool), this is currently valuable info to users. Change-Id: I3246e6d5364215a71c33b5aca876deab7b6cfd70 --- M doc/manuals/chapters/running.adoc M doc/manuals/chapters/subscribers.adoc 2 files changed, 81 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Objections: fixeria: I would prefer this is not merged as is diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index ff75c7f..1f1bcdc 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -54,7 +54,7 @@ Alternatively, you may use the `osmo-hlr-db-tool`, which is installed along with `osmo-hlr`, to bootstrap an empty database, or to migrate subscriber data -from an old 'OsmoNITB' database. See `osmo-hlr-db-tool --help`. +from an old 'OsmoNITB' database. See <>. === Multiple instances diff --git a/doc/manuals/chapters/subscribers.adoc b/doc/manuals/chapters/subscribers.adoc index ab41b0f..3bd5879 100644 --- a/doc/manuals/chapters/subscribers.adoc +++ b/doc/manuals/chapters/subscribers.adoc @@ -127,3 +127,83 @@ ---- <1> Randomly generated 5 digit MSISDN <2> Disabled CS and PS NAM prevent the subscriber from accessing the network + + +=== Import Subscriber Data + +==== Scripted Import + +WARNING: It is not generally a good idea to depend on the HLR database's internal table structure, but in the lack of an +automated import procedure, this example is provided as an ad-hoc method to aid automated subscriber import. This is not +guaranteed to remain valid. + +NOTE: We may add CSV and other import methods to the `osmo-hlr-db-tool`, but so far that is not implemented. Contact the +community if you are interested in such a feature being implemented. + +NOTE: `sqlite3` is available from your distribution packages or `sqlite.org`. + +Currently, probably the easiest way to automatically import subscribers to OsmoHLR is to write out a text file with SQL +commands per subscriber, and feed that to `sqlite3`, as described below. + +A difficulty is to always choose subscriber IDs that are not yet in use. For an initial import, the subscriber ID may be +incremented per subscriber record. If adding more subscribers to an existing database, it is necessary to choose +subscriber IDs that are not yet in use. Get the highest ID in use with: + +---- +sqlite3 hlr.db 'select max(id) from subscriber' +---- + +A full SQL example of adding a single subscriber with id 23, IMSI 001010123456789, MSISDN 1234, Ki for COMP128v1, and K +and OPC for Milenage: + +---- +INSERT subscriber (id, imsi, msisdn) VALUES (23, '001010123456789', '1234'); + +INSERT INTO auc_2g (subscriber_id, algo_id_2g, ki) +VALUES(23, 1, '0123456789abcdef0123456789abcdef'); + +INSERT INTO auc_3g (subscriber_id, algo_id_3g, k, op, opc) +VALUES(23, 5, '0123456789abcdef0123456789abcdef',NULL,'0123456789abcdef0123456789abcdef'); +---- + +Table entries to `auc_2g` and/or `auc_3g` may be omitted if no such key material is required. + +UMTS Milenage auth (on both 2G and 3G RAN) is configured by the `auc_3g` table. `algo_id_3g` must currently always be 5 +(MILENAGE). + +The algorithm IDs for `algo_id_2g` and `algo_id_3g` are: + +.Algorithm IDs in OsmoHLR's database +[options="header",width="50%",cols="40%,60%"] +|=== +|`algo_id_2g` / `algo_id_3g` | Authentication Algorithm +| 1 | COMP128v1 +| 2 | COMP128v2 +| 3 | COMP128v3 +| 4 | XOR +| 5 | MILENAGE +|=== + +Create an empty HLR database with + +---- +osmo-hlr-db-tool -l hlr.db create +---- + +Repeat above SQL commands per subscriber, incrementing the subscriber ID for each block, then feed the SQL commands for +the subscribers to be imported to the `sqlite3` command line tool: + +---- +sqlite3 hlr.db < subscribers.sql +---- + +[[db_import_nitb]] +==== Import OsmoNITB database + +To upgrade from old OsmoNITB to OsmoHLR, use `osmo-hlr-db-tool`: + +---- +osmo-hlr-db-tool -l hlr.db import-nitb-db nitb.db +---- + +Be aware that the import is lossy, only the IMSI, MSISDN, nam_cs/ps and 2G auth data are set. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/19052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3246e6d5364215a71c33b5aca876deab7b6cfd70 Gerrit-Change-Number: 19052 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 16:12:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jul 2020 16:12:50 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: add configuration with frequency hopping parameters In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19160 ) Change subject: ttcn3-bts-test: add configuration with frequency hopping parameters ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7822c3581fccba3277a63577e740e7486307635d Gerrit-Change-Number: 19160 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jul 2020 16:12:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 16:13:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jul 2020 16:13:20 +0000 Subject: Change in osmo-mgw[master]: refactor: use msgb to receive, pass and send RTP packets In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18913 ) Change subject: refactor: use msgb to receive, pass and send RTP packets ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3af40b63bc49f8636d4e7ea2f8f83bb67f6619ee Gerrit-Change-Number: 18913 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jul 2020 16:13:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 16:13:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jul 2020 16:13:23 +0000 Subject: Change in osmo-mgw[master]: refactor: use msgb to receive, pass and send RTP packets In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/18913 ) Change subject: refactor: use msgb to receive, pass and send RTP packets ...................................................................... refactor: use msgb to receive, pass and send RTP packets Instead of numerous arguments (buf, len and context data), use a msgb, like most other osmo programs do, with a msb->cb pointing at a context data struct. This opens the future for adding/stripping IuUP header data from the msgb easily. (Checked to pass current ttcn3-mgw-tests.) Change-Id: I3af40b63bc49f8636d4e7ea2f8f83bb67f6619ee --- M include/osmocom/mgcp/mgcp_codec.h M include/osmocom/mgcp/mgcp_endp.h M include/osmocom/mgcp/mgcp_internal.h M src/libosmo-mgcp/mgcp_codec.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_osmux.c M tests/mgcp/mgcp_test.c 7 files changed, 244 insertions(+), 220 deletions(-) Approvals: laforge: Looks good to me, approved dexter: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/mgcp/mgcp_codec.h b/include/osmocom/mgcp/mgcp_codec.h index 3ead60a..caeecb0 100644 --- a/include/osmocom/mgcp/mgcp_codec.h +++ b/include/osmocom/mgcp/mgcp_codec.h @@ -5,3 +5,5 @@ int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *audio_name, const struct mgcp_codec_param *param); int mgcp_codec_decide(struct mgcp_conn_rtp *conn); int mgcp_codec_pt_translate(struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp *conn_dst, int payload_type); +const struct mgcp_rtp_codec *mgcp_codec_pt_find_by_subtype_name(struct mgcp_conn_rtp *conn, + const char *subtype_name, unsigned int match_nr); diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h index 879947b..c16ea4b 100644 --- a/include/osmocom/mgcp/mgcp_endp.h +++ b/include/osmocom/mgcp/mgcp_endp.h @@ -23,8 +23,11 @@ #pragma once +#include + struct sockaddr_in; struct mgcp_conn; +struct mgcp_conn_rtp; struct mgcp_endpoint; /* Number of E1 subslots (different variants, not all useable at the same time) */ @@ -35,11 +38,19 @@ endp ? endp->name : "none", \ ## args) -/* Callback type for RTP dispatcher functions - (e.g mgcp_dispatch_rtp_bridge_cb, see below) */ -typedef int (*mgcp_dispatch_rtp_cb) (int proto, struct sockaddr_in *addr, - char *buf, unsigned int buf_size, - struct mgcp_conn *conn); +struct osmo_rtp_msg_ctx { + int proto; + struct mgcp_conn_rtp *conn_src; + struct sockaddr_in *from_addr; +}; + +#define OSMO_RTP_MSG_CTX(MSGB) ((struct osmo_rtp_msg_ctx*)(MSGB)->cb) + +osmo_static_assert(sizeof(((struct msgb*)0)->cb) >= sizeof(struct osmo_rtp_msg_ctx), osmo_rtp_msg_ctx_fits_in_msgb_cb); + +/* Callback type for RTP dispatcher functions (e.g mgcp_dispatch_rtp_bridge_cb, see below). + * The OSMO_RTP_MSG_CTX() should be set appropriately on the msg. */ +typedef int (*mgcp_dispatch_rtp_cb) (struct msgb *msg); /* Callback type for endpoint specific cleanup actions. This function * is automatically executed when a connection is freed (see mgcp_conn_free() diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h index ec3ce31..3d7224e 100644 --- a/include/osmocom/mgcp/mgcp_internal.h +++ b/include/osmocom/mgcp/mgcp_internal.h @@ -32,6 +32,18 @@ #define CI_UNUSED 0 +/* FIXME: This this is only needed to compile the currently + * broken OSMUX support. Remove when fixed */ +#define CONN_ID_BTS "0" +#define CONN_ID_NET "1" + +#define LOG_CONN(conn, level, fmt, args...) \ + LOGP(DRTP, level, "(%s I:%s) " fmt, \ + (conn)->endp ? (conn)->endp->name : "none", (conn)->id, ## args) + +#define LOG_CONN_RTP(conn_rtp, level, fmt, args...) \ + LOG_CONN((conn_rtp)->conn, level, fmt, ## args) + struct mgcp_rtp_stream_state { uint32_t ssrc; uint16_t last_seq; @@ -208,14 +220,12 @@ }; int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct sockaddr_in *addr, - char *buf, int rc, struct mgcp_conn_rtp *conn_src, + struct msgb *msg, struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp *conn_dst); int mgcp_send_dummy(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn); -int mgcp_dispatch_rtp_bridge_cb(int proto, struct sockaddr_in *addr, char *buf, - unsigned int buf_size, struct mgcp_conn *conn); +int mgcp_dispatch_rtp_bridge_cb(struct msgb *msg); void mgcp_cleanup_rtp_bridge_cb(struct mgcp_endpoint *endp, struct mgcp_conn *conn); -int mgcp_dispatch_e1_bridge_cb(int proto, struct sockaddr_in *addr, char *buf, - unsigned int buf_size, struct mgcp_conn *conn); +int mgcp_dispatch_e1_bridge_cb(struct msgb *msg); void mgcp_cleanup_e1_bridge_cb(struct mgcp_endpoint *endp, struct mgcp_conn *conn); int mgcp_bind_net_rtp_port(struct mgcp_endpoint *endp, int rtp_port, struct mgcp_conn_rtp *conn); @@ -282,3 +292,7 @@ void mgcp_get_local_addr(char *addr, struct mgcp_conn_rtp *conn); void mgcp_conn_watchdog_kick(struct mgcp_conn *conn); +void mgcp_patch_and_count(struct mgcp_endpoint *endp, + struct mgcp_rtp_state *state, + struct mgcp_rtp_end *rtp_end, + struct sockaddr_in *addr, struct msgb *msg); diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 9ac5fbb..58079c6 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -432,3 +432,28 @@ return codec_dst->payload_type; } + +/* Find the payload type number configured for a specific codec by SDP. + * For example, IuUP gets assigned a payload type number, and the endpoint needs to translate that to the number + * assigned to "AMR" on the other conn (by a=rtpmap:N). + * \param conn The side of an endpoint to get the payload type number for (to translate the payload type number to). + * \param subtype_name SDP codec name without parameters (e.g. "AMR"). + * \param match_nr Index for the match found, first being match_nr == 0. Iterate all matches by calling multiple times + * with incrementing match_nr. + * \return codec definition for that conn matching the subtype_name, or NULL if no such match_nr is found. + */ +const struct mgcp_rtp_codec *mgcp_codec_pt_find_by_subtype_name(struct mgcp_conn_rtp *conn, + const char *subtype_name, unsigned int match_nr) +{ + int i; + for (i = 0; i < conn->end.codecs_assigned; i++) { + if (!strcmp(conn->end.codecs[i].subtype_name, subtype_name)) { + if (match_nr) { + match_nr--; + continue; + } + return &conn->end.codecs[i]; + } + } + return NULL; +} diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index a0714c1..155ed20 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -53,7 +53,7 @@ #define RTP_MAX_MISORDER 100 #define RTP_BUF_SIZE 4096 -enum { +enum rtp_proto { MGCP_PROTO_RTP, MGCP_PROTO_RTCP, }; @@ -74,6 +74,8 @@ rtpconn_rate_ctr_add(conn_rtp, endp, id, 1); } +static int rx_rtp(struct msgb *msg); + /*! Determine the local rtp bind IP-address. * \param[out] addr caller provided memory to store the resulting IP-Address. * \param[in] endp mgcp endpoint, that holds a copy of the VTY parameters. @@ -486,16 +488,19 @@ * Patch the payload type of an RTP packet so that it uses the payload type * that is valid for the destination connection (conn_dst) */ static int mgcp_patch_pt(struct mgcp_conn_rtp *conn_src, - struct mgcp_conn_rtp *conn_dst, char *data, int len) + struct mgcp_conn_rtp *conn_dst, struct msgb *msg) { struct rtp_hdr *rtp_hdr; uint8_t pt_in; int pt_out; - if (len < sizeof(struct rtp_hdr)) + if (msgb_length(msg) < sizeof(struct rtp_hdr)) { + LOG_CONN_RTP(conn_src, LOGL_ERROR, "RTP packet too short (%u < %zu)\n", + msgb_length(msg), sizeof(struct rtp_hdr)); return -EINVAL; + } - rtp_hdr = (struct rtp_hdr *)data; + rtp_hdr = (struct rtp_hdr *)msgb_data(msg); pt_in = rtp_hdr->payload_type; pt_out = mgcp_codec_pt_translate(conn_src, conn_dst, pt_in); @@ -515,7 +520,7 @@ void mgcp_patch_and_count(struct mgcp_endpoint *endp, struct mgcp_rtp_state *state, struct mgcp_rtp_end *rtp_end, - struct sockaddr_in *addr, char *data, int len) + struct sockaddr_in *addr, struct msgb *msg) { uint32_t arrival_time; int32_t transit; @@ -523,11 +528,12 @@ uint32_t timestamp, ssrc; struct rtp_hdr *rtp_hdr; int payload = rtp_end->codec->payload_type; + unsigned int len = msgb_length(msg); if (len < sizeof(*rtp_hdr)) return; - rtp_hdr = (struct rtp_hdr *)data; + rtp_hdr = (struct rtp_hdr *)msgb_data(msg); seq = ntohs(rtp_hdr->sequence); timestamp = ntohl(rtp_hdr->timestamp); arrival_time = get_current_ts(rtp_end->codec->rate); @@ -660,32 +666,26 @@ * function is used to convert between RFC 5993 and TS 101318, which we normally * use. * Return 0 on sucess, negative on errors like invalid data length. */ -static int rfc5993_hr_convert(struct mgcp_endpoint *endp, char *data, int *len) +static int rfc5993_hr_convert(struct mgcp_endpoint *endp, struct msgb *msg) { - /* NOTE: *data has an overall length of RTP_BUF_SIZE, so there is - * plenty of space available to store the slightly larger, converted - * data */ - struct rtp_hdr *rtp_hdr; - - if (*len < sizeof(struct rtp_hdr)) { + if (msgb_length(msg) < sizeof(struct rtp_hdr)) { LOGPENDP(endp, DRTP, LOGL_ERROR, "AMR RTP packet too short (%d < %zu)\n", - *len, sizeof(struct rtp_hdr)); + msgb_length(msg), sizeof(struct rtp_hdr)); return -EINVAL; } - rtp_hdr = (struct rtp_hdr *)data; + rtp_hdr = (struct rtp_hdr *)msgb_data(msg); - if (*len == GSM_HR_BYTES + sizeof(struct rtp_hdr)) { + if (msgb_length(msg) == GSM_HR_BYTES + sizeof(struct rtp_hdr)) { /* TS 101318 encoding => RFC 5993 encoding */ + msgb_put(msg, 1); memmove(rtp_hdr->data + 1, rtp_hdr->data, GSM_HR_BYTES); rtp_hdr->data[0] = 0x00; - (*len) += 1; - - } else if (*len == GSM_HR_BYTES + sizeof(struct rtp_hdr) + 1) { + } else if (msgb_length(msg) == GSM_HR_BYTES + sizeof(struct rtp_hdr) + 1) { /* RFC 5993 encoding => TS 101318 encoding */ memmove(rtp_hdr->data, rtp_hdr->data + 1, GSM_HR_BYTES); - (*len) -= 1; + msgb_trim(msg, msgb_length(msg) - 1); } else { /* It is possible that multiple payloads occur in one RTP * packet. This is not supported yet. */ @@ -700,25 +700,24 @@ * efficient encoding scheme where all fields are packed together one after * another and an octet aligned mode where all fields are aligned to octet * boundaries. This function is used to convert between the two modes */ -static int amr_oa_bwe_convert(struct mgcp_endpoint *endp, char *data, int *len, +static int amr_oa_bwe_convert(struct mgcp_endpoint *endp, struct msgb *msg, bool target_is_oa) { - /* NOTE: *data has an overall length of RTP_BUF_SIZE, so there is + /* NOTE: the msgb has an allocated length of RTP_BUF_SIZE, so there is * plenty of space available to store the slightly larger, converted * data */ - struct rtp_hdr *rtp_hdr; unsigned int payload_len; int rc; - if (*len < sizeof(struct rtp_hdr)) { - LOGPENDP(endp, DRTP, LOGL_ERROR, "AMR RTP packet too short (%d < %zu)\n", *len, sizeof(struct rtp_hdr)); + if (msgb_length(msg) < sizeof(struct rtp_hdr)) { + LOGPENDP(endp, DRTP, LOGL_ERROR, "AMR RTP packet too short (%d < %zu)\n", msgb_length(msg), sizeof(struct rtp_hdr)); return -EINVAL; } - rtp_hdr = (struct rtp_hdr *)data; + rtp_hdr = (struct rtp_hdr *)msgb_data(msg); - payload_len = *len - sizeof(struct rtp_hdr); + payload_len = msgb_length(msg) - sizeof(struct rtp_hdr); if (osmo_amr_is_oa(rtp_hdr->data, payload_len)) { if (!target_is_oa) @@ -746,9 +745,7 @@ return -EINVAL; } - *len = rc + sizeof(struct rtp_hdr); - - return 0; + return msgb_trim(msg, rc + sizeof(struct rtp_hdr)); } /* Check if a conversion between octet-aligned and bandwith-efficient mode is @@ -786,15 +783,14 @@ /* Forward data to a debug tap. This is debug function that is intended for * debugging the voice traffic with tools like gstreamer */ -static void forward_data(int fd, struct mgcp_rtp_tap *tap, const char *buf, - int len) +static void forward_data(int fd, struct mgcp_rtp_tap *tap, struct msgb *msg) { int rc; if (!tap->enabled) return; - rc = sendto(fd, buf, len, 0, (struct sockaddr *)&tap->forward, + rc = sendto(fd, msgb_data(msg), msgb_length(msg), 0, (struct sockaddr *)&tap->forward, sizeof(tap->forward)); if (rc < 0) @@ -812,7 +808,7 @@ * \param[in] conn_dst associated destination connection. * \returns 0 on success, -1 on ERROR. */ int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct sockaddr_in *addr, - char *buf, int len, struct mgcp_conn_rtp *conn_src, + struct msgb *msg, struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp *conn_dst) { /*! When no destination connection is available (e.g. when only one @@ -824,6 +820,7 @@ struct mgcp_rtp_state *rtp_state; char *dest_name; int rc; + int len; OSMO_ASSERT(conn_src); OSMO_ASSERT(conn_dst); @@ -847,7 +844,7 @@ * should not occur if transcoding is consequently avoided. Until * we have transcoding support in osmo-mgw we can not resolve this. */ if (is_rtp) { - rc = mgcp_patch_pt(conn_src, conn_dst, buf, len); + rc = mgcp_patch_pt(conn_src, conn_dst, msg); if (rc < 0) { LOGPENDP(endp, DRTP, LOGL_DEBUG, "can not patch PT because no suitable egress codec was found.\n"); @@ -872,21 +869,21 @@ } else if (is_rtp) { int cont; int nbytes = 0; - int buflen = len; + int buflen = msgb_length(msg); do { /* Run transcoder */ cont = endp->cfg->rtp_processing_cb(endp, rtp_end, - buf, &buflen, + (char*)msgb_data(msg), &buflen, RTP_BUF_SIZE); if (cont < 0) break; if (addr) mgcp_patch_and_count(endp, rtp_state, rtp_end, - addr, buf, buflen); + addr, msg); if (amr_oa_bwe_convert_indicated(conn_dst->end.codec)) { - rc = amr_oa_bwe_convert(endp, buf, &buflen, + rc = amr_oa_bwe_convert(endp, msg, conn_dst->end.codec->param.amr_octet_aligned); if (rc < 0) { LOGPENDP(endp, DRTP, LOGL_ERROR, @@ -897,7 +894,7 @@ else if (rtp_end->rfc5993_hr_convert && strcmp(conn_src->end.codec->subtype_name, "GSM-HR-08") == 0) { - rc = rfc5993_hr_convert(endp, buf, &buflen); + rc = rfc5993_hr_convert(endp, msg); if (rc < 0) { LOGPENDP(endp, DRTP, LOGL_ERROR, "Error while converting to GSM-HR-08\n"); break; @@ -913,7 +910,7 @@ /* Forward a copy of the RTP data to a debug ip/port */ forward_data(rtp_end->rtp.fd, &conn_src->tap_out, - buf, buflen); + msg); /* FIXME: HACK HACK HACK. See OS#2459. * The ip.access nano3G needs the first RTP payload's first two bytes to read hex @@ -922,7 +919,7 @@ */ if (!rtp_state->patched_first_rtp_payload && conn_src->conn->mode == MGCP_CONN_LOOPBACK) { - uint8_t *data = (uint8_t *) & buf[12]; + uint8_t *data = msgb_data(msg) + 12; if (data[0] == 0xe0) { data[0] = 0xe4; data[1] = 0x00; @@ -933,9 +930,8 @@ } } - len = mgcp_udp_send(rtp_end->rtp.fd, - &rtp_end->addr, - rtp_end->rtp_port, buf, buflen); + len = mgcp_udp_send(rtp_end->rtp.fd, &rtp_end->addr, rtp_end->rtp_port, + (char*)msgb_data(msg), msgb_length(msg)); if (len <= 0) return len; @@ -956,7 +952,7 @@ len = mgcp_udp_send(rtp_end->rtcp.fd, &rtp_end->addr, - rtp_end->rtcp_port, buf, len); + rtp_end->rtcp_port, (char*)msgb_data(msg), msgb_length(msg)); rtpconn_rate_ctr_inc(conn_dst, endp, RTP_PACKETS_TX_CTR); rtpconn_rate_ctr_add(conn_dst, endp, RTP_OCTETS_TX_CTR, len); @@ -967,45 +963,6 @@ return 0; } -/* Helper function for mgcp_recv(), - Receive one RTP Packet + Originating address from file descriptor */ -static int receive_from(struct mgcp_endpoint *endp, int fd, - struct sockaddr_in *addr, char *buf, int bufsize) -{ - int rc; - socklen_t slen = sizeof(*addr); - struct sockaddr_in addr_sink; - char buf_sink[RTP_BUF_SIZE]; - bool tossed = false; - - if (!addr) - addr = &addr_sink; - if (!buf) { - tossed = true; - buf = buf_sink; - bufsize = sizeof(buf_sink); - } - - rc = recvfrom(fd, buf, bufsize, 0, (struct sockaddr *)addr, &slen); - - LOGPENDP(endp, DRTP, LOGL_DEBUG, - "receiving %u bytes length packet from %s:%u ...\n", - rc, inet_ntoa(addr->sin_addr), ntohs(addr->sin_port)); - - if (rc < 0) { - LOGPENDP(endp, DRTP, LOGL_ERROR, - "failed to receive packet, errno: %d/%s\n", - errno, strerror(errno)); - return -1; - } - - if (tossed) { - LOGPENDP(endp, DRTP, LOGL_ERROR, "packet tossed\n"); - } - - return rc; -} - /* Check if the origin (addr) matches the address/port data of the RTP * connections. */ static int check_rtp_origin(struct mgcp_conn_rtp *conn, @@ -1098,7 +1055,7 @@ /* Do some basic checks to make sure that the RTCP packets we are going to * process are not complete garbage */ -static int check_rtcp(char *buf, unsigned int buf_size) +static int check_rtcp(struct mgcp_conn_rtp *conn_src, struct msgb *msg) { struct rtcp_hdr *hdr; unsigned int len; @@ -1106,33 +1063,43 @@ /* RTPC packets that are just a header without data do not make * any sense. */ - if (buf_size < sizeof(struct rtcp_hdr)) + if (msgb_length(msg) < sizeof(struct rtcp_hdr)) { + LOG_CONN_RTP(conn_src, LOGL_ERROR, "RTCP packet too short (%u < %zu)\n", + msgb_length(msg), sizeof(struct rtcp_hdr)); return -EINVAL; + } /* Make sure that the length of the received packet does not exceed * the available buffer size */ - hdr = (struct rtcp_hdr *)buf; + hdr = (struct rtcp_hdr *)msgb_data(msg); len = (osmo_ntohs(hdr->length) + 1) * 4; - if (len > buf_size) + if (len > msgb_length(msg)) { + LOG_CONN_RTP(conn_src, LOGL_ERROR, "RTCP header length exceeds packet size (%u > %u)\n", + len, msgb_length(msg)); return -EINVAL; + } /* Make sure we accept only packets that have a proper packet type set * See also: http://www.iana.org/assignments/rtp-parameters/rtp-parameters.xhtml */ type = hdr->type; - if ((type < 192 || type > 195) && (type < 200 || type > 213)) + if ((type < 192 || type > 195) && (type < 200 || type > 213)) { + LOG_CONN_RTP(conn_src, LOGL_ERROR, "RTCP header: invalid type: %u\n", type); return -EINVAL; + } return 0; } /* Do some basic checks to make sure that the RTP packets we are going to * process are not complete garbage */ -static int check_rtp(char *buf, unsigned int buf_size) +static int check_rtp(struct mgcp_conn_rtp *conn_src, struct msgb *msg) { - /* RTP packets that are just a header without data do not make - * any sense. */ - if (buf_size < sizeof(struct rtp_hdr)) - return -EINVAL; + size_t min_size = sizeof(struct rtp_hdr); + if (msgb_length(msg) < min_size) { + LOG_CONN_RTP(conn_src, LOGL_ERROR, "RTP packet too short (%u < %zu)\n", + msgb_length(msg), min_size); + return -1; + } /* FIXME: Add more checks, the reason why we do not check more than * the length is because we currently handle IUUP packets as RTP @@ -1143,86 +1110,15 @@ return 0; } -/* Receive RTP data from a specified source connection and dispatch it to a - * destination connection. */ -static int mgcp_recv(int *proto, struct sockaddr_in *addr, char *buf, - unsigned int buf_size, struct osmo_fd *fd) -{ - struct mgcp_endpoint *endp; - struct mgcp_conn_rtp *conn; - struct mgcp_trunk *trunk; - int rc; - - conn = (struct mgcp_conn_rtp*) fd->data; - endp = conn->conn->endp; - trunk = endp->trunk; - - LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, "receiving RTP/RTCP packet...\n"); - - rc = receive_from(endp, fd->fd, addr, buf, buf_size); - if (rc <= 0) - return -1; - - /* FIXME: The way how we detect the protocol looks odd. We should look - * into the packet header. Also we should introduce a packet type - * MGCP_PROTO_IUUP because currently we handle IUUP packets like RTP - * packets which is problematic. */ - *proto = fd == &conn->end.rtp ? MGCP_PROTO_RTP : MGCP_PROTO_RTCP; - - if (*proto == MGCP_PROTO_RTP) { - if (check_rtp(buf, rc) < 0) { - LOGPCONN(conn->conn, DRTP, LOGL_ERROR, - "invalid RTP packet received -- packet tossed\n"); - return -1; - } - } else if (*proto == MGCP_PROTO_RTCP) { - if (check_rtcp(buf, rc) < 0) { - LOGPCONN(conn->conn, DRTP, LOGL_ERROR, - "invalid RTCP packet received -- packet tossed\n"); - return -1; - } - } - - LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, ""); - LOGPC(DRTP, LOGL_DEBUG, "receiving from %s %s %d\n", - conn->conn->name, inet_ntoa(addr->sin_addr), - ntohs(addr->sin_port)); - LOGPENDP(endp, DRTP, LOGL_DEBUG, "conn:%s\n", mgcp_conn_dump(conn->conn)); - - /* Check if the origin of the RTP packet seems plausible */ - if (trunk->rtp_accept_all == 0) { - if (check_rtp_origin(conn, addr) != 0) - return -1; - } - - /* Filter out dummy message */ - if (rc == 1 && buf[0] == MGCP_DUMMY_LOAD) { - LOGPCONN(conn->conn, DRTP, LOGL_NOTICE, - "dummy message received\n"); - LOGPCONN(conn->conn, DRTP, LOGL_ERROR, - "packet tossed\n"); - return 0; - } - - /* Increment RX statistics */ - rtpconn_rate_ctr_inc(conn, endp, RTP_PACKETS_RX_CTR); - rtpconn_rate_ctr_add(conn, endp, RTP_OCTETS_RX_CTR, rc); - - /* Forward a copy of the RTP data to a debug ip/port */ - forward_data(fd->fd, &conn->tap_in, buf, rc); - - return rc; -} - /* Send RTP data. Possible options are standard RTP packet * transmission or trsmission via an osmux connection */ -static int mgcp_send_rtp(int proto, struct sockaddr_in *addr, char *buf, - unsigned int buf_size, - struct mgcp_conn_rtp *conn_src, - struct mgcp_conn_rtp *conn_dst) +static int mgcp_send_rtp(struct mgcp_conn_rtp *conn_dst, struct msgb *msg) { - struct mgcp_endpoint *endp; - endp = conn_src->conn->endp; + struct osmo_rtp_msg_ctx *mc = OSMO_RTP_MSG_CTX(msg); + enum rtp_proto proto = mc->proto; + struct mgcp_conn_rtp *conn_src = mc->conn_src; + struct sockaddr_in *from_addr = mc->from_addr; + struct mgcp_endpoint *endp = conn_src->conn->endp; LOGPENDP(endp, DRTP, LOGL_DEBUG, "destin conn:%s\n", mgcp_conn_dump(conn_dst->conn)); @@ -1241,13 +1137,13 @@ "endpoint type is MGCP_RTP_DEFAULT, " "using mgcp_send() to forward data directly\n"); return mgcp_send(endp, proto == MGCP_PROTO_RTP, - addr, buf, buf_size, conn_src, conn_dst); + from_addr, msg, conn_src, conn_dst); case MGCP_OSMUX_BSC_NAT: case MGCP_OSMUX_BSC: LOGPENDP(endp, DRTP, LOGL_DEBUG, "endpoint type is MGCP_OSMUX_BSC_NAT, " "using osmux_xfrm_to_osmux() to forward data through OSMUX\n"); - return osmux_xfrm_to_osmux(buf, buf_size, conn_dst); + return osmux_xfrm_to_osmux((char*)msgb_data(msg), msgb_length(msg), conn_dst); } /* If the data has not been handled/forwarded until here, it will @@ -1265,10 +1161,13 @@ * \param[in] buf_size size data length of buf. * \param[in] conn originating connection. * \returns 0 on success, -1 on ERROR. */ -int mgcp_dispatch_rtp_bridge_cb(int proto, struct sockaddr_in *addr, char *buf, - unsigned int buf_size, struct mgcp_conn *conn) +int mgcp_dispatch_rtp_bridge_cb(struct msgb *msg) { + struct osmo_rtp_msg_ctx *mc = OSMO_RTP_MSG_CTX(msg); + struct mgcp_conn_rtp *conn_src = mc->conn_src; + struct mgcp_conn *conn = conn_src->conn; struct mgcp_conn *conn_dst; + struct sockaddr_in *from_addr = mc->from_addr; /*! NOTE: This callback function implements the endpoint specific * dispatch behaviour of an rtp bridge/proxy endpoint. It is assumed @@ -1287,11 +1186,10 @@ * address data from the UDP packet header to patch the * outgoing address in connection on the fly */ if (conn->u.rtp.end.rtp_port == 0) { - conn->u.rtp.end.addr = addr->sin_addr; - conn->u.rtp.end.rtp_port = addr->sin_port; + conn->u.rtp.end.addr = from_addr->sin_addr; + conn->u.rtp.end.rtp_port = from_addr->sin_port; } - return mgcp_send_rtp(proto, addr, buf, - buf_size, &conn->u.rtp, &conn->u.rtp); + return mgcp_send_rtp(conn_src, msg); } /* Find a destination connection. */ @@ -1323,9 +1221,7 @@ } /* Dispatch RTP packet to destination RTP connection */ - return mgcp_send_rtp(proto, addr, buf, - buf_size, &conn->u.rtp, &conn_dst->u.rtp); - + return mgcp_send_rtp(&conn_dst->u.rtp, msg); } /*! dispatch incoming RTP packet to E1 subslot, handle RTCP packets locally. @@ -1335,9 +1231,12 @@ * \param[in] buf_size size data length of buf. * \param[in] conn originating connection. * \returns 0 on success, -1 on ERROR. */ -int mgcp_dispatch_e1_bridge_cb(int proto, struct sockaddr_in *addr, char *buf, - unsigned int buf_size, struct mgcp_conn *conn) +int mgcp_dispatch_e1_bridge_cb(struct msgb *msg) { + struct osmo_rtp_msg_ctx *mc = OSMO_RTP_MSG_CTX(msg); + struct mgcp_conn_rtp *conn_src = mc->conn_src; + struct mgcp_conn *conn = conn_src->conn; + /* FIXME: integrate E1 support from libsomoabis, also implement * handling for RTCP packets, which can not converted to E1. */ LOGPCONN(conn, DRTP, LOGL_FATAL, @@ -1372,6 +1271,11 @@ "cannot dispatch! E1 support is not implemented yet!\n"); } +static bool is_dummy_msg(enum rtp_proto proto, struct msgb *msg) +{ + return msgb_length(msg) == 1 && msgb_data(msg)[0] == MGCP_DUMMY_LOAD; +} + /* Handle incoming RTP data from NET */ static int rtp_data_net(struct osmo_fd *fd, unsigned int what) { @@ -1385,23 +1289,83 @@ struct mgcp_conn_rtp *conn_src; struct mgcp_endpoint *endp; struct sockaddr_in addr; - - char buf[RTP_BUF_SIZE]; - int proto; - int len; + socklen_t slen = sizeof(addr); + int ret; + enum rtp_proto proto; + struct osmo_rtp_msg_ctx *mc; + struct msgb *msg = msgb_alloc(RTP_BUF_SIZE, "RTP-rx"); + int rc; conn_src = (struct mgcp_conn_rtp *)fd->data; OSMO_ASSERT(conn_src); endp = conn_src->conn->endp; OSMO_ASSERT(endp); - LOGPENDP(endp, DRTP, LOGL_DEBUG, "source conn:%s\n", - mgcp_conn_dump(conn_src->conn)); + proto = (fd == &conn_src->end.rtp)? MGCP_PROTO_RTP : MGCP_PROTO_RTCP; - /* Receive packet */ - len = mgcp_recv(&proto, &addr, buf, sizeof(buf), fd); - if (len < 0) - return -1; + ret = recvfrom(fd->fd, msgb_data(msg), msg->data_len, 0, (struct sockaddr *)&addr, &slen); + + if (ret <= 0) { + LOG_CONN_RTP(conn_src, LOGL_ERROR, "recvfrom error: %s\n", strerror(errno)); + rc = -1; + goto out; + } + + msgb_put(msg, ret); + + LOG_CONN_RTP(conn_src, LOGL_DEBUG, "%s: rx %u bytes from %s:%u\n", + proto == MGCP_PROTO_RTP ? "RTP" : "RTPC", + msgb_length(msg), inet_ntoa(addr.sin_addr), ntohs(addr.sin_port)); + + if ((proto == MGCP_PROTO_RTP && check_rtp(conn_src, msg)) + || (proto == MGCP_PROTO_RTCP && check_rtcp(conn_src, msg))) { + /* Logging happened in the two check_ functions */ + rc = -1; + goto out; + } + + if (is_dummy_msg(proto, msg)) { + LOG_CONN_RTP(conn_src, LOGL_DEBUG, "rx dummy packet (dropped)\n"); + rc = 0; + goto out; + } + + /* Since the msgb remains owned and freed by this function, the msg ctx data struct can just be on the stack and + * needs not be allocated with the msgb. */ + mc = OSMO_RTP_MSG_CTX(msg); + *mc = (struct osmo_rtp_msg_ctx){ + .proto = proto, + .conn_src = conn_src, + .from_addr = &addr, + }; + LOG_CONN_RTP(conn_src, LOGL_DEBUG, "msg ctx: %d %p %s\n", + mc->proto, mc->conn_src, + osmo_hexdump((void*)mc->from_addr, sizeof(struct sockaddr_in))); + + /* Increment RX statistics */ + rate_ctr_inc(&conn_src->rate_ctr_group->ctr[RTP_PACKETS_RX_CTR]); + rate_ctr_add(&conn_src->rate_ctr_group->ctr[RTP_OCTETS_RX_CTR], msgb_length(msg)); + /* FIXME: count RTP and RTCP separately, also count IuUP payload-less separately */ + + /* Forward a copy of the RTP data to a debug ip/port */ + forward_data(fd->fd, &conn_src->tap_in, msg); + + rc = rx_rtp(msg); + +out: + msgb_free(msg); + return rc; +} + +static int rx_rtp(struct msgb *msg) +{ + struct osmo_rtp_msg_ctx *mc = OSMO_RTP_MSG_CTX(msg); + struct mgcp_conn_rtp *conn_src = mc->conn_src; + struct sockaddr_in *from_addr = mc->from_addr; + struct mgcp_conn *conn = conn_src->conn; + struct mgcp_trunk *trunk = conn->endp->trunk; + + LOG_CONN_RTP(conn_src, LOGL_DEBUG, "rx_rtp(%u bytes)\n", msgb_length(msg)); mgcp_conn_watchdog_kick(conn_src->conn); @@ -1410,17 +1374,20 @@ * define, then we check if the incoming payload matches that * expectation. */ if (amr_oa_bwe_convert_indicated(conn_src->end.codec)) { - int oa = amr_oa_check(buf, len); + int oa = amr_oa_check((char*)msgb_data(msg), msgb_length(msg)); if (oa < 0) return -1; if (((bool)oa) != conn_src->end.codec->param.amr_octet_aligned) return -1; } + /* Check if the origin of the RTP packet seems plausible */ + if (!trunk->rtp_accept_all && check_rtp_origin(conn_src, from_addr)) + return -1; + /* Execute endpoint specific implementation that handles the * dispatching of the RTP data */ - return endp->type->dispatch_rtp_cb(proto, &addr, buf, len, - conn_src->conn); + return conn->endp->type->dispatch_rtp_cb(msg); } /*! set IP Type of Service parameter. diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index ceae087..85e33e0 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -236,13 +236,15 @@ { struct mgcp_conn_rtp *conn = data; struct mgcp_endpoint *endp = conn->conn->endp; - struct sockaddr_in addr = { - .sin_addr = conn->end.addr, - .sin_port = conn->end.rtp_port, - }; /* FIXME: not set/used in cb */ + struct sockaddr_in addr = { /* FIXME: do we know the source address?? */ }; + struct osmo_rtp_msg_ctx *mc = OSMO_RTP_MSG_CTX(msg); + *mc = (struct osmo_rtp_msg_ctx){ + .proto = MGCP_PROTO_RTP, + .conn_src = conn, + .from_addr = &addr, + }; - - endp->type->dispatch_rtp_cb(MGCP_PROTO_RTP, &addr, (char *)msg->data, msg->len, conn->conn); + endp->type->dispatch_rtp_cb(msg); msgb_free(msg); } diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 66f79b0..458f6c9 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -1261,7 +1262,7 @@ void mgcp_patch_and_count(struct mgcp_endpoint *endp, struct mgcp_rtp_state *state, struct mgcp_rtp_end *rtp_end, - struct sockaddr_in *addr, char *data, int len); + struct sockaddr_in *addr, struct msgb *msg); static void test_packet_error_detection(int patch_ssrc, int patch_ts) { @@ -1274,7 +1275,6 @@ struct mgcp_rtp_state state; struct mgcp_rtp_end *rtp; struct sockaddr_in addr = { 0 }; - char buffer[4096]; uint32_t last_ssrc = 0; uint32_t last_timestamp = 0; uint32_t last_seqno = 0; @@ -1323,16 +1323,17 @@ for (i = 0; i < ARRAY_SIZE(test_rtp_packets1); ++i) { struct rtp_packet_info *info = test_rtp_packets1 + i; + struct msgb *msg = msgb_alloc(4096, __func__); force_monotonic_time_us = round(1000000.0 * info->txtime); - OSMO_ASSERT(info->len <= sizeof(buffer)); + OSMO_ASSERT(info->len <= msgb_tailroom(msg)); OSMO_ASSERT(info->len >= 0); - memmove(buffer, info->data, info->len); + msg->l3h = msgb_put(msg, info->len); + memcpy((char*)msgb_l3(msg), info->data, info->len); mgcp_rtp_end_config(&endp, 1, rtp); - mgcp_patch_and_count(&endp, &state, rtp, &addr, - buffer, info->len); + mgcp_patch_and_count(&endp, &state, rtp, &addr, msg); if (state.out_stream.ssrc != last_ssrc) { printf("Output SSRC changed to %08x\n", @@ -1359,6 +1360,8 @@ last_out_ts_err_cnt = state.out_stream.err_ts_ctr->current; last_timestamp = state.out_stream.last_timestamp; last_seqno = state.out_stream.last_seq; + + msgb_free(msg); } force_monotonic_time_us = -1; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/18913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3af40b63bc49f8636d4e7ea2f8f83bb67f6619ee Gerrit-Change-Number: 18913 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 16:14:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jul 2020 16:14:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: make use of 'LENGTHTO(...)+N' syntax In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19338 ) Change subject: library/RLCMAC_CSN1_Types: make use of 'LENGTHTO(...)+N' syntax ...................................................................... library/RLCMAC_CSN1_Types: make use of 'LENGTHTO(...)+N' syntax Thanks to LaF0rge, this syntax is now supported by TITAN. Change-Id: I16ddc3e9f57dffba3e0f2ea80eeb63be3468da06 Related: SYS#4868, OS#4547 --- M library/RLCMAC_CSN1_Types.ttcn 1 file changed, 2 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index 20c2d81..a14577a 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -757,9 +757,7 @@ uint4_t ma_freq_len, octetstring m1_freq_list } with { - /* FIXME: this can not be expressed in TTCN-3 ?!? */ - //variant (ma_freq_len) "LENGTHTO(m1_freq_list)+3" - variant (ma_freq_len) "LENGTHTO(m1_freq_list)" + variant (ma_freq_len) "LENGTHTO(m1_freq_list)+3" }; type record FrequencyParameters { uint3_t tsc, @@ -801,9 +799,7 @@ variant (rfl_number_list) "PRESENCE(rfl_number_list_present = '1'B)" variant (ma_length) "PRESENCE(ma_present = '0'B)" variant (ma_bitmap) "PRESENCE(ma_present = '0'B)" - /* FIXME: this can not be expressed in TTCN-3 ?!? */ - //variant (ma_length) "LENGTHTO(ma_bitmap)+1" - variant (ma_length) "LENGTHTO(ma_bitmap)" + variant (ma_length) "LENGTHTO(ma_bitmap)+1" } /* 12.11 Packet Request Reference */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I16ddc3e9f57dffba3e0f2ea80eeb63be3468da06 Gerrit-Change-Number: 19338 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 16:14:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jul 2020 16:14:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_Templates: make ts_RLC_UL_CTRL_ACK accept a template In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19339 ) Change subject: library/RLCMAC_Templates: make ts_RLC_UL_CTRL_ACK accept a template ...................................................................... library/RLCMAC_Templates: make ts_RLC_UL_CTRL_ACK accept a template Change-Id: Ia71401b5c0d439eeb0dc58739ef0e68b15d4123f --- M library/RLCMAC_Templates.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index 560074f..5ad1b4f 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -317,7 +317,7 @@ return 0; } - template (value) RlcmacUlBlock ts_RLC_UL_CTRL_ACK(RlcmacUlCtrlMsg ctrl, + template (value) RlcmacUlBlock ts_RLC_UL_CTRL_ACK(template (value) RlcmacUlCtrlMsg ctrl, MacPayloadType pt := MAC_PT_RLCMAC_NO_OPT, boolean retry := false) := { ctrl := { diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 20e3582..2208aeb 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -1140,7 +1140,7 @@ /* Send PACKET RESOURCE REQUEST to upgrade to EGPRS * (see 3GPP TS 04.60 "7.1.3.1 Initiation of the Packet resource request procedure") */ - f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(valueof(ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap))), 0); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)), 0); f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS); if (not match(ms.ul_tbf.tx_cs_mcs, exp_ul_cs_mcs)) { setverdict(fail, "Wrong CS_MCS ", ms.ul_tbf.tx_cs_mcs, " received vs exp ", exp_ul_cs_mcs); @@ -1637,7 +1637,7 @@ /* TODO: verify TBF_EST and FinalACK are both '1' above */ /* Send PACKET RESOURCE REQUEST to request a new UL TBF */ - f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(valueof(ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, omit))), sched_fn); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, omit)), sched_fn); f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS); /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia71401b5c0d439eeb0dc58739ef0e68b15d4123f Gerrit-Change-Number: 19339 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 16:14:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jul 2020 16:14:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_Templates: cosmetic coding style change In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19340 ) Change subject: library/RLCMAC_Templates: cosmetic coding style change ...................................................................... library/RLCMAC_Templates: cosmetic coding style change Change-Id: I76931373fe9e1cf0de4263c09e36442bad7c3ce1 --- M library/RLCMAC_Templates.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index 5ad1b4f..a217f46 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -544,7 +544,7 @@ } template RlcmacDlBlock tr_RLCMAC_UL_PACKET_ASS_GPRS(template uint3_t usf := ?, template PktUlAssGprs gprs := ?) - modifies tr_RLCMAC_UL_PACKET_ASS := { + modifies tr_RLCMAC_UL_PACKET_ASS := { ctrl := { payload := { u := { @@ -559,7 +559,7 @@ } template RlcmacDlBlock tr_RLCMAC_UL_PACKET_ASS_EGPRS(template uint3_t usf := ?, template PktUlAssEgprs egprs := ?) - modifies tr_RLCMAC_UL_PACKET_ASS := { + modifies tr_RLCMAC_UL_PACKET_ASS := { ctrl := { payload := { u := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I76931373fe9e1cf0de4263c09e36442bad7c3ce1 Gerrit-Change-Number: 19340 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 16:14:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 21 Jul 2020 16:14:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/Osmocom_Types: add f_rnd_bitstring() and f_pad_bit() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19333 ) Change subject: library/Osmocom_Types: add f_rnd_bitstring() and f_pad_bit() ...................................................................... library/Osmocom_Types: add f_rnd_bitstring() and f_pad_bit() Change-Id: I9be55f6979c8ce1cbf5b2ef317c998ae30488e0e --- M library/Osmocom_Types.ttcn 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index 16395df..e55f1d6 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -74,6 +74,12 @@ return ret; } + /* return bitstring composed of random bits */ + function f_rnd_bitstring(in integer len) return bitstring { + var octetstring oct := f_rnd_octstring(len / 8 + 1); + return substr(oct2bit(oct), 0, len); + } + function f_rnd_imsi(in hexstring prefix) return hexstring { return prefix & f_rnd_hexstring(15 - lengthof(prefix), 9); } @@ -175,6 +181,14 @@ return str; } +function f_pad_bit(bitstring str, integer len, BIT1 pad) return bitstring { + var integer strlen := lengthof(str); + for (var integer i := 0; i < len-strlen; i := i+1) { + str := str & pad; + } + return str; +} + function f_pad_bcd_number(hexstring number) return hexstring { if (lengthof(number) mod 2 != 0) { return number & 'F'H; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9be55f6979c8ce1cbf5b2ef317c998ae30488e0e Gerrit-Change-Number: 19333 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 16:27:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jul 2020 16:27:46 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC subset rotation In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19303 ) Change subject: Introduce support for ACC subset rotation ...................................................................... Patch Set 3: (1 comment) Thanks for the review, I'll update the .adoc file suggestions and re-submit. https://gerrit.osmocom.org/c/osmo-bsc/+/19303/3/include/osmocom/bsc/acc.h File include/osmocom/bsc/acc.h: https://gerrit.osmocom.org/c/osmo-bsc/+/19303/3/include/osmocom/bsc/acc.h at 38 PS3, Line 38: len_allowed_adm > qty / quantity / count would be more obvious than 'len', IMHO. But only change if you agree. [?] TBH I thought a lot about using "size" or "length" terms. "size" because we talk about creating sets/subsets, so one can speak about "set sizes". Otherwise as "length" since one can usually think or imagine of it as a list of ACC numbers (again, as a usual representation of a list or set). So all in all, I have no big preference and I just picked one, but I think any of them terms can be used interchangeably. For that reason I think keeping it as it is to avoid spending time on this, but if someone really thinks another term is better I can change all references. In this struct I use "length" here when I use the param as a parameter used to generate the sets, while I use "count" where the variable is really holding a count, that is, counting whatever from an already generated set. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I952c9eeae02809c7184078c655574ec817902e06 Gerrit-Change-Number: 19303 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 21 Jul 2020 16:27:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 16:27:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jul 2020 16:27:53 +0000 Subject: Change in osmo-bsc[master]: rename files acc_ramp.* -> acc.c* In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19334 ) Change subject: rename files acc_ramp.* -> acc.c* ...................................................................... rename files acc_ramp.* -> acc.c* With upcoming next commit, the file will contain far more code that simply ramping, so rename it to be more generic. Change-Id: I8c368ab87e264439dea4ccf556821a44664cdbb0 --- M include/osmocom/bsc/Makefile.am R include/osmocom/bsc/acc.h M include/osmocom/bsc/gsm_data.h M src/ipaccess/Makefile.am M src/osmo-bsc/Makefile.am R src/osmo-bsc/acc.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/system_information.c M src/utils/Makefile.am M tests/abis/Makefile.am M tests/bsc/Makefile.am M tests/gsm0408/Makefile.am M tests/handover/Makefile.am M tests/nanobts_omlattr/Makefile.am 14 files changed, 15 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am index c2a82ce..1ee96ed 100644 --- a/include/osmocom/bsc/Makefile.am +++ b/include/osmocom/bsc/Makefile.am @@ -3,7 +3,7 @@ abis_nm.h \ abis_om2000.h \ abis_rsl.h \ - acc_ramp.h \ + acc.h \ arfcn_range_encode.h \ assignment_fsm.h \ bsc_rll.h \ diff --git a/include/osmocom/bsc/acc_ramp.h b/include/osmocom/bsc/acc.h similarity index 100% rename from include/osmocom/bsc/acc_ramp.h rename to include/osmocom/bsc/acc.h diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index a8b495f..cfed1f8 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am index a11b295..717a6a1 100644 --- a/src/ipaccess/Makefile.am +++ b/src/ipaccess/Makefile.am @@ -49,7 +49,7 @@ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ - $(top_builddir)/src/osmo-bsc/acc_ramp.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ @@ -64,7 +64,7 @@ ipaccess_proxy_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ - $(top_builddir)/src/osmo-bsc/acc_ramp.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am index 231707c..c19d01b 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -32,7 +32,7 @@ abis_om2000.c \ abis_om2000_vty.c \ abis_rsl.c \ - acc_ramp.c \ + acc.c \ arfcn_range_encode.c \ assignment_fsm.c \ bsc_ctrl_commands.c \ diff --git a/src/osmo-bsc/acc_ramp.c b/src/osmo-bsc/acc.c similarity index 99% rename from src/osmo-bsc/acc_ramp.c rename to src/osmo-bsc/acc.c index 761ab09..a1941e4 100644 --- a/src/osmo-bsc/acc_ramp.c +++ b/src/osmo-bsc/acc.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 11e51be..9cc7673 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -64,7 +64,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 13d0f46..fe78e8e 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 683c227..fd03cb3 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -48,7 +48,7 @@ bs11_config_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ - $(top_builddir)/src/osmo-bsc/acc_ramp.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/bts_siemens_bs11.o \ @@ -121,7 +121,7 @@ meas_json_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ - $(top_builddir)/src/osmo-bsc/acc_ramp.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am index 031d689..a245b51 100644 --- a/tests/abis/Makefile.am +++ b/tests/abis/Makefile.am @@ -26,7 +26,7 @@ abis_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ - $(top_builddir)/src/osmo-bsc/acc_ramp.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ $(top_builddir)/src/osmo-bsc/gsm_data.o \ diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am index 282f603..468c032 100644 --- a/tests/bsc/Makefile.am +++ b/tests/bsc/Makefile.am @@ -34,7 +34,7 @@ bsc_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ - $(top_builddir)/src/osmo-bsc/acc_ramp.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ $(top_builddir)/src/osmo-bsc/osmo_bsc_filter.o \ $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \ diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am index 4e22392..66e4072 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -24,7 +24,7 @@ gsm0408_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ - $(top_builddir)/src/osmo-bsc/acc_ramp.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ $(top_builddir)/src/osmo-bsc/bts.o \ diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am index 661b3d2..87981d9 100644 --- a/tests/handover/Makefile.am +++ b/tests/handover/Makefile.am @@ -47,7 +47,7 @@ $(top_builddir)/src/osmo-bsc/abis_om2000.o \ $(top_builddir)/src/osmo-bsc/abis_om2000_vty.o \ $(top_builddir)/src/osmo-bsc/abis_rsl.o \ - $(top_builddir)/src/osmo-bsc/acc_ramp.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ $(top_builddir)/src/osmo-bsc/assignment_fsm.o \ $(top_builddir)/src/osmo-bsc/bsc_ctrl_commands.o \ diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am index 67d059f..1cdcc50 100644 --- a/tests/nanobts_omlattr/Makefile.am +++ b/tests/nanobts_omlattr/Makefile.am @@ -24,7 +24,7 @@ nanobts_omlattr_test_LDADD = \ $(top_builddir)/src/osmo-bsc/abis_nm.o \ - $(top_builddir)/src/osmo-bsc/acc_ramp.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ $(top_builddir)/src/osmo-bsc/bts.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8c368ab87e264439dea4ccf556821a44664cdbb0 Gerrit-Change-Number: 19334 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 16:34:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jul 2020 16:34:36 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC subset rotation In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 to look at the new patch set (#4). Change subject: Introduce support for ACC subset rotation ...................................................................... Introduce support for ACC subset rotation See updated documentation section in manuals/chapters/bts.adoc regarding an explanation on how the system works. Related: SYS#4911 Change-Id: I952c9eeae02809c7184078c655574ec817902e06 --- M configure.ac M doc/manuals/chapters/bts.adoc M include/osmocom/bsc/acc.h M include/osmocom/bsc/bts.h M src/osmo-bsc/acc.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/osmo-bsc/system_information.c M tests/Makefile.am A tests/acc/Makefile.am A tests/acc/acc_test.c A tests/acc/acc_test.ok M tests/gsm0408/gsm0408_test.c M tests/testsuite.at 14 files changed, 1,604 insertions(+), 106 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/19303/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I952c9eeae02809c7184078c655574ec817902e06 Gerrit-Change-Number: 19303 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 18:47:23 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jul 2020 18:47:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_si_acc_rotate In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 ) Change subject: bsc: Introduce test TC_si_acc_rotate ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359/1/bsc/BSC_Tests.ttcn at 1857 PS1, Line 1857: runs on test_CT This is not really needed here. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359/1/bsc/BSC_Tests.ttcn at 1886 PS1, Line 1886: alt An 'alt' statement with only one alternative? This looks like our president elections with only one possible candidate :D I think you can unwrap this receive statement, or add more alternatives is that was planned. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359/1/bsc/BSC_Tests.ttcn at 1923 PS1, Line 1923: "ACC", j, " ERROR: allowed ", times_allowed[j], " < 1 times" Shouldn't this message be a part of setverdict() statement? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I18d0243353fce547d126d62c34415628a21cb52b Gerrit-Change-Number: 19359 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 21 Jul 2020 18:47:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 19:43:21 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jul 2020 19:43:21 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC subset rotation In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19303 ) Change subject: Introduce support for ACC subset rotation ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/19303/4/src/osmo-bsc/acc.c File src/osmo-bsc/acc.c: https://gerrit.osmocom.org/c/osmo-bsc/+/19303/4/src/osmo-bsc/acc.c at 53 PS4, Line 53: acc_ramp Pointer to acc_ramp structure s/acc_ramp/acc_mgr/ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I952c9eeae02809c7184078c655574ec817902e06 Gerrit-Change-Number: 19303 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 21 Jul 2020 19:43:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 19:46:01 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jul 2020 19:46:01 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19159 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib27704dcba3979d69e44065c472b1452eaa11a7a Gerrit-Change-Number: 19159 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jul 2020 19:46:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 19:46:04 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jul 2020 19:46:04 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: add configuration with frequency hopping parameters In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19160 ) Change subject: ttcn3-bts-test: add configuration with frequency hopping parameters ...................................................................... Patch Set 5: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7822c3581fccba3277a63577e740e7486307635d Gerrit-Change-Number: 19160 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 21 Jul 2020 19:46:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 19:46:56 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jul 2020 19:46:56 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19159 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 ...................................................................... ttcn3-bts-test/osmo-bsc.cfg: change pchan config for TRX#1..3 The new physical channel configuration will be used in the upcoming multi-transceiver test cases. Rather than having the same logical channel combinations configured for all transceivers, it makes sense to test more deviations. TRX#0 has kept unchanged. == Physical channel configuration == +-------+------------------+------------------+------------------+------------------+ | # / # | TRX#0 | TRX#1 | TRX#2 | TRX#3 | +-------+------------------+------------------+------------------+------------------+ | TS0 | CCCH+SDCCH4 | TCH/F | TCH/H | PDCH | +-------+------------------+------------------+------------------+------------------+ | TS1 | TCH/F | SDCCH8+CBCH | PDCH | TCH/H | +-------+------------------+------------------+------------------+------------------+ | TS2 | TCH/F | PDCH | SDCCH8+CBCH | TCH/H | +-------+------------------+------------------+------------------+------------------+ | TS3 | TCH/F_PDCH | TCH/F_TCH/H_PDCH | PDCH | SDCCH8+CBCH | +-------+------------------+------------------+------------------+------------------+ | TS4 | TCH/F_TCH/H_PDCH | TCH/F_PDCH | SDCCH8 | PDCH | +-------+------------------+------------------+------------------+------------------+ | TS5 | TCH/H | SDCCH8 | TCH/F | TCH/F | +-------+------------------+------------------+------------------+------------------+ | TS6 | SDCCH8 | PDCH | PDCH | PDCH | +-------+------------------+------------------+------------------+------------------+ | TS7 | PDCH | PDCH | PDCH | SDCCH8 | +-------+------------------+------------------+------------------+------------------+ Change-Id: Ib27704dcba3979d69e44065c472b1452eaa11a7a Related: SYS#4868, OS#4546 --- M ttcn3-bts-test/osmo-bsc.cfg 1 file changed, 39 insertions(+), 39 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved fixeria: Verified diff --git a/ttcn3-bts-test/osmo-bsc.cfg b/ttcn3-bts-test/osmo-bsc.cfg index 1dcf226..f1d2315 100644 --- a/ttcn3-bts-test/osmo-bsc.cfg +++ b/ttcn3-bts-test/osmo-bsc.cfg @@ -148,25 +148,25 @@ max_power_red 20 rsl e1 tei 1 timeslot 0 - phys_chan_config SDCCH8 + phys_chan_config TCH/F hopping enabled 0 timeslot 1 - phys_chan_config TCH/F + phys_chan_config SDCCH8+CBCH hopping enabled 0 timeslot 2 - phys_chan_config TCH/F + phys_chan_config PDCH hopping enabled 0 timeslot 3 - phys_chan_config TCH/F_PDCH - hopping enabled 0 - timeslot 4 phys_chan_config TCH/F_TCH/H_PDCH hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F_PDCH + hopping enabled 0 timeslot 5 - phys_chan_config TCH/H + phys_chan_config SDCCH8 hopping enabled 0 timeslot 6 - phys_chan_config SDCCH8 + phys_chan_config PDCH hopping enabled 0 timeslot 7 phys_chan_config PDCH @@ -178,26 +178,26 @@ max_power_red 20 rsl e1 tei 2 timeslot 0 - phys_chan_config SDCCH8 - hopping enabled 0 - timeslot 1 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 2 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 3 - phys_chan_config TCH/F_PDCH - hopping enabled 0 - timeslot 4 - phys_chan_config TCH/F_TCH/H_PDCH - hopping enabled 0 - timeslot 5 phys_chan_config TCH/H hopping enabled 0 - timeslot 6 + timeslot 1 + phys_chan_config PDCH + hopping enabled 0 + timeslot 2 + phys_chan_config SDCCH8+CBCH + hopping enabled 0 + timeslot 3 + phys_chan_config PDCH + hopping enabled 0 + timeslot 4 phys_chan_config SDCCH8 hopping enabled 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 6 + phys_chan_config PDCH + hopping enabled 0 timeslot 7 phys_chan_config PDCH hopping enabled 0 @@ -208,28 +208,28 @@ max_power_red 20 rsl e1 tei 3 timeslot 0 - phys_chan_config SDCCH8 + phys_chan_config PDCH hopping enabled 0 timeslot 1 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 2 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 3 - phys_chan_config TCH/F_PDCH - hopping enabled 0 - timeslot 4 - phys_chan_config TCH/F_TCH/H_PDCH - hopping enabled 0 - timeslot 5 phys_chan_config TCH/H hopping enabled 0 + timeslot 2 + phys_chan_config TCH/H + hopping enabled 0 + timeslot 3 + phys_chan_config SDCCH8+CBCH + hopping enabled 0 + timeslot 4 + phys_chan_config PDCH + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 timeslot 6 - phys_chan_config SDCCH8 + phys_chan_config PDCH hopping enabled 0 timeslot 7 - phys_chan_config PDCH + phys_chan_config SDCCH8 hopping enabled 0 msc 0 core-location-area-code 666 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib27704dcba3979d69e44065c472b1452eaa11a7a Gerrit-Change-Number: 19159 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 19:46:57 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 21 Jul 2020 19:46:57 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: add configuration with frequency hopping parameters In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19160 ) Change subject: ttcn3-bts-test: add configuration with frequency hopping parameters ...................................................................... ttcn3-bts-test: add configuration with frequency hopping parameters The Physical channel configuration is the same as in the non-hopping configuration file. Hopping parameters are listed below the table. == Physical channel configuration (FDMA) == +-------+------------------+------------------+------------------+------------------+ | # / # | TRX#0 | TRX#1 | TRX#2 | TRX#3 | +-------+------------------+------------------+------------------+------------------+ | ARFCN | 871 | 873 | 875 | 877 | +-------+------------------+------------------+------------------+------------------+ == Physical channel configuration (TDMA) == +-------+------------------+------------------+------------------+------------------+ | # / # | TRX#0 | TRX#1 | TRX#2 | TRX#3 | +-------+------------------+------------------+------------------+------------------+ | TS0 | CCCH+SDCCH4 | TCH/F (a) | TCH/F (a) | TCH/F (a) | +-------+------------------+------------------+------------------+------------------+ | TS1 | TCH/F | SDCCH8+CBCH | SDCCH8+CBCH (b) | SDCCH8+CBCH (b) | +-------+------------------+------------------+------------------+------------------+ | TS2 | TCH/F (c) | TCH/H (c) | TCH/F (d) | TCH/H (d) | +-------+------------------+------------------+------------------+------------------+ | TS3 | TCH/F_PDCH (e) | TCH/F_PDCH (e) | TCH/F_PDCH (e) | TCH/F_PDCH (e) | +-------+------------------+------------------+------------------+------------------+ | TS4 | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | +-------+------------------+------------------+------------------+------------------+ | TS5 | TCH/H (f) | TCH/H (f) | TCH/H (f) | TCH/H (f) | +-------+------------------+------------------+------------------+------------------+ | TS6 | SDCCH8 (g) | PDCH (h) | PDCH (h) | SDCCH8 (g) | +-------+------------------+------------------+------------------+------------------+ | TS7 | PDCH (i) | PDCH (j) | PDCH (i) | PDCH (j) | +-------+------------------+------------------+------------------+------------------+ == Hopping configuration == a) HSN=0, MAIO=0,1,2 b) HSN=1, MAIO=3,5 c) HSN=2, MAIO=0,1 d) HSN=2, MAIO=2,3 e) HSN=3, MAIO=3,2,1,0 f) HSN=5, MAIO=0,1,2,3 g) HSN=6, MAIO=1,0 h) HSN=6, MAIO=1,0 i) HSN=0, MAIO=1,3 j) HSN=0, MAIO=0,2 Change-Id: I7822c3581fccba3277a63577e740e7486307635d Related: SYS#4868, OS#4546 --- A ttcn3-bts-test/fh/BTS_Tests.cfg A ttcn3-bts-test/fh/osmo-bsc.cfg 2 files changed, 542 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve fixeria: Verified diff --git a/ttcn3-bts-test/fh/BTS_Tests.cfg b/ttcn3-bts-test/fh/BTS_Tests.cfg new file mode 100644 index 0000000..e0c3dff --- /dev/null +++ b/ttcn3-bts-test/fh/BTS_Tests.cfg @@ -0,0 +1,138 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/bts/BTS_Tests.cfg" + +[LOGGING] +*.JUnitLogger.filename_stem := "junit-xml-hopping" + +/* The following hopping configuration corresponds to ttcn3-bts-test/osmo-bsc-fh.cfg. + * See https://gerrit.osmocom.org/c/docker-playground/+/19160/ for more details. + * + * == Physical channel configuration (FDMA) == + * + * +-------+------------------+------------------+------------------+------------------+ + * | # / # | TRX#0 | TRX#1 | TRX#2 | TRX#3 | + * +-------+------------------+------------------+------------------+------------------+ + * | ARFCN | 871 | 873 | 875 | 877 | + * +-------+------------------+------------------+------------------+------------------+ + * + * == Physical channel configuration (TDMA) == + * + * +-------+------------------+------------------+------------------+------------------+ + * | # / # | TRX#0 | TRX#1 | TRX#2 | TRX#3 | + * +-------+------------------+------------------+------------------+------------------+ + * | TS0 | CCCH+SDCCH4 | TCH/F (a) | TCH/F (a) | TCH/F (a) | + * +-------+------------------+------------------+------------------+------------------+ + * | TS1 | TCH/F | SDCCH8+CBCH | SDCCH8+CBCH (b) | SDCCH8+CBCH (b) | + * +-------+------------------+------------------+------------------+------------------+ + * | TS2 | TCH/F (c) | TCH/H (c) | TCH/F (d) | TCH/H (d) | + * +-------+------------------+------------------+------------------+------------------+ + * | TS3 | TCH/F_PDCH (e) | TCH/F_PDCH (e) | TCH/F_PDCH (e) | TCH/F_PDCH (e) | + * +-------+------------------+------------------+------------------+------------------+ + * | TS4 | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | TCH/F_TCH/H_PDCH | + * +-------+------------------+------------------+------------------+------------------+ + * | TS5 | TCH/H (f) | TCH/H (f) | TCH/H (f) | TCH/H (f) | + * +-------+------------------+------------------+------------------+------------------+ + * | TS6 | SDCCH8 (g) | PDCH (h) | PDCH (h) | SDCCH8 (g) | + * +-------+------------------+------------------+------------------+------------------+ + * | TS7 | PDCH (i) | PDCH (j) | PDCH (i) | PDCH (j) | + * +-------+------------------+------------------+------------------+------------------+ + */ +[MODULE_PARAMETERS] +BTS_Tests.mp_freq_hop_enabled := true; +BTS_Tests.mp_fh_config := { + { /* TS0 */ + { /* Group a) TCH/F */ + hsn := 0, + trx_maio := { + { trx_nr := 1, maio := 0 }, + { trx_nr := 2, maio := 1 }, + { trx_nr := 3, maio := 2 } + } + } + }, + { /* TS1 */ + { /* Group b) SDCCH8+CBCH */ + hsn := 1, + trx_maio := { + { trx_nr := 2, maio := 3 }, + { trx_nr := 3, maio := 5 } + } + } + }, + { /* TS2 */ + { /* Group c) TCH/F + TCH/H (mixed) */ + hsn := 2, + trx_maio := { + { trx_nr := 0, maio := 0 }, + { trx_nr := 1, maio := 1 } + } + }, + { /* Group d) TCH/F + TCH/H (mixed) */ + hsn := 2, + trx_maio := { + { trx_nr := 2, maio := 2 }, + { trx_nr := 3, maio := 3 } + } + } + }, + { /* TS3 */ + { /* Group e) TCH/F_PDCH */ + hsn := 3, + trx_maio := { + { trx_nr := 0, maio := 3 }, + { trx_nr := 1, maio := 2 }, + { trx_nr := 2, maio := 1 }, + { trx_nr := 3, maio := 0 } + } + } + }, + { /* TS4 */ + /* No groups, all TCH/F_TCH/H_PDCH */ + }, + { /* TS5 */ + { /* Group f) TCH/H */ + hsn := 5, + trx_maio := { + { trx_nr := 0, maio := 0 }, + { trx_nr := 1, maio := 1 }, + { trx_nr := 2, maio := 2 }, + { trx_nr := 3, maio := 3 } + } + } + }, + { /* TS6 */ + { /* Group g) SDCCH8 */ + hsn := 6, + trx_maio := { + { trx_nr := 0, maio := 1 }, + { trx_nr := 3, maio := 0 } + } + }, + { /* Group h) PDCH */ + hsn := 6, + trx_maio := { + { trx_nr := 1, maio := 1 }, + { trx_nr := 2, maio := 0 } + } + } + }, + { /* TS7 */ + { /* Group i) PDCH */ + hsn := 0, + trx_maio := { + { trx_nr := 0, maio := 1 }, + { trx_nr := 2, maio := 3 } + } + }, + { /* Group h) PDCH */ + hsn := 0, + trx_maio := { + { trx_nr := 1, maio := 0 }, + { trx_nr := 3, maio := 2 } + } + } + } +}; + +[EXECUTE] +BTS_Tests.control diff --git a/ttcn3-bts-test/fh/osmo-bsc.cfg b/ttcn3-bts-test/fh/osmo-bsc.cfg new file mode 100644 index 0000000..e11cec4 --- /dev/null +++ b/ttcn3-bts-test/fh/osmo-bsc.cfg @@ -0,0 +1,404 @@ +! +! OsmoBSC (1.1.2.236-5f22) configuration saved from vty +!! +password foo +! +log gsmtap 172.18.9.10 + logging level set-all debug + logging filter all 1 +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging print file 1 + logging level set-all notice + logging level rll info + logging level rsl debug + logging level msc debug + logging level filter debug + logging level pcu debug + logging level lctrl info + logging level lsccp info +! +stats interval 5 +! +line vty + no login + bind 0.0.0.0 +! +e1_input + e1_line 0 driver ipa + e1_line 0 port 0 + no e1_line 0 keepalive + ipa bind 0.0.0.0 +cs7 instance 0 + point-code 0.23.3 + asp asp-clnt-msc-0 2905 0 m3ua + as as-clnt-msc-0 m3ua + asp asp-clnt-msc-0 + routing-key 2 0.23.3 +network + network country code 1 + mobile network code 1 + encryption a5 0 + neci 1 + paging any use tch 0 + handover 0 + handover1 window rxlev averaging 10 + handover1 window rxqual averaging 1 + handover1 window rxlev neighbor averaging 10 + handover1 power budget interval 6 + handover1 power budget hysteresis 3 + handover1 maximum distance 9999 + timer t3212 30 + bts 0 + type sysmobts + band DCS1800 + cell_identity 0 + location_area_code 1 + dtx uplink force + dtx downlink + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-descrption attach 1 + channel-descrption bs-pa-mfrms 5 + channel-descrption bs-ag-blks-res 1 + early-classmark-sending forbidden + early-classmark-sending-3g allowed + ip.access unit_id 1234 0 + ip.access rsl-ip 172.18.9.10 + oml ip.access stream_id 255 line 0 + neighbor-list mode manual-si5 + neighbor-list add arfcn 100 + neighbor-list add arfcn 200 + si5 neighbor-list add arfcn 10 + si5 neighbor-list add arfcn 20 + codec-support fr + gprs mode gprs + gprs routing area 0 + gprs network-control-order nc0 + gprs cell bvci 1234 + gprs cell timer blocking-timer 3 + gprs cell timer blocking-retries 3 + gprs cell timer unblocking-retries 3 + gprs cell timer reset-timer 3 + gprs cell timer reset-retries 3 + gprs cell timer suspend-timer 10 + gprs cell timer suspend-retries 3 + gprs cell timer resume-timer 10 + gprs cell timer resume-retries 3 + gprs cell timer capability-update-timer 10 + gprs cell timer capability-update-retries 3 + gprs nsei 1234 + gprs ns timer tns-block 3 + gprs ns timer tns-block-retries 3 + gprs ns timer tns-reset 3 + gprs ns timer tns-reset-retries 3 + gprs ns timer tns-test 30 + gprs ns timer tns-alive 3 + gprs ns timer tns-alive-retries 10 + gprs nsvc 0 nsvci 1234 + gprs nsvc 0 local udp port 23000 + gprs nsvc 0 remote udp port 23000 + gprs nsvc 0 remote ip 0.0.0.0 + no force-combined-si + trx 0 + rf_locked 0 + arfcn 871 + nominal power 50 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + ! Shall not be hopping + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + ! Intentionally non-hopping + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + ! (c) HSN=2, MAIO=0,1 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 873 + timeslot 3 + phys_chan_config TCH/F_PDCH + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 3 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + ! Intentionally non-hopping + phys_chan_config TCH/F_TCH/H_PDCH + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/H + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + phys_chan_config SDCCH8 + ! (g) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 877 + timeslot 7 + phys_chan_config PDCH + ! (i) HSN=0, MAIO=1,3 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 875 + trx 1 + rf_locked 0 + arfcn 873 + nominal power 50 + max_power_red 20 + rsl e1 tei 1 + timeslot 0 + phys_chan_config TCH/F + ! (a) HSN=0, MAIO=0,1,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 1 + phys_chan_config SDCCH8+CBCH + ! Intentionally non-hopping + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/H + ! (c) HSN=2, MAIO=0,1 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 873 + timeslot 3 + phys_chan_config TCH/F_PDCH + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 2 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + ! Intentionally non-hopping + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/H + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + phys_chan_config PDCH + ! (h) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 1 + hopping arfcn add 873 + hopping arfcn add 875 + timeslot 7 + phys_chan_config PDCH + ! (j) HSN=0, MAIO=0,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 0 + hopping arfcn add 873 + hopping arfcn add 877 + trx 2 + rf_locked 0 + arfcn 875 + nominal power 50 + max_power_red 20 + rsl e1 tei 2 + timeslot 0 + phys_chan_config TCH/F + ! (a) HSN=0, MAIO=0,1,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 1 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 1 + phys_chan_config SDCCH8+CBCH + ! (b) HSN=1, MAIO=3,5 + hopping enabled 1 + hopping sequence-number 1 + hopping maio 3 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 2 + phys_chan_config TCH/F + ! (d) HSN=2, MAIO=2,3 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 2 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 3 + phys_chan_config TCH/F_PDCH + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 1 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + ! Intentionally non-hopping + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/H + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 2 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + phys_chan_config PDCH + ! (h) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 0 + hopping arfcn add 873 + hopping arfcn add 875 + timeslot 7 + phys_chan_config PDCH + ! (i) HSN=0, MAIO=1,3 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 3 + hopping arfcn add 871 + hopping arfcn add 875 + trx 3 + rf_locked 0 + arfcn 877 + nominal power 50 + max_power_red 20 + rsl e1 tei 3 + timeslot 0 + phys_chan_config TCH/F + ! (a) HSN=0, MAIO=0,1,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 2 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 1 + phys_chan_config SDCCH8+CBCH + ! (b) HSN=1, MAIO=3,5 + hopping enabled 1 + hopping sequence-number 1 + hopping maio 5 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 2 + phys_chan_config TCH/H + ! (d) HSN=2, MAIO=2,3 + hopping enabled 1 + hopping sequence-number 2 + hopping maio 3 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 3 + phys_chan_config TCH/F_PDCH + ! (e) HSN=3, MAIO=3,2,1,0 + hopping enabled 1 + hopping sequence-number 3 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 4 + phys_chan_config TCH/F_TCH/H_PDCH + ! Intentionally non-hopping + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/H + ! (f) HSN=5, MAIO=0,1,2,3 + hopping enabled 1 + hopping sequence-number 5 + hopping maio 3 + hopping arfcn add 871 + hopping arfcn add 873 + hopping arfcn add 875 + hopping arfcn add 877 + timeslot 6 + phys_chan_config SDCCH8 + ! (g) HSN=6, MAIO=1,0 + hopping enabled 1 + hopping sequence-number 6 + hopping maio 0 + hopping arfcn add 871 + hopping arfcn add 877 + timeslot 7 + phys_chan_config PDCH + ! (j) HSN=0, MAIO=0,2 + hopping enabled 1 + hopping sequence-number 0 + hopping maio 2 + hopping arfcn add 873 + hopping arfcn add 877 +msc 0 + core-location-area-code 666 + core-cell-identity 333 + no bsc-welcome-text + no bsc-msc-lost-text + no bsc-grace-text + codec-list fr1 fr2 fr3 + type normal + allow-emergency allow + amr-config 12_2k forbidden + amr-config 10_2k forbidden + amr-config 7_95k forbidden + amr-config 7_40k forbidden + amr-config 6_70k forbidden + amr-config 5_90k allowed + amr-config 5_15k forbidden + amr-config 4_75k forbidden +bsc + mid-call-timeout 0 + no missing-msc-text -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7822c3581fccba3277a63577e740e7486307635d Gerrit-Change-Number: 19160 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 21 20:19:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 21 Jul 2020 20:19:41 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC subset rotation In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 to look at the new patch set (#5). Change subject: Introduce support for ACC subset rotation ...................................................................... Introduce support for ACC subset rotation See updated documentation section in manuals/chapters/bts.adoc regarding an explanation on how the system works. Related: SYS#4911 Change-Id: I952c9eeae02809c7184078c655574ec817902e06 --- M configure.ac M doc/manuals/chapters/bts.adoc M include/osmocom/bsc/acc.h M include/osmocom/bsc/bts.h M src/osmo-bsc/acc.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/osmo-bsc/system_information.c M tests/Makefile.am A tests/acc/Makefile.am A tests/acc/acc_test.c A tests/acc/acc_test.ok M tests/gsm0408/gsm0408_test.c M tests/testsuite.at 14 files changed, 1,604 insertions(+), 106 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/19303/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I952c9eeae02809c7184078c655574ec817902e06 Gerrit-Change-Number: 19303 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 22 00:47:51 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 00:47:51 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f178cce3537d_1c292ab9470d05f42131a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmocore failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 224s] libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -DBUILDING_LIBOSMOCORE -Wall -c gsm0503_coding.c -fPIC -DPIC -o gsm0503_coding.o >/dev/null 2>&1 [ 226s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmocoding.map -version-info 1:1:1 -no-undefined -ltalloc -Wl,-z,relro -Wl,-z,now -o libosmocoding.la -rpath /usr/lib/x86_64-linux-gnu gsm0503_interleaving.lo gsm0503_mapping.lo gsm0503_tables.lo gsm0503_parity.lo gsm0503_coding.lo ../libosmocore.la ../gsm/libosmogsm.la ../codec/libosmocodec.la [ 226s] libtool: link: gcc -shared -fPIC -DPIC .libs/gsm0503_interleaving.o .libs/gsm0503_mapping.o .libs/gsm0503_tables.o .libs/gsm0503_parity.o .libs/gsm0503_coding.o -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/.libs -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/gsm/.libs -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/codec/.libs -ltalloc ../.libs/libosmocore.so ../gsm/.libs/libosmogsm.so ../codec/.libs/libosmocodec.so -g -O2 -fstack-protector-strong -Wl,--version-script=./libosmocoding.map -Wl,-z -Wl,relro -Wl,-z -Wl,now -pthread -Wl,-soname -Wl,libosmocoding.so.0 -o .libs/libosmocoding.so.0.1.1 [ 226s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:16: multiple definition of `gsm0503_mcs_crc12'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:16: first defined here [ 226s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:15: multiple definition of `gsm0503_mcs_crc8_hdr'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:15: first defined here [ 226s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:13: multiple definition of `gsm0503_fire_crc40'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:13: first defined here [ 226s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:14: multiple definition of `gsm0503_cs234_crc16'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:14: first defined here [ 226s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:19: multiple definition of `gsm0503_tch_fr_crc3'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:19: first defined here [ 226s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:20: multiple definition of `gsm0503_tch_efr_crc8'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:20: first defined here [ 226s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:21: multiple definition of `gsm0503_amr_crc6'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:21: first defined here [ 226s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:17: multiple definition of `gsm0503_rach_crc6'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:17: first defined here [ 226s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:18: multiple definition of `gsm0503_sch_crc10'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:18: first defined here [ 226s] collect2: error: ld returned 1 exit status [ 226s] make[3]: *** [Makefile:494: libosmocoding.la] Error 1 [ 226s] make[3]: Leaving directory '/usr/src/packages/BUILD/src/coding' [ 226s] make[2]: *** [Makefile:687: all-recursive] Error 1 [ 226s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 226s] make[1]: *** [Makefile:468: all] Error 2 [ 226s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 226s] dh_auto_build: error: make -j1 returned exit code 2 [ 226s] make: *** [debian/rules:15: build] Error 25 [ 226s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 226s] ### VM INTERACTION START ### [ 229s] [ 207.637256] sysrq: SysRq : Power Off [ 229s] [ 207.641282] reboot: Power down [ 229s] ### VM INTERACTION END ### [ 229s] [ 229s] cloud123 failed "build libosmocore_1.3.1.dsc" at Wed Jul 22 00:47:36 UTC 2020. [ 229s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 01:20:08 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 01:20:08 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f179452be57b_1c292ab9470d05f42181e4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 115s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 115s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 115s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 115s] | | [ 115s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 115s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 115s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 115s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 115s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 115s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 115s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 115s] cc1: all warnings being treated as errors [ 115s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 115s] make[3]: *** Waiting for unfinished jobs.... [ 115s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 115s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 115s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 115s] make[1]: *** [Makefile:166: all] Error 2 [ 115s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 115s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 115s] make: *** [debian/rules:9: build] Error 25 [ 115s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 115s] ### VM INTERACTION START ### [ 118s] [ 98.230589] sysrq: SysRq : Power Off [ 118s] [ 98.233917] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] cloud128 failed "build ulfius_2.5.2-4.1.dsc" at Wed Jul 22 01:20:02 UTC 2020. [ 119s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 01:28:08 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 01:28:08 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f179633db520_1c292ab9470d05f4219650@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 116s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 116s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 116s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 116s] | | [ 116s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 116s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 116s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 116s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 116s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 116s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 116s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 117s] cc1: all warnings being treated as errors [ 117s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 117s] make[3]: *** Waiting for unfinished jobs.... [ 117s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 117s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 117s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 117s] make[1]: *** [Makefile:166: all] Error 2 [ 117s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 117s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 117s] make: *** [debian/rules:9: build] Error 25 [ 117s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 117s] ### VM INTERACTION START ### [ 120s] [ 107.644834] sysrq: SysRq : Power Off [ 120s] [ 107.653426] reboot: Power down [ 120s] ### VM INTERACTION END ### [ 120s] [ 120s] lamb23 failed "build ulfius_2.5.2-4.1.dsc" at Wed Jul 22 01:27:56 UTC 2020. [ 120s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 02:05:00 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 02:05:00 +0000 Subject: Build failure of network:osmocom:latest/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f179ede30f2e_1c292ab9470d05f42264dd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-sccp Last lines of build log: [ 247s] libtool: link: cat .libs/libosmo-sigtran.exp | sed -e "s/\(.*\)/\1;/" >> .libs/libosmo-sigtran.ver [ 247s] libtool: link: echo "local: *; };" >> .libs/libosmo-sigtran.ver [ 247s] libtool: link: gcc -shared -fPIC -DPIC .libs/sccp_sap.o .libs/sua.o .libs/m3ua.o .libs/xua_msg.o .libs/sccp_helpers.o .libs/sccp2sua.o .libs/sccp_scrc.o .libs/sccp_sclc.o .libs/sccp_scoc.o .libs/sccp_user.o .libs/xua_rkm.o .libs/xua_default_lm_fsm.o .libs/osmo_ss7.o .libs/osmo_ss7_hmrt.o .libs/xua_asp_fsm.o .libs/xua_as_fsm.o .libs/osmo_ss7_vty.o .libs/sccp_vty.o .libs/ipa.o /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmonetif.so -lsctp -pthread -g -O2 -fstack-protector-strong -Wl,-z -Wl,relro -Wl,-z -Wl,now -pthread -Wl,-soname -Wl,libosmo-sigtran.so.5 -Wl,-version-script -Wl,.libs/libosmo-sigtran.ver -o .libs/libosmo-sigtran.so.5.0.0 [ 247s] /usr/bin/ld: .libs/sccp_helpers.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 247s] /usr/bin/ld: .libs/sccp2sua.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 247s] /usr/bin/ld: .libs/sccp_scrc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 247s] /usr/bin/ld: .libs/sccp_sclc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 247s] /usr/bin/ld: .libs/sccp_scoc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 247s] /usr/bin/ld: .libs/sccp_user.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 247s] /usr/bin/ld: .libs/osmo_ss7.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 247s] /usr/bin/ld: .libs/osmo_ss7_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 247s] /usr/bin/ld: .libs/sccp_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 247s] collect2: error: ld returned 1 exit status [ 247s] make[3]: *** [Makefile:540: libosmo-sigtran.la] Error 1 [ 247s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 247s] make[2]: *** [Makefile:500: all-recursive] Error 1 [ 247s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 247s] make[1]: *** [Makefile:395: all] Error 2 [ 247s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 247s] dh_auto_build: error: make -j1 returned exit code 2 [ 247s] make: *** [debian/rules:12: build] Error 25 [ 247s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 247s] ### VM INTERACTION START ### [ 248s] Powering off. [ 248s] [ 236.500804] reboot: Power down [ 248s] ### VM INTERACTION END ### [ 248s] [ 248s] goat05 failed "build libosmo-sccp_1.2.0.dsc" at Wed Jul 22 02:04:54 UTC 2020. [ 248s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 02:27:35 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 02:27:35 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f17a424d813a_1c292ab9470d05f4230211@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 519s] | ~~~~~~~~~~~~~~~~~~~~~^~~ [ 520s] /bin/bash ../../libtool --tag=CC --mode=link gcc -g -Wall -I../../src/tests -I../../include -I../../include -I/usr/include/ -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -no-install -Wl,-z,relro -o test-helpers test-helpers.o test_common.o -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmogsm -losmocore -ltalloc -lasn1c -losmo-sigtran -lsctp ../../src/libosmo-ranap.la [ 520s] libtool: link: gcc -g -Wall -I../../src/tests -I../../include -I../../include -I/usr/include/ -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -Wl,-z -Wl,relro -o test-helpers test-helpers.o test_common.o /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so -ltalloc -lasn1c /usr/lib/x86_64-linux-gnu/libosmo-sigtran.so -lsctp ../../src/.libs/libosmo-ranap.so -pthread -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/.libs [ 520s] /usr/bin/ld: test_common.o:./src/tests/test_common.c:44: multiple definition of `talloc_asn1_ctx'; test-helpers.o:./src/tests/test-helpers.c:36: first defined here [ 520s] collect2: error: ld returned 1 exit status [ 520s] make[7]: *** [Makefile:424: test-helpers] Error 1 [ 520s] make[7]: Leaving directory '/usr/src/packages/BUILD/src/tests' [ 520s] make[6]: *** [Makefile:672: check-am] Error 2 [ 520s] make[6]: Leaving directory '/usr/src/packages/BUILD/src/tests' [ 520s] make[5]: *** [Makefile:690: check-recursive] Error 1 [ 520s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 520s] make[4]: *** [Makefile:842: check] Error 2 [ 520s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 520s] make[3]: *** [Makefile:461: check-recursive] Error 1 [ 520s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 520s] make[2]: *** [Makefile:761: check] Error 2 [ 520s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 520s] dh_auto_test: error: make -j1 check VERBOSE=1 returned exit code 2 [ 520s] make[1]: *** [debian/rules:19: override_dh_auto_test] Error 1 [ 520s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 520s] make: *** [debian/rules:9: build] Error 2 [ 520s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 520s] ### VM INTERACTION START ### [ 523s] [ 511.061529] sysrq: SysRq : Power Off [ 523s] [ 511.067170] reboot: Power down [ 523s] ### VM INTERACTION END ### [ 523s] [ 523s] lamb07 failed "build osmo-iuh_0.6.0.dsc" at Wed Jul 22 02:27:30 UTC 2020. [ 523s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 03:12:25 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 03:12:25 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f17aeaad5f6f_1c292ab9470d05f42345f2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 414s] /usr/bin/ld: ../../src/common/libbts.a(msg_utils.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 414s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 414s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 414s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 414s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 414s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 414s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 414s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 414s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 414s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 414s] collect2: error: ld returned 1 exit status [ 414s] make[4]: *** [Makefile:426: osmo-bts-virtual] Error 1 [ 414s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bts-virtual' [ 414s] make[3]: *** [Makefile:385: all-recursive] Error 1 [ 414s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 414s] make[2]: *** [Makefile:434: all-recursive] Error 1 [ 414s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 414s] make[1]: *** [Makefile:366: all] Error 2 [ 414s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 414s] dh_auto_build: error: make -j1 returned exit code 2 [ 414s] make: *** [debian/rules:12: build] Error 25 [ 414s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 414s] ### VM INTERACTION START ### [ 415s] Powering off. [ 415s] [ 391.429302] reboot: Power down [ 415s] ### VM INTERACTION END ### [ 415s] [ 415s] cloud102 failed "build osmo-bts_1.2.0.dsc" at Wed Jul 22 03:12:09 UTC 2020. [ 415s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 03:37:51 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 03:37:51 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f17b4a6597d8_1c292ab9470d05f4238259@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmocore failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 233s] libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -DBUILDING_LIBOSMOCORE -Wall -c gsm0503_coding.c -fPIC -DPIC -o gsm0503_coding.o >/dev/null 2>&1 [ 234s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmocoding.map -version-info 1:1:1 -no-undefined -ltalloc -Wl,-z,relro -Wl,-z,now -o libosmocoding.la -rpath /usr/lib/x86_64-linux-gnu gsm0503_interleaving.lo gsm0503_mapping.lo gsm0503_tables.lo gsm0503_parity.lo gsm0503_coding.lo ../libosmocore.la ../gsm/libosmogsm.la ../codec/libosmocodec.la [ 234s] libtool: link: gcc -shared -fPIC -DPIC .libs/gsm0503_interleaving.o .libs/gsm0503_mapping.o .libs/gsm0503_tables.o .libs/gsm0503_parity.o .libs/gsm0503_coding.o -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/.libs -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/gsm/.libs -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/codec/.libs -ltalloc ../.libs/libosmocore.so ../gsm/.libs/libosmogsm.so ../codec/.libs/libosmocodec.so -g -O2 -fstack-protector-strong -Wl,--version-script=./libosmocoding.map -Wl,-z -Wl,relro -Wl,-z -Wl,now -pthread -Wl,-soname -Wl,libosmocoding.so.0 -o .libs/libosmocoding.so.0.1.1 [ 234s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:16: multiple definition of `gsm0503_mcs_crc12'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:16: first defined here [ 234s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:15: multiple definition of `gsm0503_mcs_crc8_hdr'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:15: first defined here [ 234s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:13: multiple definition of `gsm0503_fire_crc40'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:13: first defined here [ 234s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:14: multiple definition of `gsm0503_cs234_crc16'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:14: first defined here [ 234s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:19: multiple definition of `gsm0503_tch_fr_crc3'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:19: first defined here [ 234s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:20: multiple definition of `gsm0503_tch_efr_crc8'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:20: first defined here [ 234s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:21: multiple definition of `gsm0503_amr_crc6'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:21: first defined here [ 234s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:17: multiple definition of `gsm0503_rach_crc6'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:17: first defined here [ 234s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:18: multiple definition of `gsm0503_sch_crc10'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:18: first defined here [ 234s] collect2: error: ld returned 1 exit status [ 234s] make[3]: *** [Makefile:494: libosmocoding.la] Error 1 [ 234s] make[3]: Leaving directory '/usr/src/packages/BUILD/src/coding' [ 234s] make[2]: *** [Makefile:687: all-recursive] Error 1 [ 234s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 234s] make[1]: *** [Makefile:468: all] Error 2 [ 234s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 234s] dh_auto_build: error: make -j1 returned exit code 2 [ 234s] make: *** [debian/rules:15: build] Error 25 [ 234s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 234s] ### VM INTERACTION START ### [ 238s] [ 220.276726] sysrq: SysRq : Power Off [ 238s] [ 220.283820] reboot: Power down [ 238s] ### VM INTERACTION END ### [ 238s] [ 238s] cloud137 failed "build libosmocore_1.3.1.dsc" at Wed Jul 22 03:37:46 UTC 2020. [ 238s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 04:14:08 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 04:14:08 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f17bd1aebc45_1c292ab9470d05f42450bf@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 117s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 117s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 117s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 117s] | | [ 117s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 117s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 117s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 117s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 117s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 117s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 117s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 118s] cc1: all warnings being treated as errors [ 118s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 118s] make[3]: *** Waiting for unfinished jobs.... [ 118s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 118s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 118s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 118s] make[1]: *** [Makefile:166: all] Error 2 [ 118s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 118s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 118s] make: *** [debian/rules:9: build] Error 25 [ 118s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 118s] ### VM INTERACTION START ### [ 121s] [ 108.688828] sysrq: SysRq : Power Off [ 121s] [ 108.694084] reboot: Power down [ 121s] ### VM INTERACTION END ### [ 121s] [ 121s] lamb20 failed "build ulfius_2.5.2-4.1.dsc" at Wed Jul 22 04:13:51 UTC 2020. [ 121s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 04:44:25 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 04:44:25 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f17c43e3321b_1c292ab9470d05f425299f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 474s] /usr/bin/ld: bsc_subscr_conn_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 474s] /usr/bin/ld: bsc_vty.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 474s] /usr/bin/ld: gsm_04_08_rr.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 474s] /usr/bin/ld: handover_decision.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 474s] /usr/bin/ld: handover_decision_2.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 474s] /usr/bin/ld: handover_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 474s] /usr/bin/ld: handover_logic.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 474s] /usr/bin/ld: lchan_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 474s] /usr/bin/ld: osmo_bsc_bssap.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 474s] /usr/bin/ld: osmo_bsc_main.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 474s] collect2: error: ld returned 1 exit status [ 474s] make[4]: *** [Makefile:588: osmo-bsc] Error 1 [ 474s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 474s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 474s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 474s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 474s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 474s] make[1]: *** [Makefile:380: all] Error 2 [ 474s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 474s] dh_auto_build: error: make -j1 returned exit code 2 [ 474s] make: *** [debian/rules:45: build] Error 25 [ 474s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 474s] ### VM INTERACTION START ### [ 475s] Powering off. [ 475s] [ 459.239588] reboot: Power down [ 475s] ### VM INTERACTION END ### [ 475s] [ 475s] lamb26 failed "build osmo-bsc_1.6.0.dsc" at Wed Jul 22 04:44:13 UTC 2020. [ 475s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 04:53:51 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 04:53:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f17c678283d8_1c292ab9470d05f42538cc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 431s] col/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 431s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 431s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_access_req_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 431s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_access_req_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 431s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_auth_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 431s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_auth_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 431s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 431s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 431s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_sgs.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 431s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_sgs_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 431s] collect2: error: ld returned 1 exit status [ 431s] make[4]: *** [Makefile:485: osmo-msc] Error 1 [ 431s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 431s] make[3]: *** [Makefile:422: all-recursive] Error 1 [ 431s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 431s] make[2]: *** [Makefile:462: all-recursive] Error 1 [ 431s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 431s] make[1]: *** [Makefile:394: all] Error 2 [ 431s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 431s] dh_auto_build: error: make -j1 returned exit code 2 [ 431s] make: *** [debian/rules:45: build] Error 25 [ 431s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 431s] ### VM INTERACTION START ### [ 432s] Powering off. [ 432s] [ 417.573322] reboot: Power down [ 432s] ### VM INTERACTION END ### [ 432s] [ 432s] lamb58 failed "build osmo-msc_1.6.1.dsc" at Wed Jul 22 04:53:41 UTC 2020. [ 432s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 05:02:43 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 05:02:43 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f17c87a480ff_1c292ab9470d05f425491a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 481s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o gbproxy_test.o gbproxy_test.c [ 483s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=osmo_get_rand_id -Wl,-z,relro -o gbproxy_test gbproxy_test.o ../../src/gbproxy/gb_proxy.o ../../src/gbproxy/gb_proxy_patch.o ../../src/gbproxy/gb_proxy_peer.o ../../src/gbproxy/gb_proxy_tlli.o ../../src/gprs/gprs_gb_parse.o ../../src/gprs/gprs_llc_parse.o ../../src/gprs/crc24.o ../../src/gprs/gprs_utils.o -ltalloc -losmocore -ltalloc -losmogb -losmovty -losmocore -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -losmoabis -ldl -lrt [ 483s] libtool: link: gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=osmo_get_rand_id -Wl,-z -Wl,relro -o gbproxy_test gbproxy_test.o ../../src/gbproxy/gb_proxy.o ../../src/gbproxy/gb_proxy_patch.o ../../src/gbproxy/gb_proxy_peer.o ../../src/gbproxy/gb_proxy_tlli.o ../../src/gprs/gprs_gb_parse.o ../../src/gprs/gprs_llc_parse.o ../../src/gprs/crc24.o ../../src/gprs/gprs_utils.o /usr/lib/x86_64-linux-gnu/libosmogb.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmoabis.so -ldl -lrt -pthread [ 483s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/gbproxy' [ 483s] Making all in gtphub [ 483s] make[4]: Entering directory '/usr/src/packages/BUILD/tests/gtphub' [ 483s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o gtphub_test.o gtphub_test.c [ 484s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=gtphub_resolve_ggsn_addr -Wl,--wrap=gtphub_ares_init -Wl,--wrap=gtphub_write -Wl,-z,relro -o gtphub_test gtphub_test.o ../../src/gtphub/gtphub.o ../../src/gprs/gprs_utils.o -ltalloc -losmocore -ltalloc -losmogsm -losmocore -lgtp -lrt [ 484s] libtool: link: gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=gtphub_resolve_ggsn_addr -Wl,--wrap=gtphub_ares_init -Wl,--wrap=gtphub_write -Wl,-z -Wl,relro -o gtphub_test gtphub_test.o ../../src/gtphub/gtphub.o ../../src/gprs/gprs_utils.o -ltalloc /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libgtp.so -lrt -pthread [ 484s] /usr/bin/ld: ../../src/gtphub/gtphub.o:./src/gtphub/gtphub.c:50: multiple definition of `osmo_gtphub_ctx'; gtphub_test.o:./tests/gtphub/gtphub_test.c:57: first defined here [ 484s] collect2: error: ld returned 1 exit status [ 484s] make[4]: *** [Makefile:420: gtphub_test] Error 1 [ 484s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/gtphub' [ 484s] make[3]: *** [Makefile:416: all-recursive] Error 1 [ 484s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 484s] make[2]: *** [Makefile:453: all-recursive] Error 1 [ 484s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 484s] make[1]: *** [Makefile:385: all] Error 2 [ 484s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 484s] dh_auto_build: error: make -j1 returned exit code 2 [ 484s] make: *** [debian/rules:45: build] Error 25 [ 484s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 484s] ### VM INTERACTION START ### [ 485s] Powering off. [ 485s] [ 467.225089] reboot: Power down [ 486s] ### VM INTERACTION END ### [ 486s] [ 486s] lamb01 failed "build osmo-sgsn_1.6.0.dsc" at Wed Jul 22 05:02:36 UTC 2020. [ 486s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 05:40:25 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 05:40:25 +0000 Subject: Build failure of network:osmocom:latest/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f17d15bb42d3_1c292ab9470d05f4260359@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-sccp Last lines of build log: [ 301s] libtool: link: cat .libs/libosmo-sigtran.exp | sed -e "s/\(.*\)/\1;/" >> .libs/libosmo-sigtran.ver [ 301s] libtool: link: echo "local: *; };" >> .libs/libosmo-sigtran.ver [ 301s] libtool: link: gcc -shared -fPIC -DPIC .libs/sccp_sap.o .libs/sua.o .libs/m3ua.o .libs/xua_msg.o .libs/sccp_helpers.o .libs/sccp2sua.o .libs/sccp_scrc.o .libs/sccp_sclc.o .libs/sccp_scoc.o .libs/sccp_user.o .libs/xua_rkm.o .libs/xua_default_lm_fsm.o .libs/osmo_ss7.o .libs/osmo_ss7_hmrt.o .libs/xua_asp_fsm.o .libs/xua_as_fsm.o .libs/osmo_ss7_vty.o .libs/sccp_vty.o .libs/ipa.o /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmonetif.so -lsctp -pthread -g -O2 -fstack-protector-strong -Wl,-z -Wl,relro -Wl,-z -Wl,now -pthread -Wl,-soname -Wl,libosmo-sigtran.so.5 -Wl,-version-script -Wl,.libs/libosmo-sigtran.ver -o .libs/libosmo-sigtran.so.5.0.0 [ 301s] /usr/bin/ld: .libs/sccp_helpers.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 301s] /usr/bin/ld: .libs/sccp2sua.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 301s] /usr/bin/ld: .libs/sccp_scrc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 301s] /usr/bin/ld: .libs/sccp_sclc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 301s] /usr/bin/ld: .libs/sccp_scoc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 301s] /usr/bin/ld: .libs/sccp_user.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 301s] /usr/bin/ld: .libs/osmo_ss7.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 301s] /usr/bin/ld: .libs/osmo_ss7_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 301s] /usr/bin/ld: .libs/sccp_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 301s] collect2: error: ld returned 1 exit status [ 301s] make[3]: *** [Makefile:540: libosmo-sigtran.la] Error 1 [ 301s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 301s] make[2]: *** [Makefile:500: all-recursive] Error 1 [ 301s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 301s] make[1]: *** [Makefile:395: all] Error 2 [ 301s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 301s] dh_auto_build: error: make -j1 returned exit code 2 [ 301s] make: *** [debian/rules:12: build] Error 25 [ 301s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 301s] ### VM INTERACTION START ### [ 302s] Powering off. [ 302s] [ 290.874907] reboot: Power down [ 302s] ### VM INTERACTION END ### [ 302s] [ 302s] sheep86 failed "build libosmo-sccp_1.2.0.dsc" at Wed Jul 22 05:40:17 UTC 2020. [ 302s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 06:14:08 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 06:14:08 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f17d93684667_1c292ab9470d05f42670e2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 514s] | ~~~~~~~~~~~~~~~~~~~~~^~~ [ 514s] /bin/bash ../../libtool --tag=CC --mode=link gcc -g -Wall -I../../src/tests -I../../include -I../../include -I/usr/include/ -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -no-install -Wl,-z,relro -o test-helpers test-helpers.o test_common.o -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmogsm -losmocore -ltalloc -lasn1c -losmo-sigtran -lsctp ../../src/libosmo-ranap.la [ 515s] libtool: link: gcc -g -Wall -I../../src/tests -I../../include -I../../include -I/usr/include/ -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -Wl,-z -Wl,relro -o test-helpers test-helpers.o test_common.o /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so -ltalloc -lasn1c /usr/lib/x86_64-linux-gnu/libosmo-sigtran.so -lsctp ../../src/.libs/libosmo-ranap.so -pthread -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/.libs [ 515s] /usr/bin/ld: test_common.o:./src/tests/test_common.c:44: multiple definition of `talloc_asn1_ctx'; test-helpers.o:./src/tests/test-helpers.c:36: first defined here [ 515s] collect2: error: ld returned 1 exit status [ 515s] make[7]: *** [Makefile:424: test-helpers] Error 1 [ 515s] make[7]: Leaving directory '/usr/src/packages/BUILD/src/tests' [ 515s] make[6]: *** [Makefile:672: check-am] Error 2 [ 515s] make[6]: Leaving directory '/usr/src/packages/BUILD/src/tests' [ 515s] make[5]: *** [Makefile:690: check-recursive] Error 1 [ 515s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 515s] make[4]: *** [Makefile:842: check] Error 2 [ 515s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 515s] make[3]: *** [Makefile:461: check-recursive] Error 1 [ 515s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 515s] make[2]: *** [Makefile:761: check] Error 2 [ 515s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 515s] dh_auto_test: error: make -j1 check VERBOSE=1 returned exit code 2 [ 515s] make[1]: *** [debian/rules:19: override_dh_auto_test] Error 1 [ 515s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 515s] make: *** [debian/rules:9: build] Error 2 [ 515s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 515s] ### VM INTERACTION START ### [ 518s] [ 505.678168] sysrq: SysRq : Power Off [ 518s] [ 505.684326] reboot: Power down [ 518s] ### VM INTERACTION END ### [ 518s] [ 518s] lamb02 failed "build osmo-iuh_0.6.0.dsc" at Wed Jul 22 06:14:04 UTC 2020. [ 518s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 07:00:25 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 07:00:25 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f17e41ee9a4b_1c292ab9470d05f4275534@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 383s] /usr/bin/ld: ../../src/common/libbts.a(msg_utils.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 383s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 383s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 383s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 383s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 383s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 383s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 383s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 383s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 383s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 383s] collect2: error: ld returned 1 exit status [ 383s] make[4]: *** [Makefile:426: osmo-bts-virtual] Error 1 [ 383s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bts-virtual' [ 383s] make[3]: *** [Makefile:385: all-recursive] Error 1 [ 383s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 383s] make[2]: *** [Makefile:434: all-recursive] Error 1 [ 383s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 383s] make[1]: *** [Makefile:366: all] Error 2 [ 383s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 383s] dh_auto_build: error: make -j1 returned exit code 2 [ 383s] make: *** [debian/rules:12: build] Error 25 [ 383s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 383s] ### VM INTERACTION START ### [ 385s] Powering off. [ 385s] [ 369.351191] reboot: Power down [ 385s] ### VM INTERACTION END ### [ 385s] [ 385s] lamb55 failed "build osmo-bts_1.2.0.dsc" at Wed Jul 22 07:00:23 UTC 2020. [ 385s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 07:27:00 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 07:27:00 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f17ea541a582_1c292ab9470d05f42823a0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 480s] /usr/bin/ld: bsc_subscr_conn_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 480s] /usr/bin/ld: bsc_vty.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 480s] /usr/bin/ld: gsm_04_08_rr.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 480s] /usr/bin/ld: handover_decision.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 480s] /usr/bin/ld: handover_decision_2.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 480s] /usr/bin/ld: handover_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 480s] /usr/bin/ld: handover_logic.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 480s] /usr/bin/ld: lchan_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 480s] /usr/bin/ld: osmo_bsc_bssap.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 480s] /usr/bin/ld: osmo_bsc_main.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 480s] collect2: error: ld returned 1 exit status [ 480s] make[4]: *** [Makefile:588: osmo-bsc] Error 1 [ 480s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 480s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 480s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 480s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 480s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 480s] make[1]: *** [Makefile:380: all] Error 2 [ 480s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 480s] dh_auto_build: error: make -j1 returned exit code 2 [ 480s] make: *** [debian/rules:45: build] Error 25 [ 480s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 480s] ### VM INTERACTION START ### [ 481s] Powering off. [ 481s] [ 466.498626] reboot: Power down [ 482s] ### VM INTERACTION END ### [ 482s] [ 482s] lamb57 failed "build osmo-bsc_1.6.0.dsc" at Wed Jul 22 07:26:49 UTC 2020. [ 482s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 07:35:00 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 07:35:00 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f17ec32f276f_1c292ab9470d05f42835ed@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 119s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 119s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 119s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 119s] | | [ 119s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 119s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 119s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 119s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 119s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 119s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 119s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 120s] cc1: all warnings being treated as errors [ 120s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 120s] make[3]: *** Waiting for unfinished jobs.... [ 120s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 120s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 120s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 120s] make[1]: *** [Makefile:166: all] Error 2 [ 120s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 120s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 120s] make: *** [debian/rules:9: build] Error 25 [ 120s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 120s] ### VM INTERACTION START ### [ 123s] [ 109.854311] sysrq: SysRq : Power Off [ 123s] [ 109.859352] reboot: Power down [ 123s] ### VM INTERACTION END ### [ 123s] [ 123s] lamb09 failed "build ulfius_2.5.2-4.1.dsc" at Wed Jul 22 07:34:46 UTC 2020. [ 123s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 07:35:51 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 07:35:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f17ec718b171_1c292ab9470d05f4283738@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 338s] col/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 338s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 338s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_access_req_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 338s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_access_req_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 338s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_auth_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 338s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_auth_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 338s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 338s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 338s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_sgs.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 338s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_sgs_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 338s] collect2: error: ld returned 1 exit status [ 338s] make[4]: *** [Makefile:485: osmo-msc] Error 1 [ 338s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 338s] make[3]: *** [Makefile:422: all-recursive] Error 1 [ 338s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 338s] make[2]: *** [Makefile:462: all-recursive] Error 1 [ 338s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 338s] make[1]: *** [Makefile:394: all] Error 2 [ 338s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 338s] dh_auto_build: error: make -j1 returned exit code 2 [ 338s] make: *** [debian/rules:45: build] Error 25 [ 338s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 338s] ### VM INTERACTION START ### [ 339s] Powering off. [ 339s] [ 327.865446] reboot: Power down [ 339s] ### VM INTERACTION END ### [ 339s] [ 339s] sheep88 failed "build osmo-msc_1.6.1.dsc" at Wed Jul 22 07:35:40 UTC 2020. [ 339s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 22 07:38:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 07:38:22 +0000 Subject: Change in osmo-e1d[master]: cosmetic: create HDLC specific sub-structure within e1_ts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19344 ) Change subject: cosmetic: create HDLC specific sub-structure within e1_ts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ide0577c25836252862153b4f24da550bee013687 Gerrit-Change-Number: 19344 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 22 Jul 2020 07:38:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 07:38:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 07:38:40 +0000 Subject: Change in osmo-e1d[master]: cosmetic: create HDLC specific sub-structure within e1_ts In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19344 ) Change subject: cosmetic: create HDLC specific sub-structure within e1_ts ...................................................................... cosmetic: create HDLC specific sub-structure within e1_ts This groups all HDLC-specific members together, in preparation of adding more fields for other modes. Change-Id: Ide0577c25836252862153b4f24da550bee013687 --- M src/ctl.c M src/e1d.h M src/intf_line.c 3 files changed, 30 insertions(+), 28 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/ctl.c b/src/ctl.c index 4e74485..697af01 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -150,8 +150,8 @@ ts->mode = mode; if (mode == E1_TS_MODE_HDLCFCS) { - osmo_isdnhdlc_out_init(&ts->hdlc_tx, OSMO_HDLC_F_BITREVERSE); - osmo_isdnhdlc_rcv_init(&ts->hdlc_rx, OSMO_HDLC_F_BITREVERSE); + osmo_isdnhdlc_out_init(&ts->hdlc.tx, OSMO_HDLC_F_BITREVERSE); + osmo_isdnhdlc_rcv_init(&ts->hdlc.rx, OSMO_HDLC_F_BITREVERSE); } int flags = fcntl(ts->fd, F_GETFL); diff --git a/src/e1d.h b/src/e1d.h index fca7d3e..98c3ddc 100644 --- a/src/e1d.h +++ b/src/e1d.h @@ -43,13 +43,15 @@ enum e1_ts_mode mode; /* HDLC handling */ - struct osmo_isdnhdlc_vars hdlc_tx; - struct osmo_isdnhdlc_vars hdlc_rx; + struct { + struct osmo_isdnhdlc_vars tx; + struct osmo_isdnhdlc_vars rx; - uint8_t rx_buf[264]; - uint8_t tx_buf[264]; - int tx_ofs; - int tx_len; + uint8_t rx_buf[264]; + uint8_t tx_buf[264]; + int tx_ofs; + int tx_len; + } hdlc; /* Remote end */ int fd; diff --git a/src/intf_line.c b/src/intf_line.c index af0d45d..6213151 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -157,16 +157,16 @@ oi = 0; while (oi < len) { - rv = osmo_isdnhdlc_decode(&ts->hdlc_rx, + rv = osmo_isdnhdlc_decode(&ts->hdlc.rx, &buf[oi], len-oi, &cl, - ts->rx_buf, sizeof(ts->rx_buf) + ts->hdlc.rx_buf, sizeof(ts->hdlc.rx_buf) ); if (rv > 0) { int bytes_to_write = rv; LOGPTS(ts, DXFR, LOGL_DEBUG, "RX Message: %d [ %s]\n", - rv, osmo_hexdump(ts->rx_buf, rv)); - rv = write(ts->fd, ts->rx_buf, bytes_to_write); + rv, osmo_hexdump(ts->hdlc.rx_buf, rv)); + rv = write(ts->fd, ts->hdlc.rx_buf, bytes_to_write); if (rv < 0) return rv; } else if (rv < 0 && ts->id == 4) { @@ -189,44 +189,44 @@ while (oo < len) { /* Pending message ? */ - if (!ts->tx_len) { - rv = recv(ts->fd, ts->tx_buf, sizeof(ts->tx_buf), MSG_TRUNC); + if (!ts->hdlc.tx_len) { + rv = recv(ts->fd, ts->hdlc.tx_buf, sizeof(ts->hdlc.tx_buf), MSG_TRUNC); if (rv > 0) { - if (rv > sizeof(ts->tx_buf)) { + if (rv > sizeof(ts->hdlc.tx_buf)) { LOGPTS(ts, DXFR, LOGL_ERROR, "Truncated message: Client tried to " "send %d bytes but our buffer is limited to %lu\n", - rv, sizeof(ts->tx_buf)); - rv = sizeof(ts->tx_buf); + rv, sizeof(ts->hdlc.tx_buf)); + rv = sizeof(ts->hdlc.tx_buf); } LOGPTS(ts, DXFR, LOGL_DEBUG, "TX Message: %d [ %s]\n", - rv, osmo_hexdump(ts->tx_buf, rv)); - ts->tx_len = rv; - ts->tx_ofs = 0; + rv, osmo_hexdump(ts->hdlc.tx_buf, rv)); + ts->hdlc.tx_len = rv; + ts->hdlc.tx_ofs = 0; } else if (rv < 0 && errno != EAGAIN) return rv; } /* */ - rv = osmo_isdnhdlc_encode(&ts->hdlc_tx, - &ts->tx_buf[ts->tx_ofs], ts->tx_len - ts->tx_ofs, &cl, + rv = osmo_isdnhdlc_encode(&ts->hdlc.tx, + &ts->hdlc.tx_buf[ts->hdlc.tx_ofs], ts->hdlc.tx_len - ts->hdlc.tx_ofs, &cl, &buf[oo], len - oo ); if (rv < 0) LOGPTS(ts, DXFR, LOGL_ERROR, "ERR TX: %d\n", rv); - if (ts->tx_ofs < ts->tx_len) { + if (ts->hdlc.tx_ofs < ts->hdlc.tx_len) { LOGPTS(ts, DXFR, LOGL_DEBUG, "TX chunk %d/%d %d [ %s]\n", - ts->tx_ofs, ts->tx_len, cl, osmo_hexdump(&buf[ts->tx_ofs], rv)); + ts->hdlc.tx_ofs, ts->hdlc.tx_len, cl, osmo_hexdump(&buf[ts->hdlc.tx_ofs], rv)); } if (rv > 0) oo += rv; - ts->tx_ofs += cl; - if (ts->tx_ofs >= ts->tx_len) { - ts->tx_len = 0; - ts->tx_ofs = 0; + ts->hdlc.tx_ofs += cl; + if (ts->hdlc.tx_ofs >= ts->hdlc.tx_len) { + ts->hdlc.tx_len = 0; + ts->hdlc.tx_ofs = 0; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ide0577c25836252862153b4f24da550bee013687 Gerrit-Change-Number: 19344 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 07:43:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 07:43:06 +0000 Subject: Change in osmo-e1d[master]: implement buffering to chunks in E1->application direction In-Reply-To: References: Message-ID: Hello dexter, tnt, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/19345 to look at the new patch set (#3). Change subject: implement buffering to chunks in E1->application direction ...................................................................... implement buffering to chunks in E1->application direction Existing applications (such as those written for DAHDI) expect to be reading data in buffer/chunk sizes. For example OsmoNITB: It doesn't want to execute an expensive read/recv syscall to receive 11 bytes, if it needs at least 160 bytes. Change-Id: I807671bc6f2acaef740ce215b8d8abcb5dce2640 --- M src/ctl.c M src/e1d.h M src/intf_line.c 3 files changed, 66 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/45/19345/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I807671bc6f2acaef740ce215b8d8abcb5dce2640 Gerrit-Change-Number: 19345 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 07:43:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 07:43:06 +0000 Subject: Change in osmo-e1d[master]: make RAW read buffer size configurable (instead of hard-coded 160) In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/19346 to look at the new patch set (#2). Change subject: make RAW read buffer size configurable (instead of hard-coded 160) ...................................................................... make RAW read buffer size configurable (instead of hard-coded 160) When opening a timeslot, the client can now specify the (from application perspective) timeslot read buffer size. This breaks ABI, but then we're still at a point where only prototype hardware exists, so we can get away with it. Change-Id: I6d603778cce14c5d72fe5f54904905ea7e66d7ff --- M include/osmocom/e1d/proto.h M include/osmocom/e1d/proto_clnt.h M src/ctl.c M src/e1d-ts-pipe.c M src/proto_clnt.c 5 files changed, 20 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/46/19346/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I6d603778cce14c5d72fe5f54904905ea7e66d7ff Gerrit-Change-Number: 19346 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-CC: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 07:43:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 07:43:07 +0000 Subject: Change in osmo-e1d[master]: add comment about first byte of E1DP_MAGIC References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19360 ) Change subject: add comment about first byte of E1DP_MAGIC ...................................................................... add comment about first byte of E1DP_MAGIC Change-Id: I7b0a59211521ec631512e6cac7a65e2a2172d538 --- M include/osmocom/e1d/proto.h 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/60/19360/1 diff --git a/include/osmocom/e1d/proto.h b/include/osmocom/e1d/proto.h index d8bce1f..243922d 100644 --- a/include/osmocom/e1d/proto.h +++ b/include/osmocom/e1d/proto.h @@ -82,6 +82,8 @@ }; +/* the idea here is to use the first byte as a version number, to prevent incompatible + * clients from connecting to e1d */ #define E1DP_MAGIC 0x00e1 #define E1DP_MAX_LEN 4096 #define E1DP_TS_SUPERCHAN 0xfe -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I7b0a59211521ec631512e6cac7a65e2a2172d538 Gerrit-Change-Number: 19360 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 07:44:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 07:44:06 +0000 Subject: Change in osmo-e1d[master]: implement buffering to chunks in E1->application direction In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19345 ) Change subject: implement buffering to chunks in E1->application direction ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-e1d/+/19345/2/src/intf_line.c File src/intf_line.c: https://gerrit.osmocom.org/c/osmo-e1d/+/19345/2/src/intf_line.c at 391 PS2, Line 391: rv = _tsbuf_append(ts, buf, len); > I would have gone with _e1_rx_raw() just for consistency with the HDLCFS case. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I807671bc6f2acaef740ce215b8d8abcb5dce2640 Gerrit-Change-Number: 19345 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 22 Jul 2020 07:44:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: tnt Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 07:44:12 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 07:44:12 +0000 Subject: Change in osmo-e1d[master]: add comment about first byte of E1DP_MAGIC In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19360 ) Change subject: add comment about first byte of E1DP_MAGIC ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I7b0a59211521ec631512e6cac7a65e2a2172d538 Gerrit-Change-Number: 19360 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 22 Jul 2020 07:44:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 07:44:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 07:44:24 +0000 Subject: Change in osmo-e1d[master]: make RAW read buffer size configurable (instead of hard-coded 160) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19346 ) Change subject: make RAW read buffer size configurable (instead of hard-coded 160) ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-e1d/+/19346/1/include/osmocom/e1d/proto.h File include/osmocom/e1d/proto.h: https://gerrit.osmocom.org/c/osmo-e1d/+/19346/1/include/osmocom/e1d/proto.h at 85 PS1, Line 85: #define E1DP_MAGIC 0x00e1 > So I know it's not super clear (except in my head :p) but the 0x00 was actually intended as a 'revis [?] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I6d603778cce14c5d72fe5f54904905ea7e66d7ff Gerrit-Change-Number: 19346 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: tnt Gerrit-Comment-Date: Wed, 22 Jul 2020 07:44:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: tnt Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 07:44:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 07:44:29 +0000 Subject: Change in osmo-e1d[master]: implement buffering to chunks in E1->application direction In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19345 ) Change subject: implement buffering to chunks in E1->application direction ...................................................................... implement buffering to chunks in E1->application direction Existing applications (such as those written for DAHDI) expect to be reading data in buffer/chunk sizes. For example OsmoNITB: It doesn't want to execute an expensive read/recv syscall to receive 11 bytes, if it needs at least 160 bytes. Change-Id: I807671bc6f2acaef740ce215b8d8abcb5dce2640 --- M src/ctl.c M src/e1d.h M src/intf_line.c 3 files changed, 66 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/ctl.c b/src/ctl.c index 697af01..d62195a 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -121,6 +121,20 @@ close(ts->fd); ts->fd = -1; } + + talloc_free(ts->raw.rx_buf); + ts->raw.rx_buf = NULL; + ts->raw.rx_buf_size = 0; + ts->raw.rx_buf_used = 0; +} + +static void +_e1d_ts_raw_buf_realloc(struct e1_ts *ts, unsigned int size) +{ + ts->raw.rx_buf = talloc_realloc_size(ts->line, ts->raw.rx_buf, size); + OSMO_ASSERT(ts->raw.rx_buf); + ts->raw.rx_buf_size = size; + ts->raw.rx_buf_used = 0; } static int @@ -137,6 +151,7 @@ break; case E1_TS_MODE_RAW: sock_type = SOCK_STREAM; + _e1d_ts_raw_buf_realloc(ts, 160); /* TODO: make configurable */ break; default: return -EINVAL; diff --git a/src/e1d.h b/src/e1d.h index 98c3ddc..c35f4a8 100644 --- a/src/e1d.h +++ b/src/e1d.h @@ -53,6 +53,13 @@ int tx_len; } hdlc; + /* RAW handling */ + struct { + uint8_t *rx_buf; /* actual buffer storage */ + unsigned int rx_buf_size; /* size of 'buf' in bytes */ + unsigned int rx_buf_used; /* number of bytes used so far */ + } raw; + /* Remote end */ int fd; }; diff --git a/src/intf_line.c b/src/intf_line.c index 6213151..5fd82b7 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -200,7 +200,7 @@ } LOGPTS(ts, DXFR, LOGL_DEBUG, "TX Message: %d [ %s]\n", rv, osmo_hexdump(ts->hdlc.tx_buf, rv)); - ts->hdlc.tx_len = rv; + ts->hdlc.tx_len = rv; ts->hdlc.tx_ofs = 0; } else if (rv < 0 && errno != EAGAIN) return rv; @@ -338,6 +338,48 @@ return tsz; } +/* append data to the per-timeslot buffer; flush to socket every time buffer is full */ +static int +_e1_rx_raw(struct e1_ts *ts, const uint8_t *buf, unsigned int len) +{ + unsigned int appended = 0; + int rv; + + OSMO_ASSERT(ts->mode == E1_TS_MODE_RAW); + + /* we don't keep a larger set of buffers but simply assume that whenever + * we received one full chunk/buffer size, we are able to push the data + * into the underlying unix domain socket. Kernel socket buffering should + * be far sufficient in terms of buffering capacity of voice data (which + * is typically consumed reasonably low latency and hence buffer size) */ + + while (appended < len) { + unsigned int ts_buf_tailroom = ts->raw.rx_buf_size - ts->raw.rx_buf_used; + unsigned int chunk_len; + + /* determine size of chunk we can write at this point */ + chunk_len = len - appended; + if (chunk_len > ts_buf_tailroom) + chunk_len = ts_buf_tailroom; + + /* actually copy the chunk */ + memcpy(ts->raw.rx_buf + ts->raw.rx_buf_used, buf + appended, chunk_len); + ts->raw.rx_buf_used += chunk_len; + appended += chunk_len; + + /* if ts_buf is full: flush + rewind */ + if (ts->raw.rx_buf_used >= ts->raw.rx_buf_size) { + rv = write(ts->fd, ts->raw.rx_buf, ts->raw.rx_buf_size); + if (rv < 0) + return rv; + /* FIXME: count overflows */ + ts->raw.rx_buf_used = 0; + } + } + + return appended; +} + /* write data to a timeslot (hardware -> application direction) */ static int _e1_ts_write(struct e1_ts *ts, const uint8_t *buf, size_t len) @@ -346,7 +388,7 @@ switch (ts->mode) { case E1_TS_MODE_RAW: - rv = write(ts->fd, buf, len); + rv = _e1_rx_raw(ts, buf, len); break; case E1_TS_MODE_HDLCFCS: rv = _e1_rx_hdlcfs(ts, buf, len); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I807671bc6f2acaef740ce215b8d8abcb5dce2640 Gerrit-Change-Number: 19345 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 07:44:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 07:44:29 +0000 Subject: Change in osmo-e1d[master]: add comment about first byte of E1DP_MAGIC In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19360 ) Change subject: add comment about first byte of E1DP_MAGIC ...................................................................... add comment about first byte of E1DP_MAGIC Change-Id: I7b0a59211521ec631512e6cac7a65e2a2172d538 --- M include/osmocom/e1d/proto.h 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/e1d/proto.h b/include/osmocom/e1d/proto.h index d8bce1f..243922d 100644 --- a/include/osmocom/e1d/proto.h +++ b/include/osmocom/e1d/proto.h @@ -82,6 +82,8 @@ }; +/* the idea here is to use the first byte as a version number, to prevent incompatible + * clients from connecting to e1d */ #define E1DP_MAGIC 0x00e1 #define E1DP_MAX_LEN 4096 #define E1DP_TS_SUPERCHAN 0xfe -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I7b0a59211521ec631512e6cac7a65e2a2172d538 Gerrit-Change-Number: 19360 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 07:44:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 07:44:30 +0000 Subject: Change in osmo-e1d[master]: make RAW read buffer size configurable (instead of hard-coded 160) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19346 ) Change subject: make RAW read buffer size configurable (instead of hard-coded 160) ...................................................................... make RAW read buffer size configurable (instead of hard-coded 160) When opening a timeslot, the client can now specify the (from application perspective) timeslot read buffer size. This breaks ABI, but then we're still at a point where only prototype hardware exists, so we can get away with it. Change-Id: I6d603778cce14c5d72fe5f54904905ea7e66d7ff --- M include/osmocom/e1d/proto.h M include/osmocom/e1d/proto_clnt.h M src/ctl.c M src/e1d-ts-pipe.c M src/proto_clnt.c 5 files changed, 20 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/e1d/proto.h b/include/osmocom/e1d/proto.h index 243922d..5628e31 100644 --- a/include/osmocom/e1d/proto.h +++ b/include/osmocom/e1d/proto.h @@ -84,7 +84,7 @@ /* the idea here is to use the first byte as a version number, to prevent incompatible * clients from connecting to e1d */ -#define E1DP_MAGIC 0x00e1 +#define E1DP_MAGIC 0x01e1 #define E1DP_MAX_LEN 4096 #define E1DP_TS_SUPERCHAN 0xfe #define E1DP_INVALID 0xff @@ -118,6 +118,7 @@ struct osmo_e1dp_ts_config { uint8_t mode; + uint16_t read_bufsize; } __attribute__((packed)); struct osmo_e1dp_ts_info { diff --git a/include/osmocom/e1d/proto_clnt.h b/include/osmocom/e1d/proto_clnt.h index ff2cebf..5a4f965 100644 --- a/include/osmocom/e1d/proto_clnt.h +++ b/include/osmocom/e1d/proto_clnt.h @@ -45,4 +45,4 @@ uint8_t intf, uint8_t line, enum osmo_e1dp_line_mode mode); int osmo_e1dp_client_ts_open(struct osmo_e1dp_client *clnt, uint8_t intf, uint8_t line, uint8_t ts, - enum osmo_e1dp_ts_mode mode); + enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize); diff --git a/src/ctl.c b/src/ctl.c index d62195a..fee96f8 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -138,7 +138,7 @@ } static int -_e1d_ts_start(struct e1_ts *ts, enum e1_ts_mode mode) +_e1d_ts_start(struct e1_ts *ts, enum e1_ts_mode mode, uint16_t bufsize) { int ret, sd[2]; int sock_type; @@ -151,7 +151,7 @@ break; case E1_TS_MODE_RAW: sock_type = SOCK_STREAM; - _e1d_ts_raw_buf_realloc(ts, 160); /* TODO: make configurable */ + _e1d_ts_raw_buf_realloc(ts, bufsize); break; default: return -EINVAL; @@ -383,11 +383,14 @@ return 0; } + if (cfg->read_bufsize == 0) + return 0; + /* If already open, close previous */ e1_ts_stop(ts); /* Init */ - ret = _e1d_ts_start(ts, mode); + ret = _e1d_ts_start(ts, mode, cfg->read_bufsize); if (ret < 0) return ret; diff --git a/src/e1d-ts-pipe.c b/src/e1d-ts-pipe.c index 6d3ec80..bae45de 100644 --- a/src/e1d-ts-pipe.c +++ b/src/e1d-ts-pipe.c @@ -44,9 +44,9 @@ static int ts_open(uint8_t intf_nr, uint8_t line_nr, uint8_t ts_nr, - enum osmo_e1dp_ts_mode mode) + enum osmo_e1dp_ts_mode mode, uint16_t bufsize) { - int rc = osmo_e1dp_client_ts_open(g_client, intf_nr, line_nr, ts_nr, mode); + int rc = osmo_e1dp_client_ts_open(g_client, intf_nr, line_nr, ts_nr, mode, bufsize); if (rc < 0) fprintf(stderr, "Cannot open e1d timeslot %u:%u:%u\n", intf_nr, line_nr, ts_nr); return rc; @@ -122,6 +122,7 @@ int intf_nr = -1, line_nr = -1, ts_nr = -1; enum osmo_e1dp_ts_mode mode = E1DP_TSMODE_RAW; char *path = E1DP_DEFAULT_SOCKET; + int bufsize = 160; int tsfd; int option_index, rc; @@ -141,10 +142,11 @@ { "timeslot", 1, 0, 't' }, { "mode", 1, 0, 'm' }, { "read", 1, 0, 'r' }, + { "read-bufsize", 1, 0, 'b' }, { 0,0,0,0 } }; - c = getopt_long(argc, argv, "hp:i:l:t:m:r:", long_options, &option_index); + c = getopt_long(argc, argv, "hp:i:l:t:m:r:b:", long_options, &option_index); if (c == -1) break; @@ -180,6 +182,9 @@ } infd = rc; break; + case 'b': + bufsize = atoi(optarg); + break; } } @@ -194,7 +199,7 @@ exit(1); } - tsfd = ts_open(intf_nr, line_nr, ts_nr, mode); + tsfd = ts_open(intf_nr, line_nr, ts_nr, mode, bufsize); if (tsfd < 0) exit(2); diff --git a/src/proto_clnt.c b/src/proto_clnt.c index ca62abe..69c7234 100644 --- a/src/proto_clnt.c +++ b/src/proto_clnt.c @@ -318,7 +318,7 @@ int osmo_e1dp_client_ts_open(struct osmo_e1dp_client *clnt, uint8_t intf, uint8_t line, uint8_t ts, - enum osmo_e1dp_ts_mode mode) + enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize) { struct msgb *msgb; struct osmo_e1dp_msg_hdr hdr; @@ -333,6 +333,7 @@ memset(&cfg, 0x00, sizeof(struct osmo_e1dp_ts_config)); cfg.mode = mode; + cfg.read_bufsize = read_bufsize; tsfd = -1; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I6d603778cce14c5d72fe5f54904905ea7e66d7ff Gerrit-Change-Number: 19346 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 22 07:46:43 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 07:46:43 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f17eeea6498e_1c292ab9470d05f4285977@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 448s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o gbproxy_test.o gbproxy_test.c [ 450s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=osmo_get_rand_id -Wl,-z,relro -o gbproxy_test gbproxy_test.o ../../src/gbproxy/gb_proxy.o ../../src/gbproxy/gb_proxy_patch.o ../../src/gbproxy/gb_proxy_peer.o ../../src/gbproxy/gb_proxy_tlli.o ../../src/gprs/gprs_gb_parse.o ../../src/gprs/gprs_llc_parse.o ../../src/gprs/crc24.o ../../src/gprs/gprs_utils.o -ltalloc -losmocore -ltalloc -losmogb -losmovty -losmocore -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -losmoabis -ldl -lrt [ 450s] libtool: link: gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=osmo_get_rand_id -Wl,-z -Wl,relro -o gbproxy_test gbproxy_test.o ../../src/gbproxy/gb_proxy.o ../../src/gbproxy/gb_proxy_patch.o ../../src/gbproxy/gb_proxy_peer.o ../../src/gbproxy/gb_proxy_tlli.o ../../src/gprs/gprs_gb_parse.o ../../src/gprs/gprs_llc_parse.o ../../src/gprs/crc24.o ../../src/gprs/gprs_utils.o /usr/lib/x86_64-linux-gnu/libosmogb.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmoabis.so -ldl -lrt -pthread [ 450s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/gbproxy' [ 450s] Making all in gtphub [ 450s] make[4]: Entering directory '/usr/src/packages/BUILD/tests/gtphub' [ 450s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o gtphub_test.o gtphub_test.c [ 451s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=gtphub_resolve_ggsn_addr -Wl,--wrap=gtphub_ares_init -Wl,--wrap=gtphub_write -Wl,-z,relro -o gtphub_test gtphub_test.o ../../src/gtphub/gtphub.o ../../src/gprs/gprs_utils.o -ltalloc -losmocore -ltalloc -losmogsm -losmocore -lgtp -lrt [ 451s] libtool: link: gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=gtphub_resolve_ggsn_addr -Wl,--wrap=gtphub_ares_init -Wl,--wrap=gtphub_write -Wl,-z -Wl,relro -o gtphub_test gtphub_test.o ../../src/gtphub/gtphub.o ../../src/gprs/gprs_utils.o -ltalloc /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libgtp.so -lrt -pthread [ 451s] /usr/bin/ld: ../../src/gtphub/gtphub.o:./src/gtphub/gtphub.c:50: multiple definition of `osmo_gtphub_ctx'; gtphub_test.o:./tests/gtphub/gtphub_test.c:57: first defined here [ 451s] collect2: error: ld returned 1 exit status [ 451s] make[4]: *** [Makefile:420: gtphub_test] Error 1 [ 451s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/gtphub' [ 451s] make[3]: *** [Makefile:416: all-recursive] Error 1 [ 451s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 451s] make[2]: *** [Makefile:453: all-recursive] Error 1 [ 451s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 451s] make[1]: *** [Makefile:385: all] Error 2 [ 451s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 451s] dh_auto_build: error: make -j1 returned exit code 2 [ 451s] make: *** [debian/rules:45: build] Error 25 [ 451s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 451s] ### VM INTERACTION START ### [ 452s] Powering off. [ 452s] [ 436.416747] reboot: Power down [ 452s] ### VM INTERACTION END ### [ 452s] [ 452s] lamb20 failed "build osmo-sgsn_1.6.0.dsc" at Wed Jul 22 07:46:38 UTC 2020. [ 452s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 22 07:49:12 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 07:49:12 +0000 Subject: Change in libosmo-abis[master]: e1d: Add new osmo_e1dp_client_ts_open() argument References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19361 ) Change subject: e1d: Add new osmo_e1dp_client_ts_open() argument ...................................................................... e1d: Add new osmo_e1dp_client_ts_open() argument An additional argument was added to specify the timeslot read buffer size. Change-Id: I4a088f91f23aaad05c5ab84a4783c1915d85aca6 Depends: osmo-e1d I6d603778cce14c5d72fe5f54904905ea7e66d7ff --- M src/input/e1d.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/61/19361/1 diff --git a/src/input/e1d.c b/src/input/e1d.c index 4fc0749..3a2f385 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -245,7 +245,7 @@ } if (bfd->fd <= 0) { bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, - E1DP_TSMODE_HDLCFCS); + E1DP_TSMODE_HDLCFCS, D_TSX_ALLOC_SIZE); } if (bfd->fd < 0) { LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); @@ -275,7 +275,7 @@ } if (bfd->fd <= 0) { bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, - E1DP_TSMODE_HDLCFCS); + E1DP_TSMODE_HDLCFCS, D_TSX_ALLOC_SIZE); } if (bfd->fd < 0) { LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); @@ -298,7 +298,7 @@ } if (bfd->fd <= 0) { bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, - E1DP_TSMODE_RAW); + E1DP_TSMODE_RAW, D_TSX_ALLOC_SIZE); } if (bfd->fd < 0) { LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I4a088f91f23aaad05c5ab84a4783c1915d85aca6 Gerrit-Change-Number: 19361 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 07:49:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 07:49:34 +0000 Subject: Change in libosmo-abis[master]: e1d: Add new osmo_e1dp_client_ts_open() argument In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19361 ) Change subject: e1d: Add new osmo_e1dp_client_ts_open() argument ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I4a088f91f23aaad05c5ab84a4783c1915d85aca6 Gerrit-Change-Number: 19361 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 22 Jul 2020 07:49:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 07:50:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 07:50:22 +0000 Subject: Change in libosmo-abis[master]: e1d: Add new osmo_e1dp_client_ts_open() argument In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19361 ) Change subject: e1d: Add new osmo_e1dp_client_ts_open() argument ...................................................................... e1d: Add new osmo_e1dp_client_ts_open() argument An additional argument was added to specify the timeslot read buffer size. Change-Id: I4a088f91f23aaad05c5ab84a4783c1915d85aca6 Depends: osmo-e1d I6d603778cce14c5d72fe5f54904905ea7e66d7ff --- M src/input/e1d.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/input/e1d.c b/src/input/e1d.c index 4fc0749..3a2f385 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -245,7 +245,7 @@ } if (bfd->fd <= 0) { bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, - E1DP_TSMODE_HDLCFCS); + E1DP_TSMODE_HDLCFCS, D_TSX_ALLOC_SIZE); } if (bfd->fd < 0) { LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); @@ -275,7 +275,7 @@ } if (bfd->fd <= 0) { bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, - E1DP_TSMODE_HDLCFCS); + E1DP_TSMODE_HDLCFCS, D_TSX_ALLOC_SIZE); } if (bfd->fd < 0) { LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); @@ -298,7 +298,7 @@ } if (bfd->fd <= 0) { bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, - E1DP_TSMODE_RAW); + E1DP_TSMODE_RAW, D_TSX_ALLOC_SIZE); } if (bfd->fd < 0) { LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I4a088f91f23aaad05c5ab84a4783c1915d85aca6 Gerrit-Change-Number: 19361 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 07:53:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jul 2020 07:53:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix definition of ZeroOneGamma References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19362 ) Change subject: library/RLCMAC_CSN1_Types: fix definition of ZeroOneGamma ...................................................................... library/RLCMAC_CSN1_Types: fix definition of ZeroOneGamma Change-Id: I197f300cdfe22bba1be6341381399420e38d81ad --- M library/RLCMAC_CSN1_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/19362/1 diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index a14577a..d41f9e1 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -824,7 +824,7 @@ /* 12.13 Power Control Parameters */ type record ZeroOneGamma { BIT1 gamma_present, - uint5_t gamma + uint5_t gamma optional } with { variant (gamma) "PRESENCE (gamma_present = '1'B)" }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I197f300cdfe22bba1be6341381399420e38d81ad Gerrit-Change-Number: 19362 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 07:53:46 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jul 2020 07:53:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix definition of COMPACTreducedMA References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19363 ) Change subject: library/RLCMAC_CSN1_Types: fix definition of COMPACTreducedMA ...................................................................... library/RLCMAC_CSN1_Types: fix definition of COMPACTreducedMA Change-Id: If16359edf5f0a270af3223522b9bf5efb14412e3 --- M library/RLCMAC_CSN1_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/19363/1 diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index d41f9e1..00b6f2d 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -281,7 +281,7 @@ uint7_t ma_bitmap_length, bitstring ma_bitmap, BIT1 maio_2_present, - BIT6 maio_2 + BIT6 maio_2 optional } with { variant (ma_bitmap_length) "LENGTHTO (ma_bitmap)" variant (ma_bitmap_length) "UNIT(bits)" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If16359edf5f0a270af3223522b9bf5efb14412e3 Gerrit-Change-Number: 19363 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 07:53:47 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jul 2020 07:53:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix definition of PacketDlAssignment References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19364 ) Change subject: library/RLCMAC_CSN1_Types: fix definition of PacketDlAssignment ...................................................................... library/RLCMAC_CSN1_Types: fix definition of PacketDlAssignment - s/PacketDlAssignmentRel1999SubStruct/PktDlAssR99EGPRS/g, - fix Additions in Release 1999 (missing spare bit), - fix RLC_MODE field (it takes 1 bit, not 2), - fix PRESENCE(p0) attribute (defined twice). Change-Id: I98efe66bf43853b580f38bed36487fa10a53298a --- M library/RLCMAC_CSN1_Types.ttcn M library/RLCMAC_Templates.ttcn 2 files changed, 35 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/19364/1 diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index 00b6f2d..4ebdd75 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -122,14 +122,6 @@ TenTlli tlli }; - type record PacketDlAssignmentRel1999SubStruct { - EgprsWindowSize window_size, - BIT2 link_quality_meas_mode, - BIT1 bep_period2_present, - BIT4 bep_period2 optional - } with { - variant (bep_period2) "PRESENCE(bep_period2_present = '1'B)" - }; /* 11.2.7 Packet Downlink Assignment */ type record PacketDlAssignment { PageMode page_mode, @@ -138,7 +130,7 @@ GlobalTfiOrTlli tfi_or_tlli, BIT1 egprs2('0'B), /* TODO: implement union with egprs2 */ BIT2 mac_mode, - BIT2 rlc_mode, + BIT1 rlc_mode, BIT1 control_ack, BIT8 timeslot_alloc, PacketTimingAdvance pkt_ta, @@ -154,29 +146,51 @@ PowerControlParameters pwr_ctrl optional, BIT1 tbf_starting_time_present, StartingFnDesc tbf_starting_time optional, - BIT1 release1999('1'B), - BIT1 sub_present, - PacketDlAssignmentRel1999SubStruct sub optional, - BIT1 pkt_ext_ta_present, - BIT2 pkt_ext_ta optional, - BIT1 compact_reduced_ma_present, - COMPACTreducedMA compact_reduced_ma optional - /* TODO: Additions for REL-5 */ + /* The value '1' was allocated in an earlier version of the protocol */ + BIT1 spare ('0'B), + /* Rel-{99,5,6,7,9,10,12,14} Additions (Matrioshka) */ + PktDlAssRelAdditions rel_additions optional } with { variant (persistence_levels) "PRESENCE(pres1 = '1'B)" variant (p0) "PRESENCE(p0_present = '1'B)" - variant (p0) "PRESENCE(p0_present = '1'B)" variant (reserved) "PRESENCE(p0_present = '1'B)" variant (pr_mode) "PRESENCE(p0_present = '1'B)" variant (freq_par) "PRESENCE(freq_par_present = '1'B)" variant (dl_tfi_assignment) "PRESENCE(dl_tfi_ass_present = '1'B)" variant (pwr_ctrl) "PRESENCE(pwr_ctrl_present = '1'B)" variant (tbf_starting_time) "PRESENCE(tbf_starting_time_present = '1'B)" - variant (sub) "PRESENCE(sub_present = '1'B)" + }; + + private type record PktDlAssRelAdditions { + BIT1 rel99_presence, // 0/1 + PktDlAssR99Additions rel99 optional + } with { + variant (rel99) "PRESENCE(rel99_presence = '1'B)" + }; + + private type record PktDlAssR99Additions { + BIT1 egprs_present, + PktDlAssR99EGPRS egprs optional, + BIT1 pkt_ext_ta_present, + BIT2 pkt_ext_ta optional, + BIT1 compact_reduced_ma_present, + COMPACTreducedMA compact_reduced_ma optional + /* TODO: Additions for REL-5 */ + } with { + variant (egprs) "PRESENCE(egprs_present = '1'B)" variant (pkt_ext_ta) "PRESENCE(pkt_ext_ta_present = '1'B)" variant (compact_reduced_ma) "PRESENCE(compact_reduced_ma_present = '1'B)" }; + private type record PktDlAssR99EGPRS { + EgprsWindowSize window_size, + BIT2 link_quality_meas_mode, + BIT1 bep_period2_present, + BIT4 bep_period2 optional + } with { + variant (bep_period2) "PRESENCE(bep_period2_present = '1'B)" + }; + /* 11.2.29 Packet Uplink Assignment */ type record O_Gtfi { BIT1 presence ('0'B), diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index a217f46..5bdc17d 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -504,13 +504,8 @@ pwr_ctrl := *, tbf_starting_time_present := ?, tbf_starting_time := *, - release1999 := '1'B, - sub_present := ?, - sub := *, - pkt_ext_ta_present := ?, - pkt_ext_ta := *, - compact_reduced_ma_present := ?, - compact_reduced_ma := * + spare := '0'B, + rel_additions := * } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I98efe66bf43853b580f38bed36487fa10a53298a Gerrit-Change-Number: 19364 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 08:13:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 08:13:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix definition of ZeroOneGamma In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19362 ) Change subject: library/RLCMAC_CSN1_Types: fix definition of ZeroOneGamma ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I197f300cdfe22bba1be6341381399420e38d81ad Gerrit-Change-Number: 19362 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 22 Jul 2020 08:13:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 08:13:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 08:13:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix definition of COMPACTreducedMA In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19363 ) Change subject: library/RLCMAC_CSN1_Types: fix definition of COMPACTreducedMA ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If16359edf5f0a270af3223522b9bf5efb14412e3 Gerrit-Change-Number: 19363 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 22 Jul 2020 08:13:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 08:14:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 08:14:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix definition of PacketDlAssignment In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19364 ) Change subject: library/RLCMAC_CSN1_Types: fix definition of PacketDlAssignment ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I98efe66bf43853b580f38bed36487fa10a53298a Gerrit-Change-Number: 19364 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 22 Jul 2020 08:14:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 10:58:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 22 Jul 2020 10:58:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_si_acc_rotate In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 to look at the new patch set (#2). Change subject: bsc: Introduce test TC_si_acc_rotate ...................................................................... bsc: Introduce test TC_si_acc_rotate Related: SYS#4911 Change-Id: I18d0243353fce547d126d62c34415628a21cb52b --- M bsc/BSC_Tests.ttcn 1 file changed, 73 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/59/19359/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I18d0243353fce547d126d62c34415628a21cb52b Gerrit-Change-Number: 19359 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 12:10:02 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 22 Jul 2020 12:10:02 +0000 Subject: Change in osmo-bts[master]: bts-trx: Use bool type for on/off state variables References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19365 ) Change subject: bts-trx: Use bool type for on/off state variables ...................................................................... bts-trx: Use bool type for on/off state variables Change-Id: Icb1b7bd8852417ab7b9a7dbc205aa6f6db97d64d --- M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/trx_provision_fsm.c M src/osmo-bts-trx/trx_vty.c 3 files changed, 36 insertions(+), 36 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/65/19365/1 diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h index 07751f2..f35936e 100644 --- a/src/osmo-bts-trx/l1_if.h +++ b/src/osmo-bts-trx/l1_if.h @@ -60,44 +60,44 @@ struct trx_config { uint8_t trxd_hdr_ver_req; /* requested TRXD header version */ uint8_t trxd_hdr_ver_use; /* actual TRXD header version in use */ - int setformat_sent; + bool setformat_sent; bool enabled; - int arfcn_valid; + bool arfcn_valid; uint16_t arfcn; - int arfcn_sent; + bool arfcn_sent; - int tsc_valid; + bool tsc_valid; uint8_t tsc; - int tsc_sent; + bool tsc_sent; - int bsic_valid; + bool bsic_valid; uint8_t bsic; - int bsic_sent; + bool bsic_sent; - int rxgain_valid; + bool rxgain_valid; uint8_t rxgain; - int rxgain_sent; + bool rxgain_sent; int forced_max_power_red; /* -1 if not forced by VTY config (default) */ bool nominal_power_set_by_vty; /* whether nominal trx power was enforced/retreived from VTY config "nominal-tx-power" */ - int maxdly_valid; + bool maxdly_valid; int maxdly; - int maxdly_sent; + bool maxdly_sent; - int maxdlynb_valid; + bool maxdlynb_valid; int maxdlynb; - int maxdlynb_sent; + bool maxdlynb_sent; uint8_t slotmask; - int slottype_valid[TRX_NR_TS]; + bool slottype_valid[TRX_NR_TS]; uint8_t slottype[TRX_NR_TS]; - int slottype_sent[TRX_NR_TS]; + bool slottype_sent[TRX_NR_TS]; }; struct trx_l1h { diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index c3b266d..00e6ef4 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -102,15 +102,15 @@ * provide broken values) */ if (!l1h->config.nominal_power_set_by_vty) trx_if_cmd_getnompower(l1h, l1if_getnompower_cb); - l1h->config.arfcn_sent = 1; + l1h->config.arfcn_sent = true; } if (!l1h->config.tsc_sent) { trx_if_cmd_settsc(l1h, l1h->config.tsc); - l1h->config.tsc_sent = 1; + l1h->config.tsc_sent = true; } if (!l1h->config.bsic_sent) { trx_if_cmd_setbsic(l1h, l1h->config.bsic); - l1h->config.bsic_sent = 1; + l1h->config.bsic_sent = true; } /* Ask transceiver to use the newest TRXD header version if not using it yet */ @@ -124,7 +124,7 @@ "already using maximum configured one: %" PRIu8 "\n", l1h->config.trxd_hdr_ver_use); } - l1h->config.setformat_sent = 1; + l1h->config.setformat_sent = true; } if (pinst->num == 0 && !plink->u.osmotrx.powered && !plink->u.osmotrx.poweronoff_sent) { @@ -175,8 +175,8 @@ if (l1h->config.slottype[ts_data->tn] != ts_data->slottype || !l1h->config.slottype_valid[ts_data->tn]) { l1h->config.slottype[ts_data->tn] = ts_data->slottype; - l1h->config.slottype_valid[ts_data->tn] = 1; - l1h->config.slottype_sent[ts_data->tn] = 0; + l1h->config.slottype_valid[ts_data->tn] = true; + l1h->config.slottype_sent[ts_data->tn] = false; return true; } return false; @@ -218,7 +218,7 @@ if (l1h->config.bsic != bsic || !l1h->config.bsic_valid) { l1h->config.bsic = bsic; l1h->config.bsic_valid = 1; - l1h->config.bsic_sent = 0; + l1h->config.bsic_sent = false; } break; case TRX_PROV_EV_CFG_ARFCN: @@ -226,7 +226,7 @@ if (l1h->config.arfcn != arfcn || !l1h->config.arfcn_valid) { l1h->config.arfcn = arfcn; l1h->config.arfcn_valid = 1; - l1h->config.arfcn_sent = 0; + l1h->config.arfcn_sent = false; } break; case TRX_PROV_EV_CFG_TSC: @@ -234,7 +234,7 @@ if (l1h->config.tsc != tsc || !l1h->config.tsc_valid) { l1h->config.tsc = tsc; l1h->config.tsc_valid = 1; - l1h->config.tsc_sent = 0; + l1h->config.tsc_sent = false; } break; case TRX_PROV_EV_CFG_TS: @@ -291,15 +291,15 @@ /* after power on */ if (l1h->config.rxgain_valid && !l1h->config.rxgain_sent) { trx_if_cmd_setrxgain(l1h, l1h->config.rxgain); - l1h->config.rxgain_sent = 1; + l1h->config.rxgain_sent = true; } if (l1h->config.maxdly_valid && !l1h->config.maxdly_sent) { trx_if_cmd_setmaxdly(l1h, l1h->config.maxdly); - l1h->config.maxdly_sent = 1; + l1h->config.maxdly_sent = true; } if (l1h->config.maxdlynb_valid && !l1h->config.maxdlynb_sent) { trx_if_cmd_setmaxdlynb(l1h, l1h->config.maxdlynb); - l1h->config.maxdlynb_sent = 1; + l1h->config.maxdlynb_sent = true; } for (tn = 0; tn < TRX_NR_TS; tn++) { @@ -307,7 +307,7 @@ && !l1h->config.slottype_sent[tn]) { trx_if_cmd_setslot(l1h, tn, l1h->config.slottype[tn], l1if_setslot_cb); - l1h->config.slottype_sent[tn] = 1; + l1h->config.slottype_sent[tn] = true; } } } @@ -328,11 +328,11 @@ trx_if_cmd_poweroff(l1h, l1if_poweronoff_cb); plink->u.osmotrx.poweronoff_sent = true; } - l1h->config.rxgain_sent = 0; - l1h->config.maxdly_sent = 0; - l1h->config.maxdlynb_sent = 0; + l1h->config.rxgain_sent = false; + l1h->config.maxdly_sent = false; + l1h->config.maxdlynb_sent = false; for (tn = 0; tn < TRX_NR_TS; tn++) - l1h->config.slottype_sent[tn] = 0; + l1h->config.slottype_sent[tn] = false; } else if (!pinst->phy_link->u.osmotrx.poweronoff_sent) { bts_model_trx_close_cb(pinst->trx, 0); } /* else: poweroff in progress, cb will be called upon TRXC RSP */ @@ -347,7 +347,7 @@ if (update_ts_data(l1h, ts_data)) { trx_if_cmd_setslot(l1h, ts_data->tn, l1h->config.slottype[ ts_data->tn], l1if_setslot_cb); - l1h->config.slottype_sent[ ts_data->tn] = 1; + l1h->config.slottype_sent[ts_data->tn] = true; } break; diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index fb75a4e..6b8ca77 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -245,7 +245,7 @@ l1h->config.maxdly = atoi(argv[0]); l1h->config.maxdly_valid = 1; - l1h->config.maxdly_sent = 0; + l1h->config.maxdly_sent = false; l1if_provision_transceiver_trx(l1h); return CMD_SUCCESS; @@ -271,7 +271,7 @@ l1h->config.maxdlynb = atoi(argv[0]); l1h->config.maxdlynb_valid = 1; - l1h->config.maxdlynb_sent = 0; + l1h->config.maxdlynb_sent = false; l1if_provision_transceiver_trx(l1h); return CMD_SUCCESS; @@ -358,7 +358,7 @@ l1h->config.rxgain = atoi(argv[0]); l1h->config.rxgain_valid = 1; - l1h->config.rxgain_sent = 0; + l1h->config.rxgain_sent = false; l1if_provision_transceiver_trx(l1h); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icb1b7bd8852417ab7b9a7dbc205aa6f6db97d64d Gerrit-Change-Number: 19365 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 13:01:51 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jul 2020 13:01:51 +0000 Subject: Change in osmocom-bb[master]: Revert "trx_toolkit/transceiver.py: implement the transmit burst queue" References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19366 ) Change subject: Revert "trx_toolkit/transceiver.py: implement the transmit burst queue" ...................................................................... Revert "trx_toolkit/transceiver.py: implement the transmit burst queue" This reverts commit 6e1c82d29836496b20e0d826976d9e71b32493d8. Unfortunately, solving one problem it introduced even more regressions. Change-Id: If29b4f6718cbc8af18fe18a5e3eca3912e8af01e Related: OS#4658 --- M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/transceiver.py 2 files changed, 4 insertions(+), 74 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/66/19366/1 diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index da611e8..ded8dc4 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -388,8 +388,6 @@ # Init shared clock generator self.clck_gen = CLCKGen([]) - # This method will be called on each TDMA frame - self.clck_gen.clck_handler = self.clck_handler # Power measurement emulation # Noise: -120 .. -105 @@ -458,18 +456,14 @@ for trx in self.trx_list.trx_list: # DATA interface if trx.data_if.sock in r_event: - trx.recv_data_msg() + msg = trx.recv_data_msg() + if msg is not None: + self.burst_fwd.forward_msg(trx, msg) # CTRL interface if trx.ctrl_if.sock in r_event: trx.ctrl_if.handle_rx() - # This method will be called by the clock thread - def clck_handler(self, fn): - # We assume that this list is immutable at run-time - for trx in self.trx_list.trx_list: - trx.clck_tick(self.burst_fwd, fn) - def shutdown(self): log.info("Shutting down...") diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 9fc2948..19b998e 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -23,7 +23,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import logging as log -import threading from ctrl_if_trx import CTRLInterfaceTRX from data_if import DATAInterface @@ -123,37 +122,6 @@ Transceiver and all its timeslots, so using in for the BTS side does not make any sense (imagine BCCH hopping together with DCCH). - == The transmit burst queue - - According to 3GPP 45.002, the time difference between Uplink and - Downlink corresponds to three TDMA timeslot periods. However, - in general the L1 implementations (such as osmo-bts-trx and trxcon) - never schedule to be transmitted bursts for the current TDMA frame - immediately. Instead, they are being scheduled prematurely. - - The rationale is that both transceiver and the L1 implementation - are separete processes that are not perfectly synchronized in time. - Moreover, the transceiver needs some time to prepare a burst for - transmission. This is why the time difference between Uplink and - Downlink is actually much higher on practice (20 TDMA frame periods - by default, at the moment of writing this patch). - - In order to reflect that delay in a virtual environment, this - implementation, just like a normal transceiver (e.g. osmo-trx), - queues all to be transmitted (L12TRX) bursts, so hey remain in - the transmit queue until the appropriate time of transmission. - - The API user is supposed to call recv_data_msg() in order to obtain - a L12TRX message on the TRXD (data) inteface, so it gets queued by - this function. Then, to ensure the timeous transmission, the user - of this implementation needs to call clck_tick() on each TDMA - frame. Both functions are thread-safe (queue mutex). - - In a multi-trx configuration, the use of queue additionally ensures - proper burst aggregation on multiple TRXD connections, so all L12TRX - messages are guaranteed to be sent in the right order, i.e. with - monolithically-increasing TDMA frame numbers. - """ def __init__(self, bind_addr, remote_addr, base_port, name = None, @@ -209,10 +177,6 @@ # List of child transceivers self.child_trx_list = TRXList() - # Tx (L12TRX) burst queue and mutex - self._tx_queue_lock = threading.Lock() - self._tx_queue = [] - def __str__(self): desc = "%s:%d" % (self.remote_addr, self.base_port) if self.child_idx > 0: @@ -269,12 +233,10 @@ trx.running = True elif event == "POWEROFF": trx.running = False - trx.tx_queue_clear() trx.disable_fh() - # Reset frequency hopping parameters, clear the queue + # Reset frequency hopping parameters if event == "POWEROFF": - self.tx_queue_clear() self.disable_fh() # Trigger clock generator if required @@ -312,34 +274,8 @@ "configured => dropping..." % (self, msg.desc_hdr())) return None - # Enque the message, it will be sent later - self.tx_queue_append(msg) return msg def handle_data_msg(self, msg): # TODO: make legacy mode configurable (via argv?) self.data_if.send_msg(msg, legacy = True) - - def tx_queue_append(self, msg): - with self._tx_queue_lock: - self._tx_queue.append(msg) - - def tx_queue_clear(self): - with self._tx_queue_lock: - self._tx_queue.clear() - - def clck_tick(self, fwd, fn): - if not self.running: - return - - self._tx_queue_lock.acquire() - - for msg in self._tx_queue: - if msg.fn == fn: - fwd.forward_msg(self, msg) - elif msg.fn < fn: - log.warning("(%s) Stale TRXD message (fn=%u): %s" - % (self, fn, msg.desc_hdr())) - - self._tx_queue = [msg for msg in self._tx_queue if msg.fn > fn] - self._tx_queue_lock.release() -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If29b4f6718cbc8af18fe18a5e3eca3912e8af01e Gerrit-Change-Number: 19366 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 13:50:25 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jul 2020 13:50:25 +0000 Subject: Change in osmocom-bb[master]: Revert "trx_toolkit/transceiver.py: implement the transmit burst queue" In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19366 ) Change subject: Revert "trx_toolkit/transceiver.py: implement the transmit burst queue" ...................................................................... Patch Set 1: Verified+1 This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If29b4f6718cbc8af18fe18a5e3eca3912e8af01e Gerrit-Change-Number: 19366 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 22 Jul 2020 13:50:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 17:53:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 22 Jul 2020 17:53:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix definition of ZeroOneGamma In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19362 ) Change subject: library/RLCMAC_CSN1_Types: fix definition of ZeroOneGamma ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I197f300cdfe22bba1be6341381399420e38d81ad Gerrit-Change-Number: 19362 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 22 Jul 2020 17:53:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 17:53:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 22 Jul 2020 17:53:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix definition of COMPACTreducedMA In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19363 ) Change subject: library/RLCMAC_CSN1_Types: fix definition of COMPACTreducedMA ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If16359edf5f0a270af3223522b9bf5efb14412e3 Gerrit-Change-Number: 19363 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 22 Jul 2020 17:53:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 17:55:26 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 22 Jul 2020 17:55:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix definition of PacketDlAssignment In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19364 ) Change subject: library/RLCMAC_CSN1_Types: fix definition of PacketDlAssignment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I98efe66bf43853b580f38bed36487fa10a53298a Gerrit-Change-Number: 19364 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 22 Jul 2020 17:55:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 17:56:47 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jul 2020 17:56:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix definition of ZeroOneGamma In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19362 ) Change subject: library/RLCMAC_CSN1_Types: fix definition of ZeroOneGamma ...................................................................... library/RLCMAC_CSN1_Types: fix definition of ZeroOneGamma Change-Id: I197f300cdfe22bba1be6341381399420e38d81ad --- M library/RLCMAC_CSN1_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, approved diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index a14577a..d41f9e1 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -824,7 +824,7 @@ /* 12.13 Power Control Parameters */ type record ZeroOneGamma { BIT1 gamma_present, - uint5_t gamma + uint5_t gamma optional } with { variant (gamma) "PRESENCE (gamma_present = '1'B)" }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I197f300cdfe22bba1be6341381399420e38d81ad Gerrit-Change-Number: 19362 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 17:56:47 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jul 2020 17:56:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix definition of COMPACTreducedMA In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19363 ) Change subject: library/RLCMAC_CSN1_Types: fix definition of COMPACTreducedMA ...................................................................... library/RLCMAC_CSN1_Types: fix definition of COMPACTreducedMA Change-Id: If16359edf5f0a270af3223522b9bf5efb14412e3 --- M library/RLCMAC_CSN1_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index d41f9e1..00b6f2d 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -281,7 +281,7 @@ uint7_t ma_bitmap_length, bitstring ma_bitmap, BIT1 maio_2_present, - BIT6 maio_2 + BIT6 maio_2 optional } with { variant (ma_bitmap_length) "LENGTHTO (ma_bitmap)" variant (ma_bitmap_length) "UNIT(bits)" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If16359edf5f0a270af3223522b9bf5efb14412e3 Gerrit-Change-Number: 19363 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 17:56:48 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jul 2020 17:56:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix definition of PacketDlAssignment In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19364 ) Change subject: library/RLCMAC_CSN1_Types: fix definition of PacketDlAssignment ...................................................................... library/RLCMAC_CSN1_Types: fix definition of PacketDlAssignment - s/PacketDlAssignmentRel1999SubStruct/PktDlAssR99EGPRS/g, - fix Additions in Release 1999 (missing spare bit), - fix RLC_MODE field (it takes 1 bit, not 2), - fix PRESENCE(p0) attribute (defined twice). Change-Id: I98efe66bf43853b580f38bed36487fa10a53298a --- M library/RLCMAC_CSN1_Types.ttcn M library/RLCMAC_Templates.ttcn 2 files changed, 35 insertions(+), 26 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index 00b6f2d..4ebdd75 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -122,14 +122,6 @@ TenTlli tlli }; - type record PacketDlAssignmentRel1999SubStruct { - EgprsWindowSize window_size, - BIT2 link_quality_meas_mode, - BIT1 bep_period2_present, - BIT4 bep_period2 optional - } with { - variant (bep_period2) "PRESENCE(bep_period2_present = '1'B)" - }; /* 11.2.7 Packet Downlink Assignment */ type record PacketDlAssignment { PageMode page_mode, @@ -138,7 +130,7 @@ GlobalTfiOrTlli tfi_or_tlli, BIT1 egprs2('0'B), /* TODO: implement union with egprs2 */ BIT2 mac_mode, - BIT2 rlc_mode, + BIT1 rlc_mode, BIT1 control_ack, BIT8 timeslot_alloc, PacketTimingAdvance pkt_ta, @@ -154,29 +146,51 @@ PowerControlParameters pwr_ctrl optional, BIT1 tbf_starting_time_present, StartingFnDesc tbf_starting_time optional, - BIT1 release1999('1'B), - BIT1 sub_present, - PacketDlAssignmentRel1999SubStruct sub optional, - BIT1 pkt_ext_ta_present, - BIT2 pkt_ext_ta optional, - BIT1 compact_reduced_ma_present, - COMPACTreducedMA compact_reduced_ma optional - /* TODO: Additions for REL-5 */ + /* The value '1' was allocated in an earlier version of the protocol */ + BIT1 spare ('0'B), + /* Rel-{99,5,6,7,9,10,12,14} Additions (Matrioshka) */ + PktDlAssRelAdditions rel_additions optional } with { variant (persistence_levels) "PRESENCE(pres1 = '1'B)" variant (p0) "PRESENCE(p0_present = '1'B)" - variant (p0) "PRESENCE(p0_present = '1'B)" variant (reserved) "PRESENCE(p0_present = '1'B)" variant (pr_mode) "PRESENCE(p0_present = '1'B)" variant (freq_par) "PRESENCE(freq_par_present = '1'B)" variant (dl_tfi_assignment) "PRESENCE(dl_tfi_ass_present = '1'B)" variant (pwr_ctrl) "PRESENCE(pwr_ctrl_present = '1'B)" variant (tbf_starting_time) "PRESENCE(tbf_starting_time_present = '1'B)" - variant (sub) "PRESENCE(sub_present = '1'B)" + }; + + private type record PktDlAssRelAdditions { + BIT1 rel99_presence, // 0/1 + PktDlAssR99Additions rel99 optional + } with { + variant (rel99) "PRESENCE(rel99_presence = '1'B)" + }; + + private type record PktDlAssR99Additions { + BIT1 egprs_present, + PktDlAssR99EGPRS egprs optional, + BIT1 pkt_ext_ta_present, + BIT2 pkt_ext_ta optional, + BIT1 compact_reduced_ma_present, + COMPACTreducedMA compact_reduced_ma optional + /* TODO: Additions for REL-5 */ + } with { + variant (egprs) "PRESENCE(egprs_present = '1'B)" variant (pkt_ext_ta) "PRESENCE(pkt_ext_ta_present = '1'B)" variant (compact_reduced_ma) "PRESENCE(compact_reduced_ma_present = '1'B)" }; + private type record PktDlAssR99EGPRS { + EgprsWindowSize window_size, + BIT2 link_quality_meas_mode, + BIT1 bep_period2_present, + BIT4 bep_period2 optional + } with { + variant (bep_period2) "PRESENCE(bep_period2_present = '1'B)" + }; + /* 11.2.29 Packet Uplink Assignment */ type record O_Gtfi { BIT1 presence ('0'B), diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index a217f46..5bdc17d 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -504,13 +504,8 @@ pwr_ctrl := *, tbf_starting_time_present := ?, tbf_starting_time := *, - release1999 := '1'B, - sub_present := ?, - sub := *, - pkt_ext_ta_present := ?, - pkt_ext_ta := *, - compact_reduced_ma_present := ?, - compact_reduced_ma := * + spare := '0'B, + rel_additions := * } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I98efe66bf43853b580f38bed36487fa10a53298a Gerrit-Change-Number: 19364 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 17:58:23 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jul 2020 17:58:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_si_acc_rotate In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 ) Change subject: bsc: Introduce test TC_si_acc_rotate ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I18d0243353fce547d126d62c34415628a21cb52b Gerrit-Change-Number: 19359 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 22 Jul 2020 17:58:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 17:58:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 22 Jul 2020 17:58:59 +0000 Subject: Change in osmo-bts[master]: bts-trx: Use bool type for on/off state variables In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19365 to look at the new patch set (#2). Change subject: bts-trx: Use bool type for on/off state variables ...................................................................... bts-trx: Use bool type for on/off state variables Change-Id: Icb1b7bd8852417ab7b9a7dbc205aa6f6db97d64d --- M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/trx_provision_fsm.c M src/osmo-bts-trx/trx_vty.c 3 files changed, 39 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/65/19365/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icb1b7bd8852417ab7b9a7dbc205aa6f6db97d64d Gerrit-Change-Number: 19365 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 17:59:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 22 Jul 2020 17:59:00 +0000 Subject: Change in osmo-bts[master]: bts-trx: Integrate TRX provisioning logic more tightly into the FSM References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19367 ) Change subject: bts-trx: Integrate TRX provisioning logic more tightly into the FSM ...................................................................... bts-trx: Integrate TRX provisioning logic more tightly into the FSM The state of each config required is now tracked through the "acked" variables, this way the FSM can know when all configs are confirmed by the TRX and can proceed to submit POWERON command. With this version each TRX is still totally independent (there's an FSM per TRX), which means POWERON can be sent on TRX0 before TRX!=0 are fully configured. As a result, powe ramping may start before we know the NOMTXPOWER of a TRX. This kind of issue will be fixed in next commit. Related: SYS#4920 Change-Id: I1b736a4be5ce52a854f5767d8609153e1f4c08d9 --- M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/trx_if.c M src/osmo-bts-trx/trx_if.h M src/osmo-bts-trx/trx_provision_fsm.c M src/osmo-bts-trx/trx_provision_fsm.h 5 files changed, 230 insertions(+), 89 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/67/19367/1 diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h index f35936e..fb988a6 100644 --- a/src/osmo-bts-trx/l1_if.h +++ b/src/osmo-bts-trx/l1_if.h @@ -61,21 +61,27 @@ uint8_t trxd_hdr_ver_req; /* requested TRXD header version */ uint8_t trxd_hdr_ver_use; /* actual TRXD header version in use */ bool setformat_sent; + bool setformat_acked; bool enabled; bool arfcn_valid; uint16_t arfcn; - bool arfcn_sent; + bool rxtune_sent; + bool rxtune_acked; + bool txtune_sent; + bool txtune_acked; bool tsc_valid; uint8_t tsc; bool tsc_sent; + bool tsc_acked; bool bsic_valid; uint8_t bsic; bool bsic_sent; + bool bsic_acked; bool rxgain_valid; uint8_t rxgain; @@ -84,6 +90,8 @@ int forced_max_power_red; /* -1 if not forced by VTY config (default) */ bool nominal_power_set_by_vty; /* whether nominal trx power was enforced/retreived from VTY config "nominal-tx-power" */ + bool nomtxpower_sent; + bool nomtxpower_acked; bool maxdly_valid; int maxdly; diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index e650d79..ad6faad 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -270,32 +270,24 @@ } /*! Send "SETFORMAT" command to TRX: change TRXD header format version */ -int trx_if_cmd_setformat(struct trx_l1h *l1h, uint8_t ver) +int trx_if_cmd_setformat(struct trx_l1h *l1h, uint8_t ver, trx_if_cmd_generic_cb *cb) { LOGPPHI(l1h->phy_inst, DTRX, LOGL_INFO, "Requesting TRXD header format version %u\n", ver); - return trx_ctrl_cmd(l1h, 0, "SETFORMAT", "%u", ver); + return trx_ctrl_cmd_cb(l1h, 0, cb, "SETFORMAT", "%u", ver); } /*! Send "SETTSC" command to TRX */ -int trx_if_cmd_settsc(struct trx_l1h *l1h, uint8_t tsc) +int trx_if_cmd_settsc(struct trx_l1h *l1h, uint8_t tsc, trx_if_cmd_generic_cb *cb) { - struct phy_instance *pinst = l1h->phy_inst; - if (pinst->phy_link->u.osmotrx.use_legacy_setbsic) - return 0; - - return trx_ctrl_cmd(l1h, 1, "SETTSC", "%d", tsc); + return trx_ctrl_cmd_cb(l1h, 1, cb, "SETTSC", "%d", tsc); } /*! Send "SETBSIC" command to TRX */ -int trx_if_cmd_setbsic(struct trx_l1h *l1h, uint8_t bsic) +int trx_if_cmd_setbsic(struct trx_l1h *l1h, uint8_t bsic, trx_if_cmd_generic_cb *cb) { - struct phy_instance *pinst = l1h->phy_inst; - if (!pinst->phy_link->u.osmotrx.use_legacy_setbsic) - return 0; - - return trx_ctrl_cmd(l1h, 1, "SETBSIC", "%d", bsic); + return trx_ctrl_cmd_cb(l1h, 1, cb, "SETBSIC", "%d", bsic); } /*! Send "SETRXGAIN" command to TRX */ @@ -335,7 +327,7 @@ } /*! Send "RXTUNE" command to TRX: Tune Receiver to given ARFCN */ -int trx_if_cmd_rxtune(struct trx_l1h *l1h, uint16_t arfcn) +int trx_if_cmd_rxtune(struct trx_l1h *l1h, uint16_t arfcn, trx_if_cmd_generic_cb *cb) { struct phy_instance *pinst = l1h->phy_inst; uint16_t freq10; @@ -350,11 +342,11 @@ return -ENOTSUP; } - return trx_ctrl_cmd(l1h, 1, "RXTUNE", "%d", freq10 * 100); + return trx_ctrl_cmd_cb(l1h, 1, cb, "RXTUNE", "%d", freq10 * 100); } /*! Send "TXTUNE" command to TRX: Tune Transmitter to given ARFCN */ -int trx_if_cmd_txtune(struct trx_l1h *l1h, uint16_t arfcn) +int trx_if_cmd_txtune(struct trx_l1h *l1h, uint16_t arfcn, trx_if_cmd_generic_cb *cb) { struct phy_instance *pinst = l1h->phy_inst; uint16_t freq10; @@ -369,7 +361,7 @@ return -ENOTSUP; } - return trx_ctrl_cmd(l1h, 1, "TXTUNE", "%d", freq10 * 100); + return trx_ctrl_cmd_cb(l1h, 1, cb, "TXTUNE", "%d", freq10 * 100); } /*! Send "HANDOVER" command to TRX: Enable handover RACH Detection on timeslot/sub-slot */ @@ -516,12 +508,17 @@ static int trx_ctrl_rx_rsp_setformat(struct trx_l1h *l1h, struct trx_ctrl_rsp *rsp) { + trx_if_cmd_generic_cb *cb; + /* Old transceivers reject 'SETFORMAT' with 'RSP ERR 1' */ if (strcmp(rsp->cmd, "SETFORMAT") != 0) { LOGPPHI(l1h->phy_inst, DTRX, LOGL_NOTICE, "Transceiver rejected the format negotiation command, " "using legacy TRXD header format version (0)\n"); - l1h->config.trxd_hdr_ver_use = 0; + if (rsp->cb) { + cb = (trx_if_cmd_generic_cb*) rsp->cb; + cb(l1h, 0); + } return 0; } @@ -534,19 +531,9 @@ return -EINVAL; } - /* Transceiver may suggest a lower version (than requested) */ - if (rsp->status == l1h->config.trxd_hdr_ver_req) { - l1h->config.trxd_hdr_ver_use = rsp->status; - LOGPPHI(l1h->phy_inst, DTRX, LOGL_INFO, - "Using TRXD header format version %u\n", - l1h->config.trxd_hdr_ver_use); - } else { - LOGPPHI(l1h->phy_inst, DTRX, LOGL_DEBUG, - "Transceiver suggests TRXD header version %u (requested %u)\n", - rsp->status, l1h->config.trxd_hdr_ver_req); - /* Send another SETFORMAT with suggested version */ - l1h->config.trxd_hdr_ver_req = rsp->status; - trx_if_cmd_setformat(l1h, rsp->status); + if (rsp->cb) { + cb = (trx_if_cmd_generic_cb*) rsp->cb; + cb(l1h, rsp->status); } return 0; @@ -595,6 +582,8 @@ struct trx_ctrl_rsp *rsp, struct trx_ctrl_msg *tcm) { + trx_if_cmd_generic_cb *cb; + if (strcmp(rsp->cmd, "POWERON") == 0) { return trx_ctrl_rx_rsp_poweron(l1h, rsp); } else if (strcmp(rsp->cmd, "POWEROFF") == 0) { @@ -611,6 +600,12 @@ return trx_ctrl_rx_rsp_setpower(l1h, rsp); } + /* Generic callback if available */ + if (rsp->cb) { + cb = (trx_if_cmd_generic_cb*) rsp->cb; + cb(l1h, rsp->status); + } + if (rsp->status) { LOGPPHI(l1h->phy_inst, DTRX, tcm->critical ? LOGL_FATAL : LOGL_NOTICE, "transceiver rejected TRX command with response: '%s%s%s %d'\n", diff --git a/src/osmo-bts-trx/trx_if.h b/src/osmo-bts-trx/trx_if.h index b2fc326..6b417cf 100644 --- a/src/osmo-bts-trx/trx_if.h +++ b/src/osmo-bts-trx/trx_if.h @@ -14,6 +14,7 @@ void *cb; }; +typedef void trx_if_cmd_generic_cb(struct trx_l1h *l1h, int rc); typedef void trx_if_cmd_poweronoff_cb(struct trx_l1h *l1h, bool poweronoff, int rc); typedef void trx_if_cmd_setslot_cb(struct trx_l1h *l1h, uint8_t tn, uint8_t type, int rc); typedef void trx_if_cmd_getnompower_cb(struct trx_l1h *l1h, int nominal_power, int rc); @@ -22,16 +23,16 @@ void trx_if_init(struct trx_l1h *l1h); int trx_if_cmd_poweroff(struct trx_l1h *l1h, trx_if_cmd_poweronoff_cb *cb); int trx_if_cmd_poweron(struct trx_l1h *l1h, trx_if_cmd_poweronoff_cb *cb); -int trx_if_cmd_settsc(struct trx_l1h *l1h, uint8_t tsc); -int trx_if_cmd_setbsic(struct trx_l1h *l1h, uint8_t bsic); +int trx_if_cmd_settsc(struct trx_l1h *l1h, uint8_t tsc, trx_if_cmd_generic_cb *cb); +int trx_if_cmd_setbsic(struct trx_l1h *l1h, uint8_t bsic, trx_if_cmd_generic_cb *cb); int trx_if_cmd_setrxgain(struct trx_l1h *l1h, int db); int trx_if_cmd_getnompower(struct trx_l1h *l1h, trx_if_cmd_getnompower_cb *cb); int trx_if_cmd_setpower_att(struct trx_l1h *l1h, int power_att_db, trx_if_cmd_setpower_att_cb *cb); int trx_if_cmd_setmaxdly(struct trx_l1h *l1h, int dly); int trx_if_cmd_setmaxdlynb(struct trx_l1h *l1h, int dly); int trx_if_cmd_setslot(struct trx_l1h *l1h, uint8_t tn, uint8_t type, trx_if_cmd_setslot_cb *cb); -int trx_if_cmd_rxtune(struct trx_l1h *l1h, uint16_t arfcn); -int trx_if_cmd_txtune(struct trx_l1h *l1h, uint16_t arfcn); +int trx_if_cmd_rxtune(struct trx_l1h *l1h, uint16_t arfcn, trx_if_cmd_generic_cb *cb); +int trx_if_cmd_txtune(struct trx_l1h *l1h, uint16_t arfcn, trx_if_cmd_generic_cb *cb); int trx_if_cmd_handover(struct trx_l1h *l1h, uint8_t tn, uint8_t ss); int trx_if_cmd_nohandover(struct trx_l1h *l1h, uint8_t tn, uint8_t ss); int trx_if_send_burst(struct trx_l1h *l1h, const struct trx_dl_burst_req *br); @@ -41,6 +42,6 @@ #define TRX_DATA_FORMAT_VER 1 /* Format negotiation command */ -int trx_if_cmd_setformat(struct trx_l1h *l1h, uint8_t ver); +int trx_if_cmd_setformat(struct trx_l1h *l1h, uint8_t ver, trx_if_cmd_generic_cb *cb); #endif /* TRX_IF_H */ diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index fbeee37..611ec69 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -56,14 +56,37 @@ osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_POWEROFF_CNF, (void*)(intptr_t)rc); } + +void l1if_rxtune_cb(struct trx_l1h *l1h, int rc) +{ + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_RXTUNE_CNF, (void*)(intptr_t)rc); +} + +void l1if_txtune_cb(struct trx_l1h *l1h, int rc) +{ + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_TXTUNE_CNF, (void*)(intptr_t)rc); +} + +void l1if_settsc_cb(struct trx_l1h *l1h, int rc) +{ + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_SETTSC_CNF, (void*)(intptr_t)rc); +} + +void l1if_setbsic_cb(struct trx_l1h *l1h, int rc) +{ + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_SETBSIC_CNF, (void*)(intptr_t)rc); +} + static void l1if_getnompower_cb(struct trx_l1h *l1h, int nominal_power, int rc) { struct phy_instance *pinst = l1h->phy_inst; - struct gsm_bts_trx *trx = pinst->trx; - LOGPPHI(pinst, DL1C, LOGL_DEBUG, "l1if_getnompower_cb(nominal_power=%d, rc=%d)\n", nominal_power, rc); + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_NOMTXPOWER_CNF, (void*)(intptr_t)nominal_power); +} - l1if_trx_set_nominal_power(trx, nominal_power); +void l1if_setformat_cb(struct trx_l1h *l1h, int rc) +{ + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_SETFORMAT_CNF, (void*)(intptr_t)rc); } /* @@ -87,59 +110,58 @@ return -EIO; } - if (l1h->config.enabled - && l1h->config.tsc_valid - && l1h->config.bsic_valid - && l1h->config.arfcn_valid) { - /* before power on */ - if (!l1h->config.arfcn_sent) { - trx_if_cmd_rxtune(l1h, l1h->config.arfcn); - trx_if_cmd_txtune(l1h, l1h->config.arfcn); + /* before power on */ + if (l1h->config.arfcn_valid) { + if (!l1h->config.rxtune_sent) { + trx_if_cmd_rxtune(l1h, l1h->config.arfcn, l1if_rxtune_cb); + l1h->config.rxtune_sent = true; + l1h->config.rxtune_acked = false; + } + if (!l1h->config.txtune_sent) { + trx_if_cmd_txtune(l1h, l1h->config.arfcn, l1if_txtune_cb); + l1h->config.txtune_sent = true; + l1h->config.txtune_acked = false; + } + if (l1h->config.txtune_acked) { /* After TXTUNE is sent to TRX, get the tx nominal power * (which may vary precisly on band/arfcn. Avoid sending * it if we are forced by VTY to use a specific nominal * power (because TRX may not support the command or * provide broken values) */ - if (!l1h->config.nominal_power_set_by_vty) + if (!l1h->config.nominal_power_set_by_vty && !l1h->config.nomtxpower_sent) { trx_if_cmd_getnompower(l1h, l1if_getnompower_cb); - l1h->config.arfcn_sent = true; - } - if (!l1h->config.tsc_sent) { - trx_if_cmd_settsc(l1h, l1h->config.tsc); - l1h->config.tsc_sent = true; - } - if (!l1h->config.bsic_sent) { - trx_if_cmd_setbsic(l1h, l1h->config.bsic); - l1h->config.bsic_sent = true; - } - - /* Ask transceiver to use the newest TRXD header version if not using it yet */ - if (!l1h->config.setformat_sent) { - if (l1h->config.trxd_hdr_ver_use != plink->u.osmotrx.trxd_hdr_ver_max) { - trx_if_cmd_setformat(l1h, plink->u.osmotrx.trxd_hdr_ver_max); - l1h->config.trxd_hdr_ver_req = plink->u.osmotrx.trxd_hdr_ver_max; - } else { - LOGPPHI(pinst, DL1C, LOGL_INFO, - "No need to negotiate TRXD version, " - "already using maximum configured one: %" PRIu8 "\n", - l1h->config.trxd_hdr_ver_use); + l1h->config.nomtxpower_sent = true; + l1h->config.nomtxpower_acked = false; } - l1h->config.setformat_sent = true; } - - if (pinst->num == 0 && !plink->u.osmotrx.powered && !plink->u.osmotrx.poweronoff_sent) { - trx_if_cmd_poweron(l1h, l1if_poweronoff_cb); - plink->u.osmotrx.poweronoff_sent = true; - } - - return 0; } - LOGPPHI(pinst, DL1C, LOGL_INFO, "Delaying provision, TRX attributes not yet received from BSC:%s%s%s%s\n", - l1h->config.enabled ? "" :" enable", - l1h->config.tsc_valid ? "" : " tsc", - l1h->config.bsic_valid ? "" : " bsic", - l1h->config.arfcn_valid ? "" : " arfcn"); - return 1; + if (!pinst->phy_link->u.osmotrx.use_legacy_setbsic && + l1h->config.tsc_valid && !l1h->config.tsc_sent) { + trx_if_cmd_settsc(l1h, l1h->config.tsc, l1if_settsc_cb); + l1h->config.tsc_sent = true; + l1h->config.tsc_acked = false; + } + if (pinst->phy_link->u.osmotrx.use_legacy_setbsic && + l1h->config.bsic_valid && !l1h->config.bsic_sent) { + trx_if_cmd_setbsic(l1h, l1h->config.bsic, l1if_setbsic_cb); + l1h->config.bsic_sent = true; + l1h->config.bsic_acked = false; + } + + /* Ask transceiver to use the newest TRXD header version if not using it yet */ + if (!l1h->config.setformat_sent) { + l1h->config.setformat_sent = true; + if (plink->u.osmotrx.trxd_hdr_ver_max == 0) { + LOGPPHI(pinst, DL1C, LOGL_INFO, + "No need to negotiate max TRXD version 0"); + l1h->config.trxd_hdr_ver_use = 0; + l1h->config.setformat_acked = true; + } else { + trx_if_cmd_setformat(l1h, l1h->config.trxd_hdr_ver_req, l1if_setformat_cb); + l1h->config.setformat_acked = false; + } + } + return 0; } static void l1if_setslot_cb(struct trx_l1h *l1h, uint8_t tn, uint8_t type, int rc) @@ -182,6 +204,20 @@ return false; } +/* Whether a given TRX is fully configured and can be powered on */ +static bool trx_can_be_powered_on(struct trx_l1h *l1h) +{ + struct phy_instance *pinst = l1h->phy_inst; + if (l1h->config.enabled && l1h->config.rxtune_acked && l1h->config.txtune_acked && + (l1h->config.bsic_acked || !pinst->phy_link->u.osmotrx.use_legacy_setbsic) && + (l1h->config.tsc_acked || pinst->phy_link->u.osmotrx.use_legacy_setbsic) && + (l1h->config.nomtxpower_acked || l1h->config.nominal_power_set_by_vty) && + (l1h->config.setformat_acked)) { + return true; + } + return false; +} + ////////////////////////// // FSM STATE ACTIONS @@ -202,12 +238,24 @@ } } +static void st_open_poweroff_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; + struct phy_instance *pinst = l1h->phy_inst; + + l1h->config.trxd_hdr_ver_req = pinst->phy_link->u.osmotrx.trxd_hdr_ver_max; +} + static void st_open_poweroff(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; + struct phy_instance *pinst = l1h->phy_inst; + struct gsm_bts_trx *trx = pinst->trx; uint8_t bsic; uint16_t arfcn; uint16_t tsc; + int nominal_power; + int status; switch(event) { case TRX_PROV_EV_CFG_ENABLE: @@ -226,7 +274,9 @@ if (l1h->config.arfcn != arfcn || !l1h->config.arfcn_valid) { l1h->config.arfcn = arfcn; l1h->config.arfcn_valid = true; - l1h->config.arfcn_sent = false; + l1h->config.txtune_sent = false; + l1h->config.rxtune_sent = false; + l1h->config.nomtxpower_sent = false; } break; case TRX_PROV_EV_CFG_TSC: @@ -240,17 +290,84 @@ case TRX_PROV_EV_CFG_TS: update_ts_data(l1h, (struct trx_prov_ev_cfg_ts_data*)data); break; + + /* CONFIRMATIONS FROM TRXC */ + case TRX_PROV_EV_RXTUNE_CNF: + if (l1h->config.rxtune_sent) + l1h->config.rxtune_acked = true; + break; + case TRX_PROV_EV_TXTUNE_CNF: + if (l1h->config.txtune_sent) + l1h->config.txtune_acked = true; + break; + case TRX_PROV_EV_NOMTXPOWER_CNF: + nominal_power = (int)(intptr_t)data; + if (l1h->config.nomtxpower_sent) + l1h->config.nomtxpower_acked = true; + l1if_trx_set_nominal_power(trx, nominal_power); + break; + case TRX_PROV_EV_SETBSIC_CNF: + if (l1h->config.bsic_sent) + l1h->config.bsic_acked = true; + break; + case TRX_PROV_EV_SETTSC_CNF: + if (l1h->config.tsc_sent) + l1h->config.tsc_acked = true; + break; + case TRX_PROV_EV_SETFORMAT_CNF: + status = (int)(intptr_t)data; + /* Transceiver may suggest a lower version (than requested) */ + if (status == l1h->config.trxd_hdr_ver_req) { + l1h->config.trxd_hdr_ver_use = status; + l1h->config.setformat_acked = true; + LOGPPHI(l1h->phy_inst, DTRX, LOGL_INFO, + "Using TRXD header format version %u\n", + l1h->config.trxd_hdr_ver_use); + } else { + LOGPPHI(l1h->phy_inst, DTRX, LOGL_DEBUG, + "Transceiver suggests TRXD header version %u (requested %u)\n", + status, l1h->config.trxd_hdr_ver_req); + /* Send another SETFORMAT with suggested version */ + l1h->config.trxd_hdr_ver_req = status; + l1h->config.setformat_sent = false; + } + break; + default: + OSMO_ASSERT(0); } - /* 0 = if we gathered all date and could go forward :*/ - if (l1if_provision_transceiver_trx(l1h) == 0) { + l1if_provision_transceiver_trx(l1h); + + /* if we gathered all data and could go forward :*/ + if (trx_can_be_powered_on(l1h)) { if (l1h->phy_inst->num == 0) trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWERON_CNF); else trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_POWERON); + } else { + LOGPPHI(pinst, DL1C, LOGL_INFO, "Delaying poweron, TRX attributes not yet configured:%s%s%s%s%s%s\n", + l1h->config.enabled ? "" :" enable", + pinst->phy_link->u.osmotrx.use_legacy_setbsic ? + (l1h->config.bsic_valid ? (l1h->config.bsic_acked ? "" : " bsic-ack") : " bsic") : + (l1h->config.tsc_valid ? (l1h->config.tsc_acked ? "" : " tsc-ack") : " tsc"), + l1h->config.arfcn_valid ? "" : " arfcn", + l1h->config.rxtune_acked ? "" : " rxtune-ack", + l1h->config.nominal_power_set_by_vty ? "" : (l1h->config.nomtxpower_acked ? "" : " nomtxpower-ack"), + l1h->config.setformat_acked ? "" : " setformat-ack" + ); } } + +static void st_open_wait_power_cnf_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; + struct phy_instance *pinst = l1h->phy_inst; + + trx_if_cmd_poweron(l1h, l1if_poweronoff_cb); + pinst->phy_link->u.osmotrx.poweronoff_sent = true; +} + static void st_open_wait_power_cnf(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; @@ -392,11 +509,18 @@ X(TRX_PROV_EV_CFG_BSIC) | X(TRX_PROV_EV_CFG_ARFCN) | X(TRX_PROV_EV_CFG_TSC) | - X(TRX_PROV_EV_CFG_TS), + X(TRX_PROV_EV_CFG_TS) | + X(TRX_PROV_EV_RXTUNE_CNF) | + X(TRX_PROV_EV_TXTUNE_CNF) | + X(TRX_PROV_EV_NOMTXPOWER_CNF) | + X(TRX_PROV_EV_SETBSIC_CNF) | + X(TRX_PROV_EV_SETTSC_CNF) | + X(TRX_PROV_EV_SETFORMAT_CNF), .out_state_mask = X(TRX_PROV_ST_OPEN_WAIT_POWERON_CNF) | X(TRX_PROV_ST_OPEN_POWERON), .name = "OPEN_POWEROFF", + .onenter = st_open_poweroff_on_enter, .action = st_open_poweroff, }, [TRX_PROV_ST_OPEN_WAIT_POWERON_CNF] = { @@ -406,6 +530,7 @@ .out_state_mask = X(TRX_PROV_ST_OPEN_POWERON), .name = "OPEN_WAIT_POWERON_CNF", + .onenter = st_open_wait_power_cnf_on_enter, .action = st_open_wait_power_cnf, }, [TRX_PROV_ST_OPEN_POWERON] = { @@ -438,6 +563,12 @@ OSMO_VALUE_STRING(TRX_PROV_EV_CFG_TS), OSMO_VALUE_STRING(TRX_PROV_EV_CFG_RXGAIN), OSMO_VALUE_STRING(TRX_PROV_EV_CFG_SETMAXDLY), + OSMO_VALUE_STRING(TRX_PROV_EV_RXTUNE_CNF), + OSMO_VALUE_STRING(TRX_PROV_EV_TXTUNE_CNF), + OSMO_VALUE_STRING(TRX_PROV_EV_NOMTXPOWER_CNF), + OSMO_VALUE_STRING(TRX_PROV_EV_SETBSIC_CNF), + OSMO_VALUE_STRING(TRX_PROV_EV_SETTSC_CNF), + OSMO_VALUE_STRING(TRX_PROV_EV_SETFORMAT_CNF), OSMO_VALUE_STRING(TRX_PROV_EV_POWERON_CNF), OSMO_VALUE_STRING(TRX_PROV_EV_POWEROFF), OSMO_VALUE_STRING(TRX_PROV_EV_POWEROFF_CNF), diff --git a/src/osmo-bts-trx/trx_provision_fsm.h b/src/osmo-bts-trx/trx_provision_fsm.h index 7fede35..24eb268 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.h +++ b/src/osmo-bts-trx/trx_provision_fsm.h @@ -46,6 +46,12 @@ TRX_PROV_EV_CFG_TS, TRX_PROV_EV_CFG_RXGAIN, TRX_PROV_EV_CFG_SETMAXDLY, + TRX_PROV_EV_RXTUNE_CNF, + TRX_PROV_EV_TXTUNE_CNF, + TRX_PROV_EV_NOMTXPOWER_CNF, + TRX_PROV_EV_SETBSIC_CNF, + TRX_PROV_EV_SETTSC_CNF, + TRX_PROV_EV_SETFORMAT_CNF, TRX_PROV_EV_POWERON_CNF, TRX_PROV_EV_POWEROFF, TRX_PROV_EV_POWEROFF_CNF, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1b736a4be5ce52a854f5767d8609153e1f4c08d9 Gerrit-Change-Number: 19367 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 17:59:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 22 Jul 2020 17:59:00 +0000 Subject: Change in osmo-bts[master]: bts-trx: Delay TRXC POWERON cmd until all TRXs are provisioned References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19368 ) Change subject: bts-trx: Delay TRXC POWERON cmd until all TRXs are provisioned ...................................................................... bts-trx: Delay TRXC POWERON cmd until all TRXs are provisioned Waiting until all other TRX are provisioned before really sending POWERON helps avoiding race conditions where TRX!=0 are not yet fully configured at the TRX side before POWERON is called. This solves for instance the situation where after POWERON RSP the BTS started ramping up on all TRX while on some NOMTXPOWER RSP was yet not received... Related: SYS#4920 Change-Id: I906be4714807c7a2793971cb6062120e24337d7b --- M src/osmo-bts-trx/trx_provision_fsm.c M src/osmo-bts-trx/trx_provision_fsm.h 2 files changed, 58 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/68/19368/1 diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 611ec69..420ee24 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -205,7 +205,7 @@ } /* Whether a given TRX is fully configured and can be powered on */ -static bool trx_can_be_powered_on(struct trx_l1h *l1h) +static bool trx_is_provisioned(struct trx_l1h *l1h) { struct phy_instance *pinst = l1h->phy_inst; if (l1h->config.enabled && l1h->config.rxtune_acked && l1h->config.txtune_acked && @@ -219,6 +219,37 @@ } +static void trx_signal_ready_trx0(struct trx_l1h *l1h) +{ + struct phy_instance *pinst = l1h->phy_inst; + struct phy_instance *pinst_it; + + llist_for_each_entry(pinst_it, &pinst->phy_link->instances, list) { + struct trx_l1h *l1h_it = pinst_it->u.osmotrx.hdl; + if (l1h_it->phy_inst->num != 0) + continue; + osmo_fsm_inst_dispatch(l1h_it->provision_fi, TRX_PROV_EV_OTHER_TRX_READY, NULL); + return; + } +} + +/* Called from TRX0 to check if other TRX are already configured and powered so POWERON can be sent */ +static bool trx_other_trx0_ready(struct trx_l1h *l1h) +{ + struct phy_instance *pinst = l1h->phy_inst; + struct phy_instance *pinst_it; + + /* Don't POWERON until all trx are ready */ + llist_for_each_entry(pinst_it, &pinst->phy_link->instances, list) { + struct trx_l1h *l1h_it = pinst_it->u.osmotrx.hdl; + if (l1h_it->phy_inst->num == 0) + continue; + if (l1h_it->provision_fi->state != TRX_PROV_ST_OPEN_POWERON) + return false; + } + return true; +} + ////////////////////////// // FSM STATE ACTIONS ////////////////////////// @@ -256,6 +287,7 @@ uint16_t tsc; int nominal_power; int status; + bool others_ready; switch(event) { case TRX_PROV_EV_CFG_ENABLE: @@ -332,20 +364,34 @@ l1h->config.setformat_sent = false; } break; + case TRX_PROV_EV_OTHER_TRX_READY: + OSMO_ASSERT(pinst->num == 0); + /* Do nothing here, we were triggered to see if we can finally poweron TRX0 below */ + break; default: OSMO_ASSERT(0); } l1if_provision_transceiver_trx(l1h); - /* if we gathered all data and could go forward :*/ - if (trx_can_be_powered_on(l1h)) { - if (l1h->phy_inst->num == 0) - trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWERON_CNF); - else + if (l1h->phy_inst->num == 0) + others_ready = trx_other_trx0_ready(l1h); + else + others_ready = true; /* we don't care about others in TRX!=0 */ + + /* if we gathered all data and could go forward. For TRX0, only after + * all other TRX are prepared, since it will send POWERON commad */ + if (trx_is_provisioned(l1h) && + (l1h->phy_inst->num != 0 || others_ready)) { + if (l1h->phy_inst->num != 0) { trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_POWERON); + /* Once we are powered on, signal TRX0 in case it was waiting for us */ + trx_signal_ready_trx0(l1h); + } else { + trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWERON_CNF); + } } else { - LOGPPHI(pinst, DL1C, LOGL_INFO, "Delaying poweron, TRX attributes not yet configured:%s%s%s%s%s%s\n", + LOGPFSML(fi, LOGL_INFO, "Delay poweron, wait for:%s%s%s%s%s%s%s\n", l1h->config.enabled ? "" :" enable", pinst->phy_link->u.osmotrx.use_legacy_setbsic ? (l1h->config.bsic_valid ? (l1h->config.bsic_acked ? "" : " bsic-ack") : " bsic") : @@ -353,7 +399,8 @@ l1h->config.arfcn_valid ? "" : " arfcn", l1h->config.rxtune_acked ? "" : " rxtune-ack", l1h->config.nominal_power_set_by_vty ? "" : (l1h->config.nomtxpower_acked ? "" : " nomtxpower-ack"), - l1h->config.setformat_acked ? "" : " setformat-ack" + l1h->config.setformat_acked ? "" : " setformat-ack", + (l1h->phy_inst->num != 0 || others_ready) ? "" : " other-trx" ); } } @@ -505,6 +552,7 @@ }, [TRX_PROV_ST_OPEN_POWEROFF] = { .in_event_mask = + X(TRX_PROV_EV_OTHER_TRX_READY) | X(TRX_PROV_EV_CFG_ENABLE) | X(TRX_PROV_EV_CFG_BSIC) | X(TRX_PROV_EV_CFG_ARFCN) | @@ -555,6 +603,7 @@ }; const struct value_string trx_prov_fsm_event_names[] = { + OSMO_VALUE_STRING(TRX_PROV_EV_OTHER_TRX_READY), OSMO_VALUE_STRING(TRX_PROV_EV_OPEN), OSMO_VALUE_STRING(TRX_PROV_EV_CFG_ENABLE), OSMO_VALUE_STRING(TRX_PROV_EV_CFG_BSIC), diff --git a/src/osmo-bts-trx/trx_provision_fsm.h b/src/osmo-bts-trx/trx_provision_fsm.h index 24eb268..1583270 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.h +++ b/src/osmo-bts-trx/trx_provision_fsm.h @@ -38,6 +38,7 @@ }; enum trx_provision_fsm_events { + TRX_PROV_EV_OTHER_TRX_READY, TRX_PROV_EV_OPEN, TRX_PROV_EV_CFG_ENABLE, TRX_PROV_EV_CFG_BSIC, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I906be4714807c7a2793971cb6062120e24337d7b Gerrit-Change-Number: 19368 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 18:07:57 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jul 2020 18:07:57 +0000 Subject: Change in osmo-bts[master]: bts-trx: Use bool type for on/off state variables In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19365 ) Change subject: bts-trx: Use bool type for on/off state variables ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/19365/2/src/osmo-bts-trx/l1_if.h File src/osmo-bts-trx/l1_if.h: https://gerrit.osmocom.org/c/osmo-bts/+/19365/2/src/osmo-bts-trx/l1_if.h at 68 PS2, Line 68: arfcn_valid It feels like a bitmask could be used here, or rather two: uint32_t param_valid; uint32_t param_sent; instead of these separate variables, but this is just an idea. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icb1b7bd8852417ab7b9a7dbc205aa6f6db97d64d Gerrit-Change-Number: 19365 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 22 Jul 2020 18:07:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 19:33:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 19:33:39 +0000 Subject: Change in osmocom-bb[master]: Revert "trx_toolkit/transceiver.py: implement the transmit burst queue" In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19366 ) Change subject: Revert "trx_toolkit/transceiver.py: implement the transmit burst queue" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If29b4f6718cbc8af18fe18a5e3eca3912e8af01e Gerrit-Change-Number: 19366 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 22 Jul 2020 19:33:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 19:33:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 19:33:43 +0000 Subject: Change in osmocom-bb[master]: Revert "trx_toolkit/transceiver.py: implement the transmit burst queue" In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19366 ) Change subject: Revert "trx_toolkit/transceiver.py: implement the transmit burst queue" ...................................................................... Revert "trx_toolkit/transceiver.py: implement the transmit burst queue" This reverts commit 6e1c82d29836496b20e0d826976d9e71b32493d8. Unfortunately, solving one problem it introduced even more regressions. Change-Id: If29b4f6718cbc8af18fe18a5e3eca3912e8af01e Related: OS#4658 --- M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/transceiver.py 2 files changed, 4 insertions(+), 74 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Verified laforge: Looks good to me, approved diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index da611e8..ded8dc4 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -388,8 +388,6 @@ # Init shared clock generator self.clck_gen = CLCKGen([]) - # This method will be called on each TDMA frame - self.clck_gen.clck_handler = self.clck_handler # Power measurement emulation # Noise: -120 .. -105 @@ -458,18 +456,14 @@ for trx in self.trx_list.trx_list: # DATA interface if trx.data_if.sock in r_event: - trx.recv_data_msg() + msg = trx.recv_data_msg() + if msg is not None: + self.burst_fwd.forward_msg(trx, msg) # CTRL interface if trx.ctrl_if.sock in r_event: trx.ctrl_if.handle_rx() - # This method will be called by the clock thread - def clck_handler(self, fn): - # We assume that this list is immutable at run-time - for trx in self.trx_list.trx_list: - trx.clck_tick(self.burst_fwd, fn) - def shutdown(self): log.info("Shutting down...") diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 9fc2948..19b998e 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -23,7 +23,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import logging as log -import threading from ctrl_if_trx import CTRLInterfaceTRX from data_if import DATAInterface @@ -123,37 +122,6 @@ Transceiver and all its timeslots, so using in for the BTS side does not make any sense (imagine BCCH hopping together with DCCH). - == The transmit burst queue - - According to 3GPP 45.002, the time difference between Uplink and - Downlink corresponds to three TDMA timeslot periods. However, - in general the L1 implementations (such as osmo-bts-trx and trxcon) - never schedule to be transmitted bursts for the current TDMA frame - immediately. Instead, they are being scheduled prematurely. - - The rationale is that both transceiver and the L1 implementation - are separete processes that are not perfectly synchronized in time. - Moreover, the transceiver needs some time to prepare a burst for - transmission. This is why the time difference between Uplink and - Downlink is actually much higher on practice (20 TDMA frame periods - by default, at the moment of writing this patch). - - In order to reflect that delay in a virtual environment, this - implementation, just like a normal transceiver (e.g. osmo-trx), - queues all to be transmitted (L12TRX) bursts, so hey remain in - the transmit queue until the appropriate time of transmission. - - The API user is supposed to call recv_data_msg() in order to obtain - a L12TRX message on the TRXD (data) inteface, so it gets queued by - this function. Then, to ensure the timeous transmission, the user - of this implementation needs to call clck_tick() on each TDMA - frame. Both functions are thread-safe (queue mutex). - - In a multi-trx configuration, the use of queue additionally ensures - proper burst aggregation on multiple TRXD connections, so all L12TRX - messages are guaranteed to be sent in the right order, i.e. with - monolithically-increasing TDMA frame numbers. - """ def __init__(self, bind_addr, remote_addr, base_port, name = None, @@ -209,10 +177,6 @@ # List of child transceivers self.child_trx_list = TRXList() - # Tx (L12TRX) burst queue and mutex - self._tx_queue_lock = threading.Lock() - self._tx_queue = [] - def __str__(self): desc = "%s:%d" % (self.remote_addr, self.base_port) if self.child_idx > 0: @@ -269,12 +233,10 @@ trx.running = True elif event == "POWEROFF": trx.running = False - trx.tx_queue_clear() trx.disable_fh() - # Reset frequency hopping parameters, clear the queue + # Reset frequency hopping parameters if event == "POWEROFF": - self.tx_queue_clear() self.disable_fh() # Trigger clock generator if required @@ -312,34 +274,8 @@ "configured => dropping..." % (self, msg.desc_hdr())) return None - # Enque the message, it will be sent later - self.tx_queue_append(msg) return msg def handle_data_msg(self, msg): # TODO: make legacy mode configurable (via argv?) self.data_if.send_msg(msg, legacy = True) - - def tx_queue_append(self, msg): - with self._tx_queue_lock: - self._tx_queue.append(msg) - - def tx_queue_clear(self): - with self._tx_queue_lock: - self._tx_queue.clear() - - def clck_tick(self, fwd, fn): - if not self.running: - return - - self._tx_queue_lock.acquire() - - for msg in self._tx_queue: - if msg.fn == fn: - fwd.forward_msg(self, msg) - elif msg.fn < fn: - log.warning("(%s) Stale TRXD message (fn=%u): %s" - % (self, fn, msg.desc_hdr())) - - self._tx_queue = [msg for msg in self._tx_queue if msg.fn > fn] - self._tx_queue_lock.release() -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If29b4f6718cbc8af18fe18a5e3eca3912e8af01e Gerrit-Change-Number: 19366 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 19:35:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 19:35:17 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC subset rotation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19303 ) Change subject: Introduce support for ACC subset rotation ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I952c9eeae02809c7184078c655574ec817902e06 Gerrit-Change-Number: 19303 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 22 Jul 2020 19:35:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 19:35:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 19:35:50 +0000 Subject: Change in osmo-bts[master]: bts-trx: Delay TRXC POWERON cmd until all TRXs are provisioned In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19368 ) Change subject: bts-trx: Delay TRXC POWERON cmd until all TRXs are provisioned ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I906be4714807c7a2793971cb6062120e24337d7b Gerrit-Change-Number: 19368 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 22 Jul 2020 19:35:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 19:36:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 19:36:22 +0000 Subject: Change in osmo-bts[master]: bts-trx: Use bool type for on/off state variables In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19365 ) Change subject: bts-trx: Use bool type for on/off state variables ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icb1b7bd8852417ab7b9a7dbc205aa6f6db97d64d Gerrit-Change-Number: 19365 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 22 Jul 2020 19:36:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 19:36:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 19:36:25 +0000 Subject: Change in osmo-bts[master]: bts-trx: Use bool type for on/off state variables In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19365 ) Change subject: bts-trx: Use bool type for on/off state variables ...................................................................... bts-trx: Use bool type for on/off state variables Change-Id: Icb1b7bd8852417ab7b9a7dbc205aa6f6db97d64d --- M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/trx_provision_fsm.c M src/osmo-bts-trx/trx_vty.c 3 files changed, 39 insertions(+), 39 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h index 07751f2..f35936e 100644 --- a/src/osmo-bts-trx/l1_if.h +++ b/src/osmo-bts-trx/l1_if.h @@ -60,44 +60,44 @@ struct trx_config { uint8_t trxd_hdr_ver_req; /* requested TRXD header version */ uint8_t trxd_hdr_ver_use; /* actual TRXD header version in use */ - int setformat_sent; + bool setformat_sent; bool enabled; - int arfcn_valid; + bool arfcn_valid; uint16_t arfcn; - int arfcn_sent; + bool arfcn_sent; - int tsc_valid; + bool tsc_valid; uint8_t tsc; - int tsc_sent; + bool tsc_sent; - int bsic_valid; + bool bsic_valid; uint8_t bsic; - int bsic_sent; + bool bsic_sent; - int rxgain_valid; + bool rxgain_valid; uint8_t rxgain; - int rxgain_sent; + bool rxgain_sent; int forced_max_power_red; /* -1 if not forced by VTY config (default) */ bool nominal_power_set_by_vty; /* whether nominal trx power was enforced/retreived from VTY config "nominal-tx-power" */ - int maxdly_valid; + bool maxdly_valid; int maxdly; - int maxdly_sent; + bool maxdly_sent; - int maxdlynb_valid; + bool maxdlynb_valid; int maxdlynb; - int maxdlynb_sent; + bool maxdlynb_sent; uint8_t slotmask; - int slottype_valid[TRX_NR_TS]; + bool slottype_valid[TRX_NR_TS]; uint8_t slottype[TRX_NR_TS]; - int slottype_sent[TRX_NR_TS]; + bool slottype_sent[TRX_NR_TS]; }; struct trx_l1h { diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index c3b266d..fbeee37 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -102,15 +102,15 @@ * provide broken values) */ if (!l1h->config.nominal_power_set_by_vty) trx_if_cmd_getnompower(l1h, l1if_getnompower_cb); - l1h->config.arfcn_sent = 1; + l1h->config.arfcn_sent = true; } if (!l1h->config.tsc_sent) { trx_if_cmd_settsc(l1h, l1h->config.tsc); - l1h->config.tsc_sent = 1; + l1h->config.tsc_sent = true; } if (!l1h->config.bsic_sent) { trx_if_cmd_setbsic(l1h, l1h->config.bsic); - l1h->config.bsic_sent = 1; + l1h->config.bsic_sent = true; } /* Ask transceiver to use the newest TRXD header version if not using it yet */ @@ -124,7 +124,7 @@ "already using maximum configured one: %" PRIu8 "\n", l1h->config.trxd_hdr_ver_use); } - l1h->config.setformat_sent = 1; + l1h->config.setformat_sent = true; } if (pinst->num == 0 && !plink->u.osmotrx.powered && !plink->u.osmotrx.poweronoff_sent) { @@ -175,8 +175,8 @@ if (l1h->config.slottype[ts_data->tn] != ts_data->slottype || !l1h->config.slottype_valid[ts_data->tn]) { l1h->config.slottype[ts_data->tn] = ts_data->slottype; - l1h->config.slottype_valid[ts_data->tn] = 1; - l1h->config.slottype_sent[ts_data->tn] = 0; + l1h->config.slottype_valid[ts_data->tn] = true; + l1h->config.slottype_sent[ts_data->tn] = false; return true; } return false; @@ -217,24 +217,24 @@ bsic = (uint8_t)(intptr_t)data; if (l1h->config.bsic != bsic || !l1h->config.bsic_valid) { l1h->config.bsic = bsic; - l1h->config.bsic_valid = 1; - l1h->config.bsic_sent = 0; + l1h->config.bsic_valid = true; + l1h->config.bsic_sent = false; } break; case TRX_PROV_EV_CFG_ARFCN: arfcn = (uint16_t)(intptr_t)data; if (l1h->config.arfcn != arfcn || !l1h->config.arfcn_valid) { l1h->config.arfcn = arfcn; - l1h->config.arfcn_valid = 1; - l1h->config.arfcn_sent = 0; + l1h->config.arfcn_valid = true; + l1h->config.arfcn_sent = false; } break; case TRX_PROV_EV_CFG_TSC: tsc = (uint16_t)(intptr_t)data; if (l1h->config.tsc != tsc || !l1h->config.tsc_valid) { l1h->config.tsc = tsc; - l1h->config.tsc_valid = 1; - l1h->config.tsc_sent = 0; + l1h->config.tsc_valid = true; + l1h->config.tsc_sent = false; } break; case TRX_PROV_EV_CFG_TS: @@ -291,15 +291,15 @@ /* after power on */ if (l1h->config.rxgain_valid && !l1h->config.rxgain_sent) { trx_if_cmd_setrxgain(l1h, l1h->config.rxgain); - l1h->config.rxgain_sent = 1; + l1h->config.rxgain_sent = true; } if (l1h->config.maxdly_valid && !l1h->config.maxdly_sent) { trx_if_cmd_setmaxdly(l1h, l1h->config.maxdly); - l1h->config.maxdly_sent = 1; + l1h->config.maxdly_sent = true; } if (l1h->config.maxdlynb_valid && !l1h->config.maxdlynb_sent) { trx_if_cmd_setmaxdlynb(l1h, l1h->config.maxdlynb); - l1h->config.maxdlynb_sent = 1; + l1h->config.maxdlynb_sent = true; } for (tn = 0; tn < TRX_NR_TS; tn++) { @@ -307,7 +307,7 @@ && !l1h->config.slottype_sent[tn]) { trx_if_cmd_setslot(l1h, tn, l1h->config.slottype[tn], l1if_setslot_cb); - l1h->config.slottype_sent[tn] = 1; + l1h->config.slottype_sent[tn] = true; } } } @@ -328,11 +328,11 @@ trx_if_cmd_poweroff(l1h, l1if_poweronoff_cb); plink->u.osmotrx.poweronoff_sent = true; } - l1h->config.rxgain_sent = 0; - l1h->config.maxdly_sent = 0; - l1h->config.maxdlynb_sent = 0; + l1h->config.rxgain_sent = false; + l1h->config.maxdly_sent = false; + l1h->config.maxdlynb_sent = false; for (tn = 0; tn < TRX_NR_TS; tn++) - l1h->config.slottype_sent[tn] = 0; + l1h->config.slottype_sent[tn] = false; } else if (!pinst->phy_link->u.osmotrx.poweronoff_sent) { bts_model_trx_close_cb(pinst->trx, 0); } /* else: poweroff in progress, cb will be called upon TRXC RSP */ @@ -347,7 +347,7 @@ if (update_ts_data(l1h, ts_data)) { trx_if_cmd_setslot(l1h, ts_data->tn, l1h->config.slottype[ ts_data->tn], l1if_setslot_cb); - l1h->config.slottype_sent[ ts_data->tn] = 1; + l1h->config.slottype_sent[ts_data->tn] = true; } break; diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index fb75a4e..6b8ca77 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -245,7 +245,7 @@ l1h->config.maxdly = atoi(argv[0]); l1h->config.maxdly_valid = 1; - l1h->config.maxdly_sent = 0; + l1h->config.maxdly_sent = false; l1if_provision_transceiver_trx(l1h); return CMD_SUCCESS; @@ -271,7 +271,7 @@ l1h->config.maxdlynb = atoi(argv[0]); l1h->config.maxdlynb_valid = 1; - l1h->config.maxdlynb_sent = 0; + l1h->config.maxdlynb_sent = false; l1if_provision_transceiver_trx(l1h); return CMD_SUCCESS; @@ -358,7 +358,7 @@ l1h->config.rxgain = atoi(argv[0]); l1h->config.rxgain_valid = 1; - l1h->config.rxgain_sent = 0; + l1h->config.rxgain_sent = false; l1if_provision_transceiver_trx(l1h); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icb1b7bd8852417ab7b9a7dbc205aa6f6db97d64d Gerrit-Change-Number: 19365 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 19:37:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 22 Jul 2020 19:37:04 +0000 Subject: Change in osmo-bts[master]: bts-trx: Integrate TRX provisioning logic more tightly into the FSM In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19367 ) Change subject: bts-trx: Integrate TRX provisioning logic more tightly into the FSM ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1b736a4be5ce52a854f5767d8609153e1f4c08d9 Gerrit-Change-Number: 19367 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 22 Jul 2020 19:37:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 22 21:44:26 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 21:44:26 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18b34d83204_1c292ab9470d05f45428cb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/53/53f4924c97b8158a32b779abe474eacb.16971 write: No space left on device (worker was old-atreju2:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 21:44:26 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 21:44:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18b34d1eac4_1c292ab9470d05f45427a7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: /var/cache/obs/cache/53/53f4924c97b8158a32b779abe474eacb.10750 write: No space left on device (worker was old-atreju4:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 21:44:26 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 21:44:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18b34e43d2f_1c292ab9470d05f45429a5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: /var/cache/obs/cache/53/53f4924c97b8158a32b779abe474eacb.10756 write: No space left on device (worker was old-atreju4:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 21:44:44 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 21:44:44 +0000 Subject: Build failure of network:osmocom:nightly/osmo-uecups in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18b35164e8c_1c292ab9470d05f4543122@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-uecups/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-uecups failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-uecups Last lines of build log: /var/cache/obs/cache/53/53f4924c97b8158a32b779abe474eacb.17018 write: No space left on device (worker was old-atreju2:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 21:44:44 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 21:44:44 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18b351c8a72_1c292ab9470d05f454326e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: /var/cache/obs/cache/53/53f4924c97b8158a32b779abe474eacb.10875 write: No space left on device (worker was old-atreju4:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 21:44:44 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 21:44:44 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18b3525b98f_1c292ab9470d05f45433f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: /var/cache/obs/cache/53/53f4924c97b8158a32b779abe474eacb.23605 write: No space left on device (worker was old-atreju3:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 21:47:35 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 21:47:35 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18b407454ae_1c292ab9470d05f4544063@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 608s] efined here [ 608s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 608s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 608s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 608s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 608s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 608s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 608s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 608s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 608s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 608s] collect2: error: ld returned 1 exit status [ 608s] make[4]: *** [Makefile:426: osmo-bts-virtual] Error 1 [ 608s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bts-virtual' [ 608s] make[3]: *** [Makefile:385: all-recursive] Error 1 [ 608s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 608s] make[2]: *** [Makefile:434: all-recursive] Error 1 [ 608s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 608s] make[1]: *** [Makefile:366: all] Error 2 [ 608s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 608s] dh_auto_build: error: make -j1 returned exit code 2 [ 608s] make: *** [debian/rules:12: build] Error 25 [ 608s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 608s] ### VM INTERACTION START ### [ 609s] Powering off. [ 609s] [ 592.105547] reboot: Power down [ 609s] ### VM INTERACTION END ### [ 609s] [ 609s] lamb60 failed "build osmo-bts_1.2.0.dsc" at Wed Jul 22 21:47:24 UTC 2020. [ 609s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 21:52:09 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 21:52:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18b5134828a_1c292ab9470d05f4545867@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: /var/cache/obs/cache/b9/b9a26953043e4efc8df94b6825f12d6f.18123 write: No space left on device (worker was old-atreju2:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 21:52:09 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 21:52:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18b513da410_1c292ab9470d05f4546072@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: /var/cache/obs/cache/d9/d9a590b2cf9f86d14fdcba38307cb352.12253 write: No space left on device (worker was old-atreju4:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 21:56:26 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 21:56:26 +0000 Subject: Build failure of network:osmocom:latest/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18b620e6bf0_1c292ab9470d05f4547561@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-sccp Last lines of build log: [ 1119s] libtool: link: cat .libs/libosmo-sigtran.exp | sed -e "s/\(.*\)/\1;/" >> .libs/libosmo-sigtran.ver [ 1119s] libtool: link: echo "local: *; };" >> .libs/libosmo-sigtran.ver [ 1119s] libtool: link: gcc -shared -fPIC -DPIC .libs/sccp_sap.o .libs/sua.o .libs/m3ua.o .libs/xua_msg.o .libs/sccp_helpers.o .libs/sccp2sua.o .libs/sccp_scrc.o .libs/sccp_sclc.o .libs/sccp_scoc.o .libs/sccp_user.o .libs/xua_rkm.o .libs/xua_default_lm_fsm.o .libs/osmo_ss7.o .libs/osmo_ss7_hmrt.o .libs/xua_asp_fsm.o .libs/xua_as_fsm.o .libs/osmo_ss7_vty.o .libs/sccp_vty.o .libs/ipa.o /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmonetif.so -lsctp -pthread -g -O2 -fstack-protector-strong -Wl,-z -Wl,relro -Wl,-z -Wl,now -pthread -Wl,-soname -Wl,libosmo-sigtran.so.5 -Wl,-version-script -Wl,.libs/libosmo-sigtran.ver -o .libs/libosmo-sigtran.so.5.0.0 [ 1119s] /usr/bin/ld: .libs/sccp_helpers.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 1119s] /usr/bin/ld: .libs/sccp2sua.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 1119s] /usr/bin/ld: .libs/sccp_scrc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 1119s] /usr/bin/ld: .libs/sccp_sclc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 1119s] /usr/bin/ld: .libs/sccp_scoc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 1119s] /usr/bin/ld: .libs/sccp_user.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 1119s] /usr/bin/ld: .libs/osmo_ss7.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 1119s] /usr/bin/ld: .libs/osmo_ss7_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 1119s] /usr/bin/ld: .libs/sccp_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 1119s] collect2: error: ld returned 1 exit status [ 1119s] make[3]: *** [Makefile:540: libosmo-sigtran.la] Error 1 [ 1119s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 1120s] make[2]: *** [Makefile:500: all-recursive] Error 1 [ 1120s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1120s] make[1]: *** [Makefile:395: all] Error 2 [ 1120s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1120s] dh_auto_build: error: make -j1 returned exit code 2 [ 1120s] make: *** [debian/rules:12: build] Error 25 [ 1120s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1120s] ### VM INTERACTION START ### [ 1121s] Powering off. [ 1121s] [ 1006.276887] reboot: Power down [ 1121s] ### VM INTERACTION END ### [ 1121s] [ 1121s] lamb02 failed "build libosmo-sccp_1.2.0.dsc" at Wed Jul 22 21:56:18 UTC 2020. [ 1121s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 22 21:58:24 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jul 2020 21:58:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: verify handling of frequency hopping parameters In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 to look at the new patch set (#5). Change subject: PCU_Tests: verify handling of frequency hopping parameters ...................................................................... PCU_Tests: verify handling of frequency hopping parameters Change-Id: I1beda9224998848f9243237413e5ae3e0ddab8a5 Related: SYS#4868, OS#4547 --- M pcu/PCU_Tests.ttcn 1 file changed, 271 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/19324/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1beda9224998848f9243237413e5ae3e0ddab8a5 Gerrit-Change-Number: 19324 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 21:58:25 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jul 2020 21:58:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix length field in GprsMobileAllication References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19369 ) Change subject: library/RLCMAC_CSN1_Types: fix length field in GprsMobileAllication ...................................................................... library/RLCMAC_CSN1_Types: fix length field in GprsMobileAllication - Length of field 'MA_BITMAP' is specified in bits, not bytes; - The value range of field MA_LENGTH is 0..63, therefore: - value 0 means that field 'MA_BITMAP' is 1 bit long, - value 1 means that field 'MA_BITMAP' is 2 bits long, - value 63 means that field 'MA_BITMAP' is 64 bits long. Change-Id: Iec19da18637febfa15bc09175bc51504c721c42f Related: SYS#4868, OS#4547 --- M library/RLCMAC_CSN1_Types.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/19369/1 diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index 6bdca40..cc1ae22 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -807,13 +807,13 @@ RflNumberList rfl_number_list optional, BIT1 ma_present, uint6_t ma_length optional, - bitstring ma_bitmap optional + bitstring ma_bitmap length(1..64) optional /* TODO: ARFCN index list */ } with { variant (rfl_number_list) "PRESENCE(rfl_number_list_present = '1'B)" variant (ma_length) "PRESENCE(ma_present = '0'B)" variant (ma_bitmap) "PRESENCE(ma_present = '0'B)" - variant (ma_length) "LENGTHTO(ma_bitmap)+1" + variant (ma_length) "LENGTHTO(ma_bitmap)-1, UNIT(bits)" variant (ma_bitmap) "BYTEORDER(first), BITORDER(msb)" }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iec19da18637febfa15bc09175bc51504c721c42f Gerrit-Change-Number: 19369 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 21:58:26 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jul 2020 21:58:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fixup library/GSM_RR_Types: fix BYTEORDER in MobileAllocation References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19370 ) Change subject: fixup library/GSM_RR_Types: fix BYTEORDER in MobileAllocation ...................................................................... fixup library/GSM_RR_Types: fix BYTEORDER in MobileAllocation The following bitstring in TITAN: 0 N // N = NF - 1 --------------------> 0001 1011 1110 0100 // '0001101111100100'B needs to be be encoded as follows 'on the wire': N 0 // N = NF - 1 <-------------------- 0010 0111 1101 1000 // '0010011111011000'B so it basically gets inversed => we need to use BYTEORDER(first). Change-Id: Iea2e3a9a7a0557d1ab5d935877d2161ee0988077 Fixes: I70b1baf01859d0cf3b8cec1aed04d73fc097a9b1 Related: SYS#4868, OS#4547 --- M library/GSM_RR_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/70/19370/1 diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index a0d8349..c12ebd1 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -279,7 +279,7 @@ bitstring ma } with { variant (len) "LENGTHTO(ma)" - variant (ma) "BYTEORDER(last), BITORDER(msb)" + variant (ma) "BYTEORDER(first), BITORDER(msb)" }; /* 10.5.2.25a */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iea2e3a9a7a0557d1ab5d935877d2161ee0988077 Gerrit-Change-Number: 19370 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 22 21:59:01 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 21:59:01 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18b6b2cc6ce_1c292ab9470d05f45487a2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: /var/cache/obs/cache/b9/b9a26953043e4efc8df94b6825f12d6f.19115 write: No space left on device (worker was old-atreju2:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 22 22:01:11 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jul 2020 22:01:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: [WIP] fixup PCU_Tests: add TC_pcuif_fh_pkt_ass_ul In-Reply-To: References: Message-ID: fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19343 ) Change subject: [WIP] fixup PCU_Tests: add TC_pcuif_fh_pkt_ass_ul ...................................................................... Abandoned Squashed. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic57f0a8eb029a19c33ac1355bb37181dd5c69d36 Gerrit-Change-Number: 19343 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 22:02:05 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 22 Jul 2020 22:02:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix byte/bit order in GprsMobileAllication In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19342 ) Change subject: library/RLCMAC_CSN1_Types: fix byte/bit order in GprsMobileAllication ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8f2c8c7b234605523a4fd518210b45ea3c088ff6 Gerrit-Change-Number: 19342 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 22 Jul 2020 22:02:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 22 22:02:09 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 22:02:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18b76f14be_1c292ab9470d05f45507c6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: /var/cache/obs/cache/27/275e81063e62e289e29719a5beaa7efe.11874 write: No space left on device (worker was old-atreju5:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 22 22:07:54 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 22 Jul 2020 22:07:54 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... NOT_FOR_MERGE: modify README to test gerrit comments Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba --- M README 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/71/19371/1 diff --git a/README b/README index e84849b..da28182 100644 --- a/README +++ b/README @@ -1,3 +1,5 @@ +just do something random to test osmo-gerrit-jenksin + About OsmoBSC ============= -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 22 22:08:31 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 22:08:31 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18b8f031a73_1c292ab9470d05f455398@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 597s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o gbproxy_test.o gbproxy_test.c [ 600s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=osmo_get_rand_id -Wl,-z,relro -o gbproxy_test gbproxy_test.o ../../src/gbproxy/gb_proxy.o ../../src/gbproxy/gb_proxy_patch.o ../../src/gbproxy/gb_proxy_peer.o ../../src/gbproxy/gb_proxy_tlli.o ../../src/gprs/gprs_gb_parse.o ../../src/gprs/gprs_llc_parse.o ../../src/gprs/crc24.o ../../src/gprs/gprs_utils.o -ltalloc -losmocore -ltalloc -losmogb -losmovty -losmocore -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -losmoabis -ldl -lrt [ 600s] libtool: link: gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=osmo_get_rand_id -Wl,-z -Wl,relro -o gbproxy_test gbproxy_test.o ../../src/gbproxy/gb_proxy.o ../../src/gbproxy/gb_proxy_patch.o ../../src/gbproxy/gb_proxy_peer.o ../../src/gbproxy/gb_proxy_tlli.o ../../src/gprs/gprs_gb_parse.o ../../src/gprs/gprs_llc_parse.o ../../src/gprs/crc24.o ../../src/gprs/gprs_utils.o /usr/lib/x86_64-linux-gnu/libosmogb.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmoabis.so -ldl -lrt -pthread [ 600s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/gbproxy' [ 600s] Making all in gtphub [ 600s] make[4]: Entering directory '/usr/src/packages/BUILD/tests/gtphub' [ 600s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o gtphub_test.o gtphub_test.c [ 601s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=gtphub_resolve_ggsn_addr -Wl,--wrap=gtphub_ares_init -Wl,--wrap=gtphub_write -Wl,-z,relro -o gtphub_test gtphub_test.o ../../src/gtphub/gtphub.o ../../src/gprs/gprs_utils.o -ltalloc -losmocore -ltalloc -losmogsm -losmocore -lgtp -lrt [ 601s] libtool: link: gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=gtphub_resolve_ggsn_addr -Wl,--wrap=gtphub_ares_init -Wl,--wrap=gtphub_write -Wl,-z -Wl,relro -o gtphub_test gtphub_test.o ../../src/gtphub/gtphub.o ../../src/gprs/gprs_utils.o -ltalloc /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libgtp.so -lrt -pthread [ 601s] /usr/bin/ld: ../../src/gtphub/gtphub.o:./src/gtphub/gtphub.c:50: multiple definition of `osmo_gtphub_ctx'; gtphub_test.o:./tests/gtphub/gtphub_test.c:57: first defined here [ 601s] collect2: error: ld returned 1 exit status [ 601s] make[4]: *** [Makefile:420: gtphub_test] Error 1 [ 601s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/gtphub' [ 601s] make[3]: *** [Makefile:416: all-recursive] Error 1 [ 601s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 601s] make[2]: *** [Makefile:453: all-recursive] Error 1 [ 601s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 601s] make[1]: *** [Makefile:385: all] Error 2 [ 601s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 601s] dh_auto_build: error: make -j1 returned exit code 2 [ 601s] make: *** [debian/rules:45: build] Error 25 [ 601s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 601s] ### VM INTERACTION START ### [ 602s] Powering off. [ 602s] [ 582.697809] reboot: Power down [ 603s] ### VM INTERACTION END ### [ 603s] [ 603s] lamb51 failed "build osmo-sgsn_1.6.0.dsc" at Wed Jul 22 22:08:25 UTC 2020. [ 603s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 22 22:09:46 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 22 Jul 2020 22:09:46 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 1: make me a sandwich -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 22 Jul 2020 22:09:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 22 22:10:48 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 22:10:48 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18b987eac7b_1c292ab9470d05f455474d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 339s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 339s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_access_req_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 339s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_access_req_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 339s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_auth_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 339s] /usr/bin/ld: ../../src/libvlr/libvl[ 327.244103] serial8250: too much work for irq4 [ 339s] r.a(vlr_auth_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 339s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 339s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 339s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_sgs.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 339s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_sgs_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 339s] collect2: error: ld returned 1 exit status [ 339s] make[4]: *** [Makefile:485: osmo-msc] Error 1 [ 339s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 339s] make[3]: *** [Makefile:422: all-recursive] Error 1 [ 339s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 339s] make[2]: *** [Makefile:462: all-recursive] Error 1 [ 339s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 339s] make[1]: *** [Makefile:394: all] Error 2 [ 339s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 339s] dh_auto_build: error: make -j1 returned exit code 2 [ 339s] make: *** [debian/rules:45: build] Error 25 [ 339s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 339s] ### VM INTERACTION START ### [ 340s] Powering off. [ 340s] [ 328.382468] reboot: Power down [ 340s] ### VM INTERACTION END ### [ 340s] [ 340s] sheep86 failed "build osmo-msc_1.6.1.dsc" at Wed Jul 22 22:10:42 UTC 2020. [ 340s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 22 22:13:43 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 22 Jul 2020 22:13:43 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 1: REBUILD -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 22 Jul 2020 22:13:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 22:15:47 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 22 Jul 2020 22:15:47 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 1: VERIFY -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 22 Jul 2020 22:15:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 22 22:15:45 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 22:15:45 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18ba9746c4b_1c292ab9470d05f4558056@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 634s] /usr/bin/ld: bsc_subscr_conn_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 634s] /usr/bin/ld: bsc_vty.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 634s] /usr/bin/ld: gsm_04_08_rr.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 634s] /usr/bin/ld: handover_decision.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 634s] /usr/bin/ld: handover_decision_2.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 634s] /usr/bin/ld: handover_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 634s] /usr/bin/ld: handover_logic.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 634s] /usr/bin/ld: lchan_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 634s] /usr/bin/ld: osmo_bsc_bssap.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 634s] /usr/bin/ld: osmo_bsc_main.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 634s] collect2: error: ld returned 1 exit status [ 634s] make[4]: *** [Makefile:588: osmo-bsc] Error 1 [ 634s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 634s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 634s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 634s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 634s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 634s] make[1]: *** [Makefile:380: all] Error 2 [ 634s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 634s] dh_auto_build: error: make -j1 returned exit code 2 [ 634s] make: *** [debian/rules:45: build] Error 25 [ 634s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 634s] ### VM INTERACTION START ### [ 635s] Powering off. [ 635s] [ 597.647580] reboot: Power down [ 635s] ### VM INTERACTION END ### [ 635s] [ 635s] cloud116 failed "build osmo-bsc_1.6.0.dsc" at Wed Jul 22 22:15:41 UTC 2020. [ 635s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 22 22:17:30 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 22 Jul 2020 22:17:30 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 1: BUILD -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 22 Jul 2020 22:17:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 22:17:42 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 22 Jul 2020 22:17:42 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 1: REBUILD -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 22 Jul 2020 22:17:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 22:25:23 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 22 Jul 2020 22:25:23 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 1: REBUILD -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 22 Jul 2020 22:25:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 22:26:00 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 22 Jul 2020 22:26:00 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 1: REBUILD -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 22 Jul 2020 22:26:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 22 22:32:52 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 22:32:52 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18beae56e80_1c292ab9470d05f4564291@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: /var/cache/obs/cache/34/34bd9d179d8410597c4100e0ee04f548.13371 write: No space left on device (worker was old-atreju4:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 22:32:52 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 22:32:52 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18beaf87d1a_1c292ab9470d05f45645e6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: /var/cache/obs/cache/34/34bd9d179d8410597c4100e0ee04f548.13372 write: No space left on device (worker was old-atreju4:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Jul 22 22:32:52 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 22 Jul 2020 22:32:52 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18beaf483ea_1c292ab9470d05f456441d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: /var/cache/obs/cache/34/34bd9d179d8410597c4100e0ee04f548.9179 write: No space left on device (worker was old-atreju1:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Jul 22 22:36:07 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 22 Jul 2020 22:36:07 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 1: REBUILD -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 22 Jul 2020 22:36:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 22:42:03 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 22 Jul 2020 22:42:03 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 to look at the new patch set (#2). Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... NOT_FOR_MERGE: modify README to test gerrit comments Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba --- M README 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/71/19371/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 22:43:12 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 22 Jul 2020 22:43:12 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: REBUILD -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 22 Jul 2020 22:43:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 22:48:15 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 22 Jul 2020 22:48:15 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: REBUILD -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 22 Jul 2020 22:48:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 22:50:08 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 22 Jul 2020 22:50:08 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: REBUILD -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 22 Jul 2020 22:50:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 22:52:23 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 22 Jul 2020 22:52:23 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: REBUILD -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 22 Jul 2020 22:52:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 23:31:53 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 22 Jul 2020 23:31:53 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: REBUILD -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 22 Jul 2020 23:31:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 23:53:51 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 22 Jul 2020 23:53:51 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: REBUILD -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 22 Jul 2020 23:53:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 23:57:22 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 22 Jul 2020 23:57:22 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: REBUILD -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 22 Jul 2020 23:57:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 22 23:59:36 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 22 Jul 2020 23:59:36 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: REBUILD -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 22 Jul 2020 23:59:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 00:07:58 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 23 Jul 2020 00:07:58 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: REBUILD -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 23 Jul 2020 00:07:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 00:08:45 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 23 Jul 2020 00:08:45 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: REBUILD -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 23 Jul 2020 00:08:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 00:10:19 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 23 Jul 2020 00:10:19 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: REBUILD -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 23 Jul 2020 00:10:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 00:24:43 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 23 Jul 2020 00:24:43 +0000 Subject: Change in libosmocore[master]: libomsocoding: NEON viterbi acceleration References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19372 ) Change subject: libomsocoding: NEON viterbi acceleration ...................................................................... libomsocoding: NEON viterbi acceleration configure flag required to enable this: --enable-neon Although autodetection according to __ARM_NEON would work because this is only defined if the fpu is neon neon-fp16 neon-vfpv3 eon-vfpv4 neon-fp-armv8 crypto-neon-fp-armv8 doing that would lead to a unknown performance impact, so it needs to be enabled manually. Speedup is about ~1.3-1.5 on a unspecified single core Cortex A9. This requires handling a special case for RACH with len 14 which is far too short for neon and would actually incur a performance penalty of 25%. Change-Id: I58ff2cb4ce3514f43390ff0a2121f81e6a4983b5 --- M configure.ac M src/Makefile.am M src/conv_acc.c A src/conv_acc_neon.c A src/conv_acc_neon_impl.h 5 files changed, 506 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/19372/1 diff --git a/configure.ac b/configure.ac index f69c78d..2397b2f 100644 --- a/configure.ac +++ b/configure.ac @@ -378,6 +378,17 @@ AM_CONDITIONAL(HAVE_SSE4_1, false) fi +AC_ARG_ENABLE(neon, + [AS_HELP_STRING( + [--enable-neon], + [Enable NEON support] + )], + [neon=$enableval], [neon="no"]) +AC_DEFINE(HAVE_NEON,, +[Support ARM NEON instructions]) +AM_CONDITIONAL(HAVE_NEON, [test "x$neon" != "xno"]) + + OSMO_AC_CODE_COVERAGE dnl Check if the compiler supports specified GCC's built-in function diff --git a/src/Makefile.am b/src/Makefile.am index 16119d9..be09784 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,6 +48,11 @@ endif endif +if HAVE_NEON +libosmocore_la_SOURCES += conv_acc_neon.c +# conv_acc_neon.lo : AM_CFLAGS += -mfpu=neon no, could as well be vfp with neon +endif + BUILT_SOURCES = crc8gen.c crc16gen.c crc32gen.c crc64gen.c EXTRA_DIST = conv_acc_sse_impl.h crcXXgen.c.tpl diff --git a/src/conv_acc.c b/src/conv_acc.c index c16e436..773d87d 100644 --- a/src/conv_acc.c +++ b/src/conv_acc.c @@ -85,6 +85,11 @@ void osmo_conv_sse_avx_vdec_free(int16_t *ptr); #endif +#ifdef HAVE_NEON +int16_t *osmo_conv_neon_vdec_malloc(size_t n); +void osmo_conv_neon_vdec_free(int16_t *ptr); +#endif + /* Forward Metric Units */ void osmo_conv_gen_metrics_k5_n2(const int8_t *seq, const int16_t *out, int16_t *sums, int16_t *paths, int norm); @@ -129,6 +134,21 @@ int16_t *sums, int16_t *paths, int norm); #endif +#if defined(HAVE_NEON) +void osmo_conv_neon_metrics_k5_n2(const int8_t *seq, const int16_t *out, + int16_t *sums, int16_t *paths, int norm); +void osmo_conv_neon_metrics_k5_n3(const int8_t *seq, const int16_t *out, + int16_t *sums, int16_t *paths, int norm); +void osmo_conv_neon_metrics_k5_n4(const int8_t *seq, const int16_t *out, + int16_t *sums, int16_t *paths, int norm); +void osmo_conv_neon_metrics_k7_n2(const int8_t *seq, const int16_t *out, + int16_t *sums, int16_t *paths, int norm); +void osmo_conv_neon_metrics_k7_n3(const int8_t *seq, const int16_t *out, + int16_t *sums, int16_t *paths, int norm); +void osmo_conv_neon_metrics_k7_n4(const int8_t *seq, const int16_t *out, + int16_t *sums, int16_t *paths, int norm); +#endif + /* Trellis State * state - Internal lshift register value * prev - Register values of previous 0 and 1 states @@ -528,6 +548,12 @@ if (dec->k == 5) { switch (dec->n) { case 2: +/* rach len 14 is too short for neon */ +#ifdef HAVE_NEON + if(code->len < 100) + dec->metric_func = osmo_conv_gen_metrics_k5_n2; + else +#endif dec->metric_func = osmo_conv_metrics_k5_n2; break; case 3: @@ -681,6 +707,8 @@ } else { INIT_POINTERS(gen); } +#elif defined(HAVE_NEON) + INIT_POINTERS(neon); #else INIT_POINTERS(gen); #endif diff --git a/src/conv_acc_neon.c b/src/conv_acc_neon.c new file mode 100644 index 0000000..d6ba115 --- /dev/null +++ b/src/conv_acc_neon.c @@ -0,0 +1,109 @@ +/*! \file conv_acc_neon.c + * Accelerated Viterbi decoder implementation + * for architectures with only NEON available. */ +/* + * Copyright (C) 2020 Eric Wild + * + * 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 "config.h" + +#if defined(HAVE_NEON) +#include +#endif + +/* align req is 16 on android because google was confused, 8 on sane platforms */ +#define NEON_ALIGN 8 + +#include + +/* Aligned Memory Allocator + * NEON requires 8-byte memory alignment. We store relevant trellis values + * (accumulated sums, outputs, and path decisions) as 16 bit signed integers + * so the allocated memory is casted as such. + */ +__attribute__ ((visibility("hidden"))) +int16_t *osmo_conv_neon_vdec_malloc(size_t n) +{ + return (int16_t *) memalign(NEON_ALIGN, sizeof(int16_t) * n); +} + +__attribute__ ((visibility("hidden"))) +void osmo_conv_neon_vdec_free(int16_t *ptr) +{ + free(ptr); +} + +__attribute__ ((visibility("hidden"))) +void osmo_conv_neon_metrics_k5_n2(const int8_t *val, const int16_t *out, + int16_t *sums, int16_t *paths, int norm) +{ + const int16_t _val[4] = { val[0], val[1], val[0], val[1] }; + + _neon_metrics_k5_n2(_val, out, sums, paths, norm); +} + +__attribute__ ((visibility("hidden"))) +void osmo_conv_neon_metrics_k5_n3(const int8_t *val, const int16_t *out, + int16_t *sums, int16_t *paths, int norm) +{ + const int16_t _val[4] = { val[0], val[1], val[2], 0 }; + + _neon_metrics_k5_n4(_val, out, sums, paths, norm); +} + +__attribute__ ((visibility("hidden"))) +void osmo_conv_neon_metrics_k5_n4(const int8_t *val, const int16_t *out, + int16_t *sums, int16_t *paths, int norm) +{ + const int16_t _val[4] = { val[0], val[1], val[2], val[3] }; + + _neon_metrics_k5_n4(_val, out, sums, paths, norm); +} + +__attribute__ ((visibility("hidden"))) +void osmo_conv_neon_metrics_k7_n2(const int8_t *val, const int16_t *out, + int16_t *sums, int16_t *paths, int norm) +{ + const int16_t _val[4] = { val[0], val[1], val[0], val[1] }; + + _neon_metrics_k7_n2(_val, out, sums, paths, norm); +} + +__attribute__ ((visibility("hidden"))) +void osmo_conv_neon_metrics_k7_n3(const int8_t *val, const int16_t *out, + int16_t *sums, int16_t *paths, int norm) +{ + const int16_t _val[4] = { val[0], val[1], val[2], 0 }; + + _neon_metrics_k7_n4(_val, out, sums, paths, norm); +} + +__attribute__ ((visibility("hidden"))) +void osmo_conv_neon_metrics_k7_n4(const int8_t *val, const int16_t *out, + int16_t *sums, int16_t *paths, int norm) +{ + const int16_t _val[4] = { val[0], val[1], val[2], val[3] }; + + _neon_metrics_k7_n4(_val, out, sums, paths, norm); +} diff --git a/src/conv_acc_neon_impl.h b/src/conv_acc_neon_impl.h new file mode 100644 index 0000000..da8efa1 --- /dev/null +++ b/src/conv_acc_neon_impl.h @@ -0,0 +1,353 @@ +/*! \file conv_acc_neon_impl.h + * Accelerated Viterbi decoder implementation: + * straight port of SSE to NEON based on Tom Tsous work */ +/* + * Copyright (C) 2020 Eric Wild + * + * 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. + */ + +/* Some distributions (notably Alpine Linux) for some strange reason + * don't have this #define */ +#ifndef __always_inline +#define __always_inline inline __attribute__((always_inline)) +#endif + +#define NEON_BUTTERFLY(M0,M1,M2,M3,M4) \ +{ \ + M3 = vqaddq_s16(M0, M2); \ + M4 = vqsubq_s16(M1, M2); \ + M0 = vqsubq_s16(M0, M2); \ + M1 = vqaddq_s16(M1, M2); \ + M2 = vmaxq_s16(M3, M4); \ + M3 = vreinterpretq_s16_u16(vcgtq_s16(M3, M4)); \ + M4 = vmaxq_s16(M0, M1); \ + M1 = vreinterpretq_s16_u16(vcgtq_s16(M0, M1)); \ +} + +#define NEON_DEINTERLEAVE_K5(M0,M1,M2,M3) \ +{ \ + int16x8x2_t tmp; \ + tmp = vuzpq_s16(M0, M1); \ + M2 = tmp.val[0]; \ + M3 = tmp.val[1]; \ +} + +#define NEON_DEINTERLEAVE_K7(M0,M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12,M13,M14,M15) \ +{ \ + int16x8x2_t tmp; \ + tmp = vuzpq_s16(M0, M1); \ + M8 = tmp.val[0]; M9 = tmp.val[1]; \ + tmp = vuzpq_s16(M2, M3); \ + M10 = tmp.val[0]; M11 = tmp.val[1]; \ + tmp = vuzpq_s16(M4, M5); \ + M12 = tmp.val[0]; M13 = tmp.val[1]; \ + tmp = vuzpq_s16(M6, M7); \ + M14 = tmp.val[0]; M15 = tmp.val[1]; \ +} + +#define NEON_BRANCH_METRIC_N2(M0,M1,M2,M3,M4,M6,M7) \ +{ \ + M0 = vmulq_s16(M4, M0); \ + M1 = vmulq_s16(M4, M1); \ + M2 = vmulq_s16(M4, M2); \ + M3 = vmulq_s16(M4, M3); \ + M6 = vcombine_s16(vpadd_s16(vget_low_s16(M0), vget_high_s16(M0)), vpadd_s16(vget_low_s16(M1), vget_high_s16(M1))); \ + M7 = vcombine_s16(vpadd_s16(vget_low_s16(M2), vget_high_s16(M2)), vpadd_s16(vget_low_s16(M3), vget_high_s16(M3))); \ +} + +#define NEON_BRANCH_METRIC_N4(M0,M1,M2,M3,M4,M5) \ +{ \ + M0 = vmulq_s16(M4, M0); \ + M1 = vmulq_s16(M4, M1); \ + M2 = vmulq_s16(M4, M2); \ + M3 = vmulq_s16(M4, M3); \ + int16x4_t t1 = vpadd_s16(vpadd_s16(vget_low_s16(M0), vget_high_s16(M0)), vpadd_s16(vget_low_s16(M1), vget_high_s16(M1))); \ + int16x4_t t2 = vpadd_s16(vpadd_s16(vget_low_s16(M2), vget_high_s16(M2)), vpadd_s16(vget_low_s16(M3), vget_high_s16(M3))); \ + M5 = vcombine_s16(t1, t2); \ +} + +#define NEON_NORMALIZE_K5(M0,M1,M2,M3) \ +{ \ + M2 = vminq_s16(M0, M1); \ + int16x4_t t = vpmin_s16(vget_low_s16(M2), vget_high_s16(M2)); \ + t = vpmin_s16(t, t); \ + t = vpmin_s16(t, t); \ + M2 = vdupq_lane_s16(t, 0); \ + M0 = vqsubq_s16(M0, M2); \ + M1 = vqsubq_s16(M1, M2); \ +} + +#define NEON_NORMALIZE_K7(M0,M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11) \ +{ \ + M8 = vminq_s16(M0, M1); \ + M9 = vminq_s16(M2, M3); \ + M10 = vminq_s16(M4, M5); \ + M11 = vminq_s16(M6, M7); \ + M8 = vminq_s16(M8, M9); \ + M10 = vminq_s16(M10, M11); \ + M8 = vminq_s16(M8, M10); \ + int16x4_t t = vpmin_s16(vget_low_s16(M8), vget_high_s16(M8)); \ + t = vpmin_s16(t, t); \ + t = vpmin_s16(t, t); \ + M8 = vdupq_lane_s16(t, 0); \ + M0 = vqsubq_s16(M0, M8); \ + M1 = vqsubq_s16(M1, M8); \ + M2 = vqsubq_s16(M2, M8); \ + M3 = vqsubq_s16(M3, M8); \ + M4 = vqsubq_s16(M4, M8); \ + M5 = vqsubq_s16(M5, M8); \ + M6 = vqsubq_s16(M6, M8); \ + M7 = vqsubq_s16(M7, M8); \ +} + +__always_inline void _neon_metrics_k5_n2(const int16_t *val, const int16_t *outa, int16_t *sumsa, int16_t *paths, + int norm) +{ + int16_t *__restrict out = __builtin_assume_aligned(outa, 8); + int16_t *__restrict sums = __builtin_assume_aligned(sumsa, 8); + int16x8_t m0, m1, m2, m3, m4, m5, m6; + int16x4_t input; + + /* (BMU) Load and expand 8-bit input out to 16-bits */ + input = vld1_s16(val); + m2 = vcombine_s16(input, input); + + /* (BMU) Load and compute branch metrics */ + m0 = vld1q_s16(&out[0]); + m1 = vld1q_s16(&out[8]); + + m0 = vmulq_s16(m2, m0); + m1 = vmulq_s16(m2, m1); + m2 = vcombine_s16(vpadd_s16(vget_low_s16(m0), vget_high_s16(m0)), + vpadd_s16(vget_low_s16(m1), vget_high_s16(m1))); + + /* (PMU) Load accumulated path matrics */ + m0 = vld1q_s16(&sums[0]); + m1 = vld1q_s16(&sums[8]); + + NEON_DEINTERLEAVE_K5(m0, m1, m3, m4) + + /* (PMU) Butterflies: 0-7 */ + NEON_BUTTERFLY(m3, m4, m2, m5, m6) + + if (norm) + NEON_NORMALIZE_K5(m2, m6, m0, m1) + + vst1q_s16(&sums[0], m2); + vst1q_s16(&sums[8], m6); + vst1q_s16(&paths[0], m5); + vst1q_s16(&paths[8], m4); +} + +__always_inline void _neon_metrics_k5_n4(const int16_t *val, const int16_t *outa, int16_t *sumsa, int16_t *paths, + int norm) +{ + int16_t *__restrict out = __builtin_assume_aligned(outa, 8); + int16_t *__restrict sums = __builtin_assume_aligned(sumsa, 8); + int16x8_t m0, m1, m2, m3, m4, m5, m6; + int16x4_t input; + + /* (BMU) Load and expand 8-bit input out to 16-bits */ + input = vld1_s16(val); + m4 = vcombine_s16(input, input); + + /* (BMU) Load and compute branch metrics */ + m0 = vld1q_s16(&out[0]); + m1 = vld1q_s16(&out[8]); + m2 = vld1q_s16(&out[16]); + m3 = vld1q_s16(&out[24]); + + NEON_BRANCH_METRIC_N4(m0, m1, m2, m3, m4, m2) + + /* (PMU) Load accumulated path matrics */ + m0 = vld1q_s16(&sums[0]); + m1 = vld1q_s16(&sums[8]); + + NEON_DEINTERLEAVE_K5(m0, m1, m3, m4) + + /* (PMU) Butterflies: 0-7 */ + NEON_BUTTERFLY(m3, m4, m2, m5, m6) + + if (norm) + NEON_NORMALIZE_K5(m2, m6, m0, m1) + + vst1q_s16(&sums[0], m2); + vst1q_s16(&sums[8], m6); + vst1q_s16(&paths[0], m5); + vst1q_s16(&paths[8], m4); +} + +__always_inline static void _neon_metrics_k7_n2(const int16_t *val, const int16_t *outa, int16_t *sumsa, int16_t *paths, + int norm) +{ + int16_t *__restrict out = __builtin_assume_aligned(outa, 8); + int16_t *__restrict sums = __builtin_assume_aligned(sumsa, 8); + int16x8_t m0, m1, m2, m3, m4, m5, m6, m7; + int16x8_t m8, m9, m10, m11, m12, m13, m14, m15; + int16x4_t input; + + /* (PMU) Load accumulated path matrics */ + m0 = vld1q_s16(&sums[0]); + m1 = vld1q_s16(&sums[8]); + m2 = vld1q_s16(&sums[16]); + m3 = vld1q_s16(&sums[24]); + m4 = vld1q_s16(&sums[32]); + m5 = vld1q_s16(&sums[40]); + m6 = vld1q_s16(&sums[48]); + m7 = vld1q_s16(&sums[56]); + + /* (PMU) Deinterleave into even and odd packed registers */ + NEON_DEINTERLEAVE_K7(m0, m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13, m14, m15) + + /* (BMU) Load and expand 8-bit input out to 16-bits */ + input = vld1_s16(val); + m7 = vcombine_s16(input, input); + + /* (BMU) Load and compute branch metrics */ + m0 = vld1q_s16(&out[0]); + m1 = vld1q_s16(&out[8]); + m2 = vld1q_s16(&out[16]); + m3 = vld1q_s16(&out[24]); + + NEON_BRANCH_METRIC_N2(m0, m1, m2, m3, m7, m4, m5) + + m0 = vld1q_s16(&out[32]); + m1 = vld1q_s16(&out[40]); + m2 = vld1q_s16(&out[48]); + m3 = vld1q_s16(&out[56]); + + NEON_BRANCH_METRIC_N2(m0, m1, m2, m3, m7, m6, m7) + + /* (PMU) Butterflies: 0-15 */ + NEON_BUTTERFLY(m8, m9, m4, m0, m1) + NEON_BUTTERFLY(m10, m11, m5, m2, m3) + + vst1q_s16(&paths[0], m0); + vst1q_s16(&paths[8], m2); + vst1q_s16(&paths[32], m9); + vst1q_s16(&paths[40], m11); + + /* (PMU) Butterflies: 17-31 */ + NEON_BUTTERFLY(m12, m13, m6, m0, m2) + NEON_BUTTERFLY(m14, m15, m7, m9, m11) + + vst1q_s16(&paths[16], m0); + vst1q_s16(&paths[24], m9); + vst1q_s16(&paths[48], m13); + vst1q_s16(&paths[56], m15); + + if (norm) + NEON_NORMALIZE_K7(m4, m1, m5, m3, m6, m2, m7, m11, m0, m8, m9, m10) + + vst1q_s16(&sums[0], m4); + vst1q_s16(&sums[8], m5); + vst1q_s16(&sums[16], m6); + vst1q_s16(&sums[24], m7); + vst1q_s16(&sums[32], m1); + vst1q_s16(&sums[40], m3); + vst1q_s16(&sums[48], m2); + vst1q_s16(&sums[56], m11); +} + +__always_inline static void _neon_metrics_k7_n4(const int16_t *val, const int16_t *outa, int16_t *sumsa, int16_t *paths, + int norm) +{ + int16_t *__restrict out = __builtin_assume_aligned(outa, 8); + int16_t *__restrict sums = __builtin_assume_aligned(sumsa, 8); + int16x8_t m0, m1, m2, m3, m4, m5, m6, m7; + int16x8_t m8, m9, m10, m11, m12, m13, m14, m15; + int16x4_t input; + + /* (PMU) Load accumulated path matrics */ + m0 = vld1q_s16(&sums[0]); + m1 = vld1q_s16(&sums[8]); + m2 = vld1q_s16(&sums[16]); + m3 = vld1q_s16(&sums[24]); + m4 = vld1q_s16(&sums[32]); + m5 = vld1q_s16(&sums[40]); + m6 = vld1q_s16(&sums[48]); + m7 = vld1q_s16(&sums[56]); + + /* (PMU) Deinterleave into even and odd packed registers */ + NEON_DEINTERLEAVE_K7(m0, m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13, m14, m15) + + /* (BMU) Load and expand 8-bit input out to 16-bits */ + input = vld1_s16(val); + m7 = vcombine_s16(input, input); + + /* (BMU) Load and compute branch metrics */ + m0 = vld1q_s16(&out[0]); + m1 = vld1q_s16(&out[8]); + m2 = vld1q_s16(&out[16]); + m3 = vld1q_s16(&out[24]); + + NEON_BRANCH_METRIC_N4(m0, m1, m2, m3, m7, m4) + + m0 = vld1q_s16(&out[32]); + m1 = vld1q_s16(&out[40]); + m2 = vld1q_s16(&out[48]); + m3 = vld1q_s16(&out[56]); + + NEON_BRANCH_METRIC_N4(m0, m1, m2, m3, m7, m5) + + m0 = vld1q_s16(&out[64]); + m1 = vld1q_s16(&out[72]); + m2 = vld1q_s16(&out[80]); + m3 = vld1q_s16(&out[88]); + + NEON_BRANCH_METRIC_N4(m0, m1, m2, m3, m7, m6) + + m0 = vld1q_s16(&out[96]); + m1 = vld1q_s16(&out[104]); + m2 = vld1q_s16(&out[112]); + m3 = vld1q_s16(&out[120]); + + NEON_BRANCH_METRIC_N4(m0, m1, m2, m3, m7, m7) + + /* (PMU) Butterflies: 0-15 */ + NEON_BUTTERFLY(m8, m9, m4, m0, m1) + NEON_BUTTERFLY(m10, m11, m5, m2, m3) + + vst1q_s16(&paths[0], m0); + vst1q_s16(&paths[8], m2); + vst1q_s16(&paths[32], m9); + vst1q_s16(&paths[40], m11); + + /* (PMU) Butterflies: 17-31 */ + NEON_BUTTERFLY(m12, m13, m6, m0, m2) + NEON_BUTTERFLY(m14, m15, m7, m9, m11) + + vst1q_s16(&paths[16], m0); + vst1q_s16(&paths[24], m9); + vst1q_s16(&paths[48], m13); + vst1q_s16(&paths[56], m15); + + if (norm) + NEON_NORMALIZE_K7(m4, m1, m5, m3, m6, m2, m7, m11, m0, m8, m9, m10) + + vst1q_s16(&sums[0], m4); + vst1q_s16(&sums[8], m5); + vst1q_s16(&sums[16], m6); + vst1q_s16(&sums[24], m7); + vst1q_s16(&sums[32], m1); + vst1q_s16(&sums[40], m3); + vst1q_s16(&sums[48], m2); + vst1q_s16(&sums[56], m11); +} -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58ff2cb4ce3514f43390ff0a2121f81e6a4983b5 Gerrit-Change-Number: 19372 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 00:33:47 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 23 Jul 2020 00:33:47 +0000 Subject: Change in osmo-bts[master]: bts-trx: Integrate TRX provisioning logic more tightly into the FSM In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19367 ) Change subject: bts-trx: Integrate TRX provisioning logic more tightly into the FSM ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1b736a4be5ce52a854f5767d8609153e1f4c08d9 Gerrit-Change-Number: 19367 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 23 Jul 2020 00:33:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 00:34:47 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 23 Jul 2020 00:34:47 +0000 Subject: Change in osmo-bts[master]: bts-trx: Delay TRXC POWERON cmd until all TRXs are provisioned In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19368 ) Change subject: bts-trx: Delay TRXC POWERON cmd until all TRXs are provisioned ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I906be4714807c7a2793971cb6062120e24337d7b Gerrit-Change-Number: 19368 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 23 Jul 2020 00:34:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 00:36:46 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 23 Jul 2020 00:36:46 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: REBUILD -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 23 Jul 2020 00:36:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 00:38:27 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 23 Jul 2020 00:38:27 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: REBUILD -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 23 Jul 2020 00:38:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jul 23 01:33:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:33:31 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5f18e8fbdc7db_1c292ab9470d05f4689926@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/d9/d9f66f8b58062aed3ead0dff23b2859f.13073 write: No space left on device (worker was old-atreju1:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:33:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:33:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5f18e8fc27a08_1c292ab9470d05f46900e1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: /var/cache/obs/cache/d9/d9f66f8b58062aed3ead0dff23b2859f.28711 write: No space left on device (worker was old-atreju3:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:33:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:33:31 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5f18e8fc6b4ad_1c292ab9470d05f46901de@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: /var/cache/obs/cache/d9/d9f66f8b58062aed3ead0dff23b2859f.13074 write: No space left on device (worker was old-atreju1:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:33:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:33:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5f18e8fe9ba92_1c292ab9470d05f46909b5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: /var/cache/obs/cache/d9/d9f66f8b58062aed3ead0dff23b2859f.17302 write: No space left on device (worker was old-atreju4:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:33:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:33:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5f18e8fee4472_1c292ab9470d05f469105c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-pcap failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: /var/cache/obs/cache/d9/d9f66f8b58062aed3ead0dff23b2859f.17303 write: No space left on device (worker was old-atreju4:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:33:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:33:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5f18e8ff310c0_1c292ab9470d05f46911b8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-pcu failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: /var/cache/obs/cache/d9/d9f66f8b58062aed3ead0dff23b2859f.28717 write: No space left on device (worker was old-atreju3:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:33:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:33:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5f18e8ffa9cd0_1c292ab9470d05f4691234@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: /var/cache/obs/cache/d9/d9f66f8b58062aed3ead0dff23b2859f.13078 write: No space left on device (worker was old-atreju1:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:34:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:34:05 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <5f18e919dea7c_1c292ab9470d05f4691350@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/e9/e9e49d1213e1d7fcd7ace7bce146fc36.13087 write: No space left on device (worker was old-atreju1:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:34:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:34:05 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <5f18e91a72de9_1c292ab9470d05f46915c9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/libasn1c failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: /var/cache/obs/cache/56/5680edd4ee0aae06b5a32c2ecac7b5ed.5519 write: No space left on device (worker was old-atreju2:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:34:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:34:05 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <5f18e91aea540_1c292ab9470d05f4691770@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: /var/cache/obs/cache/09/0996cd2cca04dc7443ea9a1d38e8dbfd.2288 write: No space left on device (worker was old-atreju5:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:34:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:34:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <5f18e91b6eb63_1c292ab9470d05f469198@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: /var/cache/obs/cache/09/0996cd2cca04dc7443ea9a1d38e8dbfd.28726 write: No space left on device (worker was old-atreju3:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:34:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:34:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <5f18e91c80b98_1c292ab9470d05f469236a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-pcap failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: /var/cache/obs/cache/e9/e9e49d1213e1d7fcd7ace7bce146fc36.5520 write: No space left on device (worker was old-atreju2:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:34:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:34:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5f18e91d3be67_1c292ab9470d05f4692526@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: /var/cache/obs/cache/a2/a29dcff08ea706e63c327e9ca8a58d8a.5526 write: No space left on device (worker was old-atreju2:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:34:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:34:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5f18e91dd0368_1c292ab9470d05f469273a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: /var/cache/obs/cache/59/5947f727233b2ae3eb045e33d4f27730.13089 write: No space left on device (worker was old-atreju1:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:34:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:34:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <5f18e91d8aac2_1c292ab9470d05f46926e3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: /var/cache/obs/cache/78/786d9f6e70f6c30f34bf714a6e9a5073.17313 write: No space left on device (worker was old-atreju4:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:34:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:34:39 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <5f18e939d047a_1c292ab9470d05f4693098@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: /var/cache/obs/cache/07/0735764e8c0d0ce01cb9ae442d99f175.13101 write: No space left on device (worker was old-atreju1:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:34:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:34:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <5f18e93a1a5dc_1c292ab9470d05f469315@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: /var/cache/obs/cache/07/0735764e8c0d0ce01cb9ae442d99f175.5562 write: No space left on device (worker was old-atreju2:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:34:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:34:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in openSUSE_Tumbleweed/x86_64 In-Reply-To: References: Message-ID: <5f18e9545ccf2_1c292ab9470d05f4693435@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: /var/cache/obs/cache/fc/fcfe95c44be5839d97ee547ed37c7542.17329 write: No space left on device (worker was old-atreju4:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:34:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:34:56 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in openSUSE_Tumbleweed/x86_64 In-Reply-To: References: Message-ID: <5f18e9549cdb4_1c292ab9470d05f469356f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/libasn1c failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: /var/cache/obs/cache/f9/f908b9a4f3a18b3d56117c52ad50bc0e.13107 write: No space left on device (worker was old-atreju1:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:35:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:35:14 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in openSUSE_Tumbleweed/x86_64 In-Reply-To: References: Message-ID: <5f18e9555b584_1c292ab9470d05f4693621@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/4c/4c694ff2bff522cce1c8c4aeebb07e68.28745 write: No space left on device (worker was old-atreju3:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:35:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:35:48 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in CentOS_8_Stream/x86_64 In-Reply-To: References: Message-ID: <5f18e9911e707_1c292ab9470d05f46938d1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/CentOS_8_Stream/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in CentOS_8_Stream/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/8c/8c5a96c5ad53e6414842054991e47608.17344 write: No space left on device (worker was old-atreju4:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:35:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:35:48 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in CentOS_8_Stream/x86_64 In-Reply-To: References: Message-ID: <5f18e9915a0f0_1c292ab9470d05f469391e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/CentOS_8_Stream/x86_64 Package network:osmocom:nightly/libasn1c failed to build in CentOS_8_Stream/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: /var/cache/obs/cache/34/3444420fdc175ebfe0fc0f99c9b74eef.28762 write: No space left on device (worker was old-atreju3:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:35:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:35:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in CentOS_8_Stream/x86_64 In-Reply-To: References: Message-ID: <5f18e9919c591_1c292ab9470d05f46940f4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/CentOS_8_Stream/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in CentOS_8_Stream/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: /var/cache/obs/cache/e5/e59653622ed7e081bd98087da50459cf.5653 write: No space left on device (worker was old-atreju2:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:35:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:35:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <5f18e991d97d2_1c292ab9470d05f4694197@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: /var/cache/obs/cache/9d/9de93c341b6ba7121b959121eb9093d6.13122 write: No space left on device (worker was old-atreju1:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:35:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:35:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in CentOS_8_Stream/x86_64 In-Reply-To: References: Message-ID: <5f18e99221cb9_1c292ab9470d05f4694248@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/CentOS_8_Stream/x86_64 Package network:osmocom:nightly/osmo-pcap failed to build in CentOS_8_Stream/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: /var/cache/obs/cache/db/db056e6102586ccf9e703f68000c9505.2423 write: No space left on device (worker was old-atreju5:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:35:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:35:48 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in openSUSE_Tumbleweed/x86_64 In-Reply-To: References: Message-ID: <5f18e9925f5fe_1c292ab9470d05f4694377@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: /var/cache/obs/cache/02/020743cabcd965028603e824e4ce3259.13123 write: No space left on device (worker was old-atreju1:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:35:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:35:48 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <5f18e9929b343_1c292ab9470d05f4694468@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/libasn1c failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: /var/cache/obs/cache/94/944b2b8b9786cec7279b92067767607b.2422 write: No space left on device (worker was old-atreju5:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:35:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:35:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <5f18e99348293_1c292ab9470d05f46947b8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: /var/cache/obs/cache/9a/9af93ce274b94a92608424ee8ae8ae21.28763 write: No space left on device (worker was old-atreju3:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:35:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:35:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in openSUSE_Tumbleweed/x86_64 In-Reply-To: References: Message-ID: <5f18e9931550c_1c292ab9470d05f469468c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: /var/cache/obs/cache/02/020743cabcd965028603e824e4ce3259.5654 write: No space left on device (worker was old-atreju2:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:35:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:35:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in CentOS_8_Stream/x86_64 In-Reply-To: References: Message-ID: <5f18e992d1bb1_1c292ab9470d05f4694527@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/CentOS_8_Stream/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in CentOS_8_Stream/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: /var/cache/obs/cache/9f/9f2b8997b837477d4388ff856495b5d9.17345 write: No space left on device (worker was old-atreju4:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:36:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:36:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <5f18e9951379f_1c292ab9470d05f46948fa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-pcu failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: /var/cache/obs/cache/85/851afa66b41e919e6a6fbacb01ea8b5b.17357 write: No space left on device (worker was old-atreju4:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:36:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:36:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in CentOS_8_Stream/x86_64 In-Reply-To: References: Message-ID: <5f18e9954f77b_1c292ab9470d05f46949e2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/CentOS_8_Stream/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in CentOS_8_Stream/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: /var/cache/obs/cache/1e/1ea2ce1f191b2254dfeeace9c7431f79.28774 write: No space left on device (worker was old-atreju3:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:36:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:36:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in openSUSE_Tumbleweed/x86_64 In-Reply-To: References: Message-ID: <5f18e9958aa27_1c292ab9470d05f469503f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: /var/cache/obs/cache/88/884fae38c2370472060e9dd0760e8a0d.2455 write: No space left on device (worker was old-atreju5:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:36:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:36:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in openSUSE_Tumbleweed/x86_64 In-Reply-To: References: Message-ID: <5f18e9afdefbf_1c292ab9470d05f469511c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: /var/cache/obs/cache/d6/d607b93af995e815a031646cdd57a13d.17368 write: No space left on device (worker was old-atreju4:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:36:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:36:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx-debian8 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5f18e9b09b965_1c292ab9470d05f46954d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx-debian8/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-trx-debian8 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx-debian8 Last lines of build log: /var/cache/obs/cache/26/26293cca6864b25df10ded0b9469a28b.2496 write: No space left on device (worker was old-atreju5:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:36:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:36:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in CentOS_8_Stream/x86_64 In-Reply-To: References: Message-ID: <5f18e9b12d9dd_1c292ab9470d05f469562f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/CentOS_8_Stream/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in CentOS_8_Stream/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: /var/cache/obs/cache/3b/3b6c3e887d90f75a34b247df7342179a.5735 write: No space left on device (worker was old-atreju2:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:36:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:36:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5f18e9b0d8d8a_1c292ab9470d05f46955d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: /var/cache/obs/cache/00/00f7576f0f82e70753d5453415996584.28785 write: No space left on device (worker was old-atreju3:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:36:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:36:39 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5f18e9b29c429_1c292ab9470d05f4695782@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/ef/ef14e3a837c081695191ac6834bcf3df.13145 write: No space left on device (worker was old-atreju1:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:36:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:36:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5f18e9b2d61c8_1c292ab9470d05f46958c8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: /var/cache/obs/cache/ef/ef14e3a837c081695191ac6834bcf3df.28783 write: No space left on device (worker was old-atreju3:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:36:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:36:39 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in CentOS_8_Stream/x86_64 In-Reply-To: References: Message-ID: <5f18e9b336f03_1c292ab9470d05f4695989@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/CentOS_8_Stream/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in CentOS_8_Stream/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: /var/cache/obs/cache/9e/9eee079372a84e008d0130f5e3c4cc1a.5734 write: No space left on device (worker was old-atreju2:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:36:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:36:39 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5f18e9b378e0c_1c292ab9470d05f4696011@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/42/42bd5e4da1c4676cf1fd4779a65bce69.28784 write: No space left on device (worker was old-atreju3:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:36:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:36:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5f18e9b3b9896_1c292ab9470d05f46961a4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-pcap failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: /var/cache/obs/cache/38/38abfc6b6af668d0f253dcdafc070003.13146 write: No space left on device (worker was old-atreju1:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:36:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:36:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <5f18e9b4175a5_1c292ab9470d05f469624b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: /var/cache/obs/cache/4a/4ae0f3ad9efb0548216cdfe36dd0e6b4.2495 write: No space left on device (worker was old-atreju5:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:36:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:36:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5f18e9b45b62e_1c292ab9470d05f4696351@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-pcap failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: /var/cache/obs/cache/42/42bd5e4da1c4676cf1fd4779a65bce69.17367 write: No space left on device (worker was old-atreju4:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:36:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:36:56 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5f18e9ce4a7a1_1c292ab9470d05f46964aa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/81/81d29ab0ce7fda9ff4380d824b7029b4.17380 write: No space left on device (worker was old-atreju4:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:14 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f18e9cf65511_1c292ab9470d05f4696550@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: /var/cache/obs/cache/b0/b010bb372f1626f91d00e4a59c9b0803.5795 write: No space left on device (worker was old-atreju2:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f18e9cfa407b_1c292ab9470d05f46966b8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_10/x86_64 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: /var/cache/obs/cache/b0/b010bb372f1626f91d00e4a59c9b0803.13164 write: No space left on device (worker was old-atreju1:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:14 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f18e9cfe18ab_1c292ab9470d05f4696748@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_10/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/b0/b010bb372f1626f91d00e4a59c9b0803.2571 write: No space left on device (worker was old-atreju5:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5f18e9d136e60_1c292ab9470d05f46971a8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: /var/cache/obs/cache/98/986b4fba2dd45c3f239c853263e3830f.13159 write: No space left on device (worker was old-atreju1:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:14 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in CentOS_8_Stream/x86_64 In-Reply-To: References: Message-ID: <5f18e9d0e1307_1c292ab9470d05f469703b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/CentOS_8_Stream/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in CentOS_8_Stream/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/51/5132553f764eb6c0feae71dbd71275ed.28796 write: No space left on device (worker was old-atreju3:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:14 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5f18e9d174b19_1c292ab9470d05f46972c6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: /var/cache/obs/cache/81/81d29ab0ce7fda9ff4380d824b7029b4.2538 write: No space left on device (worker was old-atreju5:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:14 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5f18e9d06f399_1c292ab9470d05f469697a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: /var/cache/obs/cache/2d/2dcfa3561b1d9ba568dfd1855156e049.28801 write: No space left on device (worker was old-atreju3:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:14 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5f18e9d1b62cc_1c292ab9470d05f469736d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: /var/cache/obs/cache/99/99f88c2d64009f8c175e5264e4318baa.5776 write: No space left on device (worker was old-atreju2:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5f18e9d221507_1c292ab9470d05f46974d0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: /var/cache/obs/cache/98/986b4fba2dd45c3f239c853263e3830f.2546 write: No space left on device (worker was old-atreju5:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5f18e9d263ff2_1c292ab9470d05f469759d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: /var/cache/obs/cache/99/99f88c2d64009f8c175e5264e4318baa.28797 write: No space left on device (worker was old-atreju3:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5f18e9d2ac75d_1c292ab9470d05f4697619@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: /var/cache/obs/cache/46/461fd749acd1c1906b977a50cf51f44a.17381 write: No space left on device (worker was old-atreju4:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:48 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18ea063e11f_1c292ab9470d05f46977ce@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_Unstable/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/4d/4d17772c119c0677e27cf9f792b3ffe3.13172 write: No space left on device (worker was old-atreju1:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:48 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5f18ea0684112_1c292ab9470d05f46978ec@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/b9/b950d87cdf91ff7b9fb15b6ec08bb811.17394 write: No space left on device (worker was old-atreju4:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:48 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18ea06c616d_1c292ab9470d05f46979d6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_Unstable/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: /var/cache/obs/cache/4d/4d17772c119c0677e27cf9f792b3ffe3.17395 write: No space left on device (worker was old-atreju4:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <5f18ea0711676_1c292ab9470d05f469808c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: /var/cache/obs/cache/db/dbd0b1466dc7d66a4a0912cd97975466.5828 write: No space left on device (worker was old-atreju2:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:48 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <5f18ea07556fb_1c292ab9470d05f4698141@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: /var/cache/obs/cache/7b/7bccd7fb2e45d638132d64d59c25da1c.5829 write: No space left on device (worker was old-atreju2:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in CentOS_8_Stream/x86_64 In-Reply-To: References: Message-ID: <5f18ea07ddd85_1c292ab9470d05f469834@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/CentOS_8_Stream/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in CentOS_8_Stream/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: /var/cache/obs/cache/d4/d49bd34c679b090e066062042d19f7b3.28810 write: No space left on device (worker was old-atreju3:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:48 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5f18ea0799061_1c292ab9470d05f46982bd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: /var/cache/obs/cache/30/30c8de2203d32214dc29a3d48ddfa12e.2613 write: No space left on device (worker was old-atreju5:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <5f18ea08d4769_1c292ab9470d05f4698666@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: /var/cache/obs/cache/85/851afa66b41e919e6a6fbacb01ea8b5b.5835 write: No space left on device (worker was old-atreju2:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18ea088bf39_1c292ab9470d05f469859d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: /var/cache/obs/cache/4d/4d17772c119c0677e27cf9f792b3ffe3.2614 write: No space left on device (worker was old-atreju5:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5f18ea0926d35_1c292ab9470d05f46987e7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: /var/cache/obs/cache/d9/d9f66f8b58062aed3ead0dff23b2859f.17396 write: No space left on device (worker was old-atreju4:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:48 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5f18ea0849752_1c292ab9470d05f4698454@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/24/246bc16a1019b6ef712f2a7211cc9f67.13174 write: No space left on device (worker was old-atreju1:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5f18ea09c1951_1c292ab9470d05f46989b2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: /var/cache/obs/cache/42/42bd5e4da1c4676cf1fd4779a65bce69.28812 write: No space left on device (worker was old-atreju3:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:48 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5f18ea096c39e_1c292ab9470d05f46988e4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/63/63c6dfd8f41d42a0be524ce3a17120a7.28811 write: No space left on device (worker was old-atreju3:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5f18ea0ae353_1c292ab9470d05f4699076@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-sysmon failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: /var/cache/obs/cache/42/42bd5e4da1c4676cf1fd4779a65bce69.5836 write: No space left on device (worker was old-atreju2:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:37:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:37:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-uecups in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5f18ea0a51445_1c292ab9470d05f46991e0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-uecups/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-uecups failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-uecups Last lines of build log: /var/cache/obs/cache/42/42bd5e4da1c4676cf1fd4779a65bce69.17397 write: No space left on device (worker was old-atreju4:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5f18ea0b6ff9f_1c292ab9470d05f46993c6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: /var/cache/obs/cache/35/353f57c368a9edda9a874dc7dde1f33b.17405 write: No space left on device (worker was old-atreju4:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in openSUSE_Tumbleweed/x86_64 In-Reply-To: References: Message-ID: <5f18ea0bb614f_1c292ab9470d05f46994cb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: /var/cache/obs/cache/dd/ddf32f22e361f7a53229acf42e41f756.28817 write: No space left on device (worker was old-atreju3:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <5f18ea0c66760_1c292ab9470d05f46996f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: /var/cache/obs/cache/df/dfbe4783ea6c6a689c5154574c8c8d24.2641 write: No space left on device (worker was old-atreju5:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:05 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <5f18ea0c27a80_1c292ab9470d05f46995d1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/09/09bb32956b07efb84999450eb5f67f55.13180 write: No space left on device (worker was old-atreju1:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5f18ea0e6e6c5_1c292ab9470d05f46997e4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: /var/cache/obs/cache/12/12f9545d1372197ed14d006aeb05b91b.2642 write: No space left on device (worker was old-atreju5:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:05 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5f18ea0ea6eea_1c292ab9470d05f4699854@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_8.0/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/12/12f9545d1372197ed14d006aeb05b91b.5860 write: No space left on device (worker was old-atreju2:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5f18ea0ee2606_1c292ab9470d05f469995d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: /var/cache/obs/cache/12/12f9545d1372197ed14d006aeb05b91b.17404 write: No space left on device (worker was old-atreju4:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5f18ea0f276d3_1c292ab9470d05f47000a4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: /var/cache/obs/cache/12/12f9545d1372197ed14d006aeb05b91b.28818 write: No space left on device (worker was old-atreju3:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:05 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18ea0f64f37_1c292ab9470d05f47001a2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_Unstable/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: /var/cache/obs/cache/02/02191ad03ed8830c913d2ef96565c4f9.5861 write: No space left on device (worker was old-atreju2:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:22 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5f18ea293c11f_1c292ab9470d05f4700218@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_8.0/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: /var/cache/obs/cache/d6/d6dd6f7f8eb2a4de6aa5ebfa207c86b3.28827 write: No space left on device (worker was old-atreju3:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18ea29a1784_1c292ab9470d05f470033d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-sysmon failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: /var/cache/obs/cache/2f/2f1f13f1aa41328b6f91b355592c20d6.17415 write: No space left on device (worker was old-atreju4:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:22 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <5f18ea2a55812_1c292ab9470d05f4700467@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/libusrp failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: 500 rename /var/cache/obs/cache/content.new /var/cache/obs/cache/content: No such file or directory (worker was old-atreju5:5) gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5f18ea2badb21_1c292ab9470d05f470056c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: /var/cache/obs/cache/16/16f85acd744fc3dfce8296ba03ffe3a8.28832 write: No space left on device (worker was old-atreju3:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:39 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5f18ea2c9f32_1c292ab9470d05f47006d0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_8.0/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/16/16f85acd744fc3dfce8296ba03ffe3a8.2692 write: No space left on device (worker was old-atreju5:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5f18ea2c542ca_1c292ab9470d05f4700732@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: /var/cache/obs/cache/16/16f85acd744fc3dfce8296ba03ffe3a8.2693 write: No space left on device (worker was old-atreju5:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5f18ea2c9a70f_1c292ab9470d05f470082b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-sysmon failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: /var/cache/obs/cache/16/16f85acd744fc3dfce8296ba03ffe3a8.5908 write: No space left on device (worker was old-atreju2:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-uecups in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5f18ea2d1a448_1c292ab9470d05f47009d9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-uecups/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-uecups failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-uecups Last lines of build log: /var/cache/obs/cache/16/16f85acd744fc3dfce8296ba03ffe3a8.13196 write: No space left on device (worker was old-atreju1:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5f18ea42b55ce_1c292ab9470d05f4701061@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: /var/cache/obs/cache/81/81d29ab0ce7fda9ff4380d824b7029b4.28837 write: No space left on device (worker was old-atreju3:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5f18ea4386cef_1c292ab9470d05f470114a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: /var/cache/obs/cache/81/81d29ab0ce7fda9ff4380d824b7029b4.2726 write: No space left on device (worker was old-atreju5:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-uecups in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5f18ea43bf668_1c292ab9470d05f47012f1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-uecups/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-uecups failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-uecups Last lines of build log: /var/cache/obs/cache/81/81d29ab0ce7fda9ff4380d824b7029b4.17426 write: No space left on device (worker was old-atreju4:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5f18ea441326_1c292ab9470d05f4701325@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: /var/cache/obs/cache/e3/e3084b05dc5c92840de443e5cd6b5225.2725 write: No space left on device (worker was old-atreju5:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5f18ea444b591_1c292ab9470d05f4701426@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: /var/cache/obs/cache/61/615ce71da84f695067b3d82a1d24609b.5939 write: No space left on device (worker was old-atreju2:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5f18ea44d8353_1c292ab9470d05f4701684@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/0d/0dbf87874a253d2ce39efaa178555b90.2706 write: No space left on device (worker was old-atreju5:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in CentOS_8_Stream/x86_64 In-Reply-To: References: Message-ID: <5f18ea4493a51_1c292ab9470d05f470153b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/CentOS_8_Stream/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in CentOS_8_Stream/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/80/80ef71f662e5479affc8a58853abe423.2705 write: No space left on device (worker was old-atreju5:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5f18ea4523a08_1c292ab9470d05f470178b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: /var/cache/obs/cache/9e/9e04fba8a793724ba9a71c4a4ea208f5.28834 write: No space left on device (worker was old-atreju3:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:38:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:38:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <5f18ea457a7e0_1c292ab9470d05f47018ad@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: /var/cache/obs/cache/4e/4ecae90a1c33d7e4f6f8a96bdb43327b.17419 write: No space left on device (worker was old-atreju4:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:39:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:39:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5f18ea64799f8_1c292ab9470d05f4701932@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: /var/cache/obs/cache/e3/e3084b05dc5c92840de443e5cd6b5225.28839 write: No space left on device (worker was old-atreju3:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:39:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:39:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in CentOS_8_Stream/x86_64 In-Reply-To: References: Message-ID: <5f18ea64c35b3_1c292ab9470d05f4702083@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/CentOS_8_Stream/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in CentOS_8_Stream/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: /var/cache/obs/cache/c2/c29fac733a01d790a0b2f60d37208c1e.28846 write: No space left on device (worker was old-atreju3:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:39:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:39:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in CentOS_8_Stream/x86_64 In-Reply-To: References: Message-ID: <5f18ea651fe08_1c292ab9470d05f4702191@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/CentOS_8_Stream/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in CentOS_8_Stream/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: /var/cache/obs/cache/c2/c29fac733a01d790a0b2f60d37208c1e.13207 write: No space left on device (worker was old-atreju1:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:39:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:39:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <5f18ea65adfc1_1c292ab9470d05f47023b6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: /var/cache/obs/cache/63/63cd85840de1f2cdb84da8eb0e9cfed2.28838 write: No space left on device (worker was old-atreju3:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:39:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:39:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <5f18ea66a7414_1c292ab9470d05f47027dd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/98/98900834a928dc5fdd431fa91238cd41.17425 write: No space left on device (worker was old-atreju4:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:39:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:39:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <5f18ea672e836_1c292ab9470d05f470287d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: /var/cache/obs/cache/2b/2bace603fe399febba10ae5840fadbd7.13201 write: No space left on device (worker was old-atreju1:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:40:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:40:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in CentOS_8_Stream/x86_64 In-Reply-To: References: Message-ID: <5f18ea8590d27_1c292ab9470d05f4702996@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/CentOS_8_Stream/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in CentOS_8_Stream/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: /var/cache/obs/cache/d3/d314cad3addb451a30fd89d6ef8fb663.6013 write: No space left on device (worker was old-atreju2:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:40:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:40:05 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5f18ea85dbb42_1c292ab9470d05f4703048@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: /var/cache/obs/cache/72/7207d8ad67b2c30a5b3f536503e4c442.2802 write: No space left on device (worker was old-atreju5:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:40:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:40:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5f18ea8628343_1c292ab9470d05f470313@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: /var/cache/obs/cache/72/7207d8ad67b2c30a5b3f536503e4c442.17446 write: No space left on device (worker was old-atreju4:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:40:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:40:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5f18eabe26694_1c292ab9470d05f470355a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-sysmon failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: /var/cache/obs/cache/38/38abfc6b6af668d0f253dcdafc070003.17474 write: No space left on device (worker was old-atreju4:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:41:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:41:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f18eabed6aa4_1c292ab9470d05f4703676@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/Debian_10/x86_64 Package network:osmocom:nightly/osmo-sysmon failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: /var/cache/obs/cache/06/0601dd2fa73e5fd6534ff8430a2e640f.6123 write: No space left on device (worker was old-atreju2:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:41:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:41:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5f18eaf9c2e42_1c292ab9470d05f4703760@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: /var/cache/obs/cache/c3/c3c09b090fff80de4edac19e660e6179.28912 write: No space left on device (worker was old-atreju3:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:42:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:42:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5f18eafa77069_1c292ab9470d05f4703882@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/c4/c466ffc8263b6924785d6eea74888060.28918 write: No space left on device (worker was old-atreju3:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:42:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:42:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in openSUSE_Tumbleweed/x86_64 In-Reply-To: References: Message-ID: <5f18eb162bd9a_1c292ab9470d05f47039c5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: /var/cache/obs/cache/83/83d94631cbb548bd2c69a69fc048a9cb.17512 write: No space left on device (worker was old-atreju4:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:42:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:42:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in openSUSE_Tumbleweed/x86_64 In-Reply-To: References: Message-ID: <5f18eb1677421_1c292ab9470d05f470402b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: /var/cache/obs/cache/ef/ef428376415566de2bd962222f3a5bc3.6233 write: No space left on device (worker was old-atreju2:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:43:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:43:31 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18eb583af8b_1c292ab9470d05f4704323@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/dc/dce31fb327db184a91726ea04187624e.28952 write: No space left on device (worker was old-atreju3:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:43:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:43:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18eb57d4db7_1c292ab9470d05f47042e0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: /var/cache/obs/cache/dc/dce31fb327db184a91726ea04187624e.3112 write: No space left on device (worker was old-atreju5:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:43:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:43:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18eb5888706_1c292ab9470d05f47044bd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: /var/cache/obs/cache/4d/4d17772c119c0677e27cf9f792b3ffe3.28953 write: No space left on device (worker was old-atreju3:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:43:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:43:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18eb58c90d9_1c292ab9470d05f470459@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: /var/cache/obs/cache/4d/4d17772c119c0677e27cf9f792b3ffe3.17539 write: No space left on device (worker was old-atreju4:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:43:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:43:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5f18eb59f020_1c292ab9470d05f47046dd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: /var/cache/obs/cache/df/df935f9797b43ff171f9af18cf2bf1a8.13319 write: No space left on device (worker was old-atreju1:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:43:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:43:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18eb595773b_1c292ab9470d05f47047ac@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: /var/cache/obs/cache/4d/4d17772c119c0677e27cf9f792b3ffe3.3118 write: No space left on device (worker was old-atreju5:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:43:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:43:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18eb59986b8_1c292ab9470d05f4704888@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: /var/cache/obs/cache/dc/dce31fb327db184a91726ea04187624e.13320 write: No space left on device (worker was old-atreju1:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:43:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:43:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18eb59ec057_1c292ab9470d05f4704932@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: /var/cache/obs/cache/4d/4d17772c119c0677e27cf9f792b3ffe3.17540 write: No space left on device (worker was old-atreju4:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:43:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:43:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-uecups in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18eb5a4d6f9_1c292ab9470d05f47050e4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-uecups/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-uecups failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-uecups Last lines of build log: /var/cache/obs/cache/4d/4d17772c119c0677e27cf9f792b3ffe3.13322 write: No space left on device (worker was old-atreju1:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:43:32 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:43:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18eb5b7f007_1c292ab9470d05f470516e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: /var/cache/obs/cache/1d/1d0c7a5d6390a24504aa5ac1e0d4472c.3119 write: No space left on device (worker was old-atreju5:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:43:32 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:43:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5f18eb5bc271c_1c292ab9470d05f470524e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/54/54ebb05cc4d76b792cd26812964df08d.13321 write: No space left on device (worker was old-atreju1:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:43:32 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:43:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5f18eb5c231c4_1c292ab9470d05f470531c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: /var/cache/obs/cache/1d/1d3c251d96f9f5325df49398dc0ddcae.3113 write: No space left on device (worker was old-atreju5:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:43:32 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:43:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18eb5c80481_1c292ab9470d05f47054cb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: /var/cache/obs/cache/73/73501ce83c4b0b0c6b75f626cdc1eb12.6319 write: No space left on device (worker was old-atreju2:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:43:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:43:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5f18eb72427cf_1c292ab9470d05f47056f3@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: /var/cache/obs/cache/34/340210ff7854b6a82c4a310995c515f9.3139 write: No space left on device (worker was old-atreju5:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:43:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:43:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5f18eb72a70bc_1c292ab9470d05f47057cb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: /var/cache/obs/cache/58/58020fdde0bbe5a64ac207bd710c59eb.13328 write: No space left on device (worker was old-atreju1:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:43:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:43:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18eb72e4d44_1c292ab9470d05f4705840@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: /var/cache/obs/cache/6c/6c8b2cd38c5bb64c971a14fac269bb9a.6345 write: No space left on device (worker was old-atreju2:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:43:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:43:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18eb7343a0b_1c292ab9470d05f4705992@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/09/09126f543c1b898083e3edde83646ed4.13329 write: No space left on device (worker was old-atreju1:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:44:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:44:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18eb73ec58f_1c292ab9470d05f4706039@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: /var/cache/obs/cache/d9/d9a590b2cf9f86d14fdcba38307cb352.3169 write: No space left on device (worker was old-atreju5:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:44:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:44:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5f18eb7436a0c_1c292ab9470d05f470614f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: /var/cache/obs/cache/fb/fb10279c21dc1cafdb0215618d574fcc.6373 write: No space left on device (worker was old-atreju2:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:44:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:44:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f18eb747805b_1c292ab9470d05f47062d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: /var/cache/obs/cache/d9/d9a590b2cf9f86d14fdcba38307cb352.28971 write: No space left on device (worker was old-atreju3:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:44:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:44:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5f18ebab38c51_1c292ab9470d05f47064fb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/62/62243efd1a65d4ee61b4d962843cb50b.13350 write: No space left on device (worker was old-atreju1:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:44:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:44:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5f18ebab9670c_1c292ab9470d05f4706545@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: /var/cache/obs/cache/b7/b7c05d47ec1dfb297394021c9c6659f3.6436 write: No space left on device (worker was old-atreju2:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:47:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:47:14 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f18ec419a708_1c292ab9470d05f470696f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_9.0/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/47/471d708c4377c6f34a22d6377c9a439f.3455 write: No space left on device (worker was old-atreju5:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:47:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:47:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f18ec41dff0f_1c292ab9470d05f47070f9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: /var/cache/obs/cache/47/471d708c4377c6f34a22d6377c9a439f.13419 write: No space left on device (worker was old-atreju1:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:47:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:47:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5f18ec4236b93_1c292ab9470d05f4707158@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: /var/cache/obs/cache/08/087dfc05f4d68c0152e45fd8c460adb8.29059 write: No space left on device (worker was old-atreju3:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:47:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:47:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f18ec428708f_1c292ab9470d05f4707217@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: /var/cache/obs/cache/1d/1d36b26294266fdbbb429c7a33d05237.17638 write: No space left on device (worker was old-atreju4:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:47:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:47:48 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f18ec63518b4_1c292ab9470d05f47073c8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_9.0/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: /var/cache/obs/cache/5f/5ffb50ea5effa86cc126de148ffd38a5.29068 write: No space left on device (worker was old-atreju3:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:47:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:47:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f18ec6390f71_1c292ab9470d05f47074b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: /var/cache/obs/cache/5f/5ffb50ea5effa86cc126de148ffd38a5.13428 write: No space left on device (worker was old-atreju1:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:48:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:48:05 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f18ec6484e2e_1c292ab9470d05f47075de@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_9.0/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/0e/0e5c14b0999b9b5b8b379134563cb541.3520 write: No space left on device (worker was old-atreju5:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:48:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:48:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f18ec64da616_1c292ab9470d05f4707692@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: /var/cache/obs/cache/0e/0e5c14b0999b9b5b8b379134563cb541.29078 write: No space left on device (worker was old-atreju3:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:48:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:48:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5f18ec807a43b_1c292ab9470d05f47077aa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: /var/cache/obs/cache/94/94a6065b578efc2887edbfeb8960f413.6738 write: No space left on device (worker was old-atreju2:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:48:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:48:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5f18ec80eecb0_1c292ab9470d05f470783f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: /var/cache/obs/cache/94/94a6065b578efc2887edbfeb8960f413.3547 write: No space left on device (worker was old-atreju5:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:48:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:48:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f18ec815566d_1c292ab9470d05f4707987@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/85/85c8637442587ba7b2e03ed446d6268d.17666 write: No space left on device (worker was old-atreju4:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:48:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:48:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f18ec81ab6bd_1c292ab9470d05f47080d3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: /var/cache/obs/cache/98/9847a54c0efe4e047ed200a0e3ce5232.17665 write: No space left on device (worker was old-atreju4:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:48:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:48:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5f18ec9dd177_1c292ab9470d05f47082e2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: /var/cache/obs/cache/1f/1fc5821ff57bf9e3982d056f0cda728f.3580 write: No space left on device (worker was old-atreju5:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:48:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:48:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5f18ec9d49ff5_1c292ab9470d05f47083af@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/1f/1fc5821ff57bf9e3982d056f0cda728f.13453 write: No space left on device (worker was old-atreju1:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:50:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:50:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5f18ed17a94f1_1c292ab9470d05f47091ac@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/6a/6a0d4d7a931ecd7efa936b2754a5610b.29141 write: No space left on device (worker was old-atreju3:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:53:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:53:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f18edc6934f1_1c292ab9470d05f4710324@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: /var/cache/obs/cache/f5/f58c791d9698e695ac69dfa66585080a.17784 write: No space left on device (worker was old-atreju4:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 01:53:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 01:53:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f18edc727993_1c292ab9470d05f47104aa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: /var/cache/obs/cache/f5/f58c791d9698e695ac69dfa66585080a.29203 write: No space left on device (worker was old-atreju3:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:00:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:00:56 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <5f18ef6de77e9_1c292ab9470d05f47149a3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/libosmo-abis failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/9c/9c442fefcd3a99b8079935c6d636a38b.7769 write: No space left on device (worker was old-atreju2:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:00:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:00:56 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <5f18ef6e96426_1c292ab9470d05f4715165@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/libasn1c failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: /var/cache/obs/cache/34/34a0710579b764ab7de864de699ca214.29352 write: No space left on device (worker was old-atreju3:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:00:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:00:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <5f18ef6f4f091_1c292ab9470d05f47153e3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/osmo-ggsn failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: /var/cache/obs/cache/c9/c9ad32f1614ca6d1e2f00113ae46bee6.13712 write: No space left on device (worker was old-atreju1:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:00:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:00:56 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <5f18ef6f988c9_1c292ab9470d05f4715427@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/simtrace2 failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: /var/cache/obs/cache/2d/2dc69ebadaed0c3898bc674bae0d70f0.29353 write: No space left on device (worker was old-atreju3:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:00:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:00:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <5f18ef6fdef71_1c292ab9470d05f471558b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/osmo-pcap failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: /var/cache/obs/cache/f0/f0db1b2e7d2e7b28da1a0988d0d3e577.17936 write: No space left on device (worker was old-atreju4:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:00:57 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:00:57 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <5f18ef708c26d_1c292ab9470d05f4715651@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/osmo-pcu failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: /var/cache/obs/cache/9c/9c442fefcd3a99b8079935c6d636a38b.13713 write: No space left on device (worker was old-atreju1:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:01:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:01:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <5f18ef908cc3f_1c292ab9470d05f471644a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/osmo-hlr failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: /var/cache/obs/cache/9c/9c442fefcd3a99b8079935c6d636a38b.17947 write: No space left on device (worker was old-atreju4:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:02:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:02:56 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18efe53770a_1c292ab9470d05f4717340@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/73/73d27b6df400bf4404cdcc44fecf4a3f.4707 write: No space left on device (worker was old-atreju5:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:02:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:02:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18efe59697c_1c292ab9470d05f4717463@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: /var/cache/obs/cache/73/73d27b6df400bf4404cdcc44fecf4a3f.7909 write: No space left on device (worker was old-atreju2:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:02:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:02:56 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18efe63ab32_1c292ab9470d05f47175c7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_Testing/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: /var/cache/obs/cache/73/73d27b6df400bf4404cdcc44fecf4a3f.17966 write: No space left on device (worker was old-atreju4:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:02:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:02:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18efe7b4e35_1c292ab9470d05f47177a4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: /var/cache/obs/cache/73/73d27b6df400bf4404cdcc44fecf4a3f.13745 write: No space left on device (worker was old-atreju1:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:02:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:02:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18efe822c23_1c292ab9470d05f471783a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: /var/cache/obs/cache/73/73d27b6df400bf4404cdcc44fecf4a3f.4714 write: No space left on device (worker was old-atreju5:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:02:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:02:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18efe862120_1c292ab9470d05f4717992@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: /var/cache/obs/cache/73/73d27b6df400bf4404cdcc44fecf4a3f.29385 write: No space left on device (worker was old-atreju3:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:02:57 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:02:57 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5f18eff21933f_1c292ab9470d05f471852@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/xUbuntu_16.04/i586 Package network:osmocom:nightly/libosmo-abis failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/73/733dfd4b61ce201526601c218a528016.7932 write: No space left on device (worker was old-atreju2:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:02:57 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:02:57 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5f18eff2662eb_1c292ab9470d05f471862c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-ggsn failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: /var/cache/obs/cache/73/733dfd4b61ce201526601c218a528016.17972 write: No space left on device (worker was old-atreju4:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:02:57 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:02:57 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5f18eff2b2dd6_1c292ab9470d05f471879c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-pcu failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: /var/cache/obs/cache/79/791bc3ffba32d0c0377d64da6da6c090.4729 write: No space left on device (worker was old-atreju5:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:02:57 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:02:57 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5f18eff2f07f2_1c292ab9470d05f471889c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-sip-connector failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: /var/cache/obs/cache/73/733dfd4b61ce201526601c218a528016.17973 write: No space left on device (worker was old-atreju4:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:02:57 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:02:57 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5f18eff3912f5_1c292ab9470d05f4718917@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-pcap failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: /var/cache/obs/cache/73/733dfd4b61ce201526601c218a528016.13751 write: No space left on device (worker was old-atreju1:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:15 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:15 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_10/i586 In-Reply-To: References: Message-ID: <5f18f00697b52_1c292ab9470d05f47193a9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_10/i586 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/3f/3f46af7486153139825bc76aa04c2916.29396 write: No space left on device (worker was old-atreju3:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:15 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:15 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_10/i586 In-Reply-To: References: Message-ID: <5f18f006d51a4_1c292ab9470d05f47194f0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_10/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: /var/cache/obs/cache/3f/3f46af7486153139825bc76aa04c2916.13756 write: No space left on device (worker was old-atreju1:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:15 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <5f18f00720d3e_1c292ab9470d05f471954c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/osmo-mgw failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: /var/cache/obs/cache/1c/1c24ec26ed0f1b66ca29b766b033c76d.4745 write: No space left on device (worker was old-atreju5:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:15 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:15 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <5f18f00763ebd_1c292ab9470d05f4719697@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/libosmo-sccp failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/96/961d24b23dae4e9925bd793d440741c1.7949 write: No space left on device (worker was old-atreju2:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:15 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_10/i586 In-Reply-To: References: Message-ID: <5f18f007c6d35_1c292ab9470d05f471974e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_10/i586 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: /var/cache/obs/cache/29/29dec9e753433163f1bcb59be32fc202.17978 write: No space left on device (worker was old-atreju4:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:15 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_10/i586 In-Reply-To: References: Message-ID: <5f18f00865815_1c292ab9470d05f4719910@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_10/i586 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: /var/cache/obs/cache/3f/3f46af7486153139825bc76aa04c2916.17979 write: No space left on device (worker was old-atreju4:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:15 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_10/i586 In-Reply-To: References: Message-ID: <5f18f008a95c6_1c292ab9470d05f47200f4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_10/i586 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: /var/cache/obs/cache/29/29dec9e753433163f1bcb59be32fc202.13757 write: No space left on device (worker was old-atreju1:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:15 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx-debian8 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5f18f009293a7_1c292ab9470d05f472019@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx-debian8/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-trx-debian8 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx-debian8 Last lines of build log: /var/cache/obs/cache/6f/6f6f23aa988c9895dcadd7dbc0cbe61a.17974 write: No space left on device (worker was old-atreju4:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:15 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5f18f0097879d_1c292ab9470d05f472024f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: /var/cache/obs/cache/90/9018dec99e68e8db332ad0ee5d0252a5.7934 write: No space left on device (worker was old-atreju2:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:16 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:16 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_10/i586 In-Reply-To: References: Message-ID: <5f18f00bb1848_1c292ab9470d05f472088f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_10/i586 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: /var/cache/obs/cache/3f/3f46af7486153139825bc76aa04c2916.4747 write: No space left on device (worker was old-atreju5:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:16 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:16 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_10/i586 In-Reply-To: References: Message-ID: <5f18f00c1f167_1c292ab9470d05f4720943@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_10/i586 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: /var/cache/obs/cache/3f/3f46af7486153139825bc76aa04c2916.7952 write: No space left on device (worker was old-atreju2:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:16 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:16 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_10/i586 In-Reply-To: References: Message-ID: <5f18f00c6f759_1c292ab9470d05f4721068@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_10/i586 Package network:osmocom:nightly/osmo-trx failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: /var/cache/obs/cache/a3/a303f648618dde9a213d011ef3a3e38d.7951 write: No space left on device (worker was old-atreju2:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:49 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:49 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_10/i586 In-Reply-To: References: Message-ID: <5f18f01f150ee_1c292ab9470d05f4721411@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_10/i586 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: /var/cache/obs/cache/0c/0cb0a16d64ee6cfbdfe57b5197e71d20.13769 write: No space left on device (worker was old-atreju1:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:49 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:49 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <5f18f01f6171f_1c292ab9470d05f4721570@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/80/808294f215bf0492bf78ccb121a2240a.17992 write: No space left on device (worker was old-atreju4:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:49 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:49 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18f0223a43d_1c292ab9470d05f47220da@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: /var/cache/obs/cache/83/8327aa2a537bb72ba61f44f13a973117.13767 write: No space left on device (worker was old-atreju1:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:49 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:49 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5f18f0228d72d_1c292ab9470d05f472218a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_8.0/i586 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/6e/6e6c02e07e441b56ef092696e7937809.13768 write: No space left on device (worker was old-atreju1:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:49 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:49 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5f18f022e874f_1c292ab9470d05f47222b1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/xUbuntu_16.04/i586 Package network:osmocom:nightly/libosmo-netif failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: /var/cache/obs/cache/19/19f3c6c251c9f84a457779885469c8fd.17991 write: No space left on device (worker was old-atreju4:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:49 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:49 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx-debian8 in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5f18f02463dc2_1c292ab9470d05f47225a0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx-debian8/Debian_8.0/i586 Package network:osmocom:nightly/osmo-trx-debian8 failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx-debian8 Last lines of build log: /var/cache/obs/cache/7d/7dfcbc3632f1d4a67a986c508e09afe4.4788 write: No space left on device (worker was old-atreju5:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:49 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:49 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18f023c080f_1c292ab9470d05f4722482@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: /var/cache/obs/cache/ed/ed9ffdb0fbbc6c45fed5147a0933fe65.4787 write: No space left on device (worker was old-atreju5:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:49 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:49 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5f18f023458b6_1c292ab9470d05f4722311@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_8.0/i586 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: /var/cache/obs/cache/6e/6e6c02e07e441b56ef092696e7937809.7992 write: No space left on device (worker was old-atreju2:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:50 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18f024db303_1c292ab9470d05f4722639@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: /var/cache/obs/cache/73/73d27b6df400bf4404cdcc44fecf4a3f.4802 write: No space left on device (worker was old-atreju5:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:50 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:50 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18f025255eb_1c292ab9470d05f47227a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/bc/bcb7956f1256cb92641fa52a4de9e731.13772 write: No space left on device (worker was old-atreju1:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:50 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18f0256bd74_1c292ab9470d05f472289a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: /var/cache/obs/cache/73/73d27b6df400bf4404cdcc44fecf4a3f.17996 write: No space left on device (worker was old-atreju4:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:50 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:50 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5f18f025adf72_1c292ab9470d05f47229c5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/xUbuntu_16.04/i586 Package network:osmocom:nightly/libosmo-sccp failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/dc/dc16eb6170472cc8958175d298d4e417.13773 write: No space left on device (worker was old-atreju1:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:50 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5f18f026230f_1c292ab9470d05f47230ca@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-mgw failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: /var/cache/obs/cache/73/733dfd4b61ce201526601c218a528016.4808 write: No space left on device (worker was old-atreju5:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:50 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5f18f0264623f_1c292ab9470d05f47231c0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: /var/cache/obs/cache/73/733dfd4b61ce201526601c218a528016.17997 write: No space left on device (worker was old-atreju4:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:50 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5f18f0269f02f_1c292ab9470d05f472321f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_8.0/i586 Package network:osmocom:nightly/osmo-bts failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: /var/cache/obs/cache/83/83d5714a3d4f65d536cf8a11d9e317ef.13774 write: No space left on device (worker was old-atreju1:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:50 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5f18f026dd414_1c292ab9470d05f47233f5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-sysmon failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: /var/cache/obs/cache/73/733dfd4b61ce201526601c218a528016.8006 write: No space left on device (worker was old-atreju2:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:50 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-uecups in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5f18f0271f3db_1c292ab9470d05f472349c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-uecups/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-uecups failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-uecups Last lines of build log: /var/cache/obs/cache/73/733dfd4b61ce201526601c218a528016.29415 write: No space left on device (worker was old-atreju3:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:50 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:50 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5f18f0276e87f_1c292ab9470d05f47235b5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_8.0/i586 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: /var/cache/obs/cache/83/83d5714a3d4f65d536cf8a11d9e317ef.29414 write: No space left on device (worker was old-atreju3:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:50 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:50 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_10/i586 In-Reply-To: References: Message-ID: <5f18f02854835_1c292ab9470d05f4723758@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_10/i586 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/f0/f09d94ddc46f7b1224d7b55abf7da49c.13775 write: No space left on device (worker was old-atreju1:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:03:50 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:03:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/i586 In-Reply-To: References: Message-ID: <5f18f0289cdf1_1c292ab9470d05f47238eb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/i586 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: /var/cache/obs/cache/f0/f09d94ddc46f7b1224d7b55abf7da49c.4809 write: No space left on device (worker was old-atreju5:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:04:40 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:04:40 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18f0403c423_1c292ab9470d05f4724130@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: /var/cache/obs/cache/b7/b76bbed5d523b1df5e2f4d9fdd2ebccc.8059 write: No space left on device (worker was old-atreju2:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:04:40 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:04:40 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18f040a05cb_1c292ab9470d05f47242b7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/e6/e6ac1fedf56748826878eef69a4cb66a.13784 write: No space left on device (worker was old-atreju1:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:04:40 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:04:40 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5f18f040dcc33_1c292ab9470d05f4724346@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_8.0/i586 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: /var/cache/obs/cache/98/9817eb2f2c8c9ea0dfecb23c2e4c23a3.4855 write: No space left on device (worker was old-atreju5:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:04:40 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:04:40 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5f18f0412f12f_1c292ab9470d05f47244b8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_8.0/i586 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: /var/cache/obs/cache/98/9817eb2f2c8c9ea0dfecb23c2e4c23a3.13785 write: No space left on device (worker was old-atreju1:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:04:40 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:04:40 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5f18f0418112a_1c292ab9470d05f4724596@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/f8/f80f7f66d47f561e0e0d8454190ad450.29425 write: No space left on device (worker was old-atreju3:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:04:40 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:04:40 +0000 Subject: Build failure of network:osmocom:nightly/osmo-uecups in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5f18f041e078a_1c292ab9470d05f472463a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-uecups/Debian_8.0/i586 Package network:osmocom:nightly/osmo-uecups failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-uecups Last lines of build log: /var/cache/obs/cache/98/9817eb2f2c8c9ea0dfecb23c2e4c23a3.18008 write: No space left on device (worker was old-atreju4:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:04:40 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:04:40 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_10/i586 In-Reply-To: References: Message-ID: <5f18f0424e0af_1c292ab9470d05f472474d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_10/i586 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: /var/cache/obs/cache/55/5597b5bd7753bcf0aaa055338e20f98e.8060 write: No space left on device (worker was old-atreju2:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:05:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:05:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18f078e9115_1c292ab9470d05f4725445@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: /var/cache/obs/cache/27/275e81063e62e289e29719a5beaa7efe.4921 write: No space left on device (worker was old-atreju5:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:05:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:05:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18f0796d8f8_1c292ab9470d05f4725536@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: /var/cache/obs/cache/27/275e81063e62e289e29719a5beaa7efe.18024 write: No space left on device (worker was old-atreju4:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:07:15 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:07:15 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f18f0d9b71c4_1c292ab9470d05f47267ad@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_10/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/1e/1ed5cb69848fbf95c25909450022e56a.13831 write: No space left on device (worker was old-atreju1:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:07:15 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:07:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f18f0dae8081_1c292ab9470d05f47270b2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_10/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: /var/cache/obs/cache/b0/b010bb372f1626f91d00e4a59c9b0803.8271 write: No space left on device (worker was old-atreju2:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:07:15 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:07:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f18f0da38bfb_1c292ab9470d05f47268f4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_10/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: /var/cache/obs/cache/b0/b010bb372f1626f91d00e4a59c9b0803.5066 write: No space left on device (worker was old-atreju5:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:07:15 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:07:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f18f0da95ad2_1c292ab9470d05f4726982@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: /var/cache/obs/cache/b0/b010bb372f1626f91d00e4a59c9b0803.13832 write: No space left on device (worker was old-atreju1:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:07:16 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:07:16 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f18f0e1120_1c292ab9470d05f47272a3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_10/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: /var/cache/obs/cache/b0/b010bb372f1626f91d00e4a59c9b0803.13833 write: No space left on device (worker was old-atreju1:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:08:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:08:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f18f115c4d72_1c292ab9470d05f47286c0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_10/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: /var/cache/obs/cache/52/525bf12e5ba5a199e59c90732d368b8f.5119 write: No space left on device (worker was old-atreju5:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:08:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:08:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f18f1165e703_1c292ab9470d05f472872a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_10/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/0c/0ce88861cfcdc76fad5ed4aa00dd58c5.13848 write: No space left on device (worker was old-atreju1:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:08:40 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:08:40 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f18f1321de85_1c292ab9470d05f47295f4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_10/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: /var/cache/obs/cache/93/933ee75288950ff38538c006b9c8e00a.18085 write: No space left on device (worker was old-atreju4:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:09:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:09:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f18f188c0f7d_1c292ab9470d05f4729742@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_9.0/i586 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: /var/cache/obs/cache/85/858181285b6435c30a8dd309c2e31520.29530 write: No space left on device (worker was old-atreju3:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:09:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:09:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f18f189231e4_1c292ab9470d05f47298c9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_9.0/i586 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: /var/cache/obs/cache/85/858181285b6435c30a8dd309c2e31520.5278 write: No space left on device (worker was old-atreju5:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:09:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:09:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f18f18a3ee34_1c292ab9470d05f4730111@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_9.0/i586 Package network:osmocom:nightly/osmo-trx failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: /var/cache/obs/cache/a2/a2e5938738fd98596238ccd8c1e426df.29531 write: No space left on device (worker was old-atreju3:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:09:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:09:48 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f18f18bd13c4_1c292ab9470d05f473034f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_9.0/i586 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/00/00e717295f69e1fe1e372f2475e932bd.5275 write: No space left on device (worker was old-atreju5:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:09:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:09:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f18f18c208a2_1c292ab9470d05f47304d9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_9.0/i586 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: /var/cache/obs/cache/00/00e717295f69e1fe1e372f2475e932bd.5277 write: No space left on device (worker was old-atreju5:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:09:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:09:48 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f18f18c7d055_1c292ab9470d05f47305f6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: /var/cache/obs/cache/00/00e717295f69e1fe1e372f2475e932bd.13890 write: No space left on device (worker was old-atreju1:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:09:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:09:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5f18f18cc4183_1c292ab9470d05f47306fe@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_8.0/i586 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: /var/cache/obs/cache/32/32981142893558a886e5e415b4bc23a6.5276 write: No space left on device (worker was old-atreju5:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:09:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:09:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f18f18dd4e4_1c292ab9470d05f4730710@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_9.0/i586 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: /var/cache/obs/cache/00/00e717295f69e1fe1e372f2475e932bd.18112 write: No space left on device (worker was old-atreju4:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:09:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:09:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f18f18d5743e_1c292ab9470d05f47308e8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_9.0/i586 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: /var/cache/obs/cache/85/858181285b6435c30a8dd309c2e31520.18110 write: No space left on device (worker was old-atreju4:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:10:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:10:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5f18f1a7cb2de_1c292ab9470d05f47309ef@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_8.0/i586 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: /var/cache/obs/cache/26/26fe97bfed5af8ae89c3a0b3ecd730b6.18119 write: No space left on device (worker was old-atreju4:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:10:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:10:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5f18f1a82172d_1c292ab9470d05f473109e@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: /var/cache/obs/cache/26/26fe97bfed5af8ae89c3a0b3ecd730b6.5305 write: No space left on device (worker was old-atreju5:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:10:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:10:22 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f18f1a8621ae_1c292ab9470d05f47311d7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_9.0/i586 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: /var/cache/obs/cache/3c/3cb57483d3bd1dcc458bcd672ca8e80b.8517 write: No space left on device (worker was old-atreju2:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:10:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:10:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f18f1a8b9968_1c292ab9470d05f4731231@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_9.0/i586 Package network:osmocom:nightly/osmo-bts failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: /var/cache/obs/cache/00/00e717295f69e1fe1e372f2475e932bd.8518 write: No space left on device (worker was old-atreju2:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:10:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:10:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f18f1a9152b2_1c292ab9470d05f4731378@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_9.0/i586 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: /var/cache/obs/cache/c0/c0cbdb89bb8951d680449eadecbc436c.29540 write: No space left on device (worker was old-atreju3:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:10:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:10:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f18f1aa9e8f9_1c292ab9470d05f4731413@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/Debian_9.0/i586 Package network:osmocom:nightly/osmo-sysmon failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: /var/cache/obs/cache/00/00e717295f69e1fe1e372f2475e932bd.8548 write: No space left on device (worker was old-atreju2:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:10:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:10:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_10/i586 In-Reply-To: References: Message-ID: <5f18f1ac311d4_1c292ab9470d05f47316b1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_10/i586 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/d1/d1164e58f0bd76b18e80f09da3aedd7e.8546 write: No space left on device (worker was old-atreju2:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:10:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:10:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_10/i586 In-Reply-To: References: Message-ID: <5f18f1ac6e527_1c292ab9470d05f4731769@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_10/i586 Package network:osmocom:nightly/osmo-msc failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: /var/cache/obs/cache/d1/d1164e58f0bd76b18e80f09da3aedd7e.8547 write: No space left on device (worker was old-atreju2:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:10:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:10:39 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f18f1acbd9db_1c292ab9470d05f473188a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_9.0/i586 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/a7/a719cbe930839580c4406d6e0fc29078.18129 write: No space left on device (worker was old-atreju4:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:10:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:10:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-uecups in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f18f1ad763e4_1c292ab9470d05f4732066@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-uecups/Debian_9.0/i586 Package network:osmocom:nightly/osmo-uecups failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-uecups Last lines of build log: /var/cache/obs/cache/00/00e717295f69e1fe1e372f2475e932bd.18130 write: No space left on device (worker was old-atreju4:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:10:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:10:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f18f1ad1646e_1c292ab9470d05f4731997@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_9.0/i586 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: /var/cache/obs/cache/a7/a719cbe930839580c4406d6e0fc29078.5335 write: No space left on device (worker was old-atreju5:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:10:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:10:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f18f1adb28e9_1c292ab9470d05f4732116@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/i586 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: /var/cache/obs/cache/a7/a719cbe930839580c4406d6e0fc29078.29548 write: No space left on device (worker was old-atreju3:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:10:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:10:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f18f1c389a08_1c292ab9470d05f4732411@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/i586 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/c7/c7a937d19000779e664a0931595a98a6.29557 write: No space left on device (worker was old-atreju3:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:14:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:14:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f27b1f35c_1c292ab9470d05f47332d6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-pcap failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: /var/cache/obs/cache/d1/d1b78cf2cd51a349df66781d8a8df75e.18198 write: No space left on device (worker was old-atreju4:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:14:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:14:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f27b5b2b9_1c292ab9470d05f473334a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-e1d failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: /var/cache/obs/cache/d1/d1b78cf2cd51a349df66781d8a8df75e.29618 write: No space left on device (worker was old-atreju3:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:14:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:14:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f27b9498a_1c292ab9470d05f47334bd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-pcu failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: /var/cache/obs/cache/d1/d1b78cf2cd51a349df66781d8a8df75e.5611 write: No space left on device (worker was old-atreju5:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:14:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:14:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f27bd1eee_1c292ab9470d05f47335e2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-sip-connector failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: /var/cache/obs/cache/d1/d1b78cf2cd51a349df66781d8a8df75e.13978 write: No space left on device (worker was old-atreju1:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:14:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:14:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f27c30265_1c292ab9470d05f473365c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: /var/cache/obs/cache/6e/6e153ae5e9d20aaa315ea2b7539146e5.18199 write: No space left on device (worker was old-atreju4:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:14:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:14:05 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f27da419c_1c292ab9470d05f473378a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/xUbuntu_18.04/i586 Package network:osmocom:nightly/libosmo-abis failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/d1/d1b78cf2cd51a349df66781d8a8df75e.18196 write: No space left on device (worker was old-atreju4:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:14:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:14:05 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f27e152b8_1c292ab9470d05f473387@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: /var/cache/obs/cache/d1/d1b78cf2cd51a349df66781d8a8df75e.29617 write: No space left on device (worker was old-atreju3:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:14:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:14:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f27e58bee_1c292ab9470d05f47339e7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-ggsn failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: /var/cache/obs/cache/3a/3a9ca33e503d80ad98eb2efb7d23372e.13977 write: No space left on device (worker was old-atreju1:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:14:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:14:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f297b9bdb_1c292ab9470d05f473409c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-bts failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: /var/cache/obs/cache/8d/8dad81c48b3f76de37e499611ab8bc0b.29626 write: No space left on device (worker was old-atreju3:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:14:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:14:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f2987e43_1c292ab9470d05f4734168@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: /var/cache/obs/cache/95/957b1fcb03e1058e1b8159ee81f073cd.18208 write: No space left on device (worker was old-atreju4:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:14:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:14:22 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f2a0209a1_1c292ab9470d05f4734688@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/xUbuntu_18.04/i586 Package network:osmocom:nightly/libosmo-netif failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: /var/cache/obs/cache/8d/8dad81c48b3f76de37e499611ab8bc0b.18207 write: No space left on device (worker was old-atreju4:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:14:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:14:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-uecups in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f2b57cee7_1c292ab9470d05f4734791@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-uecups/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-uecups failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-uecups Last lines of build log: /var/cache/obs/cache/4d/4dfcbb0976dc5e4bc7651ce378a9b822.18218 write: No space left on device (worker was old-atreju4:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:14:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:14:56 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f2b7b5d0d_1c292ab9470d05f473505a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/xUbuntu_18.04/i586 Package network:osmocom:nightly/libosmo-sccp failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/4d/4dfcbb0976dc5e4bc7651ce378a9b822.29636 write: No space left on device (worker was old-atreju3:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:14:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:14:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f2b7f00da_1c292ab9470d05f4735171@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-sysmon failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: /var/cache/obs/cache/4d/4dfcbb0976dc5e4bc7651ce378a9b822.13997 write: No space left on device (worker was old-atreju1:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:14:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:14:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f2b841db7_1c292ab9470d05f473522@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-mgw failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: /var/cache/obs/cache/da/da40f2f6c5973b3a4b0ffba0f2c20136.5674 write: No space left on device (worker was old-atreju5:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:14:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:14:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f2b8881b7_1c292ab9470d05f473534b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: /var/cache/obs/cache/4d/4dfcbb0976dc5e4bc7651ce378a9b822.13996 write: No space left on device (worker was old-atreju1:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:15:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:15:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f2d4912ec_1c292ab9470d05f4735763@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: /var/cache/obs/cache/ed/edf7d150519400e31fa40d7069eba5b0.29669 write: No space left on device (worker was old-atreju3:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:15:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:15:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f2d5597b7_1c292ab9470d05f473589b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/ff/ff986a17c3fb2b37a7f462664e9bb3ae.29671 write: No space left on device (worker was old-atreju3:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:16:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:16:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5f18f2f3ce74c_1c292ab9470d05f47368e4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-sgsn failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: /var/cache/obs/cache/7f/7fd605991ebe081043c587436d8bc46e.5789 write: No space left on device (worker was old-atreju5:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:16:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:16:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5f18f2f4156f7_1c292ab9470d05f473699b@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: /var/cache/obs/cache/f0/f0502b7cac219858d67571e4f9937e8a.5790 write: No space left on device (worker was old-atreju5:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:16:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:16:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f2f44cb57_1c292ab9470d05f47370ef@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: /var/cache/obs/cache/a3/a3c602edacd655cd3d101ebbb660459a.29681 write: No space left on device (worker was old-atreju3:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:16:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:16:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f18f2f48b17d_1c292ab9470d05f47371fb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-sgsn failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: /var/cache/obs/cache/a3/a3c602edacd655cd3d101ebbb660459a.9014 write: No space left on device (worker was old-atreju2:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:16:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:16:56 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5f18f32e2a93f_1c292ab9470d05f473786@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_18.10/i586 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: 500 rename /var/cache/obs/cache/content.new /var/cache/obs/cache/content: No such file or directory (worker was old-atreju1:9) gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:17:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:17:48 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5f18f36ac1767_1c292ab9470d05f4738071@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/xUbuntu_18.10/i586 Package network:osmocom:nightly/libosmo-abis failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/57/571e93130d6fc02ddb6637c5aaf04fd0.18304 write: No space left on device (worker was old-atreju4:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:17:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:17:48 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5f18f36b180d2_1c292ab9470d05f47381f9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.10/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: /var/cache/obs/cache/57/571e93130d6fc02ddb6637c5aaf04fd0.9163 write: No space left on device (worker was old-atreju2:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:18:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:18:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5f18f36bdbe99_1c292ab9470d05f473825a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-pcu failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: /var/cache/obs/cache/57/571e93130d6fc02ddb6637c5aaf04fd0.5942 write: No space left on device (worker was old-atreju5:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:18:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:18:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5f18f387d781c_1c292ab9470d05f47385d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: /var/cache/obs/cache/89/892abb3dff0b266ab65cca26cbc568e3.14095 write: No space left on device (worker was old-atreju1:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:18:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:18:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5f18f38d535a4_1c292ab9470d05f473895d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-bts failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: /var/cache/obs/cache/1f/1f6b322dccf80835386910d791d3b15c.18314 write: No space left on device (worker was old-atreju4:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:24:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:24:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f18f4d324771_1c292ab9470d05f4741196@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: /var/cache/obs/cache/bc/bce715ad8db2f9a149021ab6be50572e.29864 write: No space left on device (worker was old-atreju3:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:26:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:26:22 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5f18f566b1359_1c292ab9470d05f474278c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/xUbuntu_18.10/i586 Package network:osmocom:nightly/libosmo-sccp failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/c0/c0a62a04ffc0a6d4575a154a80a7f795.6653 write: No space left on device (worker was old-atreju5:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:26:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:26:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5f18f56716c1f_1c292ab9470d05f474286a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-mgw failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: /var/cache/obs/cache/57/571e93130d6fc02ddb6637c5aaf04fd0.6654 write: No space left on device (worker was old-atreju5:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:26:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:26:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5f18f5675870e_1c292ab9470d05f47429be@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-hlr failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: /var/cache/obs/cache/57/571e93130d6fc02ddb6637c5aaf04fd0.18514 write: No space left on device (worker was old-atreju4:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:26:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:26:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5f18f5679cc93_1c292ab9470d05f47430be@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-sysmon failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: /var/cache/obs/cache/57/571e93130d6fc02ddb6637c5aaf04fd0.29932 write: No space left on device (worker was old-atreju3:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:26:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:26:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-uecups in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5f18f568c95ce_1c292ab9470d05f4743160@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-uecups/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-uecups failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-uecups Last lines of build log: /var/cache/obs/cache/57/571e93130d6fc02ddb6637c5aaf04fd0.14294 write: No space left on device (worker was old-atreju1:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:26:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:26:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5f18f56917982_1c292ab9470d05f47432b2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: /var/cache/obs/cache/15/1542c076aaec5e4c125dc21d83760503.6676 write: No space left on device (worker was old-atreju5:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:26:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:26:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5f18f56953702_1c292ab9470d05f47433f0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/0c/0c6629dcf49f8036dfa3c3d4a7eafd25.6677 write: No space left on device (worker was old-atreju5:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:26:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:26:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5f18f56b39059_1c292ab9470d05f474355d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: /var/cache/obs/cache/9d/9dbdceef98ab3cf4b6e6e32a5c36ba80.6698 write: No space left on device (worker was old-atreju5:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:26:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:26:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5f18f56b72be0_1c292ab9470d05f47436fc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-sgsn failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: /var/cache/obs/cache/9d/9dbdceef98ab3cf4b6e6e32a5c36ba80.9917 write: No space left on device (worker was old-atreju2:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:39:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:39:48 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18f88f4689e_1c292ab9470d05f474862b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: /var/cache/obs/cache/34/34bd9d179d8410597c4100e0ee04f548.7878 write: No space left on device (worker was old-atreju5:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:40:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:40:05 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18f890763cb_1c292ab9470d05f47487e8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: /var/cache/obs/cache/34/34bd9d179d8410597c4100e0ee04f548.18919 write: No space left on device (worker was old-atreju4:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 02:40:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 02:40:05 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f18f890b744c_1c292ab9470d05f47488fc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: /var/cache/obs/cache/34/34bd9d179d8410597c4100e0ee04f548.14690 write: No space left on device (worker was old-atreju1:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 05:48:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 05:48:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f19249f67bfa_1c292ab9470d05f4865622@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: /var/cache/obs/cache/47/471d708c4377c6f34a22d6377c9a439f.18265 write: No space left on device (worker was old-atreju1:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 05:48:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 05:48:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f19249f2b322_1c292ab9470d05f4865542@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: /var/cache/obs/cache/47/471d708c4377c6f34a22d6377c9a439f.22749 write: No space left on device (worker was old-atreju5:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 05:48:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 05:48:05 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f19249edeef6_1c292ab9470d05f48654cc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_9.0/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/8f/8f1cad381a83bab8520a79050bc4cc10.1438 write: No space left on device (worker was old-atreju3:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 05:48:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 05:48:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f1924beb32db_1c292ab9470d05f48658c7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: /var/cache/obs/cache/5f/5ffb50ea5effa86cc126de148ffd38a5.22470 write: No space left on device (worker was old-atreju4:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 05:48:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 05:48:22 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f1924be75883_1c292ab9470d05f48657c4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_9.0/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: /var/cache/obs/cache/5f/5ffb50ea5effa86cc126de148ffd38a5.1441 write: No space left on device (worker was old-atreju3:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 05:48:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 05:48:39 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f1924c017262_1c292ab9470d05f48661f6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_9.0/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/0e/0e5c14b0999b9b5b8b379134563cb541.18270 write: No space left on device (worker was old-atreju1:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 05:48:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 05:48:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f1924c0a5ac3_1c292ab9470d05f486624a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: /var/cache/obs/cache/98/9847a54c0efe4e047ed200a0e3ce5232.18272 write: No space left on device (worker was old-atreju1:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 05:52:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 05:52:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f1925ae5bd52_1c292ab9470d05f486708c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/39/392da74a1a6961862f1c9b3485c7dd8b.1490 write: No space left on device (worker was old-atreju3:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 05:55:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 05:55:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f19267e59651_1c292ab9470d05f4868116@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: /var/cache/obs/cache/f5/f58c791d9698e695ac69dfa66585080a.22582 write: No space left on device (worker was old-atreju4:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:11:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:11:48 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f192a41b9841_1c292ab9470d05f488713@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_9.0/i586 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/00/00e717295f69e1fe1e372f2475e932bd.22918 write: No space left on device (worker was old-atreju4:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:11:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:11:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f192a4265b14_1c292ab9470d05f488731c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_9.0/i586 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: /var/cache/obs/cache/85/858181285b6435c30a8dd309c2e31520.24638 write: No space left on device (worker was old-atreju5:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:11:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:11:48 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f192a42a7ccd_1c292ab9470d05f4887443@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: /var/cache/obs/cache/00/00e717295f69e1fe1e372f2475e932bd.22920 write: No space left on device (worker was old-atreju4:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:11:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:11:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f192a432cd47_1c292ab9470d05f48876e1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_9.0/i586 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: /var/cache/obs/cache/00/00e717295f69e1fe1e372f2475e932bd.27029 write: No space left on device (worker was old-atreju2:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:11:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:11:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f192a42e76f7_1c292ab9470d05f48875ac@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_9.0/i586 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: /var/cache/obs/cache/00/00e717295f69e1fe1e372f2475e932bd.1896 write: No space left on device (worker was old-atreju3:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:12:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:12:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f192a44d5b9d_1c292ab9470d05f4887942@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_9.0/i586 Package network:osmocom:nightly/osmo-bts failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: /var/cache/obs/cache/3c/3cb57483d3bd1dcc458bcd672ca8e80b.1899 write: No space left on device (worker was old-atreju3:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:12:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:12:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f192a451b793_1c292ab9470d05f488802d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_9.0/i586 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: /var/cache/obs/cache/c0/c0cbdb89bb8951d680449eadecbc436c.22923 write: No space left on device (worker was old-atreju4:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:14:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:14:39 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f192ad895fb9_1c292ab9470d05f488823b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_9.0/i586 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/c6/c66f5d77954ab487fa5f07b1f00c50a8.1940 write: No space left on device (worker was old-atreju3:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:23:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:23:31 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f192cefdca31_1c292ab9470d05f48906f1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_10/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: /var/cache/obs/cache/b0/b010bb372f1626f91d00e4a59c9b0803.25483 write: No space left on device (worker was old-atreju5:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:23:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:23:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_10/i586 In-Reply-To: References: Message-ID: <5f192d107a8f0_1c292ab9470d05f489096b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_10/i586 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: /var/cache/obs/cache/62/62b3cbb996fd2f3b3c5264cd88b0a73e.27883 write: No space left on device (worker was old-atreju2:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:24:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:24:22 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f192d2d712ee_1c292ab9470d05f48915c5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_10/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/06/0601dd2fa73e5fd6534ff8430a2e640f.25550 write: No space left on device (worker was old-atreju5:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:24:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:24:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f192d2e2317f_1c292ab9470d05f4891718@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/Debian_10/x86_64 Package network:osmocom:nightly/osmo-sysmon failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: /var/cache/obs/cache/b0/b010bb372f1626f91d00e4a59c9b0803.27919 write: No space left on device (worker was old-atreju2:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:24:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:24:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f192d2db2dab_1c292ab9470d05f4891647@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_10/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: /var/cache/obs/cache/a2/a298537776bab709fb6fbf18c8d1fbd6.23085 write: No space left on device (worker was old-atreju4:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:24:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:24:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f192d2e894c5_1c292ab9470d05f4891818@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: /var/cache/obs/cache/67/67407565a2f55cf245065192ddfc78ce.25551 write: No space left on device (worker was old-atreju5:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:24:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:24:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f192d2ec59aa_1c292ab9470d05f4891967@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_10/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: /var/cache/obs/cache/b0/b010bb372f1626f91d00e4a59c9b0803.25557 write: No space left on device (worker was old-atreju5:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:26:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:26:05 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_10/i586 In-Reply-To: References: Message-ID: <5f192d8b64c02_1c292ab9470d05f48922c6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_10/i586 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: /var/cache/obs/cache/68/68e903b69be8ee0b784d46697587ba29.18921 write: No space left on device (worker was old-atreju1:6) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:26:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:26:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_10/i586 In-Reply-To: References: Message-ID: <5f192d8baf298_1c292ab9470d05f4892317@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_10/i586 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: /var/cache/obs/cache/68/68e903b69be8ee0b784d46697587ba29.18922 write: No space left on device (worker was old-atreju1:7) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:26:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:26:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_10/i586 In-Reply-To: References: Message-ID: <5f192d8c4a490_1c292ab9470d05f48925ef@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_10/i586 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: /var/cache/obs/cache/3f/3f46af7486153139825bc76aa04c2916.23117 write: No space left on device (worker was old-atreju4:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:26:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:26:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-uecups in Debian_10/i586 In-Reply-To: References: Message-ID: <5f192db6726ba_1c292ab9470d05f4892628@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-uecups/Debian_10/i586 Package network:osmocom:nightly/osmo-uecups failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-uecups Last lines of build log: /var/cache/obs/cache/3f/3f46af7486153139825bc76aa04c2916.28055 write: No space left on device (worker was old-atreju2:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:26:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:26:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_10/i586 In-Reply-To: References: Message-ID: <5f192db9c19e8_1c292ab9470d05f48927d2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_10/i586 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: /var/cache/obs/cache/55/5597b5bd7753bcf0aaa055338e20f98e.2099 write: No space left on device (worker was old-atreju3:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:26:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:26:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_10/i586 In-Reply-To: References: Message-ID: <5f192dbb32aaa_1c292ab9470d05f4892828@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_10/i586 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: /var/cache/obs/cache/d1/d1164e58f0bd76b18e80f09da3aedd7e.23119 write: No space left on device (worker was old-atreju4:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:26:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:26:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_10/i586 In-Reply-To: References: Message-ID: <5f192dbc3ae97_1c292ab9470d05f4892927@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_10/i586 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: /var/cache/obs/cache/ea/ead82289e96c21c96de4f5d39a7eea09.25709 write: No space left on device (worker was old-atreju5:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:26:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:26:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_10/i586 In-Reply-To: References: Message-ID: <5f192dc03d0d3_1c292ab9470d05f48930e9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_10/i586 Package network:osmocom:nightly/osmo-msc failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: /var/cache/obs/cache/ea/ead82289e96c21c96de4f5d39a7eea09.18925 write: No space left on device (worker was old-atreju1:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:26:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:26:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in Debian_10/i586 In-Reply-To: References: Message-ID: <5f192dc2266a8_1c292ab9470d05f489318c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/Debian_10/i586 Package network:osmocom:nightly/osmo-sysmon failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: /var/cache/obs/cache/3f/3f46af7486153139825bc76aa04c2916.25695 write: No space left on device (worker was old-atreju5:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:27:02 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:27:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f192dc8ec806_1c292ab9470d05f489348@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_10/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: /var/cache/obs/cache/a9/a9a4aac297898fae09528f742ca1dcee.23131 write: No space left on device (worker was old-atreju4:5) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:27:02 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:27:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f192dc9ad69f_1c292ab9470d05f4893539@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: /var/cache/obs/cache/62/6272a96c3fc29bdcecb6ffad99592341.25759 write: No space left on device (worker was old-atreju5:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 06:28:57 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 06:28:57 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f192e3cd71da_1c292ab9470d05f489597e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: /var/cache/obs/cache/47/471d708c4377c6f34a22d6377c9a439f.18970 write: No space left on device (worker was old-atreju1:9) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jul 23 07:31:56 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 23 Jul 2020 07:31:56 +0000 Subject: Change in libosmocore[master]: libomsocoding: NEON viterbi acceleration In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19372 ) Change subject: libomsocoding: NEON viterbi acceleration ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/19372/1/src/Makefile.am File src/Makefile.am: https://gerrit.osmocom.org/c/libosmocore/+/19372/1/src/Makefile.am at 53 PS1, Line 53: no, could as well be vfp with neon Is it a comment or a part of AM_CFLAGS? https://gerrit.osmocom.org/c/libosmocore/+/19372/1/src/conv_acc.c File src/conv_acc.c: https://gerrit.osmocom.org/c/libosmocore/+/19372/1/src/conv_acc.c at 553 PS1, Line 553: if(code->len < 100) If is not a function, missing space. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58ff2cb4ce3514f43390ff0a2121f81e6a4983b5 Gerrit-Change-Number: 19372 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 23 Jul 2020 07:31:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 07:34:56 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 23 Jul 2020 07:34:56 +0000 Subject: Change in libosmocore[master]: libomsocoding: NEON viterbi acceleration In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19372 ) Change subject: libomsocoding: NEON viterbi acceleration ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19372/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/19372/1//COMMIT_MSG at 7 PS1, Line 7: libomsocoding Actually, it's not really libosmocoding. Due to historical reasons, the Viterbi implementation is still in libosmocore. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58ff2cb4ce3514f43390ff0a2121f81e6a4983b5 Gerrit-Change-Number: 19372 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 23 Jul 2020 07:34:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 08:15:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jul 2020 08:15:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: verify handling of frequency hopping parameters In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 ) Change subject: PCU_Tests: verify handling of frequency hopping parameters ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1beda9224998848f9243237413e5ae3e0ddab8a5 Gerrit-Change-Number: 19324 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jul 2020 08:15:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 08:20:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jul 2020 08:20:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix byte/bit order in GprsMobileAllication In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19342 ) Change subject: library/RLCMAC_CSN1_Types: fix byte/bit order in GprsMobileAllication ...................................................................... Patch Set 3: Code-Review+1 Why not simply handling it the way it is supposed to be sent on the wire? I see no reason for managing it differently in ttcn3 than when sending it on the wire. It's just a bitstring. I'm not against this patch, simply asking myself about the implications. Is it because it's easier to manage in TTCN3 when writing tests? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8f2c8c7b234605523a4fd518210b45ea3c088ff6 Gerrit-Change-Number: 19342 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jul 2020 08:20:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 08:21:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jul 2020 08:21:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix length field in GprsMobileAllication In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19369 ) Change subject: library/RLCMAC_CSN1_Types: fix length field in GprsMobileAllication ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iec19da18637febfa15bc09175bc51504c721c42f Gerrit-Change-Number: 19369 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jul 2020 08:21:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 08:23:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jul 2020 08:23:27 +0000 Subject: Change in osmo-bts[master]: bts-trx: Integrate TRX provisioning logic more tightly into the FSM In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19367 ) Change subject: bts-trx: Integrate TRX provisioning logic more tightly into the FSM ...................................................................... bts-trx: Integrate TRX provisioning logic more tightly into the FSM The state of each config required is now tracked through the "acked" variables, this way the FSM can know when all configs are confirmed by the TRX and can proceed to submit POWERON command. With this version each TRX is still totally independent (there's an FSM per TRX), which means POWERON can be sent on TRX0 before TRX!=0 are fully configured. As a result, powe ramping may start before we know the NOMTXPOWER of a TRX. This kind of issue will be fixed in next commit. Related: SYS#4920 Change-Id: I1b736a4be5ce52a854f5767d8609153e1f4c08d9 --- M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/trx_if.c M src/osmo-bts-trx/trx_if.h M src/osmo-bts-trx/trx_provision_fsm.c M src/osmo-bts-trx/trx_provision_fsm.h 5 files changed, 230 insertions(+), 89 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h index f35936e..fb988a6 100644 --- a/src/osmo-bts-trx/l1_if.h +++ b/src/osmo-bts-trx/l1_if.h @@ -61,21 +61,27 @@ uint8_t trxd_hdr_ver_req; /* requested TRXD header version */ uint8_t trxd_hdr_ver_use; /* actual TRXD header version in use */ bool setformat_sent; + bool setformat_acked; bool enabled; bool arfcn_valid; uint16_t arfcn; - bool arfcn_sent; + bool rxtune_sent; + bool rxtune_acked; + bool txtune_sent; + bool txtune_acked; bool tsc_valid; uint8_t tsc; bool tsc_sent; + bool tsc_acked; bool bsic_valid; uint8_t bsic; bool bsic_sent; + bool bsic_acked; bool rxgain_valid; uint8_t rxgain; @@ -84,6 +90,8 @@ int forced_max_power_red; /* -1 if not forced by VTY config (default) */ bool nominal_power_set_by_vty; /* whether nominal trx power was enforced/retreived from VTY config "nominal-tx-power" */ + bool nomtxpower_sent; + bool nomtxpower_acked; bool maxdly_valid; int maxdly; diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index e650d79..ad6faad 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -270,32 +270,24 @@ } /*! Send "SETFORMAT" command to TRX: change TRXD header format version */ -int trx_if_cmd_setformat(struct trx_l1h *l1h, uint8_t ver) +int trx_if_cmd_setformat(struct trx_l1h *l1h, uint8_t ver, trx_if_cmd_generic_cb *cb) { LOGPPHI(l1h->phy_inst, DTRX, LOGL_INFO, "Requesting TRXD header format version %u\n", ver); - return trx_ctrl_cmd(l1h, 0, "SETFORMAT", "%u", ver); + return trx_ctrl_cmd_cb(l1h, 0, cb, "SETFORMAT", "%u", ver); } /*! Send "SETTSC" command to TRX */ -int trx_if_cmd_settsc(struct trx_l1h *l1h, uint8_t tsc) +int trx_if_cmd_settsc(struct trx_l1h *l1h, uint8_t tsc, trx_if_cmd_generic_cb *cb) { - struct phy_instance *pinst = l1h->phy_inst; - if (pinst->phy_link->u.osmotrx.use_legacy_setbsic) - return 0; - - return trx_ctrl_cmd(l1h, 1, "SETTSC", "%d", tsc); + return trx_ctrl_cmd_cb(l1h, 1, cb, "SETTSC", "%d", tsc); } /*! Send "SETBSIC" command to TRX */ -int trx_if_cmd_setbsic(struct trx_l1h *l1h, uint8_t bsic) +int trx_if_cmd_setbsic(struct trx_l1h *l1h, uint8_t bsic, trx_if_cmd_generic_cb *cb) { - struct phy_instance *pinst = l1h->phy_inst; - if (!pinst->phy_link->u.osmotrx.use_legacy_setbsic) - return 0; - - return trx_ctrl_cmd(l1h, 1, "SETBSIC", "%d", bsic); + return trx_ctrl_cmd_cb(l1h, 1, cb, "SETBSIC", "%d", bsic); } /*! Send "SETRXGAIN" command to TRX */ @@ -335,7 +327,7 @@ } /*! Send "RXTUNE" command to TRX: Tune Receiver to given ARFCN */ -int trx_if_cmd_rxtune(struct trx_l1h *l1h, uint16_t arfcn) +int trx_if_cmd_rxtune(struct trx_l1h *l1h, uint16_t arfcn, trx_if_cmd_generic_cb *cb) { struct phy_instance *pinst = l1h->phy_inst; uint16_t freq10; @@ -350,11 +342,11 @@ return -ENOTSUP; } - return trx_ctrl_cmd(l1h, 1, "RXTUNE", "%d", freq10 * 100); + return trx_ctrl_cmd_cb(l1h, 1, cb, "RXTUNE", "%d", freq10 * 100); } /*! Send "TXTUNE" command to TRX: Tune Transmitter to given ARFCN */ -int trx_if_cmd_txtune(struct trx_l1h *l1h, uint16_t arfcn) +int trx_if_cmd_txtune(struct trx_l1h *l1h, uint16_t arfcn, trx_if_cmd_generic_cb *cb) { struct phy_instance *pinst = l1h->phy_inst; uint16_t freq10; @@ -369,7 +361,7 @@ return -ENOTSUP; } - return trx_ctrl_cmd(l1h, 1, "TXTUNE", "%d", freq10 * 100); + return trx_ctrl_cmd_cb(l1h, 1, cb, "TXTUNE", "%d", freq10 * 100); } /*! Send "HANDOVER" command to TRX: Enable handover RACH Detection on timeslot/sub-slot */ @@ -516,12 +508,17 @@ static int trx_ctrl_rx_rsp_setformat(struct trx_l1h *l1h, struct trx_ctrl_rsp *rsp) { + trx_if_cmd_generic_cb *cb; + /* Old transceivers reject 'SETFORMAT' with 'RSP ERR 1' */ if (strcmp(rsp->cmd, "SETFORMAT") != 0) { LOGPPHI(l1h->phy_inst, DTRX, LOGL_NOTICE, "Transceiver rejected the format negotiation command, " "using legacy TRXD header format version (0)\n"); - l1h->config.trxd_hdr_ver_use = 0; + if (rsp->cb) { + cb = (trx_if_cmd_generic_cb*) rsp->cb; + cb(l1h, 0); + } return 0; } @@ -534,19 +531,9 @@ return -EINVAL; } - /* Transceiver may suggest a lower version (than requested) */ - if (rsp->status == l1h->config.trxd_hdr_ver_req) { - l1h->config.trxd_hdr_ver_use = rsp->status; - LOGPPHI(l1h->phy_inst, DTRX, LOGL_INFO, - "Using TRXD header format version %u\n", - l1h->config.trxd_hdr_ver_use); - } else { - LOGPPHI(l1h->phy_inst, DTRX, LOGL_DEBUG, - "Transceiver suggests TRXD header version %u (requested %u)\n", - rsp->status, l1h->config.trxd_hdr_ver_req); - /* Send another SETFORMAT with suggested version */ - l1h->config.trxd_hdr_ver_req = rsp->status; - trx_if_cmd_setformat(l1h, rsp->status); + if (rsp->cb) { + cb = (trx_if_cmd_generic_cb*) rsp->cb; + cb(l1h, rsp->status); } return 0; @@ -595,6 +582,8 @@ struct trx_ctrl_rsp *rsp, struct trx_ctrl_msg *tcm) { + trx_if_cmd_generic_cb *cb; + if (strcmp(rsp->cmd, "POWERON") == 0) { return trx_ctrl_rx_rsp_poweron(l1h, rsp); } else if (strcmp(rsp->cmd, "POWEROFF") == 0) { @@ -611,6 +600,12 @@ return trx_ctrl_rx_rsp_setpower(l1h, rsp); } + /* Generic callback if available */ + if (rsp->cb) { + cb = (trx_if_cmd_generic_cb*) rsp->cb; + cb(l1h, rsp->status); + } + if (rsp->status) { LOGPPHI(l1h->phy_inst, DTRX, tcm->critical ? LOGL_FATAL : LOGL_NOTICE, "transceiver rejected TRX command with response: '%s%s%s %d'\n", diff --git a/src/osmo-bts-trx/trx_if.h b/src/osmo-bts-trx/trx_if.h index b2fc326..6b417cf 100644 --- a/src/osmo-bts-trx/trx_if.h +++ b/src/osmo-bts-trx/trx_if.h @@ -14,6 +14,7 @@ void *cb; }; +typedef void trx_if_cmd_generic_cb(struct trx_l1h *l1h, int rc); typedef void trx_if_cmd_poweronoff_cb(struct trx_l1h *l1h, bool poweronoff, int rc); typedef void trx_if_cmd_setslot_cb(struct trx_l1h *l1h, uint8_t tn, uint8_t type, int rc); typedef void trx_if_cmd_getnompower_cb(struct trx_l1h *l1h, int nominal_power, int rc); @@ -22,16 +23,16 @@ void trx_if_init(struct trx_l1h *l1h); int trx_if_cmd_poweroff(struct trx_l1h *l1h, trx_if_cmd_poweronoff_cb *cb); int trx_if_cmd_poweron(struct trx_l1h *l1h, trx_if_cmd_poweronoff_cb *cb); -int trx_if_cmd_settsc(struct trx_l1h *l1h, uint8_t tsc); -int trx_if_cmd_setbsic(struct trx_l1h *l1h, uint8_t bsic); +int trx_if_cmd_settsc(struct trx_l1h *l1h, uint8_t tsc, trx_if_cmd_generic_cb *cb); +int trx_if_cmd_setbsic(struct trx_l1h *l1h, uint8_t bsic, trx_if_cmd_generic_cb *cb); int trx_if_cmd_setrxgain(struct trx_l1h *l1h, int db); int trx_if_cmd_getnompower(struct trx_l1h *l1h, trx_if_cmd_getnompower_cb *cb); int trx_if_cmd_setpower_att(struct trx_l1h *l1h, int power_att_db, trx_if_cmd_setpower_att_cb *cb); int trx_if_cmd_setmaxdly(struct trx_l1h *l1h, int dly); int trx_if_cmd_setmaxdlynb(struct trx_l1h *l1h, int dly); int trx_if_cmd_setslot(struct trx_l1h *l1h, uint8_t tn, uint8_t type, trx_if_cmd_setslot_cb *cb); -int trx_if_cmd_rxtune(struct trx_l1h *l1h, uint16_t arfcn); -int trx_if_cmd_txtune(struct trx_l1h *l1h, uint16_t arfcn); +int trx_if_cmd_rxtune(struct trx_l1h *l1h, uint16_t arfcn, trx_if_cmd_generic_cb *cb); +int trx_if_cmd_txtune(struct trx_l1h *l1h, uint16_t arfcn, trx_if_cmd_generic_cb *cb); int trx_if_cmd_handover(struct trx_l1h *l1h, uint8_t tn, uint8_t ss); int trx_if_cmd_nohandover(struct trx_l1h *l1h, uint8_t tn, uint8_t ss); int trx_if_send_burst(struct trx_l1h *l1h, const struct trx_dl_burst_req *br); @@ -41,6 +42,6 @@ #define TRX_DATA_FORMAT_VER 1 /* Format negotiation command */ -int trx_if_cmd_setformat(struct trx_l1h *l1h, uint8_t ver); +int trx_if_cmd_setformat(struct trx_l1h *l1h, uint8_t ver, trx_if_cmd_generic_cb *cb); #endif /* TRX_IF_H */ diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index fbeee37..611ec69 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -56,14 +56,37 @@ osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_POWEROFF_CNF, (void*)(intptr_t)rc); } + +void l1if_rxtune_cb(struct trx_l1h *l1h, int rc) +{ + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_RXTUNE_CNF, (void*)(intptr_t)rc); +} + +void l1if_txtune_cb(struct trx_l1h *l1h, int rc) +{ + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_TXTUNE_CNF, (void*)(intptr_t)rc); +} + +void l1if_settsc_cb(struct trx_l1h *l1h, int rc) +{ + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_SETTSC_CNF, (void*)(intptr_t)rc); +} + +void l1if_setbsic_cb(struct trx_l1h *l1h, int rc) +{ + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_SETBSIC_CNF, (void*)(intptr_t)rc); +} + static void l1if_getnompower_cb(struct trx_l1h *l1h, int nominal_power, int rc) { struct phy_instance *pinst = l1h->phy_inst; - struct gsm_bts_trx *trx = pinst->trx; - LOGPPHI(pinst, DL1C, LOGL_DEBUG, "l1if_getnompower_cb(nominal_power=%d, rc=%d)\n", nominal_power, rc); + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_NOMTXPOWER_CNF, (void*)(intptr_t)nominal_power); +} - l1if_trx_set_nominal_power(trx, nominal_power); +void l1if_setformat_cb(struct trx_l1h *l1h, int rc) +{ + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_SETFORMAT_CNF, (void*)(intptr_t)rc); } /* @@ -87,59 +110,58 @@ return -EIO; } - if (l1h->config.enabled - && l1h->config.tsc_valid - && l1h->config.bsic_valid - && l1h->config.arfcn_valid) { - /* before power on */ - if (!l1h->config.arfcn_sent) { - trx_if_cmd_rxtune(l1h, l1h->config.arfcn); - trx_if_cmd_txtune(l1h, l1h->config.arfcn); + /* before power on */ + if (l1h->config.arfcn_valid) { + if (!l1h->config.rxtune_sent) { + trx_if_cmd_rxtune(l1h, l1h->config.arfcn, l1if_rxtune_cb); + l1h->config.rxtune_sent = true; + l1h->config.rxtune_acked = false; + } + if (!l1h->config.txtune_sent) { + trx_if_cmd_txtune(l1h, l1h->config.arfcn, l1if_txtune_cb); + l1h->config.txtune_sent = true; + l1h->config.txtune_acked = false; + } + if (l1h->config.txtune_acked) { /* After TXTUNE is sent to TRX, get the tx nominal power * (which may vary precisly on band/arfcn. Avoid sending * it if we are forced by VTY to use a specific nominal * power (because TRX may not support the command or * provide broken values) */ - if (!l1h->config.nominal_power_set_by_vty) + if (!l1h->config.nominal_power_set_by_vty && !l1h->config.nomtxpower_sent) { trx_if_cmd_getnompower(l1h, l1if_getnompower_cb); - l1h->config.arfcn_sent = true; - } - if (!l1h->config.tsc_sent) { - trx_if_cmd_settsc(l1h, l1h->config.tsc); - l1h->config.tsc_sent = true; - } - if (!l1h->config.bsic_sent) { - trx_if_cmd_setbsic(l1h, l1h->config.bsic); - l1h->config.bsic_sent = true; - } - - /* Ask transceiver to use the newest TRXD header version if not using it yet */ - if (!l1h->config.setformat_sent) { - if (l1h->config.trxd_hdr_ver_use != plink->u.osmotrx.trxd_hdr_ver_max) { - trx_if_cmd_setformat(l1h, plink->u.osmotrx.trxd_hdr_ver_max); - l1h->config.trxd_hdr_ver_req = plink->u.osmotrx.trxd_hdr_ver_max; - } else { - LOGPPHI(pinst, DL1C, LOGL_INFO, - "No need to negotiate TRXD version, " - "already using maximum configured one: %" PRIu8 "\n", - l1h->config.trxd_hdr_ver_use); + l1h->config.nomtxpower_sent = true; + l1h->config.nomtxpower_acked = false; } - l1h->config.setformat_sent = true; } - - if (pinst->num == 0 && !plink->u.osmotrx.powered && !plink->u.osmotrx.poweronoff_sent) { - trx_if_cmd_poweron(l1h, l1if_poweronoff_cb); - plink->u.osmotrx.poweronoff_sent = true; - } - - return 0; } - LOGPPHI(pinst, DL1C, LOGL_INFO, "Delaying provision, TRX attributes not yet received from BSC:%s%s%s%s\n", - l1h->config.enabled ? "" :" enable", - l1h->config.tsc_valid ? "" : " tsc", - l1h->config.bsic_valid ? "" : " bsic", - l1h->config.arfcn_valid ? "" : " arfcn"); - return 1; + if (!pinst->phy_link->u.osmotrx.use_legacy_setbsic && + l1h->config.tsc_valid && !l1h->config.tsc_sent) { + trx_if_cmd_settsc(l1h, l1h->config.tsc, l1if_settsc_cb); + l1h->config.tsc_sent = true; + l1h->config.tsc_acked = false; + } + if (pinst->phy_link->u.osmotrx.use_legacy_setbsic && + l1h->config.bsic_valid && !l1h->config.bsic_sent) { + trx_if_cmd_setbsic(l1h, l1h->config.bsic, l1if_setbsic_cb); + l1h->config.bsic_sent = true; + l1h->config.bsic_acked = false; + } + + /* Ask transceiver to use the newest TRXD header version if not using it yet */ + if (!l1h->config.setformat_sent) { + l1h->config.setformat_sent = true; + if (plink->u.osmotrx.trxd_hdr_ver_max == 0) { + LOGPPHI(pinst, DL1C, LOGL_INFO, + "No need to negotiate max TRXD version 0"); + l1h->config.trxd_hdr_ver_use = 0; + l1h->config.setformat_acked = true; + } else { + trx_if_cmd_setformat(l1h, l1h->config.trxd_hdr_ver_req, l1if_setformat_cb); + l1h->config.setformat_acked = false; + } + } + return 0; } static void l1if_setslot_cb(struct trx_l1h *l1h, uint8_t tn, uint8_t type, int rc) @@ -182,6 +204,20 @@ return false; } +/* Whether a given TRX is fully configured and can be powered on */ +static bool trx_can_be_powered_on(struct trx_l1h *l1h) +{ + struct phy_instance *pinst = l1h->phy_inst; + if (l1h->config.enabled && l1h->config.rxtune_acked && l1h->config.txtune_acked && + (l1h->config.bsic_acked || !pinst->phy_link->u.osmotrx.use_legacy_setbsic) && + (l1h->config.tsc_acked || pinst->phy_link->u.osmotrx.use_legacy_setbsic) && + (l1h->config.nomtxpower_acked || l1h->config.nominal_power_set_by_vty) && + (l1h->config.setformat_acked)) { + return true; + } + return false; +} + ////////////////////////// // FSM STATE ACTIONS @@ -202,12 +238,24 @@ } } +static void st_open_poweroff_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; + struct phy_instance *pinst = l1h->phy_inst; + + l1h->config.trxd_hdr_ver_req = pinst->phy_link->u.osmotrx.trxd_hdr_ver_max; +} + static void st_open_poweroff(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; + struct phy_instance *pinst = l1h->phy_inst; + struct gsm_bts_trx *trx = pinst->trx; uint8_t bsic; uint16_t arfcn; uint16_t tsc; + int nominal_power; + int status; switch(event) { case TRX_PROV_EV_CFG_ENABLE: @@ -226,7 +274,9 @@ if (l1h->config.arfcn != arfcn || !l1h->config.arfcn_valid) { l1h->config.arfcn = arfcn; l1h->config.arfcn_valid = true; - l1h->config.arfcn_sent = false; + l1h->config.txtune_sent = false; + l1h->config.rxtune_sent = false; + l1h->config.nomtxpower_sent = false; } break; case TRX_PROV_EV_CFG_TSC: @@ -240,17 +290,84 @@ case TRX_PROV_EV_CFG_TS: update_ts_data(l1h, (struct trx_prov_ev_cfg_ts_data*)data); break; + + /* CONFIRMATIONS FROM TRXC */ + case TRX_PROV_EV_RXTUNE_CNF: + if (l1h->config.rxtune_sent) + l1h->config.rxtune_acked = true; + break; + case TRX_PROV_EV_TXTUNE_CNF: + if (l1h->config.txtune_sent) + l1h->config.txtune_acked = true; + break; + case TRX_PROV_EV_NOMTXPOWER_CNF: + nominal_power = (int)(intptr_t)data; + if (l1h->config.nomtxpower_sent) + l1h->config.nomtxpower_acked = true; + l1if_trx_set_nominal_power(trx, nominal_power); + break; + case TRX_PROV_EV_SETBSIC_CNF: + if (l1h->config.bsic_sent) + l1h->config.bsic_acked = true; + break; + case TRX_PROV_EV_SETTSC_CNF: + if (l1h->config.tsc_sent) + l1h->config.tsc_acked = true; + break; + case TRX_PROV_EV_SETFORMAT_CNF: + status = (int)(intptr_t)data; + /* Transceiver may suggest a lower version (than requested) */ + if (status == l1h->config.trxd_hdr_ver_req) { + l1h->config.trxd_hdr_ver_use = status; + l1h->config.setformat_acked = true; + LOGPPHI(l1h->phy_inst, DTRX, LOGL_INFO, + "Using TRXD header format version %u\n", + l1h->config.trxd_hdr_ver_use); + } else { + LOGPPHI(l1h->phy_inst, DTRX, LOGL_DEBUG, + "Transceiver suggests TRXD header version %u (requested %u)\n", + status, l1h->config.trxd_hdr_ver_req); + /* Send another SETFORMAT with suggested version */ + l1h->config.trxd_hdr_ver_req = status; + l1h->config.setformat_sent = false; + } + break; + default: + OSMO_ASSERT(0); } - /* 0 = if we gathered all date and could go forward :*/ - if (l1if_provision_transceiver_trx(l1h) == 0) { + l1if_provision_transceiver_trx(l1h); + + /* if we gathered all data and could go forward :*/ + if (trx_can_be_powered_on(l1h)) { if (l1h->phy_inst->num == 0) trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWERON_CNF); else trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_POWERON); + } else { + LOGPPHI(pinst, DL1C, LOGL_INFO, "Delaying poweron, TRX attributes not yet configured:%s%s%s%s%s%s\n", + l1h->config.enabled ? "" :" enable", + pinst->phy_link->u.osmotrx.use_legacy_setbsic ? + (l1h->config.bsic_valid ? (l1h->config.bsic_acked ? "" : " bsic-ack") : " bsic") : + (l1h->config.tsc_valid ? (l1h->config.tsc_acked ? "" : " tsc-ack") : " tsc"), + l1h->config.arfcn_valid ? "" : " arfcn", + l1h->config.rxtune_acked ? "" : " rxtune-ack", + l1h->config.nominal_power_set_by_vty ? "" : (l1h->config.nomtxpower_acked ? "" : " nomtxpower-ack"), + l1h->config.setformat_acked ? "" : " setformat-ack" + ); } } + +static void st_open_wait_power_cnf_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; + struct phy_instance *pinst = l1h->phy_inst; + + trx_if_cmd_poweron(l1h, l1if_poweronoff_cb); + pinst->phy_link->u.osmotrx.poweronoff_sent = true; +} + static void st_open_wait_power_cnf(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct trx_l1h *l1h = (struct trx_l1h *)fi->priv; @@ -392,11 +509,18 @@ X(TRX_PROV_EV_CFG_BSIC) | X(TRX_PROV_EV_CFG_ARFCN) | X(TRX_PROV_EV_CFG_TSC) | - X(TRX_PROV_EV_CFG_TS), + X(TRX_PROV_EV_CFG_TS) | + X(TRX_PROV_EV_RXTUNE_CNF) | + X(TRX_PROV_EV_TXTUNE_CNF) | + X(TRX_PROV_EV_NOMTXPOWER_CNF) | + X(TRX_PROV_EV_SETBSIC_CNF) | + X(TRX_PROV_EV_SETTSC_CNF) | + X(TRX_PROV_EV_SETFORMAT_CNF), .out_state_mask = X(TRX_PROV_ST_OPEN_WAIT_POWERON_CNF) | X(TRX_PROV_ST_OPEN_POWERON), .name = "OPEN_POWEROFF", + .onenter = st_open_poweroff_on_enter, .action = st_open_poweroff, }, [TRX_PROV_ST_OPEN_WAIT_POWERON_CNF] = { @@ -406,6 +530,7 @@ .out_state_mask = X(TRX_PROV_ST_OPEN_POWERON), .name = "OPEN_WAIT_POWERON_CNF", + .onenter = st_open_wait_power_cnf_on_enter, .action = st_open_wait_power_cnf, }, [TRX_PROV_ST_OPEN_POWERON] = { @@ -438,6 +563,12 @@ OSMO_VALUE_STRING(TRX_PROV_EV_CFG_TS), OSMO_VALUE_STRING(TRX_PROV_EV_CFG_RXGAIN), OSMO_VALUE_STRING(TRX_PROV_EV_CFG_SETMAXDLY), + OSMO_VALUE_STRING(TRX_PROV_EV_RXTUNE_CNF), + OSMO_VALUE_STRING(TRX_PROV_EV_TXTUNE_CNF), + OSMO_VALUE_STRING(TRX_PROV_EV_NOMTXPOWER_CNF), + OSMO_VALUE_STRING(TRX_PROV_EV_SETBSIC_CNF), + OSMO_VALUE_STRING(TRX_PROV_EV_SETTSC_CNF), + OSMO_VALUE_STRING(TRX_PROV_EV_SETFORMAT_CNF), OSMO_VALUE_STRING(TRX_PROV_EV_POWERON_CNF), OSMO_VALUE_STRING(TRX_PROV_EV_POWEROFF), OSMO_VALUE_STRING(TRX_PROV_EV_POWEROFF_CNF), diff --git a/src/osmo-bts-trx/trx_provision_fsm.h b/src/osmo-bts-trx/trx_provision_fsm.h index 7fede35..24eb268 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.h +++ b/src/osmo-bts-trx/trx_provision_fsm.h @@ -46,6 +46,12 @@ TRX_PROV_EV_CFG_TS, TRX_PROV_EV_CFG_RXGAIN, TRX_PROV_EV_CFG_SETMAXDLY, + TRX_PROV_EV_RXTUNE_CNF, + TRX_PROV_EV_TXTUNE_CNF, + TRX_PROV_EV_NOMTXPOWER_CNF, + TRX_PROV_EV_SETBSIC_CNF, + TRX_PROV_EV_SETTSC_CNF, + TRX_PROV_EV_SETFORMAT_CNF, TRX_PROV_EV_POWERON_CNF, TRX_PROV_EV_POWEROFF, TRX_PROV_EV_POWEROFF_CNF, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1b736a4be5ce52a854f5767d8609153e1f4c08d9 Gerrit-Change-Number: 19367 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 08:23:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jul 2020 08:23:29 +0000 Subject: Change in osmo-bts[master]: bts-trx: Delay TRXC POWERON cmd until all TRXs are provisioned In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19368 ) Change subject: bts-trx: Delay TRXC POWERON cmd until all TRXs are provisioned ...................................................................... bts-trx: Delay TRXC POWERON cmd until all TRXs are provisioned Waiting until all other TRX are provisioned before really sending POWERON helps avoiding race conditions where TRX!=0 are not yet fully configured at the TRX side before POWERON is called. This solves for instance the situation where after POWERON RSP the BTS started ramping up on all TRX while on some NOMTXPOWER RSP was yet not received... Related: SYS#4920 Change-Id: I906be4714807c7a2793971cb6062120e24337d7b --- M src/osmo-bts-trx/trx_provision_fsm.c M src/osmo-bts-trx/trx_provision_fsm.h 2 files changed, 58 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 611ec69..420ee24 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -205,7 +205,7 @@ } /* Whether a given TRX is fully configured and can be powered on */ -static bool trx_can_be_powered_on(struct trx_l1h *l1h) +static bool trx_is_provisioned(struct trx_l1h *l1h) { struct phy_instance *pinst = l1h->phy_inst; if (l1h->config.enabled && l1h->config.rxtune_acked && l1h->config.txtune_acked && @@ -219,6 +219,37 @@ } +static void trx_signal_ready_trx0(struct trx_l1h *l1h) +{ + struct phy_instance *pinst = l1h->phy_inst; + struct phy_instance *pinst_it; + + llist_for_each_entry(pinst_it, &pinst->phy_link->instances, list) { + struct trx_l1h *l1h_it = pinst_it->u.osmotrx.hdl; + if (l1h_it->phy_inst->num != 0) + continue; + osmo_fsm_inst_dispatch(l1h_it->provision_fi, TRX_PROV_EV_OTHER_TRX_READY, NULL); + return; + } +} + +/* Called from TRX0 to check if other TRX are already configured and powered so POWERON can be sent */ +static bool trx_other_trx0_ready(struct trx_l1h *l1h) +{ + struct phy_instance *pinst = l1h->phy_inst; + struct phy_instance *pinst_it; + + /* Don't POWERON until all trx are ready */ + llist_for_each_entry(pinst_it, &pinst->phy_link->instances, list) { + struct trx_l1h *l1h_it = pinst_it->u.osmotrx.hdl; + if (l1h_it->phy_inst->num == 0) + continue; + if (l1h_it->provision_fi->state != TRX_PROV_ST_OPEN_POWERON) + return false; + } + return true; +} + ////////////////////////// // FSM STATE ACTIONS ////////////////////////// @@ -256,6 +287,7 @@ uint16_t tsc; int nominal_power; int status; + bool others_ready; switch(event) { case TRX_PROV_EV_CFG_ENABLE: @@ -332,20 +364,34 @@ l1h->config.setformat_sent = false; } break; + case TRX_PROV_EV_OTHER_TRX_READY: + OSMO_ASSERT(pinst->num == 0); + /* Do nothing here, we were triggered to see if we can finally poweron TRX0 below */ + break; default: OSMO_ASSERT(0); } l1if_provision_transceiver_trx(l1h); - /* if we gathered all data and could go forward :*/ - if (trx_can_be_powered_on(l1h)) { - if (l1h->phy_inst->num == 0) - trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWERON_CNF); - else + if (l1h->phy_inst->num == 0) + others_ready = trx_other_trx0_ready(l1h); + else + others_ready = true; /* we don't care about others in TRX!=0 */ + + /* if we gathered all data and could go forward. For TRX0, only after + * all other TRX are prepared, since it will send POWERON commad */ + if (trx_is_provisioned(l1h) && + (l1h->phy_inst->num != 0 || others_ready)) { + if (l1h->phy_inst->num != 0) { trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_POWERON); + /* Once we are powered on, signal TRX0 in case it was waiting for us */ + trx_signal_ready_trx0(l1h); + } else { + trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWERON_CNF); + } } else { - LOGPPHI(pinst, DL1C, LOGL_INFO, "Delaying poweron, TRX attributes not yet configured:%s%s%s%s%s%s\n", + LOGPFSML(fi, LOGL_INFO, "Delay poweron, wait for:%s%s%s%s%s%s%s\n", l1h->config.enabled ? "" :" enable", pinst->phy_link->u.osmotrx.use_legacy_setbsic ? (l1h->config.bsic_valid ? (l1h->config.bsic_acked ? "" : " bsic-ack") : " bsic") : @@ -353,7 +399,8 @@ l1h->config.arfcn_valid ? "" : " arfcn", l1h->config.rxtune_acked ? "" : " rxtune-ack", l1h->config.nominal_power_set_by_vty ? "" : (l1h->config.nomtxpower_acked ? "" : " nomtxpower-ack"), - l1h->config.setformat_acked ? "" : " setformat-ack" + l1h->config.setformat_acked ? "" : " setformat-ack", + (l1h->phy_inst->num != 0 || others_ready) ? "" : " other-trx" ); } } @@ -505,6 +552,7 @@ }, [TRX_PROV_ST_OPEN_POWEROFF] = { .in_event_mask = + X(TRX_PROV_EV_OTHER_TRX_READY) | X(TRX_PROV_EV_CFG_ENABLE) | X(TRX_PROV_EV_CFG_BSIC) | X(TRX_PROV_EV_CFG_ARFCN) | @@ -555,6 +603,7 @@ }; const struct value_string trx_prov_fsm_event_names[] = { + OSMO_VALUE_STRING(TRX_PROV_EV_OTHER_TRX_READY), OSMO_VALUE_STRING(TRX_PROV_EV_OPEN), OSMO_VALUE_STRING(TRX_PROV_EV_CFG_ENABLE), OSMO_VALUE_STRING(TRX_PROV_EV_CFG_BSIC), diff --git a/src/osmo-bts-trx/trx_provision_fsm.h b/src/osmo-bts-trx/trx_provision_fsm.h index 24eb268..1583270 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.h +++ b/src/osmo-bts-trx/trx_provision_fsm.h @@ -38,6 +38,7 @@ }; enum trx_provision_fsm_events { + TRX_PROV_EV_OTHER_TRX_READY, TRX_PROV_EV_OPEN, TRX_PROV_EV_CFG_ENABLE, TRX_PROV_EV_CFG_BSIC, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I906be4714807c7a2793971cb6062120e24337d7b Gerrit-Change-Number: 19368 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 08:26:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 23 Jul 2020 08:26:09 +0000 Subject: Change in libosmocore[master]: libomsocoding: NEON viterbi acceleration In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19372 ) Change subject: libomsocoding: NEON viterbi acceleration ...................................................................... Patch Set 1: Code-Review-1 (3 comments) -1 just for the legality of the copyright notice. the other comment is not worth a -1. https://gerrit.osmocom.org/c/libosmocore/+/19372/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/19372/1//COMMIT_MSG at 11 PS1, Line 11: Although autodetection according to __ARM_NEON would work because this : is only defined if the fpu is neon neon-fp16 neon-vfpv3 eon-vfpv4 : neon-fp-armv8 crypto-neon-fp-armv8 doing that would lead to a unknown : performance impact, so it needs to be enabled manually. I don't like this kind of approach. We have auto-detection for x86 SIMD instructions, and we should try to align with that for NEON. The detection would only have to be done once at startup, right? Projects like ffmpeg are doing run-time detection of CPU features for a very long time. So without even knowing how bad the impact would be, I'm not sure we should disable it. The only question would be whether or not we should enable it by default in all our builds anyway. I'm not sure who is running osmo-bts-trx on an ARM without NEON support. We have plenty of osmo-bts-sysmo on old cores, probably also -octphy. But we've never heard of an osmo-bts-trx user who doesn't have a modern, NEON enabled core, AFAICT. https://gerrit.osmocom.org/c/libosmocore/+/19372/1/src/conv_acc_neon.c File src/conv_acc_neon.c: https://gerrit.osmocom.org/c/libosmocore/+/19372/1/src/conv_acc_neon.c at 5 PS1, Line 5: Copyright (C) 2020 Eric Wild erm, coypright by sysmocom, Author is you. At least as long as it was done during work hours :P https://gerrit.osmocom.org/c/libosmocore/+/19372/1/src/conv_acc_neon_impl.h File src/conv_acc_neon_impl.h: https://gerrit.osmocom.org/c/libosmocore/+/19372/1/src/conv_acc_neon_impl.h at 5 PS1, Line 5: same here of course -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58ff2cb4ce3514f43390ff0a2121f81e6a4983b5 Gerrit-Change-Number: 19372 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 23 Jul 2020 08:26:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 08:26:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 23 Jul 2020 08:26:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: verify handling of frequency hopping parameters In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 ) Change subject: PCU_Tests: verify handling of frequency hopping parameters ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1beda9224998848f9243237413e5ae3e0ddab8a5 Gerrit-Change-Number: 19324 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jul 2020 08:26:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 08:27:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 23 Jul 2020 08:27:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix byte/bit order in GprsMobileAllication In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19342 ) Change subject: library/RLCMAC_CSN1_Types: fix byte/bit order in GprsMobileAllication ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8f2c8c7b234605523a4fd518210b45ea3c088ff6 Gerrit-Change-Number: 19342 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jul 2020 08:27:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 08:27:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 23 Jul 2020 08:27:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix length field in GprsMobileAllication In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19369 ) Change subject: library/RLCMAC_CSN1_Types: fix length field in GprsMobileAllication ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iec19da18637febfa15bc09175bc51504c721c42f Gerrit-Change-Number: 19369 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jul 2020 08:27:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 08:39:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jul 2020 08:39:39 +0000 Subject: Change in libosmocore[master]: libomsocoding: NEON viterbi acceleration In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19372 ) Change subject: libomsocoding: NEON viterbi acceleration ...................................................................... Patch Set 1: (6 comments) https://gerrit.osmocom.org/c/libosmocore/+/19372/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/19372/1//COMMIT_MSG at 9 PS1, Line 9: configure flag required to enable this: --enable-neon double space "required to" https://gerrit.osmocom.org/c/libosmocore/+/19372/1//COMMIT_MSG at 12 PS1, Line 12: is only defined if the fpu is neon neon-fp16 neon-vfpv3 eon-vfpv4 type: missing n in nenon. https://gerrit.osmocom.org/c/libosmocore/+/19372/1//COMMIT_MSG at 14 PS1, Line 14: performance impact, so it needs to be enabled manually. I don't get what do you mean here. What do you mean with "unknown performance impact" here, why? https://gerrit.osmocom.org/c/libosmocore/+/19372/1/configure.ac File configure.ac: https://gerrit.osmocom.org/c/libosmocore/+/19372/1/configure.ac at 388 PS1, Line 388: [Support ARM NEON instructions]) I would say this flag is more "Enable neon instruction specific optimizations", because you can still disable it regardless of your target supporting neon or not. https://gerrit.osmocom.org/c/libosmocore/+/19372/1/src/conv_acc.c File src/conv_acc.c: https://gerrit.osmocom.org/c/libosmocore/+/19372/1/src/conv_acc.c at 557 PS1, Line 557: dec->metric_func = osmo_conv_metrics_k5_n2; wrong indentation. Probably rather: #ifdef HAVE_NEON if (code->len < 100) { dec->metric_func = osmo_conv_gen_metrics_k5_n2; } else #endif { dec->metric_func = osmo_conv_metrics_k5_n2; } https://gerrit.osmocom.org/c/libosmocore/+/19372/1/src/conv_acc_neon_impl.h File src/conv_acc_neon_impl.h: https://gerrit.osmocom.org/c/libosmocore/+/19372/1/src/conv_acc_neon_impl.h at 26 PS1, Line 26: /* Some distributions (notably Alpine Linux) for some strange reason In my linux (ArchLinux) __always_inline is defined in /usr/include/linux/stddef.h. Perhaps you are missing to include a header defining it? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58ff2cb4ce3514f43390ff0a2121f81e6a4983b5 Gerrit-Change-Number: 19372 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 23 Jul 2020 08:39:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 10:43:40 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 23 Jul 2020 10:43:40 +0000 Subject: Change in libosmocore[master]: libomsocoding: NEON viterbi acceleration In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19372 ) Change subject: libomsocoding: NEON viterbi acceleration ...................................................................... Patch Set 1: (5 comments) https://gerrit.osmocom.org/c/libosmocore/+/19372/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/19372/1//COMMIT_MSG at 7 PS1, Line 7: libomsocoding > Actually, it's not really libosmocoding. [?] I know, but the user of this code is libosmocoding, so this speds up libosmocoding, and therefore provides a more precise description of what now has neon support. https://gerrit.osmocom.org/c/libosmocore/+/19372/1//COMMIT_MSG at 14 PS1, Line 14: performance impact, so it needs to be enabled manually. > I don't get what do you mean here. [?] Just like the special rach case neon can be bad, i.e. on a cortex a8 with in-order dual issue pipeline neon performance is abysmal. https://gerrit.osmocom.org/c/libosmocore/+/19372/1//COMMIT_MSG at 11 PS1, Line 11: Although autodetection according to __ARM_NEON would work because this : is only defined if the fpu is neon neon-fp16 neon-vfpv3 eon-vfpv4 : neon-fp-armv8 crypto-neon-fp-armv8 doing that would lead to a unknown : performance impact, so it needs to be enabled manually. > I don't like this kind of approach. [?] SS(S)E/AVX is a cpu feature set that differs depending on bits provided by the cpu in a reg (and the knowledge that x64 means at least SSE2), NEON is a compile time target specific fpu and fp api configuration that is eternally set in stone at compile time. Detection would therefore happen at compile time. Mixing neon and the fpu is bad, as is neon on a dual issue in-order cortex a8, so there are valid reason why it should not just be enabled. That being said it's the users or devices fault, I'm fine with just turning it on. https://gerrit.osmocom.org/c/libosmocore/+/19372/1/src/Makefile.am File src/Makefile.am: https://gerrit.osmocom.org/c/libosmocore/+/19372/1/src/Makefile.am at 53 PS1, Line 53: no, could as well be vfp with neon > Is it a comment or a part of AM_CFLAGS? Just a reminder why adding explicit flags for neon instead or reyling upon the cflags provided by the build environment is a bad idea. https://gerrit.osmocom.org/c/libosmocore/+/19372/1/src/conv_acc_neon_impl.h File src/conv_acc_neon_impl.h: https://gerrit.osmocom.org/c/libosmocore/+/19372/1/src/conv_acc_neon_impl.h at 26 PS1, Line 26: /* Some distributions (notably Alpine Linux) for some strange reason > In my linux (ArchLinux) __always_inline is defined in /usr/include/linux/stddef.h. [?] This is a copy from the sse files and I see no reason to question this or waste time tracking it down.. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58ff2cb4ce3514f43390ff0a2121f81e6a4983b5 Gerrit-Change-Number: 19372 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 23 Jul 2020 10:43:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 10:53:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jul 2020 10:53:10 +0000 Subject: Change in osmo-bts[master]: rsl: Fix wrong param passed to gsm_pchan_name() in log line References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19373 ) Change subject: rsl: Fix wrong param passed to gsm_pchan_name() in log line ...................................................................... rsl: Fix wrong param passed to gsm_pchan_name() in log line Change-Id: I42b7a79b85e8750a12166dbfc66ad06f7cb713a6 --- M src/common/rsl.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/73/19373/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index b518245..4a91e3e 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -771,7 +771,7 @@ break; default: LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "PCU rel ack for unexpected lchan kind %s\n", - gsm_pchan_name(lchan->rel_act_kind)); + gsm_pchan_name(lchan->ts->pchan)); /* Release certainly was not requested by the BSC via RSL, so don't ack. */ send_rel_ack = false; break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I42b7a79b85e8750a12166dbfc66ad06f7cb713a6 Gerrit-Change-Number: 19373 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 12:33:35 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jul 2020 12:33:35 +0000 Subject: Change in osmo-bts[master]: bts-trx: Fix osmocom dyn ts assert hit during Adm State Unlock References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19374 ) Change subject: bts-trx: Fix osmocom dyn ts assert hit during Adm State Unlock ...................................................................... bts-trx: Fix osmocom dyn ts assert hit during Adm State Unlock How to reproduce: * Configure a TS to be TCH/F_TCH/H_PDCH in osmo-bsc.cfg * Run the network with osmo-bts-trx, then use osmo-bsc's "rf_locked 1" * Then, unlock it: "rf_locked 0" * The following assert will be hit: Assert failed ts->dyn.pchan_is == ts->dyn.pchan_want /osmo-bts/src/osmo-bts-trx/l1_if.c:349 """ (gdb) bt #0 0x00007ffff5bb9355 in raise () from /usr/lib/libc.so.6 #1 0x00007ffff5ba2853 in abort () from /usr/lib/libc.so.6 #2 0x00007ffff6832361 in osmo_panic_default ( fmt=0x555555814e60 "Assert failed %s %s:%d\n", args=0x7fffffffc6e0) at /libosmocore/src/panic.c:49 #3 0x00007ffff683249d in osmo_panic ( fmt=0x555555814e60 "Assert failed %s %s:%d\n") at /libosmocore/src/panic.c:84 #4 0x000055555570fdf7 in trx_set_ts (ts=0x7ffff1e6bce8) at /osmo-bts/src/osmo-bts-trx/l1_if.c:349 #5 0x00005555557133c1 in bts_model_chg_adm_state (bts=0x627000000160, mo=0x7ffff1e0f8a0, obj=0x7ffff1e0f860, adm_state=2 '\002') at /osmo-bts/src/osmo-bts-trx/l1_if.c:681 #6 0x0000555555769978 in oml_rx_chg_adm_state (bts=0x627000000160, msg=0x633000003e00) at /osmo-bts/src/common/oml.c:1044 #7 0x000055555576a8d3 in down_fom (bts=0x627000000160, msg=0x633000003e00) at /osmo-bts/src/common/oml.c:1129 #8 0x0000555555770aed in down_oml (bts=0x627000000160, msg=0x633000003e00) at /osmo-bts/src/common/oml.c:1476 #9 0x00005555557f8174 in sign_link_cb (msg=0x633000003e00) at /osmo-bts/src/common/abis.c:188 #10 0x00007ffff73b5935 in ipaccess_bts_read_cb (link=0x6120000030a0, --Type for more, q to quit, c to continue without paging-- msg=0x633000003e00) at /libosmo-abis/src/input/ipaccess.c:980 #11 0x00007ffff73a1060 in ipa_client_read (link=0x6120000030a0) at /libosmo-abis/src/input/ipa.c:72 #12 0x00007ffff73a2458 in ipa_client_fd_cb (ofd=0x62f000038a50, what=1) at /libosmo-abis/src/input/ipa.c:136 #13 0x00007ffff67ebfa7 in osmo_fd_disp_fds (_rset=0x7fffffffdda0, _wset=0x7fffffffde40, _eset=0x7fffffffdee0) at /libosmocore/src/select.c:227 #14 0x00007ffff67ec38c in _osmo_select_main (polling=0) at /libosmocore/src/select.c:265 #15 0x00007ffff67ec46b in osmo_select_main (polling=0) at /libosmocore/src/select.c:274 #16 0x00005555557ef089 in bts_main (argc=7, argv=0x7fffffffe208) at /osmo-bts/src/common/main.c:354 #17 0x00005555556fe621 in main (argc=7, argv=0x7fffffffe208) at /osmo-bts/src/osmo-bts-trx/main.c:176 """ Related: OS#4920 Change-Id: Ia3210e24b921fd0c67f77068b7ef4a65f270cd11 --- M src/osmo-bts-trx/l1_if.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/74/19374/1 diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index d65900f..bc936c0 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -678,6 +678,13 @@ /* Activate timeslots in scheduler and start power ramp up */ for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { struct gsm_bts_trx_ts *ts = &trx->ts[i]; + if (ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) { + /* dyn.pchan_is is set to GSM_PCHAN_NONE when + * internally deactivated during locking. Simply + * internally restore the old status here. + */ + ts->dyn.pchan_is = ts->dyn.pchan_want; + } trx_set_ts(ts); } rc = l1if_trx_start_power_ramp(trx, bts_model_chg_adm_state_ramp_compl_cb); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia3210e24b921fd0c67f77068b7ef4a65f270cd11 Gerrit-Change-Number: 19374 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 12:49:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 23 Jul 2020 12:49:10 +0000 Subject: Change in osmo-bts[master]: bts-trx: Fix osmocom dyn ts assert hit during Adm State Unlock In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19374 ) Change subject: bts-trx: Fix osmocom dyn ts assert hit during Adm State Unlock ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia3210e24b921fd0c67f77068b7ef4a65f270cd11 Gerrit-Change-Number: 19374 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 23 Jul 2020 12:49:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 12:49:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 23 Jul 2020 12:49:28 +0000 Subject: Change in osmo-bts[master]: rsl: Fix wrong param passed to gsm_pchan_name() in log line In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19373 ) Change subject: rsl: Fix wrong param passed to gsm_pchan_name() in log line ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I42b7a79b85e8750a12166dbfc66ad06f7cb713a6 Gerrit-Change-Number: 19373 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 23 Jul 2020 12:49:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 12:49:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 23 Jul 2020 12:49:31 +0000 Subject: Change in osmo-bts[master]: rsl: Fix wrong param passed to gsm_pchan_name() in log line In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19373 ) Change subject: rsl: Fix wrong param passed to gsm_pchan_name() in log line ...................................................................... rsl: Fix wrong param passed to gsm_pchan_name() in log line Change-Id: I42b7a79b85e8750a12166dbfc66ad06f7cb713a6 --- M src/common/rsl.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/common/rsl.c b/src/common/rsl.c index b518245..4a91e3e 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -771,7 +771,7 @@ break; default: LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "PCU rel ack for unexpected lchan kind %s\n", - gsm_pchan_name(lchan->rel_act_kind)); + gsm_pchan_name(lchan->ts->pchan)); /* Release certainly was not requested by the BSC via RSL, so don't ack. */ send_rel_ack = false; break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I42b7a79b85e8750a12166dbfc66ad06f7cb713a6 Gerrit-Change-Number: 19373 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 12:52:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 23 Jul 2020 12:52:24 +0000 Subject: Change in libosmocore[master]: libomsocoding: NEON viterbi acceleration In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19372 ) Change subject: libomsocoding: NEON viterbi acceleration ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19372/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/19372/1//COMMIT_MSG at 11 PS1, Line 11: Although autodetection according to __ARM_NEON would work because this : is only defined if the fpu is neon neon-fp16 neon-vfpv3 eon-vfpv4 : neon-fp-armv8 crypto-neon-fp-armv8 doing that would lead to a unknown : performance impact, so it needs to be enabled manually. > SS(S)E/AVX is a cpu feature set that differs depending on bits provided by the cpu in a reg (and the [?] thanks for explaining the Cortex-A8 situation. It probably deserves to be mentioned here as a concrete example why we don't enable it by default. After that explanation, I'm happy with your patch (minus the copyright notice). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58ff2cb4ce3514f43390ff0a2121f81e6a4983b5 Gerrit-Change-Number: 19372 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 23 Jul 2020 12:52:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: Hoernchen Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 12:58:13 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 23 Jul 2020 12:58:13 +0000 Subject: Change in osmo-bts[master]: bts-trx: Fix osmocom dyn ts assert hit during Adm State Unlock In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19374 ) Change subject: bts-trx: Fix osmocom dyn ts assert hit during Adm State Unlock ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia3210e24b921fd0c67f77068b7ef4a65f270cd11 Gerrit-Change-Number: 19374 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 23 Jul 2020 12:58:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 13:07:26 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 23 Jul 2020 13:07:26 +0000 Subject: Change in libosmocore[master]: libomsocoding: NEON viterbi acceleration In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19372 ) Change subject: libomsocoding: NEON viterbi acceleration ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19372/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/19372/1//COMMIT_MSG at 11 PS1, Line 11: Although autodetection according to __ARM_NEON would work because this : is only defined if the fpu is neon neon-fp16 neon-vfpv3 eon-vfpv4 : neon-fp-armv8 crypto-neon-fp-armv8 doing that would lead to a unknown : performance impact, so it needs to be enabled manually. > thanks for explaining the Cortex-A8 situation. [?] And there is the case where you have to compile with neon to get neon at runtime for a specific fpu model, then detect the neon cpu feature at run time, but the target system might actually be compiled for a different fpu layout/"no fpu" soft float model that is not related to the cpu neon feature..... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58ff2cb4ce3514f43390ff0a2121f81e6a4983b5 Gerrit-Change-Number: 19372 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 23 Jul 2020 13:07:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: Hoernchen Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jul 23 13:42:58 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 13:42:58 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1993f38be59_1c292ab9470d05f499673e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmocore failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 128s] libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -DBUILDING_LIBOSMOCORE -Wall -c gsm0503_coding.c -fPIC -DPIC -o gsm0503_coding.o >/dev/null 2>&1 [ 129s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmocoding.map -version-info 1:1:1 -no-undefined -ltalloc -Wl,-z,relro -Wl,-z,now -o libosmocoding.la -rpath /usr/lib/x86_64-linux-gnu gsm0503_interleaving.lo gsm0503_mapping.lo gsm0503_tables.lo gsm0503_parity.lo gsm0503_coding.lo ../libosmocore.la ../gsm/libosmogsm.la ../codec/libosmocodec.la [ 129s] libtool: link: gcc -shared -fPIC -DPIC .libs/gsm0503_interleaving.o .libs/gsm0503_mapping.o .libs/gsm0503_tables.o .libs/gsm0503_parity.o .libs/gsm0503_coding.o -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/.libs -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/gsm/.libs -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/codec/.libs -ltalloc ../.libs/libosmocore.so ../gsm/.libs/libosmogsm.so ../codec/.libs/libosmocodec.so -g -O2 -fstack-protector-strong -Wl,--version-script=./libosmocoding.map -Wl,-z -Wl,relro -Wl,-z -Wl,now -pthread -Wl,-soname -Wl,libosmocoding.so.0 -o .libs/libosmocoding.so.0.1.1 [ 129s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:16: multiple definition of `gsm0503_mcs_crc12'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:16: first defined here [ 129s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:15: multiple definition of `gsm0503_mcs_crc8_hdr'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:15: first defined here [ 129s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:13: multiple definition of `gsm0503_fire_crc40'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:13: first defined here [ 129s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:14: multiple definition of `gsm0503_cs234_crc16'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:14: first defined here [ 129s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:19: multiple definition of `gsm0503_tch_fr_crc3'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:19: first defined here [ 129s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:20: multiple definition of `gsm0503_tch_efr_crc8'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:20: first defined here [ 129s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:21: multiple definition of `gsm0503_amr_crc6'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:21: first defined here [ 129s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:17: multiple definition of `gsm0503_rach_crc6'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:17: first defined here [ 129s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:18: multiple definition of `gsm0503_sch_crc10'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:18: first defined here [ 129s] collect2: error: ld returned 1 exit status [ 129s] make[3]: *** [Makefile:494: libosmocoding.la] Error 1 [ 129s] make[3]: Leaving directory '/usr/src/packages/BUILD/src/coding' [ 129s] make[2]: *** [Makefile:687: all-recursive] Error 1 [ 129s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 129s] make[1]: *** [Makefile:468: all] Error 2 [ 129s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 129s] dh_auto_build: error: make -j1 returned exit code 2 [ 129s] make: *** [debian/rules:15: build] Error 25 [ 129s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 129s] ### VM INTERACTION START ### [ 132s] [ 124.131247] sysrq: SysRq : Power Off [ 132s] [ 124.132990] reboot: Power down [ 132s] ### VM INTERACTION END ### [ 132s] [ 132s] build72 failed "build libosmocore_1.3.1.dsc" at Thu Jul 23 13:42:51 UTC 2020. [ 132s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jul 23 13:46:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jul 2020 13:46:03 +0000 Subject: Change in osmo-bts[master]: bts-trx: Fix osmocom dyn ts assert hit during Adm State Unlock In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19374 ) Change subject: bts-trx: Fix osmocom dyn ts assert hit during Adm State Unlock ...................................................................... bts-trx: Fix osmocom dyn ts assert hit during Adm State Unlock How to reproduce: * Configure a TS to be TCH/F_TCH/H_PDCH in osmo-bsc.cfg * Run the network with osmo-bts-trx, then use osmo-bsc's "rf_locked 1" * Then, unlock it: "rf_locked 0" * The following assert will be hit: Assert failed ts->dyn.pchan_is == ts->dyn.pchan_want /osmo-bts/src/osmo-bts-trx/l1_if.c:349 """ (gdb) bt #0 0x00007ffff5bb9355 in raise () from /usr/lib/libc.so.6 #1 0x00007ffff5ba2853 in abort () from /usr/lib/libc.so.6 #2 0x00007ffff6832361 in osmo_panic_default ( fmt=0x555555814e60 "Assert failed %s %s:%d\n", args=0x7fffffffc6e0) at /libosmocore/src/panic.c:49 #3 0x00007ffff683249d in osmo_panic ( fmt=0x555555814e60 "Assert failed %s %s:%d\n") at /libosmocore/src/panic.c:84 #4 0x000055555570fdf7 in trx_set_ts (ts=0x7ffff1e6bce8) at /osmo-bts/src/osmo-bts-trx/l1_if.c:349 #5 0x00005555557133c1 in bts_model_chg_adm_state (bts=0x627000000160, mo=0x7ffff1e0f8a0, obj=0x7ffff1e0f860, adm_state=2 '\002') at /osmo-bts/src/osmo-bts-trx/l1_if.c:681 #6 0x0000555555769978 in oml_rx_chg_adm_state (bts=0x627000000160, msg=0x633000003e00) at /osmo-bts/src/common/oml.c:1044 #7 0x000055555576a8d3 in down_fom (bts=0x627000000160, msg=0x633000003e00) at /osmo-bts/src/common/oml.c:1129 #8 0x0000555555770aed in down_oml (bts=0x627000000160, msg=0x633000003e00) at /osmo-bts/src/common/oml.c:1476 #9 0x00005555557f8174 in sign_link_cb (msg=0x633000003e00) at /osmo-bts/src/common/abis.c:188 #10 0x00007ffff73b5935 in ipaccess_bts_read_cb (link=0x6120000030a0, --Type for more, q to quit, c to continue without paging-- msg=0x633000003e00) at /libosmo-abis/src/input/ipaccess.c:980 #11 0x00007ffff73a1060 in ipa_client_read (link=0x6120000030a0) at /libosmo-abis/src/input/ipa.c:72 #12 0x00007ffff73a2458 in ipa_client_fd_cb (ofd=0x62f000038a50, what=1) at /libosmo-abis/src/input/ipa.c:136 #13 0x00007ffff67ebfa7 in osmo_fd_disp_fds (_rset=0x7fffffffdda0, _wset=0x7fffffffde40, _eset=0x7fffffffdee0) at /libosmocore/src/select.c:227 #14 0x00007ffff67ec38c in _osmo_select_main (polling=0) at /libosmocore/src/select.c:265 #15 0x00007ffff67ec46b in osmo_select_main (polling=0) at /libosmocore/src/select.c:274 #16 0x00005555557ef089 in bts_main (argc=7, argv=0x7fffffffe208) at /osmo-bts/src/common/main.c:354 #17 0x00005555556fe621 in main (argc=7, argv=0x7fffffffe208) at /osmo-bts/src/osmo-bts-trx/main.c:176 """ Related: OS#4920 Change-Id: Ia3210e24b921fd0c67f77068b7ef4a65f270cd11 --- M src/osmo-bts-trx/l1_if.c 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index d65900f..bc936c0 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -678,6 +678,13 @@ /* Activate timeslots in scheduler and start power ramp up */ for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { struct gsm_bts_trx_ts *ts = &trx->ts[i]; + if (ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) { + /* dyn.pchan_is is set to GSM_PCHAN_NONE when + * internally deactivated during locking. Simply + * internally restore the old status here. + */ + ts->dyn.pchan_is = ts->dyn.pchan_want; + } trx_set_ts(ts); } rc = l1if_trx_start_power_ramp(trx, bts_model_chg_adm_state_ramp_compl_cb); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia3210e24b921fd0c67f77068b7ef4a65f270cd11 Gerrit-Change-Number: 19374 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jul 23 13:48:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 13:48:05 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1995221fba1_1c292ab9470d05f4996915@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 118s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 118s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 118s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 118s] | | [ 118s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 118s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 118s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 118s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 118s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 118s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 118s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 118s] cc1: all warnings being treated as errors [ 118s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 118s] make[3]: *** Waiting for unfinished jobs.... [ 118s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 118s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 118s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 118s] make[1]: *** [Makefile:166: all] Error 2 [ 118s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 118s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 118s] make: *** [debian/rules:9: build] Error 25 [ 118s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 118s] ### VM INTERACTION START ### [ 121s] [ 99.512280] sysrq: SysRq : Power Off [ 121s] [ 99.517991] reboot: Power down [ 121s] ### VM INTERACTION END ### [ 121s] [ 121s] cloud121 failed "build ulfius_2.5.2-4.1.dsc" at Thu Jul 23 13:47:55 UTC 2020. [ 121s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 13:50:05 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 13:50:05 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f199599c3d04_1c292ab9470d05f49974fe@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 156s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 156s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 156s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 156s] | | [ 156s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 156s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 156s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 156s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 156s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 156s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 156s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 157s] cc1: all warnings being treated as errors [ 157s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 157s] make[3]: *** Waiting for unfinished jobs.... [ 157s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 157s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 157s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 157s] make[1]: *** [Makefile:166: all] Error 2 [ 157s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 157s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 157s] make: *** [debian/rules:9: build] Error 25 [ 157s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 157s] ### VM INTERACTION START ### [ 160s] [ 147.518106] sysrq: SysRq : Power Off [ 160s] [ 147.523577] reboot: Power down [ 160s] ### VM INTERACTION END ### [ 160s] [ 160s] lamb23 failed "build ulfius_2.5.2-4.1.dsc" at Thu Jul 23 13:49:50 UTC 2020. [ 160s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 13:54:39 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 13:54:39 +0000 Subject: Build failure of network:osmocom:latest/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1996a72d125_1c292ab9470d05f49976e3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-sccp Last lines of build log: [ 372s] libtool: link: cat .libs/libosmo-sigtran.exp | sed -e "s/\(.*\)/\1;/" >> .libs/libosmo-sigtran.ver [ 372s] libtool: link: echo "local: *; };" >> .libs/libosmo-sigtran.ver [ 372s] libtool: link: gcc -shared -fPIC -DPIC .libs/sccp_sap.o .libs/sua.o .libs/m3ua.o .libs/xua_msg.o .libs/sccp_helpers.o .libs/sccp2sua.o .libs/sccp_scrc.o .libs/sccp_sclc.o .libs/sccp_scoc.o .libs/sccp_user.o .libs/xua_rkm.o .libs/xua_default_lm_fsm.o .libs/osmo_ss7.o .libs/osmo_ss7_hmrt.o .libs/xua_asp_fsm.o .libs/xua_as_fsm.o .libs/osmo_ss7_vty.o .libs/sccp_vty.o .libs/ipa.o /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmonetif.so -lsctp -pthread -g -O2 -fstack-protector-strong -Wl,-z -Wl,relro -Wl,-z -Wl,now -pthread -Wl,-soname -Wl,libosmo-sigtran.so.5 -Wl,-version-script -Wl,.libs/libosmo-sigtran.ver -o .libs/libosmo-sigtran.so.5.0.0 [ 372s] /usr/bin/ld: .libs/sccp_helpers.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 372s] /usr/bin/ld: .libs/sccp2sua.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 372s] /usr/bin/ld: .libs/sccp_scrc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 372s] /usr/bin/ld: .libs/sccp_sclc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 372s] /usr/bin/ld: .libs/sccp_scoc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 372s] /usr/bin/ld: .libs/sccp_user.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 372s] /usr/bin/ld: .libs/osmo_ss7.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 372s] /usr/bin/ld: .libs/osmo_ss7_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 372s] /usr/bin/ld: .libs/sccp_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 372s] collect2: error: ld returned 1 exit status [ 372s] make[3]: *** [Makefile:540: libosmo-sigtran.la] Error 1 [ 372s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 372s] make[2]: *** [Makefile:500: all-recursive] Error 1 [ 372s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 372s] make[1]: *** [Makefile:395: all] Error 2 [ 372s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 372s] dh_auto_build: error: make -j1 returned exit code 2 [ 372s] make: *** [debian/rules:12: build] Error 25 [ 372s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 372s] ### VM INTERACTION START ### [ 373s] Powering off. [ 373s] [ 359.807646] reboot: Power down [ 373s] ### VM INTERACTION END ### [ 373s] [ 373s] old-atreju2 failed "build libosmo-sccp_1.2.0.dsc" at Thu Jul 23 13:54:36 UTC 2020. [ 373s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 13:57:14 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 13:57:14 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f19973d6bd79_1c292ab9470d05f4997819@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 517s] /usr/bin/ld: ../../src/common/libbts.a(msg_utils.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 517s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 517s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 517s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 517s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 517s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 517s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 517s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 517s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 517s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 517s] collect2: error: ld returned 1 exit status [ 517s] make[4]: *** [Makefile:426: osmo-bts-virtual] Error 1 [ 517s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bts-virtual' [ 517s] make[3]: *** [Makefile:385: all-recursive] Error 1 [ 517s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 517s] make[2]: *** [Makefile:434: all-recursive] Error 1 [ 517s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 517s] make[1]: *** [Makefile:366: all] Error 2 [ 517s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 517s] dh_auto_build: error: make -j1 returned exit code 2 [ 517s] make: *** [debian/rules:12: build] Error 25 [ 517s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 517s] ### VM INTERACTION START ### [ 518s] Powering off. [ 518s] [ 487.039920] reboot: Power down [ 518s] ### VM INTERACTION END ### [ 518s] [ 518s] lamb58 failed "build osmo-bts_1.2.0.dsc" at Thu Jul 23 13:57:11 UTC 2020. [ 518s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 14:02:56 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 14:02:56 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1998a63c5a8_1c292ab9470d05f49989de@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 475s] /usr/bin/ld: bsc_subscr_conn_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 475s] /usr/bin/ld: bsc_vty.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 475s] /usr/bin/ld: gsm_04_08_rr.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 475s] /usr/bin/ld: handover_decision.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 475s] /usr/bin/ld: handover_decision_2.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 475s] /usr/bin/ld: handover_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 475s] /usr/bin/ld: handover_logic.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 475s] /usr/bin/ld: lchan_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 475s] /usr/bin/ld: osmo_bsc_bssap.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 475s] /usr/bin/ld: osmo_bsc_main.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 475s] collect2: error: ld returned 1 exit status [ 475s] make[4]: *** [Makefile:588: osmo-bsc] Error 1 [ 475s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 475s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 475s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 475s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 475s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 475s] make[1]: *** [Makefile:380: all] Error 2 [ 475s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 475s] dh_auto_build: error: make -j1 returned exit code 2 [ 475s] make: *** [debian/rules:45: build] Error 25 [ 475s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 475s] ### VM INTERACTION START ### [ 476s] Powering off. [ 476s] [ 460.997790] reboot: Power down [ 476s] ### VM INTERACTION END ### [ 476s] [ 476s] lamb13 failed "build osmo-bsc_1.6.0.dsc" at Thu Jul 23 14:02:51 UTC 2020. [ 476s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 14:03:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 14:03:31 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1998c0da5c3_1c292ab9470d05f49991f1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 514s] | ~~~~~~~~~~~~~~~~~~~~~^~~ [ 514s] /bin/bash ../../libtool --tag=CC --mode=link gcc -g -Wall -I../../src/tests -I../../include -I../../include -I/usr/include/ -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -no-install -Wl,-z,relro -o test-helpers test-helpers.o test_common.o -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmogsm -losmocore -ltalloc -lasn1c -losmo-sigtran -lsctp ../../src/libosmo-ranap.la [ 515s] libtool: link: gcc -g -Wall -I../../src/tests -I../../include -I../../include -I/usr/include/ -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -Wl,-z -Wl,relro -o test-helpers test-helpers.o test_common.o /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so -ltalloc -lasn1c /usr/lib/x86_64-linux-gnu/libosmo-sigtran.so -lsctp ../../src/.libs/libosmo-ranap.so -pthread -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/.libs [ 515s] /usr/bin/ld: test_common.o:./src/tests/test_common.c:44: multiple definition of `talloc_asn1_ctx'; test-helpers.o:./src/tests/test-helpers.c:36: first defined here [ 515s] collect2: error: ld returned 1 exit status [ 515s] make[7]: *** [Makefile:424: test-helpers] Error 1 [ 515s] make[7]: Leaving directory '/usr/src/packages/BUILD/src/tests' [ 515s] make[6]: *** [Makefile:672: check-am] Error 2 [ 515s] make[6]: Leaving directory '/usr/src/packages/BUILD/src/tests' [ 515s] make[5]: *** [Makefile:690: check-recursive] Error 1 [ 515s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 515s] make[4]: *** [Makefile:842: check] Error 2 [ 515s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 515s] make[3]: *** [Makefile:461: check-recursive] Error 1 [ 515s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 515s] make[2]: *** [Makefile:761: check] Error 2 [ 515s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 515s] dh_auto_test: error: make -j1 check VERBOSE=1 returned exit code 2 [ 515s] make[1]: *** [debian/rules:19: override_dh_auto_test] Error 1 [ 515s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 515s] make: *** [debian/rules:9: build] Error 2 [ 515s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 515s] ### VM INTERACTION START ### [ 518s] [ 506.380789] sysrq: SysRq : Power Off [ 518s] [ 506.388658] reboot: Power down [ 518s] ### VM INTERACTION END ### [ 518s] [ 518s] lamb06 failed "build osmo-iuh_0.6.0.dsc" at Thu Jul 23 14:03:28 UTC 2020. [ 518s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 14:11:48 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 14:11:48 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f199ac0f2bbc_1c292ab9470d05f499995f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 459s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o gbproxy_test.o gbproxy_test.c [ 461s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=osmo_get_rand_id -Wl,-z,relro -o gbproxy_test gbproxy_test.o ../../src/gbproxy/gb_proxy.o ../../src/gbproxy/gb_proxy_patch.o ../../src/gbproxy/gb_proxy_peer.o ../../src/gbproxy/gb_proxy_tlli.o ../../src/gprs/gprs_gb_parse.o ../../src/gprs/gprs_llc_parse.o ../../src/gprs/crc24.o ../../src/gprs/gprs_utils.o -ltalloc -losmocore -ltalloc -losmogb -losmovty -losmocore -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -losmoabis -ldl -lrt [ 462s] libtool: link: gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=osmo_get_rand_id -Wl,-z -Wl,relro -o gbproxy_test gbproxy_test.o ../../src/gbproxy/gb_proxy.o ../../src/gbproxy/gb_proxy_patch.o ../../src/gbproxy/gb_proxy_peer.o ../../src/gbproxy/gb_proxy_tlli.o ../../src/gprs/gprs_gb_parse.o ../../src/gprs/gprs_llc_parse.o ../../src/gprs/crc24.o ../../src/gprs/gprs_utils.o /usr/lib/x86_64-linux-gnu/libosmogb.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmoabis.so -ldl -lrt -pthread [ 462s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/gbproxy' [ 462s] Making all in gtphub [ 462s] make[4]: Entering directory '/usr/src/packages/BUILD/tests/gtphub' [ 462s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o gtphub_test.o gtphub_test.c [ 462s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=gtphub_resolve_ggsn_addr -Wl,--wrap=gtphub_ares_init -Wl,--wrap=gtphub_write -Wl,-z,relro -o gtphub_test gtphub_test.o ../../src/gtphub/gtphub.o ../../src/gprs/gprs_utils.o -ltalloc -losmocore -ltalloc -losmogsm -losmocore -lgtp -lrt [ 463s] libtool: link: gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=gtphub_resolve_ggsn_addr -Wl,--wrap=gtphub_ares_init -Wl,--wrap=gtphub_write -Wl,-z -Wl,relro -o gtphub_test gtphub_test.o ../../src/gtphub/gtphub.o ../../src/gprs/gprs_utils.o -ltalloc /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libgtp.so -lrt -pthread [ 463s] /usr/bin/ld: ../../src/gtphub/gtphub.o:./src/gtphub/gtphub.c:50: multiple definition of `osmo_gtphub_ctx'; gtphub_test.o:./tests/gtphub/gtphub_test.c:57: first defined here [ 463s] collect2: error: ld returned 1 exit status [ 463s] make[4]: *** [Makefile:420: gtphub_test] Error 1 [ 463s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/gtphub' [ 463s] make[3]: *** [Makefile:416: all-recursive] Error 1 [ 463s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 463s] make[2]: *** [Makefile:453: all-recursive] Error 1 [ 463s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 463s] make[1]: *** [Makefile:385: all] Error 2 [ 463s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 463s] dh_auto_build: error: make -j1 returned exit code 2 [ 463s] make: *** [debian/rules:45: build] Error 25 [ 463s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 463s] ### VM INTERACTION START ### [ 464s] Powering off. [ 464s] [ 448.004169] reboot: Power down [ 464s] ### VM INTERACTION END ### [ 464s] [ 464s] lamb12 failed "build osmo-sgsn_1.6.0.dsc" at Thu Jul 23 14:11:43 UTC 2020. [ 464s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 14:12:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 14:12:22 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f199ae0bfae4_1c292ab9470d05f41000064@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 488s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 488s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_access_req_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 488s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_access_req_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 488s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_auth_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 488s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_auth_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 488s] /usr/bin/ld: ../../src/libvlr/[ 471.724346] serial8250: too much work for irq4 [ 488s] libvlr.a(vlr_lu_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 488s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 488s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_sgs.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 488s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_sgs_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 488s] collect2: error: ld returned 1 exit status [ 488s] make[4]: *** [Makefile:485: osmo-msc] Error 1 [ 488s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 488s] make[3]: *** [Makefile:422: all-recursive] Error 1 [ 488s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 488s] make[2]: *** [Makefile:462: all-recursive] Error 1 [ 488s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 488s] make[1]: *** [Makefile:394: all] Error 2 [ 488s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 488s] dh_auto_build: error: make -j1 returned exit code 2 [ 488s] make: *** [debian/rules:45: build] Error 25 [ 488s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 488s] ### VM INTERACTION START ### [ 489s] Powering off. [ 489s] [ 473.004578] reboot: Power down [ 489s] ### VM INTERACTION END ### [ 489s] [ 489s] lamb51 failed "build osmo-msc_1.6.1.dsc" at Thu Jul 23 14:12:10 UTC 2020. [ 489s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jul 23 14:16:18 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 23 Jul 2020 14:16:18 +0000 Subject: Change in libosmocore[master]: libomsocoding: NEON viterbi acceleration In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19372 to look at the new patch set (#2). Change subject: libomsocoding: NEON viterbi acceleration ...................................................................... libomsocoding: NEON viterbi acceleration configure flag required to enable this: --enable-neon Although autodetection according to __ARM_NEON would work because this is only defined if the fpu is neon neon-fp16 neon-vfpv3 neon-vfpv4 neon-fp-armv8 crypto-neon-fp-armv8 doing that would lead to a unknown performance impact, so it needs to be enabled manually. Speedup is about ~1.3-1.5 on a unspecified single core Cortex A9. This requires handling a special case for RACH with len 14 which is far too short for neon and would actually incur a performance penalty of 25%. Change-Id: I58ff2cb4ce3514f43390ff0a2121f81e6a4983b5 --- M configure.ac M src/Makefile.am M src/conv_acc.c A src/conv_acc_neon.c A src/conv_acc_neon_impl.h 5 files changed, 508 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/19372/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58ff2cb4ce3514f43390ff0a2121f81e6a4983b5 Gerrit-Change-Number: 19372 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 14:21:22 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 23 Jul 2020 14:21:22 +0000 Subject: Change in libosmocore[master]: libomsocoding: NEON viterbi acceleration In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19372 to look at the new patch set (#3). Change subject: libomsocoding: NEON viterbi acceleration ...................................................................... libomsocoding: NEON viterbi acceleration configure flag required to enable this: --enable-neon Although autodetection according to __ARM_NEON would work because this is only defined if the fpu is neon neon-fp16 neon-vfpv3 neon-vfpv4 neon-fp-armv8 crypto-neon-fp-armv8 doing that would lead to a unknown performance impact, so it needs to be enabled manually. Speedup is about ~1.3-1.5 on a unspecified single core Cortex A9. This requires handling a special case for RACH with len 14 which is far too short for neon and would actually incur a performance penalty of 25%. Related: OS#4585 Change-Id: I58ff2cb4ce3514f43390ff0a2121f81e6a4983b5 --- M configure.ac M src/Makefile.am M src/conv_acc.c A src/conv_acc_neon.c A src/conv_acc_neon_impl.h 5 files changed, 508 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/19372/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58ff2cb4ce3514f43390ff0a2121f81e6a4983b5 Gerrit-Change-Number: 19372 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 14:25:38 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 23 Jul 2020 14:25:38 +0000 Subject: Change in osmo-bts[master]: bts-trx: Fix osmocom dyn ts assert hit during Adm State Unlock In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19374 ) Change subject: bts-trx: Fix osmocom dyn ts assert hit during Adm State Unlock ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/19374/1/src/osmo-bts-trx/l1_if.c File src/osmo-bts-trx/l1_if.c: https://gerrit.osmocom.org/c/osmo-bts/+/19374/1/src/osmo-bts-trx/l1_if.c at 681 PS1, Line 681: GSM_PCHAN_TCH_F_TCH_H_PDCH How about GSM_PCHAN_TCH_F_PDCH? Is it also affected? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia3210e24b921fd0c67f77068b7ef4a65f270cd11 Gerrit-Change-Number: 19374 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 23 Jul 2020 14:25:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 14:26:47 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jul 2020 14:26:47 +0000 Subject: Change in libosmocore[master]: libomsocoding: NEON viterbi acceleration In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19372 ) Change subject: libomsocoding: NEON viterbi acceleration ...................................................................... Patch Set 3: (3 comments) https://gerrit.osmocom.org/c/libosmocore/+/19372/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/19372/3//COMMIT_MSG at 14 PS3, Line 14: performance impact, so it needs to be enabled manually. Please put in here the cortex-a8 situation like Harald suggested https://gerrit.osmocom.org/c/libosmocore/+/19372/3/src/conv_acc.c File src/conv_acc.c: https://gerrit.osmocom.org/c/libosmocore/+/19372/3/src/conv_acc.c at 557 PS3, Line 557: dec->metric_func = osmo_conv_metrics_k5_n2; wrong indentation not addressed. https://gerrit.osmocom.org/c/libosmocore/+/19372/1/src/conv_acc_neon_impl.h File src/conv_acc_neon_impl.h: https://gerrit.osmocom.org/c/libosmocore/+/19372/1/src/conv_acc_neon_impl.h at 26 PS1, Line 26: /* Some distributions (notably Alpine Linux) for some strange reason > This is a copy from the sse files and I see no reason to question this or waste time tracking it dow [?] Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58ff2cb4ce3514f43390ff0a2121f81e6a4983b5 Gerrit-Change-Number: 19372 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 23 Jul 2020 14:26:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: Hoernchen Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 14:27:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jul 2020 14:27:27 +0000 Subject: Change in osmo-bts[master]: bts-trx: Fix osmocom dyn ts assert hit during Adm State Unlock In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19374 ) Change subject: bts-trx: Fix osmocom dyn ts assert hit during Adm State Unlock ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/19374/1/src/osmo-bts-trx/l1_if.c File src/osmo-bts-trx/l1_if.c: https://gerrit.osmocom.org/c/osmo-bts/+/19374/1/src/osmo-bts-trx/l1_if.c at 681 PS1, Line 681: GSM_PCHAN_TCH_F_TCH_H_PDCH > How about GSM_PCHAN_TCH_F_PDCH? Is it also affected? Not, its activation/deactivation works differently and hence is not affected, I tested it. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia3210e24b921fd0c67f77068b7ef4a65f270cd11 Gerrit-Change-Number: 19374 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 23 Jul 2020 14:27:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 14:32:05 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 23 Jul 2020 14:32:05 +0000 Subject: Change in libosmocore[master]: libomsocoding: NEON viterbi acceleration In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19372 ) Change subject: libomsocoding: NEON viterbi acceleration ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19372/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/19372/3//COMMIT_MSG at 14 PS3, Line 14: performance impact, so it needs to be enabled manually. > Please put in here the cortex-a8 situation like Harald suggested The fpu feature situation is far more severe. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58ff2cb4ce3514f43390ff0a2121f81e6a4983b5 Gerrit-Change-Number: 19372 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 23 Jul 2020 14:32:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 14:35:29 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 23 Jul 2020 14:35:29 +0000 Subject: Change in libosmocore[master]: libomsocoding: NEON viterbi acceleration In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19372 ) Change subject: libomsocoding: NEON viterbi acceleration ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19372/3/src/conv_acc.c File src/conv_acc.c: https://gerrit.osmocom.org/c/libosmocore/+/19372/3/src/conv_acc.c at 557 PS3, Line 557: dec->metric_func = osmo_conv_metrics_k5_n2; > wrong indentation not addressed. it is not wrong, it is the reasonable approach here because your proposed "fix" suddenly introduces a new scope around the assignment in case NEON is not defined which clearly is not a preferrable choice just to make something "look nice" because it actually impacts the code itself and not merely cosmetic things -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58ff2cb4ce3514f43390ff0a2121f81e6a4983b5 Gerrit-Change-Number: 19372 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 23 Jul 2020 14:35:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 14:38:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jul 2020 14:38:24 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC subset rotation In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19303 ) Change subject: Introduce support for ACC subset rotation ...................................................................... Patch Set 5: I fixed the typo pointed out by @fixeria, does that mean we can merge this one? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I952c9eeae02809c7184078c655574ec817902e06 Gerrit-Change-Number: 19303 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 23 Jul 2020 14:38:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 15:04:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jul 2020 15:04:00 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC subset rotation In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 to look at the new patch set (#6). Change subject: Introduce support for ACC subset rotation ...................................................................... Introduce support for ACC subset rotation See updated documentation section in manuals/chapters/bts.adoc regarding an explanation on how the system works. Related: SYS#4911 Change-Id: I952c9eeae02809c7184078c655574ec817902e06 --- M configure.ac M doc/manuals/chapters/bts.adoc M include/osmocom/bsc/acc.h M include/osmocom/bsc/bts.h M src/osmo-bsc/acc.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/osmo-bsc/system_information.c M tests/Makefile.am A tests/acc/Makefile.am A tests/acc/acc_test.c A tests/acc/acc_test.ok M tests/gsm0408/gsm0408_test.c M tests/testsuite.at 14 files changed, 1,604 insertions(+), 117 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/19303/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I952c9eeae02809c7184078c655574ec817902e06 Gerrit-Change-Number: 19303 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jul 23 16:12:22 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 16:12:22 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f19b6fedb766_1c292ab9470d05f4101866@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Testing/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 79s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 79s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 79s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 79s] | | [ 79s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 79s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 79s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 79s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 79s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 79s] 2425 | MHD_start_daemon (unsigned int flags, [ 79s] | ^~~~~~~~~~~~~~~~ [ 79s] cc1: all warnings being treated as errors [ 79s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 79s] make[3]: *** Waiting for unfinished jobs.... [ 79s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 79s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 79s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 79s] make[1]: *** [Makefile:166: all] Error 2 [ 79s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 79s] dh_auto_build: error: cd build && make -j6 "INSTALL=install --strip-program=true" returned exit code 2 [ 79s] make: *** [debian/rules:9: build] Error 25 [ 79s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 79s] ### VM INTERACTION START ### [ 83s] [ 74.526305] sysrq: SysRq : Power Off [ 83s] [ 74.530540] reboot: Power down [ 83s] ### VM INTERACTION END ### [ 83s] [ 83s] sheep85 failed "build ulfius_2.5.2-4.1.dsc" at Thu Jul 23 16:12:09 UTC 2020. [ 83s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 17:01:31 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 17:01:31 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f19c27ada4ca_1c292ab9470d05f410218e9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Testing/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 65s] /usr/src/packages/BUILD/src/ulfius.c: In function 'ulfius_run_mhd_daemon': [ 65s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 65s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 65s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 65s] | | [ 65s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 65s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 65s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 65s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 65s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 65s] 2425 | MHD_start_daemon (unsigned int flags, [ 65s] | ^~~~~~~~~~~~~~~~ [ 66s] cc1: all warnings being treated as errors [ 66s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 66s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 66s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 66s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 66s] make[1]: *** [Makefile:166: all] Error 2 [ 66s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 66s] dh_auto_build: error: cd build && make -j3 "INSTALL=install --strip-program=true" returned exit code 2 [ 66s] make: *** [debian/rules:9: build] Error 25 [ 66s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 66s] ### VM INTERACTION START ### [ 69s] [ 61.822762] sysrq: SysRq : Power Off [ 69s] [ 61.824256] reboot: Power down [ 69s] ### VM INTERACTION END ### [ 69s] [ 69s] build73 failed "build ulfius_2.5.2-4.1.dsc" at Thu Jul 23 17:01:25 UTC 2020. [ 69s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jul 23 17:16:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jul 2020 17:16:00 +0000 Subject: Change in osmo-bsc[master]: fixup References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19375 ) Change subject: fixup ...................................................................... fixup Change-Id: I9731ab29b00bf91cb94b427de423bfbde6b292c8 --- M src/osmo-bsc/acc.c M tests/acc/acc_test.ok 2 files changed, 24 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/75/19375/1 diff --git a/src/osmo-bsc/acc.c b/src/osmo-bsc/acc.c index 0da6528..6fb7ee9 100644 --- a/src/osmo-bsc/acc.c +++ b/src/osmo-bsc/acc.c @@ -68,7 +68,7 @@ static void acc_mgr_enable_rotation_cond(struct acc_mgr *acc_mgr) { - if (acc_mgr->allowed_permanent_count && + if (acc_mgr->allowed_permanent_count && acc_mgr->allowed_subset_mask_count && acc_mgr->allowed_permanent_count != acc_mgr->allowed_subset_mask_count) { if (!osmo_timer_pending(&acc_mgr->rotate_timer)) osmo_timer_schedule(&acc_mgr->rotate_timer, acc_mgr->rotation_time_sec, 0); @@ -296,6 +296,9 @@ void acc_mgr_set_len_allowed_adm(struct acc_mgr *acc_mgr, uint8_t len_allowed_adm) { uint8_t old_len; + + OSMO_ASSERT(len_allowed_adm <= 10); + if (acc_mgr->len_allowed_adm == len_allowed_adm) return; @@ -310,6 +313,9 @@ void acc_mgr_set_len_allowed_ramp(struct acc_mgr *acc_mgr, uint8_t len_allowed_ramp) { uint8_t old_len; + + OSMO_ASSERT(len_allowed_ramp <= 10); + if (acc_mgr->len_allowed_ramp == len_allowed_ramp) return; diff --git a/tests/acc/acc_test.ok b/tests/acc/acc_test.ok index c6ea655..42cacc2 100644 --- a/tests/acc/acc_test.ok +++ b/tests/acc/acc_test.ok @@ -20,7 +20,7 @@ pcu_info_update(): t2=0x00 t3=0xff (bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x200 (active_len=1, ramp_len=10, adm_len=1, perm_len=10, rotation=on) pcu_info_update(): t2=0x01 t3=0xff -(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=10, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=10, adm_len=1, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xfe @@ -47,7 +47,7 @@ pcu_info_update(): t2=0x00 t3=0x0f (bts=0) ACC: updated ACC allowed active subset 0x3f0 -> 0x300 (active_len=2, ramp_len=10, adm_len=2, perm_len=10, rotation=on) pcu_info_update(): t2=0x00 t3=0xff -(bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=10, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x00f (active_len=4, ramp_len=10, adm_len=4, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xf0 @@ -71,7 +71,7 @@ pcu_info_update(): t2=0x02 t3=0xbf (bts=0) ACC: updated ACC allowed active subset 0x140 -> 0x100 (active_len=1, ramp_len=10, adm_len=1, perm_len=5, rotation=on) pcu_info_update(): t2=0x02 t3=0xff -(bts=0) ACC: updated ACC allowed active subset 0x100 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=5, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x100 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=5, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x002 (active_len=1, ramp_len=10, adm_len=1, perm_len=5, rotation=on) pcu_info_update(): t2=0x03 t3=0xfd @@ -92,7 +92,7 @@ (bts=0) ACC: updated ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=10, adm_len=6, perm_len=5, rotation=off) (bts=0) ACC: updated ACC allowed active subset 0x15a -> 0x140 (active_len=2, ramp_len=10, adm_len=2, perm_len=5, rotation=on) pcu_info_update(): t2=0x02 t3=0xbf -(bts=0) ACC: updated ACC allowed active subset 0x140 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=5, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x140 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=5, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x05a (active_len=4, ramp_len=10, adm_len=4, perm_len=5, rotation=on) pcu_info_update(): t2=0x03 t3=0xa5 @@ -128,7 +128,7 @@ pcu_info_update(): t2=0x00 t3=0xff (bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x200 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x01 t3=0xff -(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xfe @@ -155,7 +155,7 @@ pcu_info_update(): t2=0x00 t3=0x0f (bts=0) ACC: updated ACC allowed active subset 0x3f0 -> 0x300 (active_len=2, ramp_len=2, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x00 t3=0xff -(bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x00f (active_len=4, ramp_len=4, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xf0 @@ -178,7 +178,7 @@ pcu_info_update(): t2=0x01 t3=0xbf (bts=0) ACC: updated ACC allowed active subset 0x240 -> 0x200 (active_len=1, ramp_len=1, adm_len=10, perm_len=4, rotation=on) pcu_info_update(): t2=0x01 t3=0xff -(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=4, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=4, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x004 (active_len=1, ramp_len=1, adm_len=10, perm_len=4, rotation=on) pcu_info_update(): t2=0x03 t3=0xfb @@ -198,7 +198,7 @@ (bts=0) ACC: updated ACC allowed active subset 0x24c -> 0x24c (active_len=4, ramp_len=6, adm_len=10, perm_len=4, rotation=off) (bts=0) ACC: updated ACC allowed active subset 0x24c -> 0x240 (active_len=2, ramp_len=2, adm_len=10, perm_len=4, rotation=on) pcu_info_update(): t2=0x01 t3=0xbf -(bts=0) ACC: updated ACC allowed active subset 0x240 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=4, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x240 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=4, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x24c (active_len=4, ramp_len=4, adm_len=10, perm_len=4, rotation=off) pcu_info_update(): t2=0x01 t3=0xb3 @@ -279,7 +279,7 @@ pcu_info_update(): t2=0x00 t3=0xff (bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x200 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x01 t3=0xff -(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xfe @@ -306,7 +306,7 @@ pcu_info_update(): t2=0x00 t3=0x0f (bts=0) ACC: updated ACC allowed active subset 0x3f0 -> 0x300 (active_len=2, ramp_len=2, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x00 t3=0xff -(bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x00f (active_len=4, ramp_len=4, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xf0 @@ -326,7 +326,7 @@ pcu_info_update(): t2=0x01 t3=0xbf (bts=0) ACC: updated ACC allowed active subset 0x240 -> 0x200 (active_len=1, ramp_len=1, adm_len=4, perm_len=4, rotation=on) pcu_info_update(): t2=0x01 t3=0xff -(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=4, perm_len=4, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=4, perm_len=4, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x004 (active_len=1, ramp_len=1, adm_len=4, perm_len=4, rotation=on) pcu_info_update(): t2=0x03 t3=0xfb @@ -339,7 +339,7 @@ do_allowed_len_ramp_loop(4) (bts=0) ACC: updated ACC allowed active subset 0x24c -> 0x240 (active_len=2, ramp_len=2, adm_len=4, perm_len=4, rotation=on) pcu_info_update(): t2=0x01 t3=0xbf -(bts=0) ACC: updated ACC allowed active subset 0x240 -> 0x000 (active_len=0, ramp_len=0, adm_len=4, perm_len=4, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x240 -> 0x000 (active_len=0, ramp_len=0, adm_len=4, perm_len=4, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x24c (active_len=4, ramp_len=4, adm_len=4, perm_len=4, rotation=off) pcu_info_update(): t2=0x01 t3=0xb3 @@ -416,7 +416,7 @@ ===test_acc_ramp_fixed=== (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_ramp_fixed() -(bts=0) ACC: updated ACC allowed active subset 0x3ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x3ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xfe @@ -453,7 +453,7 @@ BTS allocation OK in test_acc_ramp_fixed2() (bts=0) ACC: updated ACC allowed active subset 0x3ff -> 0x3f8 (active_len=7, ramp_len=10, adm_len=7, perm_len=10, rotation=on) pcu_info_update(): t2=0x00 t3=0x07 -(bts=0) ACC: updated ACC allowed active subset 0x3f8 -> 0x000 (active_len=0, ramp_len=0, adm_len=7, perm_len=10, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x3f8 -> 0x000 (active_len=0, ramp_len=0, adm_len=7, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x007 (active_len=3, ramp_len=3, adm_len=7, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xf8 @@ -471,7 +471,7 @@ *** Barring some ACCs *** (bts=0) ACC: New ACC allowed subset 0x15a (active_len=5, ramp_len=10, adm_len=10, perm_len=5, rotation=off) pcu_info_update(): t2=0x02 t3=0xa5 -(bts=0) ACC: updated ACC allowed active subset 0x15a -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=5, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x15a -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=5, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x002 (active_len=1, ramp_len=1, adm_len=10, perm_len=5, rotation=on) pcu_info_update(): t2=0x03 t3=0xfd @@ -501,7 +501,7 @@ ===test_acc_ramp_dynamic=== (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_ramp_dynamic() -(bts=0) ACC: updated ACC allowed active subset 0x3ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x3ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xfe @@ -539,7 +539,7 @@ *** Barring one ACC *** (bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) pcu_info_update(): t2=0x02 t3=0x00 -(bts=0) ACC: updated ACC allowed active subset 0x1ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=9, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x1ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=9, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) pcu_info_update(): t2=0x03 t3=0xfe -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9731ab29b00bf91cb94b427de423bfbde6b292c8 Gerrit-Change-Number: 19375 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 17:16:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jul 2020 17:16:11 +0000 Subject: Change in osmo-bsc[master]: fixup In-Reply-To: References: Message-ID: pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19375 ) Change subject: fixup ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9731ab29b00bf91cb94b427de423bfbde6b292c8 Gerrit-Change-Number: 19375 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 17:16:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jul 2020 17:16:28 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC subset rotation In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 to look at the new patch set (#7). Change subject: Introduce support for ACC subset rotation ...................................................................... Introduce support for ACC subset rotation See updated documentation section in manuals/chapters/bts.adoc regarding an explanation on how the system works. Related: SYS#4911 Change-Id: I952c9eeae02809c7184078c655574ec817902e06 --- M configure.ac M doc/manuals/chapters/bts.adoc M include/osmocom/bsc/acc.h M include/osmocom/bsc/bts.h M src/osmo-bsc/acc.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/osmo-bsc/system_information.c M tests/Makefile.am A tests/acc/Makefile.am A tests/acc/acc_test.c A tests/acc/acc_test.ok M tests/gsm0408/gsm0408_test.c M tests/testsuite.at 14 files changed, 1,610 insertions(+), 117 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/19303/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I952c9eeae02809c7184078c655574ec817902e06 Gerrit-Change-Number: 19303 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 17:35:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 23 Jul 2020 17:35:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix byte/bit order in GprsMobileAllication In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19342 ) Change subject: library/RLCMAC_CSN1_Types: fix byte/bit order in GprsMobileAllication ...................................................................... Patch Set 3: Hi Pau, > Why not simply handling it the way it is supposed to be sent on the wire? I see no reason for managing it differently in ttcn3 than when sending it on the wire. It's just a bitstring. Well, this way you would have to deal with inverted bitstrings, i.e. '1010'B would mean that ARFSNs N+1 and N+3 (from SI Type 1) are part of the hopping sequence, while ARFCNs N+0 and N+2 are not (read it from right to left). I believe doing ma[N] in TTCN-3 would be much more self-explaining, rather than doing ma[lengthof(ma) - N]. > I'm not against this patch, simply asking myself about the implications. Is it because it's easier to manage in TTCN3 when writing tests? Yep, exactly. See above. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8f2c8c7b234605523a4fd518210b45ea3c088ff6 Gerrit-Change-Number: 19342 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jul 2020 17:35:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 17:39:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 23 Jul 2020 17:39:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix byte/bit order in GprsMobileAllication In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19342 ) Change subject: library/RLCMAC_CSN1_Types: fix byte/bit order in GprsMobileAllication ...................................................................... Patch Set 3: HI, fine then, thanks for explaining. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8f2c8c7b234605523a4fd518210b45ea3c088ff6 Gerrit-Change-Number: 19342 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 23 Jul 2020 17:39:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 18:43:15 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 23 Jul 2020 18:43:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fixup library/GSM_RR_Types: fix BYTEORDER in MobileAllocation In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19370 ) Change subject: fixup library/GSM_RR_Types: fix BYTEORDER in MobileAllocation ...................................................................... Patch Set 1: Code-Review+2 This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iea2e3a9a7a0557d1ab5d935877d2161ee0988077 Gerrit-Change-Number: 19370 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 23 Jul 2020 18:43:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 18:46:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 23 Jul 2020 18:46:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix byte/bit order in GprsMobileAllication In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19342 ) Change subject: library/RLCMAC_CSN1_Types: fix byte/bit order in GprsMobileAllication ...................................................................... library/RLCMAC_CSN1_Types: fix byte/bit order in GprsMobileAllication According to 3GPP TS 44.060, table 12.10a.2, given that the number of bit positions in MA_BITMAP equals NF, the first bit position in MA_BITMAP corresponds to ARFCN_INDEX = NF-1, the last position corresponds to ARFCN_INDEX = 0. To put differently, the following bitstring in TITAN: 0 N // N = NF - 1 --------------------> 0001 1011 1110 0100 // '0001101111100100'B needs to be be encoded as follows 'on the wire': N 0 // N = NF - 1 <-------------------- 0010 0111 1101 1000 // '0010011111011000'B so it basically gets inversed. Let's add both BYTEORDER and BITORDER attributes to achieve that. Change-Id: I8f2c8c7b234605523a4fd518210b45ea3c088ff6 Related: SYS#4868, OS#4547 --- M library/RLCMAC_CSN1_Types.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index 4ebdd75..6bdca40 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -814,7 +814,8 @@ variant (ma_length) "PRESENCE(ma_present = '0'B)" variant (ma_bitmap) "PRESENCE(ma_present = '0'B)" variant (ma_length) "LENGTHTO(ma_bitmap)+1" - } + variant (ma_bitmap) "BYTEORDER(first), BITORDER(msb)" + }; /* 12.11 Packet Request Reference */ type record PacketRequestReference { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8f2c8c7b234605523a4fd518210b45ea3c088ff6 Gerrit-Change-Number: 19342 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 18:46:21 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 23 Jul 2020 18:46:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types: fix length field in GprsMobileAllication In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19369 ) Change subject: library/RLCMAC_CSN1_Types: fix length field in GprsMobileAllication ...................................................................... library/RLCMAC_CSN1_Types: fix length field in GprsMobileAllication - Length of field 'MA_BITMAP' is specified in bits, not bytes; - The value range of field MA_LENGTH is 0..63, therefore: - value 0 means that field 'MA_BITMAP' is 1 bit long, - value 1 means that field 'MA_BITMAP' is 2 bits long, - value 63 means that field 'MA_BITMAP' is 64 bits long. Change-Id: Iec19da18637febfa15bc09175bc51504c721c42f Related: SYS#4868, OS#4547 --- M library/RLCMAC_CSN1_Types.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index 6bdca40..cc1ae22 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -807,13 +807,13 @@ RflNumberList rfl_number_list optional, BIT1 ma_present, uint6_t ma_length optional, - bitstring ma_bitmap optional + bitstring ma_bitmap length(1..64) optional /* TODO: ARFCN index list */ } with { variant (rfl_number_list) "PRESENCE(rfl_number_list_present = '1'B)" variant (ma_length) "PRESENCE(ma_present = '0'B)" variant (ma_bitmap) "PRESENCE(ma_present = '0'B)" - variant (ma_length) "LENGTHTO(ma_bitmap)+1" + variant (ma_length) "LENGTHTO(ma_bitmap)-1, UNIT(bits)" variant (ma_bitmap) "BYTEORDER(first), BITORDER(msb)" }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iec19da18637febfa15bc09175bc51504c721c42f Gerrit-Change-Number: 19369 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 18:46:22 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 23 Jul 2020 18:46:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fixup library/GSM_RR_Types: fix BYTEORDER in MobileAllocation In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19370 ) Change subject: fixup library/GSM_RR_Types: fix BYTEORDER in MobileAllocation ...................................................................... fixup library/GSM_RR_Types: fix BYTEORDER in MobileAllocation The following bitstring in TITAN: 0 N // N = NF - 1 --------------------> 0001 1011 1110 0100 // '0001101111100100'B needs to be be encoded as follows 'on the wire': N 0 // N = NF - 1 <-------------------- 0010 0111 1101 1000 // '0010011111011000'B so it basically gets inversed => we need to use BYTEORDER(first). Change-Id: Iea2e3a9a7a0557d1ab5d935877d2161ee0988077 Fixes: I70b1baf01859d0cf3b8cec1aed04d73fc097a9b1 Related: SYS#4868, OS#4547 --- M library/GSM_RR_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index a0d8349..c12ebd1 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -279,7 +279,7 @@ bitstring ma } with { variant (len) "LENGTHTO(ma)" - variant (ma) "BYTEORDER(last), BITORDER(msb)" + variant (ma) "BYTEORDER(first), BITORDER(msb)" }; /* 10.5.2.25a */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iea2e3a9a7a0557d1ab5d935877d2161ee0988077 Gerrit-Change-Number: 19370 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 18:46:22 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 23 Jul 2020 18:46:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GPRS_Components: s/f_ms_rx_imm_ass_pacch/f_ms_rx_pkt_ass_pacch/g In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19341 ) Change subject: GPRS_Components: s/f_ms_rx_imm_ass_pacch/f_ms_rx_pkt_ass_pacch/g ...................................................................... GPRS_Components: s/f_ms_rx_imm_ass_pacch/f_ms_rx_pkt_ass_pacch/g Immediate Assignment is sent on AGCH/PCH, while on PACCH we have Packet Uplink/Downlink Assignment instead (see 11.2.29, 11.2.7). Change-Id: I56473ae5dfa565d2c9d26984b14685a4163bf69a --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 9 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index bba2c97..ee2c38f 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -280,14 +280,15 @@ } } -function f_ms_rx_imm_ass_pacch(inout GprsMS ms, out uint32_t poll_fn, template RlcmacDlBlock t_imm_ass := ?) +function f_ms_rx_pkt_ass_pacch(inout GprsMS ms, out uint32_t poll_fn, + template RlcmacDlBlock t_pkt_ass := ?) runs on MS_BTS_IFACE_CT return RlcmacDlBlock { var RlcmacDlBlock dl_block; var uint32_t dl_fn; f_rx_rlcmac_dl_block(dl_block, dl_fn); - if (not match(dl_block, t_imm_ass)) { - setverdict(fail, "Failed to match Packet Assignment:", t_imm_ass); + if (not match(dl_block, t_pkt_ass)) { + setverdict(fail, "Failed to match Packet Assignment:", t_pkt_ass); f_shutdown(__BFILE__, __LINE__); } diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 2208aeb..f919dbe 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -819,7 +819,7 @@ (T3192 in MS) was started and until it fires the MS will be available on PDCH in case new data arrives from SGSN. Let's verify it: */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data)); - f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_DL_PACKET_ASS); + f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_DL_PACKET_ASS); f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); @@ -1141,7 +1141,7 @@ * (see 3GPP TS 04.60 "7.1.3.1 Initiation of the Packet resource request procedure") */ f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)), 0); - f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS); + f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS); if (not match(ms.ul_tbf.tx_cs_mcs, exp_ul_cs_mcs)) { setverdict(fail, "Wrong CS_MCS ", ms.ul_tbf.tx_cs_mcs, " received vs exp ", exp_ul_cs_mcs); f_shutdown(__BFILE__, __LINE__); @@ -1159,7 +1159,7 @@ /* Now SGSN sends some DL data, PCU will page on PACCH */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data)); - f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_DL_PACKET_ASS); + f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_DL_PACKET_ASS); /* DL Ass sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); @@ -1260,7 +1260,7 @@ f_dl_block_ack_fn(dl_block, dl_fn)); /* Expect UL ass */ - f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS); + f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS); /* Send one UL block (with TLLI since we are in One-Phase Access contention resoultion) and make sure it is ACKED fine */ @@ -1638,7 +1638,7 @@ /* Send PACKET RESOURCE REQUEST to request a new UL TBF */ f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, omit)), sched_fn); - f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS); + f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS); /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I56473ae5dfa565d2c9d26984b14685a4163bf69a Gerrit-Change-Number: 19341 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 23 19:02:49 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 23 Jul 2020 19:02:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: add frequency hopping parameters In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19323 ) Change subject: library/PCUIF_Types: version 10: add frequency hopping parameters ...................................................................... Patch Set 5: I am still waiting for the IPv6 patches from lynxis... All version 10 specific changes should be merged together, so we don't break compatibility twice. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idf11bc4ba3ff0b00b32f2beab8fd020c67119d05 Gerrit-Change-Number: 19323 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 23 Jul 2020 19:02:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jul 23 21:48:06 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 21:48:06 +0000 Subject: Build failure of network:osmocom:latest/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1a059b8e781_1c292ab9470d05f4104685d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-sccp Last lines of build log: [ 394s] libtool: link: cat .libs/libosmo-sigtran.exp | sed -e "s/\(.*\)/\1;/" >> .libs/libosmo-sigtran.ver [ 394s] libtool: link: echo "local: *; };" >> .libs/libosmo-sigtran.ver [ 394s] libtool: link: gcc -shared -fPIC -DPIC .libs/sccp_sap.o .libs/sua.o .libs/m3ua.o .libs/xua_msg.o .libs/sccp_helpers.o .libs/sccp2sua.o .libs/sccp_scrc.o .libs/sccp_sclc.o .libs/sccp_scoc.o .libs/sccp_user.o .libs/xua_rkm.o .libs/xua_default_lm_fsm.o .libs/osmo_ss7.o .libs/osmo_ss7_hmrt.o .libs/xua_asp_fsm.o .libs/xua_as_fsm.o .libs/osmo_ss7_vty.o .libs/sccp_vty.o .libs/ipa.o /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmonetif.so -lsctp -pthread -g -O2 -fstack-protector-strong -Wl,-z -Wl,relro -Wl,-z -Wl,now -pthread -Wl,-soname -Wl,libosmo-sigtran.so.5 -Wl,-version-script -Wl,.libs/libosmo-sigtran.ver -o .libs/libosmo-sigtran.so.5.0.0 [ 394s] /usr/bin/ld: .libs/sccp_helpers.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 394s] /usr/bin/ld: .libs/sccp2sua.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 394s] /usr/bin/ld: .libs/sccp_scrc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 394s] /usr/bin/ld: .libs/sccp_sclc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 394s] /usr/bin/ld: .libs/sccp_scoc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 394s] /usr/bin/ld: .libs/sccp_user.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 394s] /usr/bin/ld: .libs/osmo_ss7.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 394s] /usr/bin/ld: .libs/osmo_ss7_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 394s] /usr/bin/ld: .libs/sccp_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 394s] collect2: error: ld returned 1 exit status [ 394s] make[3]: *** [Makefile:540: libosmo-sigtran.la] Error 1 [ 394s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 394s] make[2]: *** [Makefile:500: all-recursive] Error 1 [ 394s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 394s] make[1]: *** [Makefile:395: all] Error 2 [ 394s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 394s] dh_auto_build: error: make -j1 returned exit code 2 [ 394s] make: *** [debian/rules:12: build] Error 25 [ 394s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 394s] ### VM INTERACTION START ### [ 395s] Powering off. [ 395s] [ 380.102032] reboot: Power down [ 395s] ### VM INTERACTION END ### [ 395s] [ 395s] lamb12 failed "build libosmo-sccp_1.2.0.dsc" at Thu Jul 23 21:47:53 UTC 2020. [ 395s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 21:47:49 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 21:47:49 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1a059b3a44e_1c292ab9470d05f41046798@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 382s] /usr/bin/ld: ../../src/common/libbts.a(msg_utils.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 382s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 382s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 382s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 382s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 382s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 382s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 382s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 382s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 382s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 382s] collect2: error: ld returned 1 exit status [ 382s] make[4]: *** [Makefile:426: osmo-bts-virtual] Error 1 [ 382s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bts-virtual' [ 382s] make[3]: *** [Makefile:385: all-recursive] Error 1 [ 382s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 382s] make[2]: *** [Makefile:434: all-recursive] Error 1 [ 382s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 382s] make[1]: *** [Makefile:366: all] Error 2 [ 382s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 382s] dh_auto_build: error: make -j1 returned exit code 2 [ 382s] make: *** [debian/rules:12: build] Error 25 [ 382s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 382s] ### VM INTERACTION START ### [ 383s] Powering off. [ 383s] [ 368.247014] reboot: Power down [ 383s] ### VM INTERACTION END ### [ 383s] [ 383s] lamb12 failed "build osmo-bts_1.2.0.dsc" at Thu Jul 23 21:47:44 UTC 2020. [ 383s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 21:56:23 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 21:56:23 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1a0799e8725_1c292ab9470d05f410476cf@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 481s] /usr/bin/ld: bsc_subscr_conn_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 481s] /usr/bin/ld: bsc_vty.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 481s] /usr/bin/ld: gsm_04_08_rr.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 481s] /usr/bin/ld: handover_decision.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 481s] /usr/bin/ld: handover_decision_2.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 481s] /usr/bin/ld: handover_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 481s] /usr/bin/ld: handover_logic.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 481s] /usr/bin/ld: lchan_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 481s] /usr/bin/ld: osmo_bsc_bssap.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 481s] /usr/bin/ld: osmo_bsc_main.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 481s] collect2: error: ld returned 1 exit status [ 481s] make[4]: *** [Makefile:588: osmo-bsc] Error 1 [ 481s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 481s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 481s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 481s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 481s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 481s] make[1]: *** [Makefile:380: all] Error 2 [ 481s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 481s] dh_auto_build: error: make -j1 returned exit code 2 [ 481s] make: *** [debian/rules:45: build] Error 25 [ 481s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 481s] ### VM INTERACTION START ### [ 482s] Powering off. [ 482s] [ 466.140140] reboot: Power down [ 482s] ### VM INTERACTION END ### [ 482s] [ 482s] lamb25 failed "build osmo-bsc_1.6.0.dsc" at Thu Jul 23 21:56:09 UTC 2020. [ 482s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 21:57:32 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 21:57:32 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1a07d721a4d_1c292ab9470d05f4104774@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 457s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o gbproxy_test.o gbproxy_test.c [ 459s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=osmo_get_rand_id -Wl,-z,relro -o gbproxy_test gbproxy_test.o ../../src/gbproxy/gb_proxy.o ../../src/gbproxy/gb_proxy_patch.o ../../src/gbproxy/gb_proxy_peer.o ../../src/gbproxy/gb_proxy_tlli.o ../../src/gprs/gprs_gb_parse.o ../../src/gprs/gprs_llc_parse.o ../../src/gprs/crc24.o ../../src/gprs/gprs_utils.o -ltalloc -losmocore -ltalloc -losmogb -losmovty -losmocore -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -losmoabis -ldl -lrt [ 459s] libtool: link: gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=osmo_get_rand_id -Wl,-z -Wl,relro -o gbproxy_test gbproxy_test.o ../../src/gbproxy/gb_proxy.o ../../src/gbproxy/gb_proxy_patch.o ../../src/gbproxy/gb_proxy_peer.o ../../src/gbproxy/gb_proxy_tlli.o ../../src/gprs/gprs_gb_parse.o ../../src/gprs/gprs_llc_parse.o ../../src/gprs/crc24.o ../../src/gprs/gprs_utils.o /usr/lib/x86_64-linux-gnu/libosmogb.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmoabis.so -ldl -lrt -pthread [ 459s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/gbproxy' [ 459s] Making all in gtphub [ 459s] make[4]: Entering directory '/usr/src/packages/BUILD/tests/gtphub' [ 459s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o gtphub_test.o gtphub_test.c [ 460s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=gtphub_resolve_ggsn_addr -Wl,--wrap=gtphub_ares_init -Wl,--wrap=gtphub_write -Wl,-z,relro -o gtphub_test gtphub_test.o ../../src/gtphub/gtphub.o ../../src/gprs/gprs_utils.o -ltalloc -losmocore -ltalloc -losmogsm -losmocore -lgtp -lrt [ 460s] libtool: link: gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=gtphub_resolve_ggsn_addr -Wl,--wrap=gtphub_ares_init -Wl,--wrap=gtphub_write -Wl,-z -Wl,relro -o gtphub_test gtphub_test.o ../../src/gtphub/gtphub.o ../../src/gprs/gprs_utils.o -ltalloc /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libgtp.so -lrt -pthread [ 460s] /usr/bin/ld: ../../src/gtphub/gtphub.o:./src/gtphub/gtphub.c:50: multiple definition of `osmo_gtphub_ctx'; gtphub_test.o:./tests/gtphub/gtphub_test.c:57: first defined here [ 460s] collect2: error: ld returned 1 exit status [ 460s] make[4]: *** [Makefile:420: gtphub_test] Error 1 [ 460s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/gtphub' [ 460s] make[3]: *** [Makefile:416: all-recursive] Error 1 [ 460s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 460s] make[2]: *** [Makefile:453: all-recursive] Error 1 [ 460s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 460s] make[1]: *** [Makefile:385: all] Error 2 [ 460s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 460s] dh_auto_build: error: make -j1 returned exit code 2 [ 460s] make: *** [debian/rules:45: build] Error 25 [ 460s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 460s] ### VM INTERACTION START ### [ 461s] Powering off. [ 461s] [ 445.381350] reboot: Power down [ 461s] ### VM INTERACTION END ### [ 461s] [ 461s] lamb01 failed "build osmo-sgsn_1.6.0.dsc" at Thu Jul 23 21:57:23 UTC 2020. [ 461s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 23 21:58:06 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 23 Jul 2020 21:58:06 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1a07f613afd_1c292ab9470d05f410478d0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 483s] col/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 483s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 483s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_access_req_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 483s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_access_req_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 483s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_auth_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 483s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_auth_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 483s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 483s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 483s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_sgs.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 483s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_sgs_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 483s] collect2: error: ld returned 1 exit status [ 483s] make[4]: *** [Makefile:485: osmo-msc] Error 1 [ 483s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 483s] make[3]: *** [Makefile:422: all-recursive] Error 1 [ 483s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 483s] make[2]: *** [Makefile:462: all-recursive] Error 1 [ 483s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 483s] make[1]: *** [Makefile:394: all] Error 2 [ 483s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 483s] dh_auto_build: error: make -j1 returned exit code 2 [ 483s] make: *** [debian/rules:45: build] Error 25 [ 483s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 483s] ### VM INTERACTION START ### [ 484s] Powering off. [ 484s] [ 462.349431] reboot: Power down [ 484s] ### VM INTERACTION END ### [ 484s] [ 484s] cloud131 failed "build osmo-msc_1.6.1.dsc" at Thu Jul 23 21:57:55 UTC 2020. [ 484s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jul 23 23:42:34 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 23 Jul 2020 23:42:34 +0000 Subject: Change in osmo-msc[master]: Clear Command: set cause value to "Call Control" In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19213 ) Change subject: Clear Command: set cause value to "Call Control" ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-msc/+/19213/1/src/libmsc/msc_a.c File src/libmsc/msc_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/19213/1/src/libmsc/msc_a.c at 782 PS1, Line 782: /* "Call Control" is the only cause code listed in 3GPP TS 48.008 3.2.1.21 CLEAR COMMAND spec reference is here https://gerrit.osmocom.org/c/osmo-msc/+/19213/1/src/libmsc/msc_a.c at 784 PS1, Line 784: GSM0808_CAUSE_CALL_CONTROL > So even if it's a connection for USSD or SMS, we still send "call control"? yes, see OS#4664 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1347ed72ae7d7ea73a557b866e764819c5ef8c42 Gerrit-Change-Number: 19213 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 23 Jul 2020 23:42:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 01:04:00 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 24 Jul 2020 01:04:00 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: is this regex? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 24 Jul 2020 01:04:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 01:05:30 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 24 Jul 2020 01:05:30 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: good to talk to myself throug jenkins. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 24 Jul 2020 01:05:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 01:06:07 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 24 Jul 2020 01:06:07 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: maybe -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 24 Jul 2020 01:06:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 01:07:42 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 24 Jul 2020 01:07:42 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: it -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 24 Jul 2020 01:07:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 01:22:30 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 24 Jul 2020 01:22:30 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: has -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 24 Jul 2020 01:22:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 01:26:54 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 24 Jul 2020 01:26:54 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: a -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 24 Jul 2020 01:26:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 01:34:48 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 24 Jul 2020 01:34:48 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: reason -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 24 Jul 2020 01:34:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 01:36:23 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 24 Jul 2020 01:36:23 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: why -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 24 Jul 2020 01:36:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 01:36:59 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 24 Jul 2020 01:36:59 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: I -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 24 Jul 2020 01:36:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 01:38:42 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 24 Jul 2020 01:38:42 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: can -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 24 Jul 2020 01:38:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 01:39:27 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 24 Jul 2020 01:39:27 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: not -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 24 Jul 2020 01:39:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 01:47:00 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 24 Jul 2020 01:47:00 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: make me a sandwich -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 24 Jul 2020 01:47:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 01:56:10 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 24 Jul 2020 01:56:10 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Patch Set 2: but not on this -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 24 Jul 2020 01:56:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Jul 24 03:42:06 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 24 Jul 2020 03:42:06 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1a589931f15_1c292ab9470d05f4106874b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmocore failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 121s] libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -DBUILDING_LIBOSMOCORE -Wall -c gsm0503_coding.c -fPIC -DPIC -o gsm0503_coding.o >/dev/null 2>&1 [ 122s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmocoding.map -version-info 1:1:1 -no-undefined -ltalloc -Wl,-z,relro -Wl,-z,now -o libosmocoding.la -rpath /usr/lib/x86_64-linux-gnu gsm0503_interleaving.lo gsm0503_mapping.lo gsm0503_tables.lo gsm0503_parity.lo gsm0503_coding.lo ../libosmocore.la ../gsm/libosmogsm.la ../codec/libosmocodec.la [ 122s] libtool: link: gcc -shared -fPIC -DPIC .libs/gsm0503_interleaving.o .libs/gsm0503_mapping.o .libs/gsm0503_tables.o .libs/gsm0503_parity.o .libs/gsm0503_coding.o -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/.libs -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/gsm/.libs -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/codec/.libs -ltalloc ../.libs/libosmocore.so ../gsm/.libs/libosmogsm.so ../codec/.libs/libosmocodec.so -g -O2 -fstack-protector-strong -Wl,--version-script=./libosmocoding.map -Wl,-z -Wl,relro -Wl,-z -Wl,now -pthread -Wl,-soname -Wl,libosmocoding.so.0 -o .libs/libosmocoding.so.0.1.1 [ 122s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:16: multiple definition of `gsm0503_mcs_crc12'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:16: first defined here [ 122s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:15: multiple definition of `gsm0503_mcs_crc8_hdr'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:15: first defined here [ 122s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:13: multiple definition of `gsm0503_fire_crc40'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:13: first defined here [ 122s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:14: multiple definition of `gsm0503_cs234_crc16'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:14: first defined here [ 122s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:19: multiple definition of `gsm0503_tch_fr_crc3'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:19: first defined here [ 122s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:20: multiple definition of `gsm0503_tch_efr_crc8'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:20: first defined here [ 122s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:21: multiple definition of `gsm0503_amr_crc6'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:21: first defined here [ 122s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:17: multiple definition of `gsm0503_rach_crc6'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:17: first defined here [ 122s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:18: multiple definition of `gsm0503_sch_crc10'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:18: first defined here [ 122s] collect2: error: ld returned 1 exit status [ 122s] make[3]: *** [Makefile:494: libosmocoding.la] Error 1 [ 122s] make[3]: Leaving directory '/usr/src/packages/BUILD/src/coding' [ 122s] make[2]: *** [Makefile:687: all-recursive] Error 1 [ 122s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 122s] make[1]: *** [Makefile:468: all] Error 2 [ 122s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 122s] dh_auto_build: error: make -j1 returned exit code 2 [ 122s] make: *** [debian/rules:15: build] Error 25 [ 122s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 122s] ### VM INTERACTION START ### [ 125s] [ 116.331998] sysrq: SysRq : Power Off [ 125s] [ 116.338536] reboot: Power down [ 125s] ### VM INTERACTION END ### [ 125s] [ 125s] goat15 failed "build libosmocore_1.3.1.dsc" at Fri Jul 24 03:41:52 UTC 2020. [ 125s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 24 03:44:58 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 24 Jul 2020 03:44:58 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1a5946c3dbc_1c292ab9470d05f410689be@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 88s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 88s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 88s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 88s] | | [ 88s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 88s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 88s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 88s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 88s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 88s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 88s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 88s] cc1: all warnings being treated as errors [ 88s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 88s] make[3]: *** Waiting for unfinished jobs.... [ 88s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 88s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 88s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 88s] make[1]: *** [Makefile:166: all] Error 2 [ 88s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 88s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 88s] make: *** [debian/rules:9: build] Error 25 [ 88s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 88s] ### VM INTERACTION START ### [ 91s] [ 79.463847] sysrq: SysRq : Power Off [ 91s] [ 79.476967] reboot: Power down [ 91s] ### VM INTERACTION END ### [ 91s] [ 91s] old-atreju5 failed "build ulfius_2.5.2-4.1.dsc" at Fri Jul 24 03:44:49 UTC 2020. [ 91s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 24 03:46:41 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 24 Jul 2020 03:46:41 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1a59a3e09c0_1c292ab9470d05f4106921d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 84s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 84s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 84s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 84s] | | [ 84s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 84s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 84s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 84s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 84s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 84s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 84s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 85s] cc1: all warnings being treated as errors [ 85s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 85s] make[3]: *** Waiting for unfinished jobs.... [ 85s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 85s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 85s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 85s] make[1]: *** [Makefile:166: all] Error 2 [ 85s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 85s] dh_auto_build: error: cd build && make -j6 "INSTALL=install --strip-program=true" returned exit code 2 [ 85s] make: *** [debian/rules:9: build] Error 25 [ 85s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 85s] ### VM INTERACTION START ### [ 88s] [ 78.454817] sysrq: SysRq : Power Off [ 88s] [ 78.459167] reboot: Power down [ 88s] ### VM INTERACTION END ### [ 88s] [ 88s] sheep86 failed "build ulfius_2.5.2-4.1.dsc" at Fri Jul 24 03:46:30 UTC 2020. [ 88s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 24 03:52:58 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 24 Jul 2020 03:52:58 +0000 Subject: Build failure of network:osmocom:latest/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1a5b2a1222b_1c292ab9470d05f410698a9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-sccp Last lines of build log: [ 340s] libtool: link: cat .libs/libosmo-sigtran.exp | sed -e "s/\(.*\)/\1;/" >> .libs/libosmo-sigtran.ver [ 340s] libtool: link: echo "local: *; };" >> .libs/libosmo-sigtran.ver [ 340s] libtool: link: gcc -shared -fPIC -DPIC .libs/sccp_sap.o .libs/sua.o .libs/m3ua.o .libs/xua_msg.o .libs/sccp_helpers.o .libs/sccp2sua.o .libs/sccp_scrc.o .libs/sccp_sclc.o .libs/sccp_scoc.o .libs/sccp_user.o .libs/xua_rkm.o .libs/xua_default_lm_fsm.o .libs/osmo_ss7.o .libs/osmo_ss7_hmrt.o .libs/xua_asp_fsm.o .libs/xua_as_fsm.o .libs/osmo_ss7_vty.o .libs/sccp_vty.o .libs/ipa.o /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmonetif.so -lsctp -pthread -g -O2 -fstack-protector-strong -Wl,-z -Wl,relro -Wl,-z -Wl,now -pthread -Wl,-soname -Wl,libosmo-sigtran.so.5 -Wl,-version-script -Wl,.libs/libosmo-sigtran.ver -o .libs/libosmo-sigtran.so.5.0.0 [ 340s] /usr/bin/ld: .libs/sccp_helpers.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 340s] /usr/bin/ld: .libs/sccp2sua.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 340s] /usr/bin/ld: .libs/sccp_scrc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 340s] /usr/bin/ld: .libs/sccp_sclc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 340s] /usr/bin/ld: .libs/sccp_scoc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 340s] /usr/bin/ld: .libs/sccp_user.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 340s] /usr/bin/ld: .libs/osmo_ss7.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 340s] /usr/bin/ld: .libs/osmo_ss7_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 340s] /usr/bin/ld: .libs/sccp_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 340s] collect2: error: ld returned 1 exit status [ 340s] make[3]: *** [Makefile:540: libosmo-sigtran.la] Error 1 [ 340s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 340s] make[2]: *** [Makefile:500: all-recursive] Error 1 [ 340s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 340s] make[1]: *** [Makefile:395: all] Error 2 [ 340s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 340s] dh_auto_build: error: make -j1 returned exit code 2 [ 340s] make: *** [debian/rules:12: build] Error 25 [ 340s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 340s] ### VM INTERACTION START ### [ 341s] Powering off. [ 341s] [ 327.029724] reboot: Power down [ 341s] ### VM INTERACTION END ### [ 341s] [ 341s] old-atreju5 failed "build libosmo-sccp_1.2.0.dsc" at Fri Jul 24 03:52:45 UTC 2020. [ 341s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 24 03:54:41 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 24 Jul 2020 03:54:41 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1a5b9f9758d_1c292ab9470d05f410701cb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 441s] /usr/bin/ld: ../../src/common/libbts.a(msg_utils.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 441s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 441s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 441s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 441s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 441s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 441s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 441s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 441s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 441s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 441s] collect2: error: ld returned 1 exit status [ 441s] make[4]: *** [Makefile:426: osmo-bts-virtual] Error 1 [ 441s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bts-virtual' [ 441s] make[3]: *** [Makefile:385: all-recursive] Error 1 [ 441s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 441s] make[2]: *** [Makefile:434: all-recursive] Error 1 [ 441s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 441s] make[1]: *** [Makefile:366: all] Error 2 [ 441s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 441s] dh_auto_build: error: make -j1 returned exit code 2 [ 441s] make: *** [debian/rules:12: build] Error 25 [ 441s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 441s] ### VM INTERACTION START ### [ 442s] Powering off. [ 442s] [ 413.518349] reboot: Power down [ 442s] ### VM INTERACTION END ### [ 442s] [ 442s] cloud114 failed "build osmo-bts_1.2.0.dsc" at Fri Jul 24 03:54:37 UTC 2020. [ 442s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 24 03:57:32 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 24 Jul 2020 03:57:32 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1a5c3b7aeb_1c292ab9470d05f410702ee@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 270s] | ~~~~~~~~~~~~~~~~~~~~~^~~ [ 270s] /bin/bash ../../libtool --tag=CC --mode=link gcc -g -Wall -I../../src/tests -I../../include -I../../include -I/usr/include/ -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -no-install -Wl,-z,relro -o test-helpers test-helpers.o test_common.o -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmogsm -losmocore -ltalloc -lasn1c -losmo-sigtran -lsctp ../../src/libosmo-ranap.la [ 270s] libtool: link: gcc -g -Wall -I../../src/tests -I../../include -I../../include -I/usr/include/ -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -Wl,-z -Wl,relro -o test-helpers test-helpers.o test_common.o /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so -ltalloc -lasn1c /usr/lib/x86_64-linux-gnu/libosmo-sigtran.so -lsctp ../../src/.libs/libosmo-ranap.so -pthread -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/.libs [ 270s] /usr/bin/ld: test_common.o:./src/tests/test_common.c:44: multiple definition of `talloc_asn1_ctx'; test-helpers.o:./src/tests/test-helpers.c:36: first defined here [ 270s] collect2: error: ld returned 1 exit status [ 270s] make[7]: *** [Makefile:424: test-helpers] Error 1 [ 270s] make[7]: Leaving directory '/usr/src/packages/BUILD/src/tests' [ 270s] make[6]: *** [Makefile:672: check-am] Error 2 [ 270s] make[6]: Leaving directory '/usr/src/packages/BUILD/src/tests' [ 270s] make[5]: *** [Makefile:690: check-recursive] Error 1 [ 270s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 270s] make[4]: *** [Makefile:842: check] Error 2 [ 270s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 270s] make[3]: *** [Makefile:461: check-recursive] Error 1 [ 270s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 270s] make[2]: *** [Makefile:761: check] Error 2 [ 270s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 270s] dh_auto_test: error: make -j1 check VERBOSE=1 returned exit code 2 [ 270s] make[1]: *** [debian/rules:19: override_dh_auto_test] Error 1 [ 270s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 270s] make: *** [debian/rules:9: build] Error 2 [ 270s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 270s] ### VM INTERACTION START ### [ 273s] [ 265.215381] sysrq: SysRq : Power Off [ 273s] [ 265.218942] reboot: Power down [ 273s] ### VM INTERACTION END ### [ 273s] [ 273s] build79 failed "build osmo-iuh_0.6.0.dsc" at Fri Jul 24 03:57:25 UTC 2020. [ 273s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 24 04:00:23 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 24 Jul 2020 04:00:23 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1a5cebc292_1c292ab9470d05f4107048c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 276s] /usr/bin/ld: bsc_subscr_conn_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 276s] /usr/bin/ld: bsc_vty.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 276s] /usr/bin/ld: gsm_04_08_rr.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 276s] /usr/bin/ld: handover_decision.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 276s] /usr/bin/ld: handover_decision_2.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 276s] /usr/bin/ld: handover_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 276s] /usr/bin/ld: handover_logic.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 276s] /usr/bin/ld: lchan_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 276s] /usr/bin/ld: osmo_bsc_bssap.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 276s] /usr/bin/ld: osmo_bsc_main.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 276s] collect2: error: ld returned 1 exit status [ 276s] make[4]: *** [Makefile:588: osmo-bsc] Error 1 [ 276s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 276s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 276s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 276s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 276s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 276s] make[1]: *** [Makefile:380: all] Error 2 [ 276s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 276s] dh_auto_build: error: make -j1 returned exit code 2 [ 276s] make: *** [debian/rules:45: build] Error 25 [ 276s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 277s] ### VM INTERACTION START ### [ 278s] Powering off. [ 278s] [ 267.079660] reboot: Power down [ 278s] ### VM INTERACTION END ### [ 278s] [ 278s] build82 failed "build osmo-bsc_1.6.0.dsc" at Fri Jul 24 04:00:21 UTC 2020. [ 278s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 24 04:02:06 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 24 Jul 2020 04:02:06 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1a5d46b233f_1c292ab9470d05f41070579@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 255s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o gbproxy_test.o gbproxy_test.c [ 257s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=osmo_get_rand_id -Wl,-z,relro -o gbproxy_test gbproxy_test.o ../../src/gbproxy/gb_proxy.o ../../src/gbproxy/gb_proxy_patch.o ../../src/gbproxy/gb_proxy_peer.o ../../src/gbproxy/gb_proxy_tlli.o ../../src/gprs/gprs_gb_parse.o ../../src/gprs/gprs_llc_parse.o ../../src/gprs/crc24.o ../../src/gprs/gprs_utils.o -ltalloc -losmocore -ltalloc -losmogb -losmovty -losmocore -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -losmoabis -ldl -lrt [ 257s] libtool: link: gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=osmo_get_rand_id -Wl,-z -Wl,relro -o gbproxy_test gbproxy_test.o ../../src/gbproxy/gb_proxy.o ../../src/gbproxy/gb_proxy_patch.o ../../src/gbproxy/gb_proxy_peer.o ../../src/gbproxy/gb_proxy_tlli.o ../../src/gprs/gprs_gb_parse.o ../../src/gprs/gprs_llc_parse.o ../../src/gprs/crc24.o ../../src/gprs/gprs_utils.o /usr/lib/x86_64-linux-gnu/libosmogb.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmoabis.so -ldl -lrt -pthread [ 257s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/gbproxy' [ 257s] Making all in gtphub [ 257s] make[4]: Entering directory '/usr/src/packages/BUILD/tests/gtphub' [ 257s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o gtphub_test.o gtphub_test.c [ 258s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=gtphub_resolve_ggsn_addr -Wl,--wrap=gtphub_ares_init -Wl,--wrap=gtphub_write -Wl,-z,relro -o gtphub_test gtphub_test.o ../../src/gtphub/gtphub.o ../../src/gprs/gprs_utils.o -ltalloc -losmocore -ltalloc -losmogsm -losmocore -lgtp -lrt [ 258s] libtool: link: gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=gtphub_resolve_ggsn_addr -Wl,--wrap=gtphub_ares_init -Wl,--wrap=gtphub_write -Wl,-z -Wl,relro -o gtphub_test gtphub_test.o ../../src/gtphub/gtphub.o ../../src/gprs/gprs_utils.o -ltalloc /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libgtp.so -lrt -pthread [ 258s] /usr/bin/ld: ../../src/gtphub/gtphub.o:./src/gtphub/gtphub.c:50: multiple definition of `osmo_gtphub_ctx'; gtphub_test.o:./tests/gtphub/gtphub_test.c:57: first defined here [ 258s] collect2: error: ld returned 1 exit status [ 258s] make[4]: *** [Makefile:420: gtphub_test] Error 1 [ 258s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/gtphub' [ 258s] make[3]: *** [Makefile:416: all-recursive] Error 1 [ 258s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 258s] make[2]: *** [Makefile:453: all-recursive] Error 1 [ 258s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 258s] make[1]: *** [Makefile:385: all] Error 2 [ 258s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 258s] dh_auto_build: error: make -j1 returned exit code 2 [ 258s] make: *** [debian/rules:45: build] Error 25 [ 258s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 258s] ### VM INTERACTION START ### [ 259s] Powering off. [ 259s] [ 248.302792] reboot: Power down [ 259s] ### VM INTERACTION END ### [ 259s] [ 259s] build78 failed "build osmo-sgsn_1.6.0.dsc" at Fri Jul 24 04:01:52 UTC 2020. [ 259s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 24 04:04:06 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 24 Jul 2020 04:04:06 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1a5dbe5077a_1c292ab9470d05f41071523@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 373s] /usr/bin/ld: ../../src/libmsc/libmsc.a(mncc.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 373s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 373s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_access_req_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 373s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_access_req_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 373s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_auth_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 373s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_auth_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 373s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 373s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 373s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_sgs.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 373s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_sgs_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 374s] collect2: error: ld returned 1 exit status [ 374s] make[4]: *** [Makefile:485: osmo-msc] Error 1 [ 374s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 374s] make[3]: *** [Makefile:422: all-recursive] Error 1 [ 374s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 374s] make[2]: *** [Makefile:462: all-recursive] Error 1 [ 374s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 374s] make[1]: *** [Makefile:394: all] Error 2 [ 374s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 374s] dh_auto_build: error: make -j1 returned exit code 2 [ 374s] make: *** [debian/rules:45: build] Error 25 [ 374s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 374s] ### VM INTERACTION START ### [ 375s] Powering off. [ 375s] [ 360.445548] reboot: Power down [ 375s] ### VM INTERACTION END ### [ 375s] [ 375s] old-atreju5 failed "build osmo-msc_1.6.1.dsc" at Fri Jul 24 04:03:50 UTC 2020. [ 375s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Jul 24 08:53:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jul 2020 08:53:36 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC subset rotation In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 to look at the new patch set (#8). Change subject: Introduce support for ACC subset rotation ...................................................................... Introduce support for ACC subset rotation See updated documentation section in manuals/chapters/bts.adoc regarding an explanation on how the system works. Related: SYS#4911 Change-Id: I952c9eeae02809c7184078c655574ec817902e06 --- M configure.ac M doc/manuals/chapters/bts.adoc M include/osmocom/bsc/acc.h M include/osmocom/bsc/bts.h M src/osmo-bsc/acc.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/osmo-bsc/system_information.c M tests/Makefile.am A tests/acc/Makefile.am A tests/acc/acc_test.c A tests/acc/acc_test.ok M tests/gsm0408/gsm0408_test.c M tests/testsuite.at 14 files changed, 1,610 insertions(+), 117 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/19303/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I952c9eeae02809c7184078c655574ec817902e06 Gerrit-Change-Number: 19303 Gerrit-PatchSet: 8 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 08:56:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jul 2020 08:56:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_si_acc_rotate In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 to look at the new patch set (#3). Change subject: bsc: Introduce test TC_si_acc_rotate ...................................................................... bsc: Introduce test TC_si_acc_rotate Related: SYS#4911 Change-Id: I18d0243353fce547d126d62c34415628a21cb52b --- M bsc/BSC_Tests.ttcn 1 file changed, 76 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/59/19359/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I18d0243353fce547d126d62c34415628a21cb52b Gerrit-Change-Number: 19359 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 09:04:28 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jul 2020 09:04:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update to newer titan.ProtocolEmulations.M3UA master c... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19377 ) Change subject: deps/Makefile: Update to newer titan.ProtocolEmulations.M3UA master containing build fix ...................................................................... deps/Makefile: Update to newer titan.ProtocolEmulations.M3UA master containing build fix For more info, see https://git.eclipse.org/r/c/titan/titan.ProtocolEmulations.M3UA/+/166637 Change-Id: I2550d6883464835e5977a8876c514c8ab707fac4 --- M deps/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/19377/1 diff --git a/deps/Makefile b/deps/Makefile index c352cb2..b808dcc 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -78,7 +78,7 @@ # In order to keep local changes in the repository of a dependency, set its commit to the # name of a local branch here (e.g. 'master'). titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da -titan.ProtocolEmulations.M3UA_commit= 06b0f71a7d13fafc6f778974f6b4379ad87511ea +titan.ProtocolEmulations.M3UA_commit= f086e78d74defa044d864f17adaad9433fedc961 titan.ProtocolEmulations.SCCP_commit= R.7.A-9-g9e70fba titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A-4-g20cfaf8 titan.ProtocolModules.BSSGP_v13.0.0_commit= R.2.A-6-gc447f28 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2550d6883464835e5977a8876c514c8ab707fac4 Gerrit-Change-Number: 19377 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 09:05:11 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jul 2020 09:05:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update to newer titan.ProtocolEmulations.M3UA master c... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19377 ) Change subject: deps/Makefile: Update to newer titan.ProtocolEmulations.M3UA master containing build fix ...................................................................... Patch Set 1: I already updated our osmocom github fork with upstream's master. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2550d6883464835e5977a8876c514c8ab707fac4 Gerrit-Change-Number: 19377 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 24 Jul 2020 09:05:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 09:10:19 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 24 Jul 2020 09:10:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update to newer titan.ProtocolEmulations.M3UA master c... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19377 ) Change subject: deps/Makefile: Update to newer titan.ProtocolEmulations.M3UA master containing build fix ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2550d6883464835e5977a8876c514c8ab707fac4 Gerrit-Change-Number: 19377 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 24 Jul 2020 09:10:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 09:15:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jul 2020 09:15:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update to newer titan.ProtocolEmulations.M3UA master c... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19377 ) Change subject: deps/Makefile: Update to newer titan.ProtocolEmulations.M3UA master containing build fix ...................................................................... deps/Makefile: Update to newer titan.ProtocolEmulations.M3UA master containing build fix For more info, see https://git.eclipse.org/r/c/titan/titan.ProtocolEmulations.M3UA/+/166637 Change-Id: I2550d6883464835e5977a8876c514c8ab707fac4 --- M deps/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/deps/Makefile b/deps/Makefile index c352cb2..b808dcc 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -78,7 +78,7 @@ # In order to keep local changes in the repository of a dependency, set its commit to the # name of a local branch here (e.g. 'master'). titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da -titan.ProtocolEmulations.M3UA_commit= 06b0f71a7d13fafc6f778974f6b4379ad87511ea +titan.ProtocolEmulations.M3UA_commit= f086e78d74defa044d864f17adaad9433fedc961 titan.ProtocolEmulations.SCCP_commit= R.7.A-9-g9e70fba titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A-4-g20cfaf8 titan.ProtocolModules.BSSGP_v13.0.0_commit= R.2.A-6-gc447f28 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2550d6883464835e5977a8876c514c8ab707fac4 Gerrit-Change-Number: 19377 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 10:34:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jul 2020 10:34:58 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC subset rotation In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 to look at the new patch set (#9). Change subject: Introduce support for ACC subset rotation ...................................................................... Introduce support for ACC subset rotation See updated documentation section in manuals/chapters/bts.adoc regarding an explanation on how the system works. Related: SYS#4911 Change-Id: I952c9eeae02809c7184078c655574ec817902e06 --- M configure.ac M doc/manuals/chapters/bts.adoc M include/osmocom/bsc/acc.h M include/osmocom/bsc/bts.h M src/osmo-bsc/acc.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/osmo-bsc/system_information.c M tests/Makefile.am A tests/acc/Makefile.am A tests/acc/acc_test.c A tests/acc/acc_test.ok M tests/gsm0408/gsm0408_test.c M tests/testsuite.at 14 files changed, 1,610 insertions(+), 117 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/19303/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I952c9eeae02809c7184078c655574ec817902e06 Gerrit-Change-Number: 19303 Gerrit-PatchSet: 9 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 12:50:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jul 2020 12:50:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Introduce test TC_si_acc_ramp_rotate References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378 ) Change subject: Introduce test TC_si_acc_ramp_rotate ...................................................................... Introduce test TC_si_acc_ramp_rotate Change-Id: I29acf4f117ccea53028c780cc9feb1da1fc16739 --- M bsc/BSC_Tests.ttcn 1 file changed, 91 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/19378/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index ac6b356..63271c1 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1865,12 +1865,39 @@ return count; } +/* result is stored in g_system_information[rsl_idx] */ +private function f_si_recv_one_si(integer rsl_idx := 0) runs on test_CT +{ + var ASP_RSL_Unitdata rx_rsl_ud; + IPA_RSL[rsl_idx].receive(tr_ASP_RSL_UD((tr_RSL_NO_BCCH_INFO, + tr_RSL_BCCH_INFO, + tr_RSL_NO_SACCH_FILL, + tr_RSL_SACCH_FILL)) + ) -> value rx_rsl_ud; + + f_sysinfo_seen(rsl_idx, rx_rsl_ud.rsl); +} + +private function f_recv_next_si1(integer rsl_idx := 0) runs on test_CT return SystemInformationConfig +{ + var SystemInformationConfig last_si; + while (true) { + f_si_recv_one_si(rsl_idx); + last_si := g_system_information[rsl_idx]; + if (last_si.si1 == omit) { + continue; + } + g_system_information[rsl_idx].si1 := omit; + break; + } + return last_si; +} + /* verify ACC rotate feature */ testcase TC_si_acc_rotate() runs on test_CT { var template SystemInformationConfig sic := SystemInformationConfig_default; var SystemInformationConfig last_si; var AccessControlClass acc; - var ASP_RSL_Unitdata rx_rsl_ud; var uint8_t count; var integer times_allowed[10] := { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -1883,21 +1910,8 @@ /* Init and get first sysinfo */ f_init_bts_and_check_sysinfo(0, expect_si := ?); - var integer i := 0; - while (i < 20) { - IPA_RSL[0].receive(tr_ASP_RSL_UD((tr_RSL_NO_BCCH_INFO, - tr_RSL_BCCH_INFO, - tr_RSL_NO_SACCH_FILL, - tr_RSL_SACCH_FILL)) - ) -> value rx_rsl_ud; - - f_sysinfo_seen(0, rx_rsl_ud.rsl); - last_si := g_system_information[0]; - if (last_si.si1 == omit) { - continue; - } - - g_system_information[0].si1 := omit; + for (var integer i:= 0; i < 20; i := i + 1) { + last_si := f_recv_next_si1(0); acc := last_si.si1.rach_control.acc; count := f_acc09_count_allowed(acc); log("RSL: GOT SI1 ACC len=", count, ": ", acc); @@ -1913,8 +1927,6 @@ times_allowed[j] := times_allowed[j] + 1; } } - - i := i + 1; } for (var integer j := 0; j < 10; j := j + 1) { @@ -1930,6 +1942,66 @@ "rach access-control-class 5 allowed"}); } +/* verify ACC startup ramp+rotate feature */ +testcase TC_si_acc_ramp_rotate() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + var SystemInformationConfig last_si; + var AccessControlClass acc; + var ASP_RSL_Unitdata rx_rsl_ud; + var uint8_t count; + var uint8_t prev_count; + var integer times_allowed[10] := { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + + f_init(0, guard_timeout := 80.0); + + f_bts_0_cfg(BSCVTY, {"rach access-control-class 4 barred", + "access-control-class-rotate 0", + "access-control-class-rotate-quantum 1", + "access-control-class-ramping", + "access-control-class-ramping-step-interval 5", + "access-control-class-ramping-step-size 5"}); + + /* Init and get first sysinfo */ + f_init_bts_and_check_sysinfo(0, expect_si := ?); + last_si := g_system_information[0]; + acc := last_si.si1.rach_control.acc; + count := f_acc09_count_allowed(acc); + /* Adm subset size was set to 0 above, so wait until all ACC are barred */ + while (count > 0) { + last_si := f_recv_next_si1(0); + acc := last_si.si1.rach_control.acc; + count := f_acc09_count_allowed(acc); + log("RSL: wait len()=0: GOT SI1 ACC len=", count, ": ", acc); + } + + /* Increase adm subset size, we should see ramping start up */ + f_bts_0_cfg(BSCVTY, {"access-control-class-rotate 10"}); + prev_count := 0; + while (true) { + last_si := f_recv_next_si1(0); + acc := last_si.si1.rach_control.acc; + count := f_acc09_count_allowed(acc); + log("RSL: GOT SI1 ACC len=", count, ": ", acc); + + if (prev_count > count) { + setverdict(fail, "ACC allowed count dropped while expecting grow: ", prev_count, " -> ", count); + break; + } + + if (count == 9) { + break; /* Maximum reached (10 - 1 perm barred), done here */ + } + + prev_count := count; + } + + setverdict(pass); + + f_bts_0_cfg(BSCVTY, {"access-control-class-rotate 10", + "rach access-control-class 4 allowed", + "no access-control-class-ramping"}); +} + testcase TC_ctrl_msc_connection_status() runs on test_CT { var charstring ctrl_resp; @@ -5905,6 +5977,7 @@ execute( TC_si2quater_48_earfcns() ); execute( TC_si2quater_49_earfcns() ); execute( TC_si_acc_rotate() ); + execute (TC_si_acc_ramp_rotate() ); /* RSL DCHAN Channel ACtivation / Deactivation */ execute( TC_chan_act_noreply() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I29acf4f117ccea53028c780cc9feb1da1fc16739 Gerrit-Change-Number: 19378 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 12:50:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jul 2020 12:50:59 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC ramping during whole BTS life cycle In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19376 ) Change subject: Introduce support for ACC ramping during whole BTS life cycle ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id17f947c92cdfc0eb9541a9bf066338169caaeb5 Gerrit-Change-Number: 19376 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 24 Jul 2020 12:50:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 14:33:30 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 24 Jul 2020 14:33:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test RR Channel Release EARFCNs In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 to look at the new patch set (#2). Change subject: bsc: test RR Channel Release EARFCNs ...................................................................... bsc: test RR Channel Release EARFCNs Add a DCHAN and release to recently added SI2quater tests (because these tests already configure various amounts of EARFCNs in osmo-bsc). Verify that the RR Channel Release for CSFB contains all configured EARFCNs. In GSM_RR_Types.ttcn, add coding for "Cell selection indicator after release of all TCH and SDCCH IE". In f_expect_chan_rel(), add optional arg csfb_expect_cells, and, if present, decode the RR Channel Release message's L3 part, and in turn the Cell Selection Indicator Value contained. Match against csfb_expect_cells. In f_tc_si2quater_n_earfcns(), also compose a list of EARFCNs as found in the RR Channel Release, and pass to f_expect_chan_rel(). Depends: I59e427e4ebb1c6af99b27a15c40fed82457ac8ab (osmo-bsc) Change-Id: I882c5e1f70bcc4833fc837a95c900ce291919cc5 --- M bsc/BSC_Tests.ttcn M library/GSM_RR_Types.ttcn 2 files changed, 162 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/19216/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I882c5e1f70bcc4833fc837a95c900ce291919cc5 Gerrit-Change-Number: 19216 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 14:33:30 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 24 Jul 2020 14:33:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test RR Channel Release cause codes from Clear Command cause codes In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217 to look at the new patch set (#2). Change subject: bsc: test RR Channel Release cause codes from Clear Command cause codes ...................................................................... bsc: test RR Channel Release cause codes from Clear Command cause codes Invoke Clear Command with various Cause codes and verify that the RR Channel Release reflects them. Depends: I734cc55c501d61bbdadee81a223b26f9df57f959 (osmo-bsc) Change-Id: Ie6c99f28b610a67f2d59ec00b3541940e882251b --- M bsc/BSC_Tests.ttcn M library/GSM_RR_Types.ttcn 2 files changed, 89 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/19217/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie6c99f28b610a67f2d59ec00b3541940e882251b Gerrit-Change-Number: 19217 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 14:35:38 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jul 2020 14:35:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test RR Channel Release cause codes from Clear Command cause codes In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217 ) Change subject: bsc: test RR Channel Release cause codes from Clear Command cause codes ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie6c99f28b610a67f2d59ec00b3541940e882251b Gerrit-Change-Number: 19217 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 24 Jul 2020 14:35:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 14:46:25 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 24 Jul 2020 14:46:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test RR Channel Release EARFCNs In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 ) Change subject: bsc: test RR Channel Release EARFCNs ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn File library/GSM_RR_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/1/library/GSM_RR_Types.ttcn at 1159 PS1, Line 1159: meas_bw_presence := ?, > The problem is that this field is unconditionally set to '?', so your template parameter does not af [?] argh! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I882c5e1f70bcc4833fc837a95c900ce291919cc5 Gerrit-Change-Number: 19216 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 24 Jul 2020 14:46:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 14:49:52 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 24 Jul 2020 14:49:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test RR Channel Release EARFCNs In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 to look at the new patch set (#3). Change subject: bsc: test RR Channel Release EARFCNs ...................................................................... bsc: test RR Channel Release EARFCNs Add a DCHAN and release to recently added SI2quater tests (because these tests already configure various amounts of EARFCNs in osmo-bsc). Verify that the RR Channel Release for CSFB contains all configured EARFCNs. In GSM_RR_Types.ttcn, add coding for "Cell selection indicator after release of all TCH and SDCCH IE". In f_expect_chan_rel(), add optional arg csfb_expect_cells, and, if present, decode the RR Channel Release message's L3 part, and in turn the Cell Selection Indicator Value contained. Match against csfb_expect_cells. In f_tc_si2quater_n_earfcns(), also compose a list of EARFCNs as found in the RR Channel Release, and pass to f_expect_chan_rel(). Depends: I59e427e4ebb1c6af99b27a15c40fed82457ac8ab (osmo-bsc) Change-Id: I882c5e1f70bcc4833fc837a95c900ce291919cc5 --- M bsc/BSC_Tests.ttcn M library/GSM_RR_Types.ttcn 2 files changed, 170 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/19216/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I882c5e1f70bcc4833fc837a95c900ce291919cc5 Gerrit-Change-Number: 19216 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 15:27:19 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jul 2020 15:27:19 +0000 Subject: Change in osmo-bts[master]: bts-trx: prov_fsm: Fix mess with 1 event having 2 names References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19379 ) Change subject: bts-trx: prov_fsm: Fix mess with 1 event having 2 names ...................................................................... bts-trx: prov_fsm: Fix mess with 1 event having 2 names They were both half implemented but named differently, due to myself adding them during the initial FSM implementation. This prevents osmo-bts-trx sending a POWEROFF when OML link is dropped. Related: SYS#4864 Change-Id: Ic2dab864b6d4075dfb9a1e4acfd9af013c9c46fe --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/trx_provision_fsm.c 2 files changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/79/19379/1 diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index bc936c0..cd7ecc0 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -232,7 +232,7 @@ struct phy_instance *pinst = trx_phy_instance(trx); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; - osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_POWEROFF, NULL); + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CLOSE, NULL); /* Set to Operational State: Disabled */ check_transceiver_availability_trx(l1h, 0); diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 420ee24..f075e98 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -583,7 +583,7 @@ }, [TRX_PROV_ST_OPEN_POWERON] = { .in_event_mask = - X(TRX_PROV_EV_POWEROFF) | + X(TRX_PROV_EV_CLOSE) | X(TRX_PROV_EV_CFG_TS), .out_state_mask = X(TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF) | @@ -619,7 +619,6 @@ OSMO_VALUE_STRING(TRX_PROV_EV_SETTSC_CNF), OSMO_VALUE_STRING(TRX_PROV_EV_SETFORMAT_CNF), OSMO_VALUE_STRING(TRX_PROV_EV_POWERON_CNF), - OSMO_VALUE_STRING(TRX_PROV_EV_POWEROFF), OSMO_VALUE_STRING(TRX_PROV_EV_POWEROFF_CNF), OSMO_VALUE_STRING(TRX_PROV_EV_CLOSE), { 0, NULL } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic2dab864b6d4075dfb9a1e4acfd9af013c9c46fe Gerrit-Change-Number: 19379 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 15:28:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jul 2020 15:28:45 +0000 Subject: Change in osmo-bts[master]: bts-trx: prov_fsm: Fix mess with 1 event having 2 names In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/19379 ) Change subject: bts-trx: prov_fsm: Fix mess with 1 event having 2 names ...................................................................... bts-trx: prov_fsm: Fix mess with 1 event having 2 names They were both half implemented but named differently, due to myself adding them during the initial FSM implementation. This prevents osmo-bts-trx sending a POWEROFF when OML link is dropped. Related: SYS#4864 Change-Id: Ic2dab864b6d4075dfb9a1e4acfd9af013c9c46fe --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/trx_provision_fsm.c M src/osmo-bts-trx/trx_provision_fsm.h 3 files changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/79/19379/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic2dab864b6d4075dfb9a1e4acfd9af013c9c46fe Gerrit-Change-Number: 19379 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 16:27:50 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jul 2020 16:27:50 +0000 Subject: Change in osmo-bts[master]: bts_shutdown_fsm: Fix switching too quickly to state WAIT_TRX_CLOSED References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19380 ) Change subject: bts_shutdown_fsm: Fix switching too quickly to state WAIT_TRX_CLOSED ...................................................................... bts_shutdown_fsm: Fix switching too quickly to state WAIT_TRX_CLOSED Ramping down was set up with a target of -10 dBm, but then the code only waited for all TRXs to be at least 0dBm, meaning that if operating more than 1 TRX, the FSM could transit to state ST_WAIT_TRX_CLOSED when one TRX reached -10 and other were already equal or below 0 (but not yet -10). As a result, later on, when other TRXs reached -10 dBm they would trigger EV_TRX_RAMP_COMPL which was not expected (no use) in ST_WAIT_TRX_CLOSED. Related: SYS#4864 Change-Id: If7af0b138efe78ec591c199a19fc22b304416a13 --- M src/common/bts_shutdown_fsm.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/80/19380/1 diff --git a/src/common/bts_shutdown_fsm.c b/src/common/bts_shutdown_fsm.c index c81a4ab..0ac3078 100644 --- a/src/common/bts_shutdown_fsm.c +++ b/src/common/bts_shutdown_fsm.c @@ -32,6 +32,8 @@ #define X(s) (1 << (s)) +#define BTS_SHUTDOWN_POWER_RAMP_TGT -10 + static const struct osmo_tdef_state_timeout bts_shutdown_fsm_timeouts[32] = { [BTS_SHUTDOWN_ST_WAIT_RAMP_DOWN_COMPL] = { .T = -1 }, [BTS_SHUTDOWN_ST_WAIT_TRX_CLOSED] = { .T = -2 }, @@ -83,7 +85,7 @@ llist_for_each_entry(trx, &bts->trx_list, list) { if (trx->mo.nm_state.operational != NM_OPSTATE_ENABLED) continue; - power_ramp_start(trx, to_mdB(-10), 1, ramp_down_compl_cb); + power_ramp_start(trx, to_mdB(BTS_SHUTDOWN_POWER_RAMP_TGT), 1, ramp_down_compl_cb); } } @@ -100,7 +102,7 @@ llist_for_each_entry(trx, &bts->trx_list, list) { if (trx->mo.nm_state.operational == NM_OPSTATE_ENABLED && - trx->power_params.p_total_cur_mdBm > 0) + trx->power_params.p_total_cur_mdBm > BTS_SHUTDOWN_POWER_RAMP_TGT) remaining++; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7af0b138efe78ec591c199a19fc22b304416a13 Gerrit-Change-Number: 19380 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 16:28:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jul 2020 16:28:40 +0000 Subject: Change in osmo-bts[master]: bts_shutdown_fsm: Fix switching too quickly to state WAIT_TRX_CLOSED In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19380 ) Change subject: bts_shutdown_fsm: Fix switching too quickly to state WAIT_TRX_CLOSED ...................................................................... Patch Set 1: Code-Review-1 I didn't test this patch myself, will do it over next days. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7af0b138efe78ec591c199a19fc22b304416a13 Gerrit-Change-Number: 19380 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 24 Jul 2020 16:28:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 16:42:12 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 24 Jul 2020 16:42:12 +0000 Subject: Change in osmo-bts[master]: bts_shutdown_fsm: Fix switching too quickly to state WAIT_TRX_CLOSED In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19380 ) Change subject: bts_shutdown_fsm: Fix switching too quickly to state WAIT_TRX_CLOSED ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7af0b138efe78ec591c199a19fc22b304416a13 Gerrit-Change-Number: 19380 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 24 Jul 2020 16:42:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 16:42:41 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 24 Jul 2020 16:42:41 +0000 Subject: Change in osmo-bts[master]: bts-trx: prov_fsm: Fix mess with 1 event having 2 names In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19379 ) Change subject: bts-trx: prov_fsm: Fix mess with 1 event having 2 names ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic2dab864b6d4075dfb9a1e4acfd9af013c9c46fe Gerrit-Change-Number: 19379 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 24 Jul 2020 16:42:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 16:42:45 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 24 Jul 2020 16:42:45 +0000 Subject: Change in osmo-bts[master]: bts-trx: prov_fsm: Fix mess with 1 event having 2 names In-Reply-To: References: Message-ID: Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19379 ) Change subject: bts-trx: prov_fsm: Fix mess with 1 event having 2 names ...................................................................... bts-trx: prov_fsm: Fix mess with 1 event having 2 names They were both half implemented but named differently, due to myself adding them during the initial FSM implementation. This prevents osmo-bts-trx sending a POWEROFF when OML link is dropped. Related: SYS#4864 Change-Id: Ic2dab864b6d4075dfb9a1e4acfd9af013c9c46fe --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/trx_provision_fsm.c M src/osmo-bts-trx/trx_provision_fsm.h 3 files changed, 2 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, approved; Verified diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index bc936c0..cd7ecc0 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -232,7 +232,7 @@ struct phy_instance *pinst = trx_phy_instance(trx); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; - osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_POWEROFF, NULL); + osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CLOSE, NULL); /* Set to Operational State: Disabled */ check_transceiver_availability_trx(l1h, 0); diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 420ee24..f075e98 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -583,7 +583,7 @@ }, [TRX_PROV_ST_OPEN_POWERON] = { .in_event_mask = - X(TRX_PROV_EV_POWEROFF) | + X(TRX_PROV_EV_CLOSE) | X(TRX_PROV_EV_CFG_TS), .out_state_mask = X(TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF) | @@ -619,7 +619,6 @@ OSMO_VALUE_STRING(TRX_PROV_EV_SETTSC_CNF), OSMO_VALUE_STRING(TRX_PROV_EV_SETFORMAT_CNF), OSMO_VALUE_STRING(TRX_PROV_EV_POWERON_CNF), - OSMO_VALUE_STRING(TRX_PROV_EV_POWEROFF), OSMO_VALUE_STRING(TRX_PROV_EV_POWEROFF_CNF), OSMO_VALUE_STRING(TRX_PROV_EV_CLOSE), { 0, NULL } diff --git a/src/osmo-bts-trx/trx_provision_fsm.h b/src/osmo-bts-trx/trx_provision_fsm.h index 1583270..0f80088 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.h +++ b/src/osmo-bts-trx/trx_provision_fsm.h @@ -54,7 +54,6 @@ TRX_PROV_EV_SETTSC_CNF, TRX_PROV_EV_SETFORMAT_CNF, TRX_PROV_EV_POWERON_CNF, - TRX_PROV_EV_POWEROFF, TRX_PROV_EV_POWEROFF_CNF, TRX_PROV_EV_CLOSE, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic2dab864b6d4075dfb9a1e4acfd9af013c9c46fe Gerrit-Change-Number: 19379 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 16:42:54 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 24 Jul 2020 16:42:54 +0000 Subject: Change in osmo-bts[master]: bts_shutdown_fsm: Fix switching too quickly to state WAIT_TRX_CLOSED In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19380 ) Change subject: bts_shutdown_fsm: Fix switching too quickly to state WAIT_TRX_CLOSED ...................................................................... Patch Set 1: -Verified -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7af0b138efe78ec591c199a19fc22b304416a13 Gerrit-Change-Number: 19380 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 24 Jul 2020 16:42:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 19:59:42 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 24 Jul 2020 19:59:42 +0000 Subject: Change in libosmocore[master]: i460_mux: correctly re-initalize when deleting subchannels References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19381 ) Change subject: i460_mux: correctly re-initalize when deleting subchannels ...................................................................... i460_mux: correctly re-initalize when deleting subchannels When a subchannel is deleted using osmo_i460_subchan_del() the entire schan struct is cleared. However, this means that also the mux.tx_queue llist head is overwritten with zeros. The llist head is the uninitalized and on the next use of the subchannel the programm will segfault. Lets re-initalize the subchannel correctly like it is also done in osmo_i460_ts_init() for all subchannels. Change-Id: I937a9d4db95f44a860cd2c5dbb660dc1970b9a49 --- M src/gsm/i460_mux.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/81/19381/1 diff --git a/src/gsm/i460_mux.c b/src/gsm/i460_mux.c index 3fb63ec..d930fcb 100644 --- a/src/gsm/i460_mux.c +++ b/src/gsm/i460_mux.c @@ -358,6 +358,8 @@ { talloc_free(schan->demux.out_bitbuf); memset(schan, 0, sizeof(*schan)); + schan->rate = OSMO_I460_RATE_NONE; + INIT_LLIST_HEAD(&schan->mux.tx_queue); } /*! @} */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I937a9d4db95f44a860cd2c5dbb660dc1970b9a49 Gerrit-Change-Number: 19381 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 24 21:03:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 24 Jul 2020 21:03:14 +0000 Subject: Change in libosmocore[master]: i460_mux: correctly re-initalize when deleting subchannels In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19381 ) Change subject: i460_mux: correctly re-initalize when deleting subchannels ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I937a9d4db95f44a860cd2c5dbb660dc1970b9a49 Gerrit-Change-Number: 19381 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 24 Jul 2020 21:03:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Jul 24 21:50:39 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 24 Jul 2020 21:50:39 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1b57cd97a32_2bd02ac693dbc6101563ae@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmocore failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 207s] libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -DBUILDING_LIBOSMOCORE -Wall -c gsm0503_coding.c -fPIC -DPIC -o gsm0503_coding.o >/dev/null 2>&1 [ 209s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmocoding.map -version-info 1:1:1 -no-undefined -ltalloc -Wl,-z,relro -Wl,-z,now -o libosmocoding.la -rpath /usr/lib/x86_64-linux-gnu gsm0503_interleaving.lo gsm0503_mapping.lo gsm0503_tables.lo gsm0503_parity.lo gsm0503_coding.lo ../libosmocore.la ../gsm/libosmogsm.la ../codec/libosmocodec.la [ 209s] libtool: link: gcc -shared -fPIC -DPIC .libs/gsm0503_interleaving.o .libs/gsm0503_mapping.o .libs/gsm0503_tables.o .libs/gsm0503_parity.o .libs/gsm0503_coding.o -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/.libs -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/gsm/.libs -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/codec/.libs -ltalloc ../.libs/libosmocore.so ../gsm/.libs/libosmogsm.so ../codec/.libs/libosmocodec.so -g -O2 -fstack-protector-strong -Wl,--version-script=./libosmocoding.map -Wl,-z -Wl,relro -Wl,-z -Wl,now -pthread -Wl,-soname -Wl,libosmocoding.so.0 -o .libs/libosmocoding.so.0.1.1 [ 209s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:16: multiple definition of `gsm0503_mcs_crc12'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:16: first defined here [ 209s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:15: multiple definition of `gsm0503_mcs_crc8_hdr'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:15: first defined here [ 209s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:13: multiple definition of `gsm0503_fire_crc40'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:13: first defined here [ 209s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:14: multiple definition of `gsm0503_cs234_crc16'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:14: first defined here [ 209s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:19: multiple definition of `gsm0503_tch_fr_crc3'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:19: first defined here [ 209s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:20: multiple definition of `gsm0503_tch_efr_crc8'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:20: first defined here [ 209s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:21: multiple definition of `gsm0503_amr_crc6'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:21: first defined here [ 209s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:17: multiple definition of `gsm0503_rach_crc6'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:17: first defined here [ 209s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:18: multiple definition of `gsm0503_sch_crc10'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:18: first defined here [ 209s] collect2: error: ld returned 1 exit status [ 209s] make[3]: *** [Makefile:494: libosmocoding.la] Error 1 [ 209s] make[3]: Leaving directory '/usr/src/packages/BUILD/src/coding' [ 209s] make[2]: *** [Makefile:687: all-recursive] Error 1 [ 209s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 209s] make[1]: *** [Makefile:468: all] Error 2 [ 209s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 209s] dh_auto_build: error: make -j1 returned exit code 2 [ 209s] make: *** [debian/rules:15: build] Error 25 [ 209s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 209s] ### VM INTERACTION START ### [ 212s] [ 199.776857] sysrq: SysRq : Power Off [ 212s] [ 199.784167] reboot: Power down [ 212s] ### VM INTERACTION END ### [ 212s] [ 212s] lamb23 failed "build libosmocore_1.3.1.dsc" at Fri Jul 24 21:50:21 UTC 2020. [ 212s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 24 21:53:47 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 24 Jul 2020 21:53:47 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1b588148421_2bd02ac693dbc61015824d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 109s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 109s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 109s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 109s] | | [ 109s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 109s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 109s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 109s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 109s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 109s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 109s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 109s] cc1: all warnings being treated as errors [ 109s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 109s] make[3]: *** Waiting for unfinished jobs.... [ 110s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 110s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 110s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 110s] make[1]: *** [Makefile:166: all] Error 2 [ 110s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 110s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 110s] make: *** [debian/rules:9: build] Error 25 [ 110s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 110s] ### VM INTERACTION START ### [ 113s] [ 95.703928] sysrq: SysRq : Power Off [ 113s] [ 95.708384] reboot: Power down [ 113s] ### VM INTERACTION END ### [ 113s] [ 113s] cloud101 failed "build ulfius_2.5.2-4.1.dsc" at Fri Jul 24 21:53:41 UTC 2020. [ 113s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 24 21:54:21 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 24 Jul 2020 21:54:21 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1b58a071be7_2bd02ac693dbc61015832f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 108s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 108s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 108s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 108s] | | [ 108s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 108s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 108s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 108s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 108s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 108s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 108s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 109s] cc1: all warnings being treated as errors [ 109s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 109s] make[3]: *** Waiting for unfinished jobs.... [ 109s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 109s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 109s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 109s] make[1]: *** [Makefile:166: all] Error 2 [ 109s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 109s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 109s] make: *** [debian/rules:9: build] Error 25 [ 109s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 109s] ### VM INTERACTION START ### [ 112s] [ 95.492496] sysrq: SysRq : Power Off [ 112s] [ 95.496341] reboot: Power down [ 112s] ### VM INTERACTION END ### [ 112s] [ 112s] cloud114 failed "build ulfius_2.5.2-4.1.dsc" at Fri Jul 24 21:54:06 UTC 2020. [ 112s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 24 22:00:21 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 24 Jul 2020 22:00:21 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1b5a08b6c1c_2bd02ac693dbc610158856@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 378s] /usr/bin/ld: ../../src/common/libbts.a(msg_utils.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 378s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 378s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 378s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 378s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 378s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 378s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 378s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 378s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 378s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 378s] collect2: error: ld returned 1 exit status [ 378s] make[4]: *** [Makefile:426: osmo-bts-virtual] Error 1 [ 378s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bts-virtual' [ 378s] make[3]: *** [Makefile:385: all-recursive] Error 1 [ 378s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 378s] make[2]: *** [Makefile:434: all-recursive] Error 1 [ 378s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 378s] make[1]: *** [Makefile:366: all] Error 2 [ 378s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 378s] dh_auto_build: error: make -j1 returned exit code 2 [ 378s] make: *** [debian/rules:12: build] Error 25 [ 378s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 378s] ### VM INTERACTION START ### [ 379s] Powering off. [ 379s] [ 363.850529] reboot: Power down [ 379s] ### VM INTERACTION END ### [ 379s] [ 379s] lamb16 failed "build osmo-bts_1.2.0.dsc" at Fri Jul 24 22:00:20 UTC 2020. [ 379s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 24 22:03:30 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 24 Jul 2020 22:03:30 +0000 Subject: Build failure of network:osmocom:latest/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1b5abedc7ed_2bd02ac693dbc61015915f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-sccp Last lines of build log: [ 431s] libtool: link: cat .libs/libosmo-sigtran.exp | sed -e "s/\(.*\)/\1;/" >> .libs/libosmo-sigtran.ver [ 431s] libtool: link: echo "local: *; };" >> .libs/libosmo-sigtran.ver [ 431s] libtool: link: gcc -shared -fPIC -DPIC .libs/sccp_sap.o .libs/sua.o .libs/m3ua.o .libs/xua_msg.o .libs/sccp_helpers.o .libs/sccp2sua.o .libs/sccp_scrc.o .libs/sccp_sclc.o .libs/sccp_scoc.o .libs/sccp_user.o .libs/xua_rkm.o .libs/xua_default_lm_fsm.o .libs/osmo_ss7.o .libs/osmo_ss7_hmrt.o .libs/xua_asp_fsm.o .libs/xua_as_fsm.o .libs/osmo_ss7_vty.o .libs/sccp_vty.o .libs/ipa.o /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmonetif.so -lsctp -pthread -g -O2 -fstack-protector-strong -Wl,-z -Wl,relro -Wl,-z -Wl,now -pthread -Wl,-soname -Wl,libosmo-sigtran.so.5 -Wl,-version-script -Wl,.libs/libosmo-sigtran.ver -o .libs/libosmo-sigtran.so.5.0.0 [ 431s] /usr/bin/ld: .libs/sccp_helpers.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 431s] /usr/bin/ld: .libs/sccp2sua.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 431s] /usr/bin/ld: .libs/sccp_scrc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 431s] /usr/bin/ld: .libs/sccp_sclc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 431s] /usr/bin/ld: .libs/sccp_scoc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 431s] /usr/bin/ld: .libs/sccp_user.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 431s] /usr/bin/ld: .libs/osmo_ss7.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 431s] /usr/bin/ld: .libs/osmo_ss7_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 431s] /usr/bin/ld: .libs/sccp_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 431s] collect2: error: ld returned 1 exit status [ 431s] make[3]: *** [Makefile:540: libosmo-sigtran.la] Error 1 [ 431s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 431s] make[2]: *** [Makefile:500: all-recursive] Error 1 [ 431s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 431s] make[1]: *** [Makefile:395: all] Error 2 [ 431s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 431s] dh_auto_build: error: make -j1 returned exit code 2 [ 431s] make: *** [debian/rules:12: build] Error 25 [ 431s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 431s] ### VM INTERACTION START ### [ 432s] Powering off. [ 432s] [ 408.684882] reboot: Power down [ 432s] ### VM INTERACTION END ### [ 432s] [ 432s] cloud122 failed "build libosmo-sccp_1.2.0.dsc" at Fri Jul 24 22:03:21 UTC 2020. [ 432s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 24 22:11:47 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 24 Jul 2020 22:11:47 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1b5cb8f18a5_2bd02ac693dbc610159547@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 470s] /usr/bin/ld: bsc_subscr_conn_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 470s] /usr/bin/ld: bsc_vty.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 470s] /usr/bin/ld: gsm_04_08_rr.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 470s] /usr/bin/ld: handover_decision.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 470s] /usr/bin/ld: handover_decision_2.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 470s] /usr/bin/ld: handover_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 470s] /usr/bin/ld: handover_logic.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 470s] /usr/bin/ld: lchan_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 470s] /usr/bin/ld: osmo_bsc_bssap.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 470s] /usr/bin/ld: osmo_bsc_main.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 470s] collect2: error: ld returned 1 exit status [ 470s] make[4]: *** [Makefile:588: osmo-bsc] Error 1 [ 470s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 470s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 470s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 470s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 470s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 470s] make[1]: *** [Makefile:380: all] Error 2 [ 470s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 470s] dh_auto_build: error: make -j1 returned exit code 2 [ 470s] make: *** [debian/rules:45: build] Error 25 [ 470s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 470s] ### VM INTERACTION START ### [ 472s] Powering off. [ 472s] [ 456.022418] reboot: Power down [ 472s] ### VM INTERACTION END ### [ 472s] [ 472s] lamb04 failed "build osmo-bsc_1.6.0.dsc" at Fri Jul 24 22:11:30 UTC 2020. [ 472s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 24 22:12:21 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 24 Jul 2020 22:12:21 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1b5cd7eb9ba_2bd02ac693dbc61015969c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 515s] | ~~~~~~~~~~~~~~~~~~~~~^~~ [ 515s] /bin/bash ../../libtool --tag=CC --mode=link gcc -g -Wall -I../../src/tests -I../../include -I../../include -I/usr/include/ -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -no-install -Wl,-z,relro -o test-helpers test-helpers.o test_common.o -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmogsm -losmocore -ltalloc -lasn1c -losmo-sigtran -lsctp ../../src/libosmo-ranap.la [ 515s] libtool: link: gcc -g -Wall -I../../src/tests -I../../include -I../../include -I/usr/include/ -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -Wl,-z -Wl,relro -o test-helpers test-helpers.o test_common.o /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so -ltalloc -lasn1c /usr/lib/x86_64-linux-gnu/libosmo-sigtran.so -lsctp ../../src/.libs/libosmo-ranap.so -pthread -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/.libs [ 515s] /usr/bin/ld: test_common.o:./src/tests/test_common.c:44: multiple definition of `talloc_asn1_ctx'; test-helpers.o:./src/tests/test-helpers.c:36: first defined here [ 515s] collect2: error: ld returned 1 exit status [ 515s] make[7]: *** [Makefile:424: test-helpers] Error 1 [ 515s] make[7]: Leaving directory '/usr/src/packages/BUILD/src/tests' [ 515s] make[6]: *** [Makefile:672: check-am] Error 2 [ 515s] make[6]: Leaving directory '/usr/src/packages/BUILD/src/tests' [ 515s] make[5]: *** [Makefile:690: check-recursive] Error 1 [ 515s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 515s] make[4]: *** [Makefile:842: check] Error 2 [ 515s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 515s] make[3]: *** [Makefile:461: check-recursive] Error 1 [ 515s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 515s] make[2]: *** [Makefile:761: check] Error 2 [ 515s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 515s] dh_auto_test: error: make -j1 check VERBOSE=1 returned exit code 2 [ 515s] make[1]: *** [debian/rules:19: override_dh_auto_test] Error 1 [ 515s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 515s] make: *** [debian/rules:9: build] Error 2 [ 515s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 515s] ### VM INTERACTION START ### [ 519s] [ 502.692678] sysrq: SysRq : Power Off [ 519s] [ 502.706572] reboot: Power down [ 519s] ### VM INTERACTION END ### [ 519s] [ 519s] cloud122 failed "build osmo-iuh_0.6.0.dsc" at Fri Jul 24 22:12:11 UTC 2020. [ 519s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 24 22:21:13 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 24 Jul 2020 22:21:13 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1b5ef719a54_2bd02ac693dbc6101600d6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 475s] /usr/bin/ld: ../../src/libmsc/libmsc.a(mncc.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 475s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 475s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_access_req_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 475s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_access_req_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 475s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_auth_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 475s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_auth_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 475s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 475s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 475s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_sgs.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 475s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_sgs_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 475s] collect2: error: ld returned 1 exit status [ 475s] make[4]: *** [Makefile:485: osmo-msc] Error 1 [ 475s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 475s] make[3]: *** [Makefile:422: all-recursive] Error 1 [ 475s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 475s] make[2]: *** [Makefile:462: all-recursive] Error 1 [ 475s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 475s] make[1]: *** [Makefile:394: all] Error 2 [ 475s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 475s] dh_auto_build: error: make -j1 returned exit code 2 [ 475s] make: *** [debian/rules:45: build] Error 25 [ 475s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 475s] ### VM INTERACTION START ### [ 476s] Powering off. [ 476s] [ 454.364683] reboot: Power down [ 476s] ### VM INTERACTION END ### [ 476s] [ 476s] cloud127 failed "build osmo-msc_1.6.1.dsc" at Fri Jul 24 22:21:07 UTC 2020. [ 476s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 24 22:21:47 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 24 Jul 2020 22:21:47 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1b5f118e518_2bd02ac693dbc610160124@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 491s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o gbproxy_test.o gbproxy_test.c [ 494s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=osmo_get_rand_id -Wl,-z,relro -o gbproxy_test gbproxy_test.o ../../src/gbproxy/gb_proxy.o ../../src/gbproxy/gb_proxy_patch.o ../../src/gbproxy/gb_proxy_peer.o ../../src/gbproxy/gb_proxy_tlli.o ../../src/gprs/gprs_gb_parse.o ../../src/gprs/gprs_llc_parse.o ../../src/gprs/crc24.o ../../src/gprs/gprs_utils.o -ltalloc -losmocore -ltalloc -losmogb -losmovty -losmocore -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -losmoabis -ldl -lrt [ 494s] libtool: link: gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=osmo_get_rand_id -Wl,-z -Wl,relro -o gbproxy_test gbproxy_test.o ../../src/gbproxy/gb_proxy.o ../../src/gbproxy/gb_proxy_patch.o ../../src/gbproxy/gb_proxy_peer.o ../../src/gbproxy/gb_proxy_tlli.o ../../src/gprs/gprs_gb_parse.o ../../src/gprs/gprs_llc_parse.o ../../src/gprs/crc24.o ../../src/gprs/gprs_utils.o /usr/lib/x86_64-linux-gnu/libosmogb.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmoabis.so -ldl -lrt -pthread [ 494s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/gbproxy' [ 494s] Making all in gtphub [ 494s] make[4]: Entering directory '/usr/src/packages/BUILD/tests/gtphub' [ 494s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o gtphub_test.o gtphub_test.c [ 495s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=gtphub_resolve_ggsn_addr -Wl,--wrap=gtphub_ares_init -Wl,--wrap=gtphub_write -Wl,-z,relro -o gtphub_test gtphub_test.o ../../src/gtphub/gtphub.o ../../src/gprs/gprs_utils.o -ltalloc -losmocore -ltalloc -losmogsm -losmocore -lgtp -lrt [ 496s] libtool: link: gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=gtphub_resolve_ggsn_addr -Wl,--wrap=gtphub_ares_init -Wl,--wrap=gtphub_write -Wl,-z -Wl,relro -o gtphub_test gtphub_test.o ../../src/gtphub/gtphub.o ../../src/gprs/gprs_utils.o -ltalloc /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libgtp.so -lrt -pthread [ 496s] /usr/bin/ld: ../../src/gtphub/gtphub.o:./src/gtphub/gtphub.c:50: multiple definition of `osmo_gtphub_ctx'; gtphub_test.o:./tests/gtphub/gtphub_test.c:57: first defined here [ 496s] collect2: error: ld returned 1 exit status [ 496s] make[4]: *** [Makefile:420: gtphub_test] Error 1 [ 496s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/gtphub' [ 496s] make[3]: *** [Makefile:416: all-recursive] Error 1 [ 496s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 496s] make[2]: *** [Makefile:453: all-recursive] Error 1 [ 496s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 496s] make[1]: *** [Makefile:385: all] Error 2 [ 496s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 496s] dh_auto_build: error: make -j1 returned exit code 2 [ 496s] make: *** [debian/rules:45: build] Error 25 [ 496s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 496s] ### VM INTERACTION START ### [ 497s] Powering off. [ 497s] [ 468.991022] reboot: Power down [ 497s] ### VM INTERACTION END ### [ 497s] [ 497s] cloud101 failed "build osmo-sgsn_1.6.0.dsc" at Fri Jul 24 22:21:32 UTC 2020. [ 497s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Jul 25 08:08:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jul 2020 08:08:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test RR Channel Release EARFCNs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 ) Change subject: bsc: test RR Channel Release EARFCNs ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I882c5e1f70bcc4833fc837a95c900ce291919cc5 Gerrit-Change-Number: 19216 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 25 Jul 2020 08:08:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Jul 25 08:10:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jul 2020 08:10:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test RR Channel Release cause codes from Clear Command cause codes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217 ) Change subject: bsc: test RR Channel Release cause codes from Clear Command cause codes ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie6c99f28b610a67f2d59ec00b3541940e882251b Gerrit-Change-Number: 19217 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 25 Jul 2020 08:10:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Jul 25 10:31:04 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 25 Jul 2020 10:31:04 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1c09f123880_2bd02ac693dbc6102612ba@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmocore failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 222s] libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -DBUILDING_LIBOSMOCORE -Wall -c gsm0503_coding.c -fPIC -DPIC -o gsm0503_coding.o >/dev/null 2>&1 [ 223s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmocoding.map -version-info 1:1:1 -no-undefined -ltalloc -Wl,-z,relro -Wl,-z,now -o libosmocoding.la -rpath /usr/lib/x86_64-linux-gnu gsm0503_interleaving.lo gsm0503_mapping.lo gsm0503_tables.lo gsm0503_parity.lo gsm0503_coding.lo ../libosmocore.la ../gsm/libosmogsm.la ../codec/libosmocodec.la [ 224s] libtool: link: gcc -shared -fPIC -DPIC .libs/gsm0503_interleaving.o .libs/gsm0503_mapping.o .libs/gsm0503_tables.o .libs/gsm0503_parity.o .libs/gsm0503_coding.o -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/.libs -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/gsm/.libs -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/codec/.libs -ltalloc ../.libs/libosmocore.so ../gsm/.libs/libosmogsm.so ../codec/.libs/libosmocodec.so -g -O2 -fstack-protector-strong -Wl,--version-script=./libosmocoding.map -Wl,-z -Wl,relro -Wl,-z -Wl,now -pthread -Wl,-soname -Wl,libosmocoding.so.0 -o .libs/libosmocoding.so.0.1.1 [ 224s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:16: multiple definition of `gsm0503_mcs_crc12'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:16: first defined here [ 224s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:15: multiple definition of `gsm0503_mcs_crc8_hdr'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:15: first defined here [ 224s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:13: multiple definition of `gsm0503_fire_crc40'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:13: first defined here [ 224s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:14: multiple definition of `gsm0503_cs234_crc16'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:14: first defined here [ 224s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:19: multiple definition of `gsm0503_tch_fr_crc3'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:19: first defined here [ 224s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:20: multiple definition of `gsm0503_tch_efr_crc8'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:20: first defined here [ 224s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:21: multiple definition of `gsm0503_amr_crc6'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:21: first defined here [ 224s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:17: multiple definition of `gsm0503_rach_crc6'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:17: first defined here [ 224s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:18: multiple definition of `gsm0503_sch_crc10'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:18: first defined here [ 224s] collect2: error: ld returned 1 exit status [ 224s] make[3]: *** [Makefile:494: libosmocoding.la] Error 1 [ 224s] make[3]: Leaving directory '/usr/src/packages/BUILD/src/coding' [ 224s] make[2]: *** [Makefile:687: all-recursive] Error 1 [ 224s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 224s] make[1]: *** [Makefile:468: all] Error 2 [ 224s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 224s] dh_auto_build: error: make -j1 returned exit code 2 [ 224s] make: *** [debian/rules:15: build] Error 25 [ 224s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 224s] ### VM INTERACTION START ### [ 227s] [ 207.152120] sysrq: SysRq : Power Off [ 227s] [ 207.155893] reboot: Power down [ 227s] ### VM INTERACTION END ### [ 227s] [ 227s] cloud102 failed "build libosmocore_1.3.1.dsc" at Sat Jul 25 10:30:58 UTC 2020. [ 227s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 25 10:41:21 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 25 Jul 2020 10:41:21 +0000 Subject: Build failure of network:osmocom:latest/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1c0c63e5d4f_2bd02ac693dbc6102613d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-sccp Last lines of build log: [ 427s] libtool: link: cat .libs/libosmo-sigtran.exp | sed -e "s/\(.*\)/\1;/" >> .libs/libosmo-sigtran.ver [ 427s] libtool: link: echo "local: *; };" >> .libs/libosmo-sigtran.ver [ 427s] libtool: link: gcc -shared -fPIC -DPIC .libs/sccp_sap.o .libs/sua.o .libs/m3ua.o .libs/xua_msg.o .libs/sccp_helpers.o .libs/sccp2sua.o .libs/sccp_scrc.o .libs/sccp_sclc.o .libs/sccp_scoc.o .libs/sccp_user.o .libs/xua_rkm.o .libs/xua_default_lm_fsm.o .libs/osmo_ss7.o .libs/osmo_ss7_hmrt.o .libs/xua_asp_fsm.o .libs/xua_as_fsm.o .libs/osmo_ss7_vty.o .libs/sccp_vty.o .libs/ipa.o /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmonetif.so -lsctp -pthread -g -O2 -fstack-protector-strong -Wl,-z -Wl,relro -Wl,-z -Wl,now -pthread -Wl,-soname -Wl,libosmo-sigtran.so.5 -Wl,-version-script -Wl,.libs/libosmo-sigtran.ver -o .libs/libosmo-sigtran.so.5.0.0 [ 427s] /usr/bin/ld: .libs/sccp_helpers.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 427s] /usr/bin/ld: .libs/sccp2sua.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 427s] /usr/bin/ld: .libs/sccp_scrc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 427s] /usr/bin/ld: .libs/sccp_sclc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 427s] /usr/bin/ld: .libs/sccp_scoc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 427s] /usr/bin/ld: .libs/sccp_user.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 427s] /usr/bin/ld: .libs/osmo_ss7.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 427s] /usr/bin/ld: .libs/osmo_ss7_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 427s] /usr/bin/ld: .libs/sccp_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 427s] collect2: error: ld returned 1 exit status [ 427s] make[3]: *** [Makefile:540: libosmo-sigtran.la] Error 1 [ 427s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 427s] make[2]: *** [Makefile:500: all-recursive] Error 1 [ 427s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 427s] make[1]: *** [Makefile:395: all] Error 2 [ 427s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 427s] dh_auto_build: error: make -j1 returned exit code 2 [ 427s] make: *** [debian/rules:12: build] Error 25 [ 427s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 427s] ### VM INTERACTION START ### [ 428s] Powering off. [ 428s] [ 405.601563] reboot: Power down [ 428s] ### VM INTERACTION END ### [ 428s] [ 428s] cloud102 failed "build libosmo-sccp_1.2.0.dsc" at Sat Jul 25 10:41:09 UTC 2020. [ 428s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Jul 25 20:28:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 25 Jul 2020 20:28:02 +0000 Subject: Change in libosmocore[master]: i460_mux: correctly re-initalize when deleting subchannels In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19381 ) Change subject: i460_mux: correctly re-initalize when deleting subchannels ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19381/1/src/gsm/i460_mux.c File src/gsm/i460_mux.c: https://gerrit.osmocom.org/c/libosmocore/+/19381/1/src/gsm/i460_mux.c at 361 PS1, Line 361: schan->rate = OSMO_I460_RATE_NONE; to be honest, in indsight, I don't even understand why we memset the entire sub-channel here. Particularly also the bit buffer allocated above by alloc_bitbuf() in line 346 cannot simply be memset() over - this creates a memory leak. Also, imagine there are some entries left in the mux.tx_queue. We simply leak that memory if we re-initialize the LLIST_HEAD here. I think we need to be more intelligent with clenaup here, i.e. * iterate over tx_queue enties and free them, * release the demux bit buffer * whatever else cleanup that might be related. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I937a9d4db95f44a860cd2c5dbb660dc1970b9a49 Gerrit-Change-Number: 19381 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 25 Jul 2020 20:28:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Jul 25 22:03:28 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 25 Jul 2020 22:03:28 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1cac3a67c33_2bd02ac693dbc6103340e7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmocore failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 206s] libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -DBUILDING_LIBOSMOCORE -Wall -c gsm0503_coding.c -fPIC -DPIC -o gsm0503_coding.o >/dev/null 2>&1 [ 207s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmocoding.map -version-info 1:1:1 -no-undefined -ltalloc -Wl,-z,relro -Wl,-z,now -o libosmocoding.la -rpath /usr/lib/x86_64-linux-gnu gsm0503_interleaving.lo gsm0503_mapping.lo gsm0503_tables.lo gsm0503_parity.lo gsm0503_coding.lo ../libosmocore.la ../gsm/libosmogsm.la ../codec/libosmocodec.la [ 207s] libtool: link: gcc -shared -fPIC -DPIC .libs/gsm0503_interleaving.o .libs/gsm0503_mapping.o .libs/gsm0503_tables.o .libs/gsm0503_parity.o .libs/gsm0503_coding.o -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/.libs -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/gsm/.libs -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/codec/.libs -ltalloc ../.libs/libosmocore.so ../gsm/.libs/libosmogsm.so ../codec/.libs/libosmocodec.so -g -O2 -fstack-protector-strong -Wl,--version-script=./libosmocoding.map -Wl,-z -Wl,relro -Wl,-z -Wl,now -pthread -Wl,-soname -Wl,libosmocoding.so.0 -o .libs/libosmocoding.so.0.1.1 [ 207s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:16: multiple definition of `gsm0503_mcs_crc12'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:16: first defined here [ 207s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:15: multiple definition of `gsm0503_mcs_crc8_hdr'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:15: first defined here [ 207s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:13: multiple definition of `gsm0503_fire_crc40'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:13: first defined here [ 207s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:14: multiple definition of `gsm0503_cs234_crc16'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:14: first defined here [ 207s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:19: multiple definition of `gsm0503_tch_fr_crc3'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:19: first defined here [ 207s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:20: multiple definition of `gsm0503_tch_efr_crc8'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:20: first defined here [ 207s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:21: multiple definition of `gsm0503_amr_crc6'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:21: first defined here [ 207s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:17: multiple definition of `gsm0503_rach_crc6'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:17: first defined here [ 207s] /usr/bin/ld: .libs/gsm0503_coding.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:18: multiple definition of `gsm0503_sch_crc10'; .libs/gsm0503_parity.o:./src/coding/../../include/osmocom/coding/gsm0503_parity.h:18: first defined here [ 207s] collect2: error: ld returned 1 exit status [ 207s] make[3]: *** [Makefile:494: libosmocoding.la] Error 1 [ 207s] make[3]: Leaving directory '/usr/src/packages/BUILD/src/coding' [ 207s] make[2]: *** [Makefile:687: all-recursive] Error 1 [ 207s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 207s] make[1]: *** [Makefile:468: all] Error 2 [ 207s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 207s] dh_auto_build: error: make -j1 returned exit code 2 [ 207s] make: *** [debian/rules:15: build] Error 25 [ 207s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 207s] ### VM INTERACTION START ### [ 210s] [ 198.331084] sysrq: SysRq : Power Off [ 210s] [ 198.338014] reboot: Power down [ 210s] ### VM INTERACTION END ### [ 210s] [ 210s] lamb02 failed "build libosmocore_1.3.1.dsc" at Sat Jul 25 22:03:17 UTC 2020. [ 210s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 25 22:04:54 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 25 Jul 2020 22:04:54 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1cac9655803_2bd02ac693dbc610334121@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 86s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 86s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 86s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 86s] | | [ 86s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 86s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 86s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 86s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 86s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 86s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 86s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 87s] cc1: all warnings being treated as errors [ 87s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 87s] make[3]: *** Waiting for unfinished jobs.... [ 87s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 87s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 87s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 87s] make[1]: *** [Makefile:166: all] Error 2 [ 87s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 87s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 87s] make: *** [debian/rules:9: build] Error 25 [ 87s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 87s] ### VM INTERACTION START ### [ 90s] [ 78.161048] sysrq: SysRq : Power Off [ 90s] [ 78.163930] reboot: Power down [ 90s] ### VM INTERACTION END ### [ 90s] [ 90s] old-atreju5 failed "build ulfius_2.5.2-4.1.dsc" at Sat Jul 25 22:04:48 UTC 2020. [ 90s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 25 22:06:19 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 25 Jul 2020 22:06:19 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1cacee45d23_2bd02ac693dbc61033432f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 117s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 117s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 117s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 117s] | | [ 117s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 117s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 117s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 117s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 117s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 117s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 117s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 117s] cc1: all warnings being treated as errors [ 117s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 117s] make[3]: *** Waiting for unfinished jobs.... [ 117s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 117s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 117s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 117s] make[1]: *** [Makefile:166: all] Error 2 [ 117s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 117s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 117s] make: *** [debian/rules:9: build] Error 25 [ 117s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 117s] ### VM INTERACTION START ### [ 120s] [ 107.772688] sysrq: SysRq : Power Off [ 120s] [ 107.779154] reboot: Power down [ 120s] ### VM INTERACTION END ### [ 120s] [ 120s] lamb12 failed "build ulfius_2.5.2-4.1.dsc" at Sat Jul 25 22:06:03 UTC 2020. [ 120s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 25 22:13:11 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 25 Jul 2020 22:13:11 +0000 Subject: Build failure of network:osmocom:latest/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1cae949e567_2bd02ac693dbc610334785@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-sccp Last lines of build log: [ 313s] libtool: link: cat .libs/libosmo-sigtran.exp | sed -e "s/\(.*\)/\1;/" >> .libs/libosmo-sigtran.ver [ 313s] libtool: link: echo "local: *; };" >> .libs/libosmo-sigtran.ver [ 313s] libtool: link: gcc -shared -fPIC -DPIC .libs/sccp_sap.o .libs/sua.o .libs/m3ua.o .libs/xua_msg.o .libs/sccp_helpers.o .libs/sccp2sua.o .libs/sccp_scrc.o .libs/sccp_sclc.o .libs/sccp_scoc.o .libs/sccp_user.o .libs/xua_rkm.o .libs/xua_default_lm_fsm.o .libs/osmo_ss7.o .libs/osmo_ss7_hmrt.o .libs/xua_asp_fsm.o .libs/xua_as_fsm.o .libs/osmo_ss7_vty.o .libs/sccp_vty.o .libs/ipa.o /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmonetif.so -lsctp -pthread -g -O2 -fstack-protector-strong -Wl,-z -Wl,relro -Wl,-z -Wl,now -pthread -Wl,-soname -Wl,libosmo-sigtran.so.5 -Wl,-version-script -Wl,.libs/libosmo-sigtran.ver -o .libs/libosmo-sigtran.so.5.0.0 [ 313s] /usr/bin/ld: .libs/sccp_helpers.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 313s] /usr/bin/ld: .libs/sccp2sua.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 313s] /usr/bin/ld: .libs/sccp_scrc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 313s] /usr/bin/ld: .libs/sccp_sclc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 313s] /usr/bin/ld: .libs/sccp_scoc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 313s] /usr/bin/ld: .libs/sccp_user.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 313s] /usr/bin/ld: .libs/osmo_ss7.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 313s] /usr/bin/ld: .libs/osmo_ss7_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 313s] /usr/bin/ld: .libs/sccp_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 313s] collect2: error: ld returned 1 exit status [ 313s] make[3]: *** [Makefile:540: libosmo-sigtran.la] Error 1 [ 313s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 313s] make[2]: *** [Makefile:500: all-recursive] Error 1 [ 313s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 313s] make[1]: *** [Makefile:395: all] Error 2 [ 313s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 313s] dh_auto_build: error: make -j1 returned exit code 2 [ 313s] make: *** [debian/rules:12: build] Error 25 [ 313s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 313s] ### VM INTERACTION START ### [ 314s] Powering off. [ 314s] [ 302.897707] reboot: Power down [ 314s] ### VM INTERACTION END ### [ 314s] [ 314s] sheep85 failed "build libosmo-sccp_1.2.0.dsc" at Sat Jul 25 22:13:00 UTC 2020. [ 314s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 25 22:14:19 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 25 Jul 2020 22:14:19 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1caece85d22_2bd02ac693dbc6103348bc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 426s] /usr/bin/ld: ../../src/common/libbts.a(msg_utils.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 426s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 426s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 426s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 426s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 426s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 426s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 426s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 426s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 426s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 426s] collect2: error: ld returned 1 exit status [ 426s] make[4]: *** [Makefile:426: osmo-bts-virtual] Error 1 [ 426s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bts-virtual' [ 426s] make[3]: *** [Makefile:385: all-recursive] Error 1 [ 426s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 426s] make[2]: *** [Makefile:434: all-recursive] Error 1 [ 426s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 426s] make[1]: *** [Makefile:366: all] Error 2 [ 426s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 426s] dh_auto_build: error: make -j1 returned exit code 2 [ 426s] make: *** [debian/rules:12: build] Error 25 [ 426s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 426s] ### VM INTERACTION START ### [ 427s] Powering off. [ 427s] [ 412.504931] reboot: Power down [ 427s] ### VM INTERACTION END ### [ 428s] [ 428s] lamb03 failed "build osmo-bts_1.2.0.dsc" at Sat Jul 25 22:14:08 UTC 2020. [ 428s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 25 22:21:28 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 25 Jul 2020 22:21:28 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1cb073327ed_2bd02ac693dbc6103362a4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 482s] /usr/bin/ld: bsc_subscr_conn_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 482s] /usr/bin/ld: bsc_vty.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 482s] /usr/bin/ld: gsm_04_08_rr.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 482s] /usr/bin/ld: handover_decision.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 482s] /usr/bin/ld: handover_decision_2.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 482s] /usr/bin/ld: handover_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 482s] /usr/bin/ld: handover_logic.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 482s] /usr/bin/ld: lchan_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 482s] /usr/bin/ld: osmo_bsc_bssap.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 482s] /usr/bin/ld: osmo_bsc_main.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 482s] collect2: error: ld returned 1 exit status [ 482s] make[4]: *** [Makefile:588: osmo-bsc] Error 1 [ 482s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 482s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 482s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 483s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 483s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 483s] make[1]: *** [Makefile:380: all] Error 2 [ 483s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 483s] dh_auto_build: error: make -j1 returned exit code 2 [ 483s] make: *** [debian/rules:45: build] Error 25 [ 483s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 483s] ### VM INTERACTION START ### [ 484s] Powering off. [ 484s] [ 467.719248] reboot: Power down [ 484s] ### VM INTERACTION END ### [ 484s] [ 484s] lamb16 failed "build osmo-bsc_1.6.0.dsc" at Sat Jul 25 22:21:17 UTC 2020. [ 484s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 25 22:22:02 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 25 Jul 2020 22:22:02 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1cb091e7e63_2bd02ac693dbc6103363a4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 519s] | ~~~~~~~~~~~~~~~~~~~~~^~~ [ 519s] /bin/bash ../../libtool --tag=CC --mode=link gcc -g -Wall -I../../src/tests -I../../include -I../../include -I/usr/include/ -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -no-install -Wl,-z,relro -o test-helpers test-helpers.o test_common.o -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmogsm -losmocore -ltalloc -lasn1c -losmo-sigtran -lsctp ../../src/libosmo-ranap.la [ 519s] libtool: link: gcc -g -Wall -I../../src/tests -I../../include -I../../include -I/usr/include/ -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -Wl,-z -Wl,relro -o test-helpers test-helpers.o test_common.o /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so -ltalloc -lasn1c /usr/lib/x86_64-linux-gnu/libosmo-sigtran.so -lsctp ../../src/.libs/libosmo-ranap.so -pthread -Wl,-rpath -Wl,/usr/src/packages/BUILD/src/.libs [ 519s] /usr/bin/ld: test_common.o:./src/tests/test_common.c:44: multiple definition of `talloc_asn1_ctx'; test-helpers.o:./src/tests/test-helpers.c:36: first defined here [ 520s] collect2: error: ld returned 1 exit status [ 520s] make[7]: *** [Makefile:424: test-helpers] Error 1 [ 520s] make[7]: Leaving directory '/usr/src/packages/BUILD/src/tests' [ 520s] make[6]: *** [Makefile:672: check-am] Error 2 [ 520s] make[6]: Leaving directory '/usr/src/packages/BUILD/src/tests' [ 520s] make[5]: *** [Makefile:690: check-recursive] Error 1 [ 520s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 520s] make[4]: *** [Makefile:842: check] Error 2 [ 520s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 520s] make[3]: *** [Makefile:461: check-recursive] Error 1 [ 520s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 520s] make[2]: *** [Makefile:761: check] Error 2 [ 520s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 520s] dh_auto_test: error: make -j1 check VERBOSE=1 returned exit code 2 [ 520s] make[1]: *** [debian/rules:19: override_dh_auto_test] Error 1 [ 520s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 520s] make: *** [debian/rules:9: build] Error 2 [ 520s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 520s] ### VM INTERACTION START ### [ 523s] [ 506.778239] sysrq: SysRq : Power Off [ 523s] [ 506.782100] reboot: Power down [ 523s] ### VM INTERACTION END ### [ 523s] [ 523s] cloud102 failed "build osmo-iuh_0.6.0.dsc" at Sat Jul 25 22:21:52 UTC 2020. [ 523s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 25 22:26:19 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 25 Jul 2020 22:26:19 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1cb19d209bc_2bd02ac693dbc610338395@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 252s] /usr/bin/ld: ../../src/libmsc/libmsc.a(mncc.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 252s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 252s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_access_req_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 252s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_access_req_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 252s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_auth_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 252s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_auth_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 252s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 252s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 252s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_sgs.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 252s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_sgs_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 252s] collect2: error: ld returned 1 exit status [ 252s] make[4]: *** [Makefile:485: osmo-msc] Error 1 [ 252s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 252s] make[3]: *** [Makefile:422: all-recursive] Error 1 [ 252s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 252s] make[2]: *** [Makefile:462: all-recursive] Error 1 [ 252s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 252s] make[1]: *** [Makefile:394: all] Error 2 [ 252s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 252s] dh_auto_build: error: make -j1 returned exit code 2 [ 252s] make: *** [debian/rules:45: build] Error 25 [ 252s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 252s] ### VM INTERACTION START ### [ 253s] Powering off. [ 253s] [ 242.755322] reboot: Power down [ 253s] ### VM INTERACTION END ### [ 253s] [ 253s] build76 failed "build osmo-msc_1.6.1.dsc" at Sat Jul 25 22:26:18 UTC 2020. [ 253s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Jul 25 22:30:37 2020 From: admin at opensuse.org (OBS Notification) Date: Sat, 25 Jul 2020 22:30:37 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1cb28ef7bc_2bd02ac693dbc6103386d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 490s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o gbproxy_test.o gbproxy_test.c [ 493s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=osmo_get_rand_id -Wl,-z,relro -o gbproxy_test gbproxy_test.o ../../src/gbproxy/gb_proxy.o ../../src/gbproxy/gb_proxy_patch.o ../../src/gbproxy/gb_proxy_peer.o ../../src/gbproxy/gb_proxy_tlli.o ../../src/gprs/gprs_gb_parse.o ../../src/gprs/gprs_llc_parse.o ../../src/gprs/crc24.o ../../src/gprs/gprs_utils.o -ltalloc -losmocore -ltalloc -losmogb -losmovty -losmocore -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -losmoabis -ldl -lrt [ 493s] libtool: link: gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=osmo_get_rand_id -Wl,-z -Wl,relro -o gbproxy_test gbproxy_test.o ../../src/gbproxy/gb_proxy.o ../../src/gbproxy/gb_proxy_patch.o ../../src/gbproxy/gb_proxy_peer.o ../../src/gbproxy/gb_proxy_tlli.o ../../src/gprs/gprs_gb_parse.o ../../src/gprs/gprs_llc_parse.o ../../src/gprs/crc24.o ../../src/gprs/gprs_utils.o /usr/lib/x86_64-linux-gnu/libosmogb.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmoabis.so -ldl -lrt -pthread [ 493s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/gbproxy' [ 493s] Making all in gtphub [ 493s] make[4]: Entering directory '/usr/src/packages/BUILD/tests/gtphub' [ 493s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o gtphub_test.o gtphub_test.c [ 494s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=gtphub_resolve_ggsn_addr -Wl,--wrap=gtphub_ares_init -Wl,--wrap=gtphub_write -Wl,-z,relro -o gtphub_test gtphub_test.o ../../src/gtphub/gtphub.o ../../src/gprs/gprs_utils.o -ltalloc -losmocore -ltalloc -losmogsm -losmocore -lgtp -lrt [ 494s] libtool: link: gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=gtphub_resolve_ggsn_addr -Wl,--wrap=gtphub_ares_init -Wl,--wrap=gtphub_write -Wl,-z -Wl,relro -o gtphub_test gtphub_test.o ../../src/gtphub/gtphub.o ../../src/gprs/gprs_utils.o -ltalloc /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libgtp.so -lrt -pthread [ 494s] /usr/bin/ld: ../../src/gtphub/gtphub.o:./src/gtphub/gtphub.c:50: multiple definition of `osmo_gtphub_ctx'; gtphub_test.o:./tests/gtphub/gtphub_test.c:57: first defined here [ 494s] collect2: error: ld returned 1 exit status [ 494s] make[4]: *** [Makefile:420: gtphub_test] Error 1 [ 494s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/gtphub' [ 494s] make[3]: *** [Makefile:416: all-recursive] Error 1 [ 494s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 494s] make[2]: *** [Makefile:453: all-recursive] Error 1 [ 494s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 494s] make[1]: *** [Makefile:385: all] Error 2 [ 494s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 494s] dh_auto_build: error: make -j1 returned exit code 2 [ 494s] make: *** [debian/rules:45: build] Error 25 [ 494s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 494s] ### VM INTERACTION START ### [ 495s] Powering off. [ 495s] [ 469.022860] reboot: Power down [ 495s] ### VM INTERACTION END ### [ 495s] [ 495s] cloud102 failed "build osmo-sgsn_1.6.0.dsc" at Sat Jul 25 22:30:19 UTC 2020. [ 495s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 26 04:23:15 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 26 Jul 2020 04:23:15 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1d054ad370d_2bd02ac693dbc6103497b9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 68s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 68s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 68s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 68s] | | [ 68s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 68s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 68s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 68s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 68s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 68s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 68s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 69s] cc1: all warnings being treated as errors [ 69s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 69s] make[3]: *** Waiting for unfinished jobs.... [ 69s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 69s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 69s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 69s] make[1]: *** [Makefile:166: all] Error 2 [ 69s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 69s] dh_auto_build: error: cd build && make -j16 "INSTALL=install --strip-program=true" returned exit code 2 [ 69s] make: *** [debian/rules:9: build] Error 25 [ 69s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 69s] ### VM INTERACTION START ### [ 72s] [ 63.292186] sysrq: SysRq : Power Off [ 72s] [ 63.298824] reboot: Power down [ 72s] ### VM INTERACTION END ### [ 72s] [ 72s] goat13 failed "build ulfius_2.5.2-4.1.dsc" at Sun Jul 26 04:23:07 UTC 2020. [ 72s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 26 04:24:24 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 26 Jul 2020 04:24:24 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1d0585ba2f5_2bd02ac693dbc61034997a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 117s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 117s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 117s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 117s] | | [ 117s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 117s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 117s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 117s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 117s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 117s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 117s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 118s] cc1: all warnings being treated as errors [ 118s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 118s] make[3]: *** Waiting for unfinished jobs.... [ 118s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 118s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 118s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 118s] make[1]: *** [Makefile:166: all] Error 2 [ 118s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 118s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 118s] make: *** [debian/rules:9: build] Error 25 [ 118s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 118s] ### VM INTERACTION START ### [ 121s] [ 108.856269] sysrq: SysRq : Power Off [ 121s] [ 108.863219] reboot: Power down [ 121s] ### VM INTERACTION END ### [ 121s] [ 121s] lamb66 failed "build ulfius_2.5.2-4.1.dsc" at Sun Jul 26 04:24:15 UTC 2020. [ 121s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 26 04:33:32 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 26 Jul 2020 04:33:32 +0000 Subject: Build failure of network:osmocom:latest/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1d07a335301_2bd02ac693dbc6103500b2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-sccp Last lines of build log: [ 228s] libtool: link: cat .libs/libosmo-sigtran.exp | sed -e "s/\(.*\)/\1;/" >> .libs/libosmo-sigtran.ver [ 228s] libtool: link: echo "local: *; };" >> .libs/libosmo-sigtran.ver [ 228s] libtool: link: gcc -shared -fPIC -DPIC .libs/sccp_sap.o .libs/sua.o .libs/m3ua.o .libs/xua_msg.o .libs/sccp_helpers.o .libs/sccp2sua.o .libs/sccp_scrc.o .libs/sccp_sclc.o .libs/sccp_scoc.o .libs/sccp_user.o .libs/xua_rkm.o .libs/xua_default_lm_fsm.o .libs/osmo_ss7.o .libs/osmo_ss7_hmrt.o .libs/xua_asp_fsm.o .libs/xua_as_fsm.o .libs/osmo_ss7_vty.o .libs/sccp_vty.o .libs/ipa.o /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmonetif.so -lsctp -pthread -g -O2 -fstack-protector-strong -Wl,-z -Wl,relro -Wl,-z -Wl,now -pthread -Wl,-soname -Wl,libosmo-sigtran.so.5 -Wl,-version-script -Wl,.libs/libosmo-sigtran.ver -o .libs/libosmo-sigtran.so.5.0.0 [ 228s] /usr/bin/ld: .libs/sccp_helpers.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 228s] /usr/bin/ld: .libs/sccp2sua.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 228s] /usr/bin/ld: .libs/sccp_scrc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 228s] /usr/bin/ld: .libs/sccp_sclc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 228s] /usr/bin/ld: .libs/sccp_scoc.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 228s] /usr/bin/ld: .libs/sccp_user.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 228s] /usr/bin/ld: .libs/osmo_ss7.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 228s] /usr/bin/ld: .libs/osmo_ss7_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 228s] /usr/bin/ld: .libs/sccp_vty.o:./src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:./src/sccp_internal.h:123: first defined here [ 228s] collect2: error: ld returned 1 exit status [ 228s] make[3]: *** [Makefile:540: libosmo-sigtran.la] Error 1 [ 228s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 228s] make[2]: *** [Makefile:500: all-recursive] Error 1 [ 228s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 228s] make[1]: *** [Makefile:395: all] Error 2 [ 228s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 228s] dh_auto_build: error: make -j1 returned exit code 2 [ 228s] make: *** [debian/rules:12: build] Error 25 [ 228s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 228s] ### VM INTERACTION START ### [ 229s] Powering off. [ 229s] [ 216.493849] reboot: Power down [ 229s] ### VM INTERACTION END ### [ 229s] [ 229s] build72 failed "build libosmo-sccp_1.2.0.dsc" at Sun Jul 26 04:33:30 UTC 2020. [ 229s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 26 04:36:41 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 26 Jul 2020 04:36:41 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1d08774db79_2bd02ac693dbc610350130@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 404s] /usr/bin/ld: ../../src/common/libbts.a(msg_utils.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 404s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 404s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 404s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 404s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 404s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 404s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 404s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 404s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 404s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 404s] collect2: error: ld returned 1 exit status [ 404s] make[4]: *** [Makefile:426: osmo-bts-virtual] Error 1 [ 404s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bts-virtual' [ 404s] make[3]: *** [Makefile:385: all-recursive] Error 1 [ 404s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 404s] make[2]: *** [Makefile:434: all-recursive] Error 1 [ 404s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 404s] make[1]: *** [Makefile:366: all] Error 2 [ 404s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 404s] dh_auto_build: error: make -j1 returned exit code 2 [ 404s] make: *** [debian/rules:12: build] Error 25 [ 404s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 404s] ### VM INTERACTION START ### [ 405s] Powering off. [ 405s] [ 388.757369] reboot: Power down [ 405s] ### VM INTERACTION END ### [ 405s] [ 405s] lamb27 failed "build osmo-bts_1.2.0.dsc" at Sun Jul 26 04:36:30 UTC 2020. [ 405s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 26 04:43:15 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 26 Jul 2020 04:43:15 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1d09fa319c2_2bd02ac693dbc610350288@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 531s] /usr/bin/ld: bsc_subscr_conn_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] /usr/bin/ld: bsc_vty.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] /usr/bin/ld: gsm_04_08_rr.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] /usr/bin/ld: handover_decision.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] /usr/bin/ld: handover_decision_2.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] /usr/bin/ld: handover_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] /usr/bin/ld: handover_logic.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] /usr/bin/ld: lchan_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] /usr/bin/ld: osmo_bsc_bssap.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] /usr/bin/ld: osmo_bsc_main.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] collect2: error: ld returned 1 exit status [ 531s] make[4]: *** [Makefile:588: osmo-bsc] Error 1 [ 531s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 531s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 531s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 531s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 531s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 531s] make[1]: *** [Makefile:380: all] Error 2 [ 531s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 531s] dh_auto_build: error: make -j1 returned exit code 2 [ 531s] make: *** [debian/rules:45: build] Error 25 [ 531s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 531s] ### VM INTERACTION START ### [ 532s] Powering off. [ 532s] [ 502.992453] reboot: Power down [ 532s] ### VM INTERACTION END ### [ 532s] [ 532s] cloud115 failed "build osmo-bsc_1.6.0.dsc" at Sun Jul 26 04:43:14 UTC 2020. [ 532s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 26 04:45:49 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 26 Jul 2020 04:45:49 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1d0a922d225_2bd02ac693dbc610350376@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 443s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o gbproxy_test.o gbproxy_test.c [ 445s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=osmo_get_rand_id -Wl,-z,relro -o gbproxy_test gbproxy_test.o ../../src/gbproxy/gb_proxy.o ../../src/gbproxy/gb_proxy_patch.o ../../src/gbproxy/gb_proxy_peer.o ../../src/gbproxy/gb_proxy_tlli.o ../../src/gprs/gprs_gb_parse.o ../../src/gprs/gprs_llc_parse.o ../../src/gprs/crc24.o ../../src/gprs/gprs_utils.o -ltalloc -losmocore -ltalloc -losmogb -losmovty -losmocore -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -losmoabis -ldl -lrt [ 446s] libtool: link: gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=osmo_get_rand_id -Wl,-z -Wl,relro -o gbproxy_test gbproxy_test.o ../../src/gbproxy/gb_proxy.o ../../src/gbproxy/gb_proxy_patch.o ../../src/gbproxy/gb_proxy_peer.o ../../src/gbproxy/gb_proxy_tlli.o ../../src/gprs/gprs_gb_parse.o ../../src/gprs/gprs_llc_parse.o ../../src/gprs/crc24.o ../../src/gprs/gprs_utils.o /usr/lib/x86_64-linux-gnu/libosmogb.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmoabis.so -ldl -lrt -pthread [ 446s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/gbproxy' [ 446s] Making all in gtphub [ 446s] make[4]: Entering directory '/usr/src/packages/BUILD/tests/gtphub' [ 446s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o gtphub_test.o gtphub_test.c [ 447s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=gtphub_resolve_ggsn_addr -Wl,--wrap=gtphub_ares_init -Wl,--wrap=gtphub_write -Wl,-z,relro -o gtphub_test gtphub_test.o ../../src/gtphub/gtphub.o ../../src/gprs/gprs_utils.o -ltalloc -losmocore -ltalloc -losmogsm -losmocore -lgtp -lrt [ 447s] libtool: link: gcc -Wall -ggdb3 -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -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 -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,--wrap=gtphub_resolve_ggsn_addr -Wl,--wrap=gtphub_ares_init -Wl,--wrap=gtphub_write -Wl,-z -Wl,relro -o gtphub_test gtphub_test.o ../../src/gtphub/gtphub.o ../../src/gprs/gprs_utils.o -ltalloc /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libgtp.so -lrt -pthread [ 447s] /usr/bin/ld: ../../src/gtphub/gtphub.o:./src/gtphub/gtphub.c:50: multiple definition of `osmo_gtphub_ctx'; gtphub_test.o:./tests/gtphub/gtphub_test.c:57: first defined here [ 447s] collect2: error: ld returned 1 exit status [ 447s] make[4]: *** [Makefile:420: gtphub_test] Error 1 [ 447s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/gtphub' [ 447s] make[3]: *** [Makefile:416: all-recursive] Error 1 [ 447s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 447s] make[2]: *** [Makefile:453: all-recursive] Error 1 [ 447s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 447s] make[1]: *** [Makefile:385: all] Error 2 [ 447s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 447s] dh_auto_build: error: make -j1 returned exit code 2 [ 447s] make: *** [debian/rules:45: build] Error 25 [ 447s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 447s] ### VM INTERACTION START ### [ 448s] Powering off. [ 448s] [ 433.114539] reboot: Power down [ 448s] ### VM INTERACTION END ### [ 448s] [ 448s] lamb11 failed "build osmo-sgsn_1.6.0.dsc" at Sun Jul 26 04:45:37 UTC 2020. [ 448s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 26 04:46:24 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 26 Jul 2020 04:46:24 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1d0ab0b6c2a_2bd02ac693dbc61035047b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 484s] /usr/bin/ld: ../../src/libmsc/libmsc.a(mncc.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 484s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 484s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_access_req_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 484s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_access_req_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 484s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_auth_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 484s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_auth_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 484s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 484s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 484s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_sgs.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 484s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_sgs_fsm.o):/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here [ 484s] collect2: error: ld returned 1 exit status [ 484s] make[4]: *** [Makefile:485: osmo-msc] Error 1 [ 484s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 484s] make[3]: *** [Makefile:422: all-recursive] Error 1 [ 484s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 484s] make[2]: *** [Makefile:462: all-recursive] Error 1 [ 484s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 484s] make[1]: *** [Makefile:394: all] Error 2 [ 484s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 484s] dh_auto_build: error: make -j1 returned exit code 2 [ 484s] make: *** [debian/rules:45: build] Error 25 [ 484s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 484s] ### VM INTERACTION START ### [ 485s] Powering off. [ 485s] [ 458.742804] reboot: Power down [ 486s] ### VM INTERACTION END ### [ 486s] [ 486s] cloud118 failed "build osmo-msc_1.6.1.dsc" at Sun Jul 26 04:46:18 UTC 2020. [ 486s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Jul 26 08:55:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 08:55:37 +0000 Subject: Change in libosmocore[rel-1.3.2]: gsm0503_parity: Fix compilation with gcc-10 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19382 ) Change subject: gsm0503_parity: Fix compilation with gcc-10 ...................................................................... gsm0503_parity: Fix compilation with gcc-10 /usr/bin/ld: .libs/gsm0503_coding.o:/home/laforge/projects/git/libosmocore/src/coding/../../include/osmocom/coding/gsm0503_parity.h:16: multiple definition of `gsm0503_mcs_crc12'; .libs/gsm0503_parity.o:/home/laforge/projects/git/libosmocore/src/coding/../../include/osmocom/coding/gsm0503_parity.h:16: first defined here Change-Id: I15945bbf59c873e50154c40fed0ba3d6b4d7c399 --- M include/osmocom/coding/gsm0503_parity.h 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/82/19382/1 diff --git a/include/osmocom/coding/gsm0503_parity.h b/include/osmocom/coding/gsm0503_parity.h index 28a5444..6459b40 100644 --- a/include/osmocom/coding/gsm0503_parity.h +++ b/include/osmocom/coding/gsm0503_parity.h @@ -10,14 +10,14 @@ * @{ * \file gsm0503_parity.h */ -const struct osmo_crc64gen_code gsm0503_fire_crc40; -const struct osmo_crc16gen_code gsm0503_cs234_crc16; -const struct osmo_crc8gen_code gsm0503_mcs_crc8_hdr; -const struct osmo_crc16gen_code gsm0503_mcs_crc12; -const struct osmo_crc8gen_code gsm0503_rach_crc6; -const struct osmo_crc16gen_code gsm0503_sch_crc10; -const struct osmo_crc8gen_code gsm0503_tch_fr_crc3; -const struct osmo_crc8gen_code gsm0503_tch_efr_crc8; -const struct osmo_crc8gen_code gsm0503_amr_crc6; +extern const struct osmo_crc64gen_code gsm0503_fire_crc40; +extern const struct osmo_crc16gen_code gsm0503_cs234_crc16; +extern const struct osmo_crc8gen_code gsm0503_mcs_crc8_hdr; +extern const struct osmo_crc16gen_code gsm0503_mcs_crc12; +extern const struct osmo_crc8gen_code gsm0503_rach_crc6; +extern const struct osmo_crc16gen_code gsm0503_sch_crc10; +extern const struct osmo_crc8gen_code gsm0503_tch_fr_crc3; +extern const struct osmo_crc8gen_code gsm0503_tch_efr_crc8; +extern const struct osmo_crc8gen_code gsm0503_amr_crc6; /*! @} */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: rel-1.3.2 Gerrit-Change-Id: I15945bbf59c873e50154c40fed0ba3d6b4d7c399 Gerrit-Change-Number: 19382 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 08:55:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 08:55:39 +0000 Subject: Change in libosmocore[rel-1.3.2]: gsm_29_118.h: Fix compilation with gcc-10 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19383 ) Change subject: gsm_29_118.h: Fix compilation with gcc-10 ...................................................................... gsm_29_118.h: Fix compilation with gcc-10 this causes problems when compiling user applications /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):/usr/local/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/local/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here Change-Id: Iaa1d36c7a9bb64aa84ee85fa3e40f6b3560fe693 --- M include/osmocom/gsm/protocol/gsm_29_118.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/83/19383/1 diff --git a/include/osmocom/gsm/protocol/gsm_29_118.h b/include/osmocom/gsm/protocol/gsm_29_118.h index 9adb90f..1583588 100644 --- a/include/osmocom/gsm/protocol/gsm_29_118.h +++ b/include/osmocom/gsm/protocol/gsm_29_118.h @@ -181,4 +181,4 @@ * See also: RFC1123 Section 2.1 Host Names and Numbers */ #define SGS_VLR_NAME_MAXLEN 255 -const struct tlv_definition sgsap_ie_tlvdef; +extern const struct tlv_definition sgsap_ie_tlvdef; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: rel-1.3.2 Gerrit-Change-Id: Iaa1d36c7a9bb64aa84ee85fa3e40f6b3560fe693 Gerrit-Change-Number: 19383 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 08:55:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 08:55:39 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Brel-1=2E3=2E2=5D=3A_Bump_version=3A_1=2E3=2E1=2E2-69b71_=E2=86=92_1=2E3=2E2?= References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19384 ) Change subject: Bump version: 1.3.1.2-69b71 ? 1.3.2 ...................................................................... Bump version: 1.3.1.2-69b71 ? 1.3.2 Version 1.3.2 is a patch release fixing compilation of 1.3.1 with gcc-10. Change-Id: I30e89cf227ea71ec76ecbc819cb2a86cf556ce5a --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/84/19384/1 diff --git a/debian/changelog b/debian/changelog index b6c6383..6087cf7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libosmocore (1.3.2) unstable; urgency=medium + + * gsm0503_parity: Fix compilation with gcc-10 + * gsm_29_118.h: Fix compilation with gcc-10 + + -- Harald Welte Sun, 26 Jul 2020 10:49:51 +0200 + libosmocore (1.3.1) unstable; urgency=medium * libosmosim: Build irrespective of PC/SC support -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: rel-1.3.2 Gerrit-Change-Id: I30e89cf227ea71ec76ecbc819cb2a86cf556ce5a Gerrit-Change-Number: 19384 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 08:59:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 08:59:48 +0000 Subject: Change in libosmocore[rel-1.3.2]: gsm_29_118.h: Fix compilation with gcc-10 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19383 ) Change subject: gsm_29_118.h: Fix compilation with gcc-10 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: rel-1.3.2 Gerrit-Change-Id: Iaa1d36c7a9bb64aa84ee85fa3e40f6b3560fe693 Gerrit-Change-Number: 19383 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jul 2020 08:59:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 09:00:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 09:00:01 +0000 Subject: Change in libosmocore[rel-1.3.2]: gsm0503_parity: Fix compilation with gcc-10 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19382 ) Change subject: gsm0503_parity: Fix compilation with gcc-10 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: rel-1.3.2 Gerrit-Change-Id: I15945bbf59c873e50154c40fed0ba3d6b4d7c399 Gerrit-Change-Number: 19382 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 26 Jul 2020 09:00:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 09:01:12 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 09:01:12 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Brel-1=2E3=2E2=5D=3A_Bump_version=3A_1=2E3=2E1=2E2-69b71_=E2=86=92_1=2E3=2E2?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19384 ) Change subject: Bump version: 1.3.1.2-69b71 ? 1.3.2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: rel-1.3.2 Gerrit-Change-Id: I30e89cf227ea71ec76ecbc819cb2a86cf556ce5a Gerrit-Change-Number: 19384 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jul 2020 09:01:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 09:01:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 09:01:25 +0000 Subject: Change in libosmocore[rel-1.3.2]: gsm0503_parity: Fix compilation with gcc-10 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19382 ) Change subject: gsm0503_parity: Fix compilation with gcc-10 ...................................................................... gsm0503_parity: Fix compilation with gcc-10 /usr/bin/ld: .libs/gsm0503_coding.o:/home/laforge/projects/git/libosmocore/src/coding/../../include/osmocom/coding/gsm0503_parity.h:16: multiple definition of `gsm0503_mcs_crc12'; .libs/gsm0503_parity.o:/home/laforge/projects/git/libosmocore/src/coding/../../include/osmocom/coding/gsm0503_parity.h:16: first defined here Change-Id: I15945bbf59c873e50154c40fed0ba3d6b4d7c399 --- M include/osmocom/coding/gsm0503_parity.h 1 file changed, 9 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/coding/gsm0503_parity.h b/include/osmocom/coding/gsm0503_parity.h index 28a5444..6459b40 100644 --- a/include/osmocom/coding/gsm0503_parity.h +++ b/include/osmocom/coding/gsm0503_parity.h @@ -10,14 +10,14 @@ * @{ * \file gsm0503_parity.h */ -const struct osmo_crc64gen_code gsm0503_fire_crc40; -const struct osmo_crc16gen_code gsm0503_cs234_crc16; -const struct osmo_crc8gen_code gsm0503_mcs_crc8_hdr; -const struct osmo_crc16gen_code gsm0503_mcs_crc12; -const struct osmo_crc8gen_code gsm0503_rach_crc6; -const struct osmo_crc16gen_code gsm0503_sch_crc10; -const struct osmo_crc8gen_code gsm0503_tch_fr_crc3; -const struct osmo_crc8gen_code gsm0503_tch_efr_crc8; -const struct osmo_crc8gen_code gsm0503_amr_crc6; +extern const struct osmo_crc64gen_code gsm0503_fire_crc40; +extern const struct osmo_crc16gen_code gsm0503_cs234_crc16; +extern const struct osmo_crc8gen_code gsm0503_mcs_crc8_hdr; +extern const struct osmo_crc16gen_code gsm0503_mcs_crc12; +extern const struct osmo_crc8gen_code gsm0503_rach_crc6; +extern const struct osmo_crc16gen_code gsm0503_sch_crc10; +extern const struct osmo_crc8gen_code gsm0503_tch_fr_crc3; +extern const struct osmo_crc8gen_code gsm0503_tch_efr_crc8; +extern const struct osmo_crc8gen_code gsm0503_amr_crc6; /*! @} */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: rel-1.3.2 Gerrit-Change-Id: I15945bbf59c873e50154c40fed0ba3d6b4d7c399 Gerrit-Change-Number: 19382 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 09:01:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 09:01:26 +0000 Subject: Change in libosmocore[rel-1.3.2]: gsm_29_118.h: Fix compilation with gcc-10 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19383 ) Change subject: gsm_29_118.h: Fix compilation with gcc-10 ...................................................................... gsm_29_118.h: Fix compilation with gcc-10 this causes problems when compiling user applications /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):/usr/local/include/osmocom/gsm/protocol/gsm_29_118.h:184: multiple definition of `sgsap_ie_tlvdef'; msc_main.o:/usr/local/include/osmocom/gsm/protocol/gsm_29_118.h:184: first defined here Change-Id: Iaa1d36c7a9bb64aa84ee85fa3e40f6b3560fe693 --- M include/osmocom/gsm/protocol/gsm_29_118.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/gsm/protocol/gsm_29_118.h b/include/osmocom/gsm/protocol/gsm_29_118.h index 9adb90f..1583588 100644 --- a/include/osmocom/gsm/protocol/gsm_29_118.h +++ b/include/osmocom/gsm/protocol/gsm_29_118.h @@ -181,4 +181,4 @@ * See also: RFC1123 Section 2.1 Host Names and Numbers */ #define SGS_VLR_NAME_MAXLEN 255 -const struct tlv_definition sgsap_ie_tlvdef; +extern const struct tlv_definition sgsap_ie_tlvdef; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: rel-1.3.2 Gerrit-Change-Id: Iaa1d36c7a9bb64aa84ee85fa3e40f6b3560fe693 Gerrit-Change-Number: 19383 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 09:01:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 09:01:27 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Brel-1=2E3=2E2=5D=3A_Bump_version=3A_1=2E3=2E1=2E2-69b71_=E2=86=92_1=2E3=2E2?= In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19384 ) Change subject: Bump version: 1.3.1.2-69b71 ? 1.3.2 ...................................................................... Bump version: 1.3.1.2-69b71 ? 1.3.2 Version 1.3.2 is a patch release fixing compilation of 1.3.1 with gcc-10. Change-Id: I30e89cf227ea71ec76ecbc819cb2a86cf556ce5a --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index b6c6383..6087cf7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libosmocore (1.3.2) unstable; urgency=medium + + * gsm0503_parity: Fix compilation with gcc-10 + * gsm_29_118.h: Fix compilation with gcc-10 + + -- Harald Welte Sun, 26 Jul 2020 10:49:51 +0200 + libosmocore (1.3.1) unstable; urgency=medium * libosmosim: Build irrespective of PC/SC support -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: rel-1.3.2 Gerrit-Change-Id: I30e89cf227ea71ec76ecbc819cb2a86cf556ce5a Gerrit-Change-Number: 19384 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 09:42:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 09:42:18 +0000 Subject: Change in libosmo-sccp[rel-1.2.1]: sccp_internal.h: fix compilation with gcc-10 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19385 ) Change subject: sccp_internal.h: fix compilation with gcc-10 ...................................................................... sccp_internal.h: fix compilation with gcc-10 /usr/bin/ld: .libs/sccp_helpers.o:/home/laforge/projects/git/libosmo-sccp/src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:/home/laforge/projects/git/libosmo-sccp/src/sccp_internal.h:123: first defined here See also https://alioth-lists.debian.net/pipermail/debian-mobcom-maintainers/Week-of-Mon-20200413/000646.html Change-Id: Icbc06ed2c8d2bd5c63716945c3df923ea4de7886 --- M src/sccp_internal.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/85/19385/1 diff --git a/src/sccp_internal.h b/src/sccp_internal.h index 8df6c9b..98f6d37 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -120,7 +120,7 @@ struct msgb *sccp_msgb_alloc(const char *name); -struct osmo_fsm sccp_scoc_fsm; +extern struct osmo_fsm sccp_scoc_fsm; void sccp_scoc_show_connections(struct vty *vty, struct osmo_sccp_instance *inst); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: Icbc06ed2c8d2bd5c63716945c3df923ea4de7886 Gerrit-Change-Number: 19385 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 09:42:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 09:42:18 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-sccp=5Brel-1=2E2=2E1=5D=3A_Bump_version=3A_1=2E2=2E0=2E1-cb80_=E2=86=92_1=2E2=2E1?= References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19386 ) Change subject: Bump version: 1.2.0.1-cb80 ? 1.2.1 ...................................................................... Bump version: 1.2.0.1-cb80 ? 1.2.1 Tag a release with the gcc-10 compile fix we already had in master. Change-Id: I800639aeb1ef78e8f16bb6d7eedf3826e9f78736 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/86/19386/1 diff --git a/debian/changelog b/debian/changelog index 2b14542..bc021e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libosmo-sccp (1.2.1) unstable; urgency=medium + + * sccp_internal.h: fix compilation with gcc-10 + + -- Harald Welte Sun, 26 Jul 2020 11:05:25 +0200 + libosmo-sccp (1.2.0) unstable; urgency=medium [ Kira Obrezkova ] -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: I800639aeb1ef78e8f16bb6d7eedf3826e9f78736 Gerrit-Change-Number: 19386 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 09:43:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 09:43:24 +0000 Subject: Change in libosmo-sccp[rel-1.2.1]: sccp_internal.h: fix compilation with gcc-10 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19385 ) Change subject: sccp_internal.h: fix compilation with gcc-10 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: Icbc06ed2c8d2bd5c63716945c3df923ea4de7886 Gerrit-Change-Number: 19385 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 26 Jul 2020 09:43:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 09:43:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 09:43:38 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-sccp=5Brel-1=2E2=2E1=5D=3A_Bump_version=3A_1=2E2=2E0=2E1-cb80_=E2=86=92_1=2E2=2E1?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19386 ) Change subject: Bump version: 1.2.0.1-cb80 ? 1.2.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: I800639aeb1ef78e8f16bb6d7eedf3826e9f78736 Gerrit-Change-Number: 19386 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 26 Jul 2020 09:43:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 09:49:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 09:49:09 +0000 Subject: Change in libosmo-sccp[rel-1.2.1]: sccp_internal.h: fix compilation with gcc-10 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19385 ) Change subject: sccp_internal.h: fix compilation with gcc-10 ...................................................................... sccp_internal.h: fix compilation with gcc-10 /usr/bin/ld: .libs/sccp_helpers.o:/home/laforge/projects/git/libosmo-sccp/src/sccp_internal.h:123: multiple definition of `sccp_scoc_fsm'; .libs/sua.o:/home/laforge/projects/git/libosmo-sccp/src/sccp_internal.h:123: first defined here See also https://alioth-lists.debian.net/pipermail/debian-mobcom-maintainers/Week-of-Mon-20200413/000646.html Change-Id: Icbc06ed2c8d2bd5c63716945c3df923ea4de7886 --- M src/sccp_internal.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/sccp_internal.h b/src/sccp_internal.h index 8df6c9b..98f6d37 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -120,7 +120,7 @@ struct msgb *sccp_msgb_alloc(const char *name); -struct osmo_fsm sccp_scoc_fsm; +extern struct osmo_fsm sccp_scoc_fsm; void sccp_scoc_show_connections(struct vty *vty, struct osmo_sccp_instance *inst); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: Icbc06ed2c8d2bd5c63716945c3df923ea4de7886 Gerrit-Change-Number: 19385 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 09:49:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 09:49:10 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-sccp=5Brel-1=2E2=2E1=5D=3A_Bump_version=3A_1=2E2=2E0=2E1-cb80_=E2=86=92_1=2E2=2E1?= In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19386 ) Change subject: Bump version: 1.2.0.1-cb80 ? 1.2.1 ...................................................................... Bump version: 1.2.0.1-cb80 ? 1.2.1 Tag a release with the gcc-10 compile fix we already had in master. Change-Id: I800639aeb1ef78e8f16bb6d7eedf3826e9f78736 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 2b14542..bc021e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libosmo-sccp (1.2.1) unstable; urgency=medium + + * sccp_internal.h: fix compilation with gcc-10 + + -- Harald Welte Sun, 26 Jul 2020 11:05:25 +0200 + libosmo-sccp (1.2.0) unstable; urgency=medium [ Kira Obrezkova ] -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: I800639aeb1ef78e8f16bb6d7eedf3826e9f78736 Gerrit-Change-Number: 19386 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 09:52:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 09:52:09 +0000 Subject: Change in osmo-bts[rel-1.2.1]: fix compilation with gcc-10 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19387 ) Change subject: fix compilation with gcc-10 ...................................................................... fix compilation with gcc-10 /usr/bin/ld: /home/laforge/projects/git/osmo-bts/tests/sysmobts/../../src/osmo-bts-sysmo/tch.c:584: undefined reference to `femtobts_tch_pl_names' /usr/bin/ld: l1_transp_hw.o:/home/laforge/projects/git/osmo-bts/src/osmo-bts-sysmo/femtobts.h:108: multiple definition of `pdch_msu_size'; main.o:/home/laforge/projects/git/osmo-bts/src/osmo-bts-sysmo/femtobts.h:108: first defined here /usr/bin/ld: l1_transp_hw.o:/home/laforge/projects/git/osmo-bts/src/osmo-bts-sysmo/femtobts.h:71: multiple definition of `femtobts_l1prim_type'; main.o:/home/laforge/projects/git/osmo-bts/src/osmo-bts-sysmo/femtobts.h:71: first defined here see also: https://alioth-lists.debian.net/pipermail/debian-mobcom-maintainers/Week-of-Mon-20200413/000651.html Change-Id: I4a9896153876fcda496365776883827746205f00 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/osmo-bts-litecell15/lc15bts.h M src/osmo-bts-oc2g/oc2gbts.h M src/osmo-bts-sysmo/femtobts.h M tests/sysmobts/Makefile.am 6 files changed, 43 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/87/19387/1 diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 41998ad..3943e50 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -342,13 +342,13 @@ return get_value_string(lchan_ciph_state_names, state); } -enum { +enum gsm_bts_trx_ts_flags { TS_F_PDCH_ACTIVE = 0x1000, TS_F_PDCH_ACT_PENDING = 0x2000, TS_F_PDCH_DEACT_PENDING = 0x4000, TS_F_PDCH_PENDING_MASK = 0x6000 /*< TS_F_PDCH_ACT_PENDING | TS_F_PDCH_DEACT_PENDING */ -} gsm_bts_trx_ts_flags; +}; /* One Timeslot in a TRX */ struct gsm_bts_trx_ts { @@ -793,8 +793,8 @@ const char *btsvariant2str(enum gsm_bts_type_variant v); extern const struct value_string gsm_chreq_descs[]; -const struct value_string gsm_pchant_names[13]; -const struct value_string gsm_pchant_descs[13]; +extern const struct value_string gsm_pchant_names[13]; +extern const struct value_string gsm_pchant_descs[13]; const char *gsm_pchan_name(enum gsm_phys_chan_config c); enum gsm_phys_chan_config gsm_pchan_parse(const char *name); const char *gsm_lchant_name(enum gsm_chan_t c); diff --git a/include/osmo-bts/scheduler_backend.h b/include/osmo-bts/scheduler_backend.h index 51c957c..c52bc70 100644 --- a/include/osmo-bts/scheduler_backend.h +++ b/include/osmo-bts/scheduler_backend.h @@ -40,8 +40,8 @@ extern const ubit_t _sched_tsc[8][26]; extern const ubit_t _sched_egprs_tsc[8][78]; -const ubit_t _sched_fcch_burst[148]; -const ubit_t _sched_sch_train[64]; +extern const ubit_t _sched_fcch_burst[148]; +extern const ubit_t _sched_sch_train[64]; struct msgb *_sched_dequeue_prim(struct l1sched_trx *l1t, int8_t tn, uint32_t fn, enum trx_chan_type chan); diff --git a/src/osmo-bts-litecell15/lc15bts.h b/src/osmo-bts-litecell15/lc15bts.h index 4c40db0..31ca923 100644 --- a/src/osmo-bts-litecell15/lc15bts.h +++ b/src/osmo-bts-litecell15/lc15bts.h @@ -23,24 +23,24 @@ }; enum l1prim_type lc15bts_get_l1prim_type(GsmL1_PrimId_t id); -const struct value_string lc15bts_l1prim_names[GsmL1_PrimId_NUM+1]; +extern const struct value_string lc15bts_l1prim_names[GsmL1_PrimId_NUM+1]; GsmL1_PrimId_t lc15bts_get_l1prim_conf(GsmL1_PrimId_t id); enum l1prim_type lc15bts_get_sysprim_type(Litecell15_PrimId_t id); -const struct value_string lc15bts_sysprim_names[Litecell15_PrimId_NUM+1]; +extern const struct value_string lc15bts_sysprim_names[Litecell15_PrimId_NUM+1]; Litecell15_PrimId_t lc15bts_get_sysprim_conf(Litecell15_PrimId_t id); -const struct value_string lc15bts_l1sapi_names[GsmL1_Sapi_NUM+1]; -const struct value_string lc15bts_l1status_names[GSML1_STATUS_NUM+1]; +extern const struct value_string lc15bts_l1sapi_names[GsmL1_Sapi_NUM+1]; +extern const struct value_string lc15bts_l1status_names[GSML1_STATUS_NUM+1]; -const struct value_string lc15bts_tracef_names[29]; -const struct value_string lc15bts_tracef_docs[29]; +extern const struct value_string lc15bts_tracef_names[29]; +extern const struct value_string lc15bts_tracef_docs[29]; -const struct value_string lc15bts_tch_pl_names[15]; +extern const struct value_string lc15bts_tch_pl_names[15]; -const struct value_string lc15bts_clksrc_names[10]; +extern const struct value_string lc15bts_clksrc_names[10]; -const struct value_string lc15bts_dir_names[6]; +extern const struct value_string lc15bts_dir_names[6]; enum pdch_cs { PDCH_CS_1, @@ -59,6 +59,6 @@ _NUM_PDCH_CS }; -const uint8_t pdch_msu_size[_NUM_PDCH_CS]; +extern const uint8_t pdch_msu_size[_NUM_PDCH_CS]; #endif /* LC15BTS_H */ diff --git a/src/osmo-bts-oc2g/oc2gbts.h b/src/osmo-bts-oc2g/oc2gbts.h index 9eb8745..80fd1d5 100644 --- a/src/osmo-bts-oc2g/oc2gbts.h +++ b/src/osmo-bts-oc2g/oc2gbts.h @@ -39,26 +39,26 @@ }; enum l1prim_type oc2gbts_get_l1prim_type(GsmL1_PrimId_t id); -const struct value_string oc2gbts_l1prim_names[GsmL1_PrimId_NUM+1]; +extern const struct value_string oc2gbts_l1prim_names[GsmL1_PrimId_NUM+1]; GsmL1_PrimId_t oc2gbts_get_l1prim_conf(GsmL1_PrimId_t id); enum l1prim_type oc2gbts_get_sysprim_type(Oc2g_PrimId_t id); -const struct value_string oc2gbts_sysprim_names[Oc2g_PrimId_NUM+1]; +extern const struct value_string oc2gbts_sysprim_names[Oc2g_PrimId_NUM+1]; Oc2g_PrimId_t oc2gbts_get_sysprim_conf(Oc2g_PrimId_t id); -const struct value_string oc2gbts_l1sapi_names[GsmL1_Sapi_NUM+1]; -const struct value_string oc2gbts_l1status_names[GSML1_STATUS_NUM+1]; +extern const struct value_string oc2gbts_l1sapi_names[GsmL1_Sapi_NUM+1]; +extern const struct value_string oc2gbts_l1status_names[GSML1_STATUS_NUM+1]; -const struct value_string oc2gbts_tracef_names[29]; -const struct value_string oc2gbts_tracef_docs[29]; +extern const struct value_string oc2gbts_tracef_names[29]; +extern const struct value_string oc2gbts_tracef_docs[29]; -const struct value_string oc2gbts_tch_pl_names[15]; +extern const struct value_string oc2gbts_tch_pl_names[15]; -const struct value_string oc2gbts_clksrc_names[10]; +extern const struct value_string oc2gbts_clksrc_names[10]; -const struct value_string oc2gbts_dir_names[6]; +extern const struct value_string oc2gbts_dir_names[6]; -const struct value_string oc2gbts_rsl_ho_causes[IPAC_HO_RQD_CAUSE_MAX]; +extern const struct value_string oc2gbts_rsl_ho_causes[IPAC_HO_RQD_CAUSE_MAX]; enum pdch_cs { PDCH_CS_1, @@ -77,7 +77,7 @@ _NUM_PDCH_CS }; -const uint8_t pdch_msu_size[_NUM_PDCH_CS]; +extern const uint8_t pdch_msu_size[_NUM_PDCH_CS]; /* OC2G default parameters */ #define OC2G_BTS_MAX_CELL_SIZE_DEFAULT 166 /* 166 qbits is default value */ diff --git a/src/osmo-bts-sysmo/femtobts.h b/src/osmo-bts-sysmo/femtobts.h index 9163ebb..b048fc4 100644 --- a/src/osmo-bts-sysmo/femtobts.h +++ b/src/osmo-bts-sysmo/femtobts.h @@ -68,25 +68,25 @@ }; #endif -const enum l1prim_type femtobts_l1prim_type[GsmL1_PrimId_NUM]; -const struct value_string femtobts_l1prim_names[GsmL1_PrimId_NUM+1]; -const GsmL1_PrimId_t femtobts_l1prim_req2conf[GsmL1_PrimId_NUM]; +extern const enum l1prim_type femtobts_l1prim_type[GsmL1_PrimId_NUM]; +extern const struct value_string femtobts_l1prim_names[GsmL1_PrimId_NUM+1]; +extern const GsmL1_PrimId_t femtobts_l1prim_req2conf[GsmL1_PrimId_NUM]; -const enum l1prim_type femtobts_sysprim_type[SuperFemto_PrimId_NUM]; -const struct value_string femtobts_sysprim_names[SuperFemto_PrimId_NUM+1]; -const SuperFemto_PrimId_t femtobts_sysprim_req2conf[SuperFemto_PrimId_NUM]; +extern const enum l1prim_type femtobts_sysprim_type[SuperFemto_PrimId_NUM]; +extern const struct value_string femtobts_sysprim_names[SuperFemto_PrimId_NUM+1]; +extern const SuperFemto_PrimId_t femtobts_sysprim_req2conf[SuperFemto_PrimId_NUM]; -const struct value_string femtobts_l1sapi_names[GsmL1_Sapi_NUM+1]; -const struct value_string femtobts_l1status_names[GSML1_STATUS_NUM+1]; +extern const struct value_string femtobts_l1sapi_names[GsmL1_Sapi_NUM+1]; +extern const struct value_string femtobts_l1status_names[GSML1_STATUS_NUM+1]; -const struct value_string femtobts_tracef_names[29]; -const struct value_string femtobts_tracef_docs[29]; +extern const struct value_string femtobts_tracef_names[29]; +extern const struct value_string femtobts_tracef_docs[29]; -const struct value_string femtobts_tch_pl_names[15]; -const struct value_string femtobts_chcomb_names[8]; -const struct value_string femtobts_clksrc_names[10]; +extern const struct value_string femtobts_tch_pl_names[15]; +extern const struct value_string femtobts_chcomb_names[8]; +extern const struct value_string femtobts_clksrc_names[10]; -const struct value_string femtobts_dir_names[6]; +extern const struct value_string femtobts_dir_names[6]; enum pdch_cs { PDCH_CS_1, @@ -105,6 +105,6 @@ _NUM_PDCH_CS }; -const uint8_t pdch_msu_size[_NUM_PDCH_CS]; +extern const uint8_t pdch_msu_size[_NUM_PDCH_CS]; #endif /* FEMTOBTS_H */ diff --git a/tests/sysmobts/Makefile.am b/tests/sysmobts/Makefile.am index 0829ca5..53180d1 100644 --- a/tests/sysmobts/Makefile.am +++ b/tests/sysmobts/Makefile.am @@ -13,5 +13,6 @@ $(top_srcdir)/src/osmo-bts-sysmo/calib_file.c \ $(top_srcdir)/src/osmo-bts-sysmo/calib_fixup.c \ $(top_srcdir)/src/osmo-bts-sysmo/misc/sysmobts_par.c \ + $(top_srcdir)/src/osmo-bts-sysmo/femtobts.c \ $(top_srcdir)/src/osmo-bts-sysmo/eeprom.c sysmobts_test_LDADD = $(top_builddir)/src/common/libbts.a $(LIBOSMOABIS_LIBS) $(LDADD) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: I4a9896153876fcda496365776883827746205f00 Gerrit-Change-Number: 19387 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 09:55:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 09:55:43 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Brel-1=2E2=2E1=5D=3A_Bump_version=3A_1=2E2=2E0=2E1-2bb3_=E2=86=92_1=2E2=2E1?= References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19388 ) Change subject: Bump version: 1.2.0.1-2bb3 ? 1.2.1 ...................................................................... Bump version: 1.2.0.1-2bb3 ? 1.2.1 Tag patch release with gcc-10 compilation fixes Change-Id: I37eb6c31b2463f43ed79a64d1f5cf7eb3b1bafb8 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/19388/1 diff --git a/debian/changelog b/debian/changelog index aa3269b..ac30e01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-bts (1.2.1) unstable; urgency=medium + + * fix compilation with gcc-10 + + -- Harald Welte Sun, 26 Jul 2020 11:52:23 +0200 + osmo-bts (1.2.0) unstable; urgency=medium [ Oliver Smith ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: I37eb6c31b2463f43ed79a64d1f5cf7eb3b1bafb8 Gerrit-Change-Number: 19388 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 09:59:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 09:59:00 +0000 Subject: Change in osmo-bts[rel-1.2.1]: fix compilation with gcc-10 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19387 ) Change subject: fix compilation with gcc-10 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: I4a9896153876fcda496365776883827746205f00 Gerrit-Change-Number: 19387 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 26 Jul 2020 09:59:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 10:01:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 10:01:25 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: silently ignore LCHAN_EV_RLL_ERR_IND References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19389 ) Change subject: lchan_fsm: silently ignore LCHAN_EV_RLL_ERR_IND ...................................................................... lchan_fsm: silently ignore LCHAN_EV_RLL_ERR_IND The RLL ERR IND is sent by the BTS in any number of casese that lead to a disconnect of a radio link layer, for example due to bad RF conditions. The lchan FSM currnently prints error messages about this event not being permitted, leading to confusion among users. Let's ignore this event, I don't think the lchan FSM should or could be doing anything as a result. We could also simply remove that event, but let's keep it in case we should need it in the future. Change-Id: I07aad62d25566d6068a95797915bb97fc3c66328 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/89/19389/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index e879059..4ed95dd 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1336,6 +1336,13 @@ lchan_fail_to(LCHAN_ST_UNUSED, "LCHAN_EV_TS_ERROR"); return; + case LCHAN_EV_RLL_ERR_IND: + /* let's just ignore this. We are already logging the + * fact that this message was received inside + * abis_rsl.c. There can be any number of reasons why the + * radio link layer failed */ + return; + default: return; } @@ -1464,6 +1471,7 @@ .allstate_action = lchan_fsm_allstate_action, .allstate_event_mask = 0 | S(LCHAN_EV_TS_ERROR) + | S(LCHAN_EV_RLL_ERR_IND) , .timer_cb = lchan_fsm_timer_cb, .cleanup = lchan_fsm_cleanup, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I07aad62d25566d6068a95797915bb97fc3c66328 Gerrit-Change-Number: 19389 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Jul 26 10:21:42 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 26 Jul 2020 10:21:42 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f1d5947b459b_2bd02ac693dbc6103852a9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Testing/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 57s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 57s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 57s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 57s] | | [ 57s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 57s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 57s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 57s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 57s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 57s] 2425 | MHD_start_daemon (unsigned int flags, [ 57s] | ^~~~~~~~~~~~~~~~ [ 57s] cc1: all warnings being treated as errors [ 57s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 57s] make[3]: *** Waiting for unfinished jobs.... [ 57s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 57s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 57s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 57s] make[1]: *** [Makefile:166: all] Error 2 [ 57s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 57s] dh_auto_build: error: cd build && make -j3 "INSTALL=install --strip-program=true" returned exit code 2 [ 57s] make: *** [debian/rules:9: build] Error 25 [ 57s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 57s] ### VM INTERACTION START ### [ 60s] [ 53.302355] sysrq: SysRq : Power Off [ 60s] [ 53.304623] reboot: Power down [ 60s] ### VM INTERACTION END ### [ 60s] [ 60s] build77 failed "build ulfius_2.5.2-4.1.dsc" at Sun Jul 26 10:21:38 UTC 2020. [ 60s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 26 10:23:59 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 26 Jul 2020 10:23:59 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f1d59d99f08c_2bd02ac693dbc61038659@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Testing/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 115s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 115s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 115s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 115s] | | [ 115s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 115s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 115s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 115s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 115s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 115s] 2425 | MHD_start_daemon (unsigned int flags, [ 115s] | ^~~~~~~~~~~~~~~~ [ 115s] cc1: all warnings being treated as errors [ 115s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 115s] make[3]: *** Waiting for unfinished jobs.... [ 115s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 115s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 115s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 115s] make[1]: *** [Makefile:166: all] Error 2 [ 115s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 115s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 115s] make: *** [debian/rules:9: build] Error 25 [ 115s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 116s] ### VM INTERACTION START ### [ 119s] [ 107.687043] sysrq: SysRq : Power Off [ 119s] [ 107.693962] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] lamb10 failed "build ulfius_2.5.2-4.1.dsc" at Sun Jul 26 10:23:51 UTC 2020. [ 119s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Jul 26 12:08:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 12:08:32 +0000 Subject: Change in osmo-iuh[rel-0.6.0]: Fix compilation with gcc-10 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/19390 ) Change subject: Fix compilation with gcc-10 ...................................................................... Fix compilation with gcc-10 /usr/bin/ld: test_common.o:(.bss+0x0): multiple definition of `talloc_asn1_ctx'; test-helpers.o:(.bss+0x0): first defined here See also https://alioth-lists.debian.net/pipermail/debian-mobcom-maintainers/Week-of-Mon-20200413/000652.html Change-Id: I4ce41158bb27e6b9242613106f226fc86995c53c --- M src/tests/test-helpers.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/90/19390/1 diff --git a/src/tests/test-helpers.c b/src/tests/test-helpers.c index f218a79..ac7e129 100644 --- a/src/tests/test-helpers.c +++ b/src/tests/test-helpers.c @@ -33,7 +33,7 @@ #include int asn1_xer_print = 0; -void *talloc_asn1_ctx; +extern void *talloc_asn1_ctx; /* use odd number of digits */ const uint8_t imsi_encoded[] = { 0x10, 0x32, 0x54, 0x76, 0xF8 }; -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/19390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: rel-0.6.0 Gerrit-Change-Id: I4ce41158bb27e6b9242613106f226fc86995c53c Gerrit-Change-Number: 19390 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 12:10:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 12:10:14 +0000 Subject: Change in osmo-iuh[rel-0.6.0]: Fix compilation with gcc-10 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/19390 ) Change subject: Fix compilation with gcc-10 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/19390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: rel-0.6.0 Gerrit-Change-Id: I4ce41158bb27e6b9242613106f226fc86995c53c Gerrit-Change-Number: 19390 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 26 Jul 2020 12:10:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 12:13:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 12:13:22 +0000 Subject: Change in osmo-sgsn[master]: Send a BVC-RESET to all presistent Gb interfaces at start-up In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 to look at the new patch set (#3). Change subject: Send a BVC-RESET to all presistent Gb interfaces at start-up ...................................................................... Send a BVC-RESET to all presistent Gb interfaces at start-up 3GPP TS 48.018 Section 8.4: > After any failure affecting the NSE, the party (BSS or SGSN) where > the failure resided shall reset the signalling BVC. After sending or > receiving a BVC-RESET PDU for the signalling BVC, the BSS shall stop all > traffic and initiate the BVC-RESET procedure for all BVCs corresponding > to PTP functional entities of the underlying network service entity. The > BSS must complete the BVC-RESET procedure for signalling BVC before > starting PTP BVC-RESET procedures. TODO: We should not just trigger a single outbound BVC-RESET message, but we should re-transmit them until we get a response. This would likely entail adding FSMs to libosmogb, which we will leave for a later point - it's anticipated that the NS + BSSGP code is undergoing quite some changes in the coming months anyway, so leave it for then. Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Closes: OS#4629 Depends: libosmocore.git I353adc1aa72377f7d4b3336d2ff47791fb73d62c --- M src/sgsn/sgsn_main.c 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/27/19027/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Gerrit-Change-Number: 19027 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 12:14:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 12:14:54 +0000 Subject: Change in osmo-sgsn[rel-1.6.1]: gtphub_test: Fix compilation with gcc-10 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19391 ) Change subject: gtphub_test: Fix compilation with gcc-10 ...................................................................... gtphub_test: Fix compilation with gcc-10 /usr/bin/ld: ../../src/gtphub/gtphub.o:/home/laforge/projects/git/osmo-sgsn/src/gtphub/gtphub.c:50: multiple definition of `osmo_gtphub_ctx'; gtphub_test.o:/home/laforge/projects/git/osmo-sgsn/tests/gtphub/gtphub_test.c:57: first defined here collect2: error: ld returned 1 exit status See also https://alioth-lists.debian.net/pipermail/debian-mobcom-maintainers/Week-of-Mon-20200413/000653.html Change-Id: I19c1eef6649d2747f0b624f5292d7ae47c4ca839 --- M tests/gtphub/gtphub_test.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/91/19391/1 diff --git a/tests/gtphub/gtphub_test.c b/tests/gtphub/gtphub_test.c index 2e48bb1..ed46176 100644 --- a/tests/gtphub/gtphub_test.c +++ b/tests/gtphub/gtphub_test.c @@ -54,7 +54,7 @@ void gtphub_init(struct gtphub *hub); void gtphub_free(struct gtphub *hub); -void *osmo_gtphub_ctx; +extern void *osmo_gtphub_ctx; static void nr_mapping_free(struct expiring_item *e) { -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: rel-1.6.1 Gerrit-Change-Id: I19c1eef6649d2747f0b624f5292d7ae47c4ca839 Gerrit-Change-Number: 19391 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 12:15:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 12:15:51 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sgsn=5Brel-1=2E6=2E1=5D=3A_Bump_version=3A_1=2E6=2E0=2E1-7aa2_=E2=86=92_1=2E6=2E1?= References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19392 ) Change subject: Bump version: 1.6.0.1-7aa2 ? 1.6.1 ...................................................................... Bump version: 1.6.0.1-7aa2 ? 1.6.1 cherry-pick gcc-10 compilation fix from master Change-Id: I1a97054c567535521e2b9ca684ef8eee21872feb --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/92/19392/1 diff --git a/debian/changelog b/debian/changelog index 2827f43..a479de9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-sgsn (1.6.1) unstable; urgency=medium + + * gtphub_test: Fix compilation with gcc-10 + + -- Harald Welte Sun, 26 Jul 2020 14:15:18 +0200 + osmo-sgsn (1.6.0) unstable; urgency=medium [ Pau Espin Pedrol ] -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: rel-1.6.1 Gerrit-Change-Id: I1a97054c567535521e2b9ca684ef8eee21872feb Gerrit-Change-Number: 19392 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 12:19:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 12:19:08 +0000 Subject: =?UTF-8?Q?Change_in_osmo-iuh=5Brel-0=2E6=2E0=5D=3A_Bump_version=3A_0=2E6=2E0=2E1-cada_=E2=86=92_0=2E6=2E1?= References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/19393 ) Change subject: Bump version: 0.6.0.1-cada ? 0.6.1 ...................................................................... Bump version: 0.6.0.1-cada ? 0.6.1 cherry-pick gcc-10 compilation fixes from master. Change-Id: Ib4b35bfeb05bacdd24e599f7b053107d15cfe305 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/93/19393/1 diff --git a/debian/changelog b/debian/changelog index f59c49e..0d8b7cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-iuh (0.6.1) unstable; urgency=medium + + * Fix compilation with gcc-10 + + -- Harald Welte Sun, 26 Jul 2020 14:18:48 +0200 + osmo-iuh (0.6.0) unstable; urgency=medium [ Vadim Yanitskiy ] -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/19393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: rel-0.6.0 Gerrit-Change-Id: Ib4b35bfeb05bacdd24e599f7b053107d15cfe305 Gerrit-Change-Number: 19393 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 12:29:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 12:29:36 +0000 Subject: =?UTF-8?Q?Change_in_osmo-iuh=5Brel-0=2E6=2E0=5D=3A_Bump_version=3A_0=2E6=2E0=2E1-cada_=E2=86=92_0=2E6=2E1?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/19393 ) Change subject: Bump version: 0.6.0.1-cada ? 0.6.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/19393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: rel-0.6.0 Gerrit-Change-Id: Ib4b35bfeb05bacdd24e599f7b053107d15cfe305 Gerrit-Change-Number: 19393 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jul 2020 12:29:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 12:29:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 12:29:39 +0000 Subject: Change in osmo-iuh[rel-0.6.0]: Fix compilation with gcc-10 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/19390 ) Change subject: Fix compilation with gcc-10 ...................................................................... Fix compilation with gcc-10 /usr/bin/ld: test_common.o:(.bss+0x0): multiple definition of `talloc_asn1_ctx'; test-helpers.o:(.bss+0x0): first defined here See also https://alioth-lists.debian.net/pipermail/debian-mobcom-maintainers/Week-of-Mon-20200413/000652.html Change-Id: I4ce41158bb27e6b9242613106f226fc86995c53c --- M src/tests/test-helpers.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/tests/test-helpers.c b/src/tests/test-helpers.c index f218a79..ac7e129 100644 --- a/src/tests/test-helpers.c +++ b/src/tests/test-helpers.c @@ -33,7 +33,7 @@ #include int asn1_xer_print = 0; -void *talloc_asn1_ctx; +extern void *talloc_asn1_ctx; /* use odd number of digits */ const uint8_t imsi_encoded[] = { 0x10, 0x32, 0x54, 0x76, 0xF8 }; -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/19390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: rel-0.6.0 Gerrit-Change-Id: I4ce41158bb27e6b9242613106f226fc86995c53c Gerrit-Change-Number: 19390 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 12:29:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 12:29:39 +0000 Subject: =?UTF-8?Q?Change_in_osmo-iuh=5Brel-0=2E6=2E0=5D=3A_Bump_version=3A_0=2E6=2E0=2E1-cada_=E2=86=92_0=2E6=2E1?= In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/19393 ) Change subject: Bump version: 0.6.0.1-cada ? 0.6.1 ...................................................................... Bump version: 0.6.0.1-cada ? 0.6.1 cherry-pick gcc-10 compilation fixes from master. Change-Id: Ib4b35bfeb05bacdd24e599f7b053107d15cfe305 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index f59c49e..0d8b7cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-iuh (0.6.1) unstable; urgency=medium + + * Fix compilation with gcc-10 + + -- Harald Welte Sun, 26 Jul 2020 14:18:48 +0200 + osmo-iuh (0.6.0) unstable; urgency=medium [ Vadim Yanitskiy ] -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/19393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: rel-0.6.0 Gerrit-Change-Id: Ib4b35bfeb05bacdd24e599f7b053107d15cfe305 Gerrit-Change-Number: 19393 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 12:31:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 12:31:25 +0000 Subject: Change in osmo-sgsn[rel-1.6.1]: gtphub_test: Fix compilation with gcc-10 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19391 ) Change subject: gtphub_test: Fix compilation with gcc-10 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: rel-1.6.1 Gerrit-Change-Id: I19c1eef6649d2747f0b624f5292d7ae47c4ca839 Gerrit-Change-Number: 19391 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jul 2020 12:31:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 12:31:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 12:31:29 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sgsn=5Brel-1=2E6=2E1=5D=3A_Bump_version=3A_1=2E6=2E0=2E1-7aa2_=E2=86=92_1=2E6=2E1?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19392 ) Change subject: Bump version: 1.6.0.1-7aa2 ? 1.6.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: rel-1.6.1 Gerrit-Change-Id: I1a97054c567535521e2b9ca684ef8eee21872feb Gerrit-Change-Number: 19392 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jul 2020 12:31:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 12:31:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 12:31:54 +0000 Subject: Change in osmo-sgsn[rel-1.6.1]: gtphub_test: Fix compilation with gcc-10 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19391 ) Change subject: gtphub_test: Fix compilation with gcc-10 ...................................................................... gtphub_test: Fix compilation with gcc-10 /usr/bin/ld: ../../src/gtphub/gtphub.o:/home/laforge/projects/git/osmo-sgsn/src/gtphub/gtphub.c:50: multiple definition of `osmo_gtphub_ctx'; gtphub_test.o:/home/laforge/projects/git/osmo-sgsn/tests/gtphub/gtphub_test.c:57: first defined here collect2: error: ld returned 1 exit status See also https://alioth-lists.debian.net/pipermail/debian-mobcom-maintainers/Week-of-Mon-20200413/000653.html Change-Id: I19c1eef6649d2747f0b624f5292d7ae47c4ca839 --- M tests/gtphub/gtphub_test.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/gtphub/gtphub_test.c b/tests/gtphub/gtphub_test.c index 2e48bb1..ed46176 100644 --- a/tests/gtphub/gtphub_test.c +++ b/tests/gtphub/gtphub_test.c @@ -54,7 +54,7 @@ void gtphub_init(struct gtphub *hub); void gtphub_free(struct gtphub *hub); -void *osmo_gtphub_ctx; +extern void *osmo_gtphub_ctx; static void nr_mapping_free(struct expiring_item *e) { -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: rel-1.6.1 Gerrit-Change-Id: I19c1eef6649d2747f0b624f5292d7ae47c4ca839 Gerrit-Change-Number: 19391 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 12:31:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 12:31:54 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sgsn=5Brel-1=2E6=2E1=5D=3A_Bump_version=3A_1=2E6=2E0=2E1-7aa2_=E2=86=92_1=2E6=2E1?= In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19392 ) Change subject: Bump version: 1.6.0.1-7aa2 ? 1.6.1 ...................................................................... Bump version: 1.6.0.1-7aa2 ? 1.6.1 cherry-pick gcc-10 compilation fix from master Change-Id: I1a97054c567535521e2b9ca684ef8eee21872feb --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 2827f43..a479de9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-sgsn (1.6.1) unstable; urgency=medium + + * gtphub_test: Fix compilation with gcc-10 + + -- Harald Welte Sun, 26 Jul 2020 14:15:18 +0200 + osmo-sgsn (1.6.0) unstable; urgency=medium [ Pau Espin Pedrol ] -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: rel-1.6.1 Gerrit-Change-Id: I1a97054c567535521e2b9ca684ef8eee21872feb Gerrit-Change-Number: 19392 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Jul 26 13:03:41 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 26 Jul 2020 13:03:41 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1d7f3d83c06_2bd02ac693dbc610405561@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 385s] /usr/bin/ld: ../../src/common/libbts.a(msg_utils.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 385s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 385s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 385s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_lookup.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 385s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 385s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 385s] /usr/bin/ld: ../../src/common/libbts.a(bts_ctrl_commands.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 385s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:797: multiple definition of `gsm_pchant_descs'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:797: first defined here [ 385s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:796: multiple definition of `gsm_pchant_names'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:796: first defined here [ 385s] /usr/bin/ld: ../../src/common/libbts.a(tx_power.o):./src/common/../../include/osmo-bts/gsm_data_shared.h:351: multiple definition of `gsm_bts_trx_ts_flags'; main.o:./src/osmo-bts-virtual/../../include/osmo-bts/gsm_data_shared.h:351: first defined here [ 385s] collect2: error: ld returned 1 exit status [ 385s] make[4]: *** [Makefile:426: osmo-bts-virtual] Error 1 [ 385s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bts-virtual' [ 385s] make[3]: *** [Makefile:385: all-recursive] Error 1 [ 385s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 385s] make[2]: *** [Makefile:434: all-recursive] Error 1 [ 385s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 385s] make[1]: *** [Makefile:366: all] Error 2 [ 385s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 385s] dh_auto_build: error: make -j1 returned exit code 2 [ 385s] make: *** [debian/rules:12: build] Error 25 [ 385s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 385s] ### VM INTERACTION START ### [ 386s] Powering off. [ 386s] [ 370.356375] reboot: Power down [ 386s] ### VM INTERACTION END ### [ 386s] [ 386s] lamb25 failed "build osmo-bts_1.2.0.dsc" at Sun Jul 26 13:03:29 UTC 2020. [ 386s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 26 13:13:24 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 26 Jul 2020 13:13:24 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1d8192b34d8_2bd02ac693dbc6104058da@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 531s] /usr/bin/ld: bsc_subscr_conn_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] /usr/bin/ld: bsc_vty.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] /usr/bin/ld: gsm_04_08_rr.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] /usr/bin/ld: handover_decision.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] /usr/bin/ld: handover_decision_2.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] /usr/bin/ld: handover_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] /usr/bin/ld: handover_logic.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] /usr/bin/ld: lchan_fsm.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] /usr/bin/ld: osmo_bsc_bssap.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] /usr/bin/ld: osmo_bsc_main.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:./src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here [ 531s] collect2: error: ld returned 1 exit status [ 531s] make[4]: *** [Makefile:588: osmo-bsc] Error 1 [ 531s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 531s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 531s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 531s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 531s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 531s] make[1]: *** [Makefile:380: all] Error 2 [ 531s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 531s] dh_auto_build: error: make -j1 returned exit code 2 [ 531s] make: *** [debian/rules:45: build] Error 25 [ 531s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 531s] ### VM INTERACTION START ### [ 532s] Powering off. [ 532s] [ 502.379716] reboot: Power down [ 532s] ### VM INTERACTION END ### [ 532s] [ 532s] cloud106 failed "build osmo-bsc_1.6.0.dsc" at Sun Jul 26 13:13:23 UTC 2020. [ 532s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Jul 26 13:17:06 2020 From: admin at opensuse.org (OBS Notification) Date: Sun, 26 Jul 2020 13:17:06 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1d82651e416_2bd02ac693dbc610405916@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 431s] ranlib libmsc.a [ 431s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libmsc' [ 431s] Making all in osmo-msc [ 431s] make[4]: Entering directory '/usr/src/packages/BUILD/src/osmo-msc' [ 431s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o msc_main.o msc_main.c [ 432s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-z,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -losmoabis -losmonetif -lsmpp34 -losmo-ranap -ltalloc -lasn1c -losmo-sigtran -losmo-mgcp-client -losmo-gsup-client -ldbi -lsctp [ 432s] libtool: link: gcc -Wall -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-z -Wl,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmoabis.so /usr/lib/x86_64-linux-gnu/libosmonetif.so /usr/lib/x86_64-linux-gnu/libsmpp34.so -losmo-ranap -ltalloc -lasn1c /usr/lib/x86_64-linux-gnu/libosmo-sigtran.so -losmo-mgcp-client /usr/lib/x86_64-linux-gnu/libosmo-gsup-client.so -ldbi -lsctp -pthread [ 432s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_access_req_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 432s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_auth_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 432s] /usr/bin/ld: ../../src/libvlr/libvlr.a(vlr_lu_fsm.o):./src/libvlr/vlr_auth_fsm.h:30: multiple definition of `vlr_auth_fsm'; ../../src/libvlr/libvlr.a(vlr.o):./src/libvlr/vlr_auth_fsm.h:30: first defined here [ 432s] collect2: error: ld returned 1 exit status [ 432s] make[4]: *** [Makefile:485: osmo-msc] Error 1 [ 432s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 432s] make[3]: *** [Makefile:422: all-recursive] Error 1 [ 432s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 432s] make[2]: *** [Makefile:462: all-recursive] Error 1 [ 432s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 432s] make[1]: *** [Makefile:394: all] Error 2 [ 432s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 432s] dh_auto_build: error: make -j1 returned exit code 2 [ 432s] make: *** [debian/rules:45: build] Error 25 [ 432s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 432s] ### VM INTERACTION START ### [ 433s] Powering off. [ 433s] [ 418.124491] reboot: Power down [ 433s] ### VM INTERACTION END ### [ 433s] [ 433s] lamb27 failed "build osmo-msc_1.6.1.dsc" at Sun Jul 26 13:16:55 UTC 2020. [ 433s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Jul 26 15:30:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 15:30:04 +0000 Subject: Change in osmo-msc[rel-1.6.2]: vlr_auth_fsm: Fix compilation with gcc-10 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/19394 ) Change subject: vlr_auth_fsm: Fix compilation with gcc-10 ...................................................................... vlr_auth_fsm: Fix compilation with gcc-10 See also: https://alioth-lists.debian.net/pipermail/debian-mobcom-maintainers/Week-of-Mon-20200413/000650.html Change-Id: If3fdbfa20dec02ba57c582700dff12ebbb7d9439 --- M src/libvlr/vlr_auth_fsm.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/94/19394/1 diff --git a/src/libvlr/vlr_auth_fsm.h b/src/libvlr/vlr_auth_fsm.h index 1f2cb49..f3925fd 100644 --- a/src/libvlr/vlr_auth_fsm.h +++ b/src/libvlr/vlr_auth_fsm.h @@ -27,7 +27,7 @@ VLR_AUTH_E_MS_ID_IMSI, }; -struct osmo_fsm vlr_auth_fsm; +extern struct osmo_fsm vlr_auth_fsm; struct osmo_fsm_inst *auth_fsm_start(struct vlr_subscr *vsub, uint32_t log_level, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: rel-1.6.2 Gerrit-Change-Id: If3fdbfa20dec02ba57c582700dff12ebbb7d9439 Gerrit-Change-Number: 19394 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 15:30:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 15:30:06 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Brel-1=2E6=2E2=5D=3A_Bump_version=3A_1=2E6=2E1=2E1-c270_=E2=86=92_1=2E6=2E2?= References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/19395 ) Change subject: Bump version: 1.6.1.1-c270 ? 1.6.2 ...................................................................... Bump version: 1.6.1.1-c270 ? 1.6.2 cherry-pick gcc-10 compile fix Change-Id: I338ee80155c1c0c2e46a352432674cccfc27ebea --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/95/19395/1 diff --git a/debian/changelog b/debian/changelog index 7b5f708..e1651e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-msc (1.6.2) unstable; urgency=medium + + * vlr_auth_fsm: Fix compilation with gcc-10 + + -- Harald Welte Sun, 26 Jul 2020 17:28:45 +0200 + osmo-msc (1.6.1) unstable; urgency=medium [ Vadim Yanitskiy ] -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: rel-1.6.2 Gerrit-Change-Id: I338ee80155c1c0c2e46a352432674cccfc27ebea Gerrit-Change-Number: 19395 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 15:31:31 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 15:31:31 +0000 Subject: Change in osmo-msc[rel-1.6.2]: vlr_auth_fsm: Fix compilation with gcc-10 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19394 ) Change subject: vlr_auth_fsm: Fix compilation with gcc-10 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: rel-1.6.2 Gerrit-Change-Id: If3fdbfa20dec02ba57c582700dff12ebbb7d9439 Gerrit-Change-Number: 19394 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 26 Jul 2020 15:31:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 15:31:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 15:31:46 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Brel-1=2E6=2E2=5D=3A_Bump_version=3A_1=2E6=2E1=2E1-c270_=E2=86=92_1=2E6=2E2?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19395 ) Change subject: Bump version: 1.6.1.1-c270 ? 1.6.2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: rel-1.6.2 Gerrit-Change-Id: I338ee80155c1c0c2e46a352432674cccfc27ebea Gerrit-Change-Number: 19395 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 26 Jul 2020 15:31:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 15:36:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 15:36:48 +0000 Subject: Change in osmo-bsc[rel-1.6.1]: handorer.h: Fix compilation with gcc-10 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19396 ) Change subject: handorer.h: Fix compilation with gcc-10 ...................................................................... handorer.h: Fix compilation with gcc-10 /usr/bin/ld: bsc_subscr_conn_fsm.o:/home/laforge/projects/git/osmo-bsc/src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:/home/laforge/projects/git/osmo-bsc/src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here See also https://alioth-lists.debian.net/pipermail/debian-mobcom-maintainers/Week-of-Mon-20200413/000649.html Change-Id: Ic21af84f2a6de48d220940f30dad02a0e7683ce8 --- M include/osmocom/bsc/handover.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/96/19396/1 diff --git a/include/osmocom/bsc/handover.h b/include/osmocom/bsc/handover.h index b00ee60..d22ac86 100644 --- a/include/osmocom/bsc/handover.h +++ b/include/osmocom/bsc/handover.h @@ -23,7 +23,7 @@ struct gsm_lchan; struct gsm_bts; struct gsm_subscriber_connection; -struct gsm_meas_rep mr; +struct gsm_meas_rep; enum handover_result { HO_RESULT_OK, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: rel-1.6.1 Gerrit-Change-Id: Ic21af84f2a6de48d220940f30dad02a0e7683ce8 Gerrit-Change-Number: 19396 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 15:36:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 15:36:49 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Brel-1=2E6=2E1=5D=3A_Bump_version=3A_1=2E6=2E0=2E1-b1c4a_=E2=86=92_1=2E6=2E1?= References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19397 ) Change subject: Bump version: 1.6.0.1-b1c4a ? 1.6.1 ...................................................................... Bump version: 1.6.0.1-b1c4a ? 1.6.1 cherry-pick gcc-10 compilation fixes from master Change-Id: Ibae07633413af023fa105dda21d21a32040661c3 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/19397/1 diff --git a/debian/changelog b/debian/changelog index b65bc0d..9a41bcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-bsc (1.6.1) unstable; urgency=medium + + * handorer.h: Fix compilation with gcc-10 + + -- Harald Welte Sun, 26 Jul 2020 17:35:45 +0200 + osmo-bsc (1.6.0) unstable; urgency=medium [ Philipp Maier ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: rel-1.6.1 Gerrit-Change-Id: Ibae07633413af023fa105dda21d21a32040661c3 Gerrit-Change-Number: 19397 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 15:38:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 15:38:05 +0000 Subject: Change in osmo-bsc[rel-1.6.1]: handorer.h: Fix compilation with gcc-10 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19396 ) Change subject: handorer.h: Fix compilation with gcc-10 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: rel-1.6.1 Gerrit-Change-Id: Ic21af84f2a6de48d220940f30dad02a0e7683ce8 Gerrit-Change-Number: 19396 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 26 Jul 2020 15:38:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 15:38:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 15:38:14 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Brel-1=2E6=2E1=5D=3A_Bump_version=3A_1=2E6=2E0=2E1-b1c4a_=E2=86=92_1=2E6=2E1?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19397 ) Change subject: Bump version: 1.6.0.1-b1c4a ? 1.6.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: rel-1.6.1 Gerrit-Change-Id: Ibae07633413af023fa105dda21d21a32040661c3 Gerrit-Change-Number: 19397 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 26 Jul 2020 15:38:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 15:39:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 15:39:14 +0000 Subject: Change in osmo-msc[rel-1.6.2]: vlr_auth_fsm: Fix compilation with gcc-10 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19394 ) Change subject: vlr_auth_fsm: Fix compilation with gcc-10 ...................................................................... vlr_auth_fsm: Fix compilation with gcc-10 See also: https://alioth-lists.debian.net/pipermail/debian-mobcom-maintainers/Week-of-Mon-20200413/000650.html Change-Id: If3fdbfa20dec02ba57c582700dff12ebbb7d9439 --- M src/libvlr/vlr_auth_fsm.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libvlr/vlr_auth_fsm.h b/src/libvlr/vlr_auth_fsm.h index 1f2cb49..f3925fd 100644 --- a/src/libvlr/vlr_auth_fsm.h +++ b/src/libvlr/vlr_auth_fsm.h @@ -27,7 +27,7 @@ VLR_AUTH_E_MS_ID_IMSI, }; -struct osmo_fsm vlr_auth_fsm; +extern struct osmo_fsm vlr_auth_fsm; struct osmo_fsm_inst *auth_fsm_start(struct vlr_subscr *vsub, uint32_t log_level, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: rel-1.6.2 Gerrit-Change-Id: If3fdbfa20dec02ba57c582700dff12ebbb7d9439 Gerrit-Change-Number: 19394 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 15:39:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 15:39:14 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Brel-1=2E6=2E2=5D=3A_Bump_version=3A_1=2E6=2E1=2E1-c270_=E2=86=92_1=2E6=2E2?= In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19395 ) Change subject: Bump version: 1.6.1.1-c270 ? 1.6.2 ...................................................................... Bump version: 1.6.1.1-c270 ? 1.6.2 cherry-pick gcc-10 compile fix Change-Id: I338ee80155c1c0c2e46a352432674cccfc27ebea --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 7b5f708..e1651e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-msc (1.6.2) unstable; urgency=medium + + * vlr_auth_fsm: Fix compilation with gcc-10 + + -- Harald Welte Sun, 26 Jul 2020 17:28:45 +0200 + osmo-msc (1.6.1) unstable; urgency=medium [ Vadim Yanitskiy ] -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: rel-1.6.2 Gerrit-Change-Id: I338ee80155c1c0c2e46a352432674cccfc27ebea Gerrit-Change-Number: 19395 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 18:28:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 18:28:32 +0000 Subject: Change in osmo-bsc[rel-1.6.1]: handorer.h: Fix compilation with gcc-10 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19396 ) Change subject: handorer.h: Fix compilation with gcc-10 ...................................................................... handorer.h: Fix compilation with gcc-10 /usr/bin/ld: bsc_subscr_conn_fsm.o:/home/laforge/projects/git/osmo-bsc/src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: multiple definition of `mr'; abis_rsl.o:/home/laforge/projects/git/osmo-bsc/src/osmo-bsc/../../include/osmocom/bsc/handover.h:26: first defined here See also https://alioth-lists.debian.net/pipermail/debian-mobcom-maintainers/Week-of-Mon-20200413/000649.html Change-Id: Ic21af84f2a6de48d220940f30dad02a0e7683ce8 --- M include/osmocom/bsc/handover.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/handover.h b/include/osmocom/bsc/handover.h index b00ee60..d22ac86 100644 --- a/include/osmocom/bsc/handover.h +++ b/include/osmocom/bsc/handover.h @@ -23,7 +23,7 @@ struct gsm_lchan; struct gsm_bts; struct gsm_subscriber_connection; -struct gsm_meas_rep mr; +struct gsm_meas_rep; enum handover_result { HO_RESULT_OK, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: rel-1.6.1 Gerrit-Change-Id: Ic21af84f2a6de48d220940f30dad02a0e7683ce8 Gerrit-Change-Number: 19396 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 18:28:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 18:28:33 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Brel-1=2E6=2E1=5D=3A_Bump_version=3A_1=2E6=2E0=2E1-b1c4a_=E2=86=92_1=2E6=2E1?= In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19397 ) Change subject: Bump version: 1.6.0.1-b1c4a ? 1.6.1 ...................................................................... Bump version: 1.6.0.1-b1c4a ? 1.6.1 cherry-pick gcc-10 compilation fixes from master Change-Id: Ibae07633413af023fa105dda21d21a32040661c3 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index b65bc0d..9a41bcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-bsc (1.6.1) unstable; urgency=medium + + * handorer.h: Fix compilation with gcc-10 + + -- Harald Welte Sun, 26 Jul 2020 17:35:45 +0200 + osmo-bsc (1.6.0) unstable; urgency=medium [ Philipp Maier ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: rel-1.6.1 Gerrit-Change-Id: Ibae07633413af023fa105dda21d21a32040661c3 Gerrit-Change-Number: 19397 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 18:51:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 18:51:19 +0000 Subject: Change in osmo-bts[rel-1.2.1]: bts-trx: trx_if.c: Fix some printf formats References: Message-ID: Hello pespin, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19398 to review the following change. Change subject: bts-trx: trx_if.c: Fix some printf formats ...................................................................... bts-trx: trx_if.c: Fix some printf formats Compiler from raspberrypi4 warns/errors about those. Change-Id: I4f973eb4ffdf8869b522d14e25853357fcd1e984 --- M src/osmo-bts-trx/trx_if.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/98/19398/1 diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index 099c330..f717a0c 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -394,8 +394,8 @@ goto parse_err; if (p - buf_in >= sizeof(rsp->cmd)) { - LOGP(DTRX, LOGL_ERROR, "cmd buffer too small %lu >= %lu\n", - p - buf_in, sizeof(rsp->cmd)); + LOGP(DTRX, LOGL_ERROR, "cmd buffer too small %lu >= %zu\n", + (long unsigned) (p - buf_in), sizeof(rsp->cmd)); goto parse_err; } @@ -415,7 +415,7 @@ k = p + strlen(p); if (strlen(k) >= sizeof(rsp->params)) { - LOGP(DTRX, LOGL_ERROR, "params buffer too small %lu >= %lu\n", + LOGP(DTRX, LOGL_ERROR, "params buffer too small %zu >= %zu\n", strlen(k), sizeof(rsp->params)); goto parse_err; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: I4f973eb4ffdf8869b522d14e25853357fcd1e984 Gerrit-Change-Number: 19398 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 18:51:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 18:51:19 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Brel-1=2E2=2E1=5D=3A_Bump_version=3A_1=2E2=2E0=2E2-94ea_=E2=86=92_1=2E2=2E1?= References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19399 ) Change subject: Bump version: 1.2.0.2-94ea ? 1.2.1 ...................................................................... Bump version: 1.2.0.2-94ea ? 1.2.1 Cherry-pick gcc-10 compilation fixes. Change-Id: I4ee92fecd7f1f48922c827c000742d195f78d8b9 --- M debian/changelog 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/99/19399/1 diff --git a/debian/changelog b/debian/changelog index aa3269b..7d7b882 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +osmo-bts (1.2.1) unstable; urgency=medium + + [ Harald Welte ] + * fix compilation with gcc-10 + + [ Pau Espin Pedrol ] + * bts-trx: trx_if.c: Fix some printf formats + + -- Harald Welte Sun, 26 Jul 2020 20:50:12 +0200 + osmo-bts (1.2.0) unstable; urgency=medium [ Oliver Smith ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: I4ee92fecd7f1f48922c827c000742d195f78d8b9 Gerrit-Change-Number: 19399 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 18:51:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 18:51:59 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Brel-1=2E2=2E1=5D=3A_Bump_version=3A_1=2E2=2E0=2E1-2bb3_=E2=86=92_1=2E2=2E1?= In-Reply-To: References: Message-ID: laforge has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19388 ) Change subject: Bump version: 1.2.0.1-2bb3 ? 1.2.1 ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: I37eb6c31b2463f43ed79a64d1f5cf7eb3b1bafb8 Gerrit-Change-Number: 19388 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 19:02:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 19:02:13 +0000 Subject: Change in osmo-bts[rel-1.2.1]: bts-trx: trx_if.c: Fix some printf formats In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19398 ) Change subject: bts-trx: trx_if.c: Fix some printf formats ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: I4f973eb4ffdf8869b522d14e25853357fcd1e984 Gerrit-Change-Number: 19398 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 26 Jul 2020 19:02:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 19:02:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 19:02:19 +0000 Subject: Change in osmo-bts[rel-1.2.1]: fix compilation with gcc-10 In-Reply-To: References: Message-ID: laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19387 ) Change subject: fix compilation with gcc-10 ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: I4a9896153876fcda496365776883827746205f00 Gerrit-Change-Number: 19387 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 19:02:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 19:02:24 +0000 Subject: Change in osmo-bts[rel-1.2.1]: fix compilation with gcc-10 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19387 ) Change subject: fix compilation with gcc-10 ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: I4a9896153876fcda496365776883827746205f00 Gerrit-Change-Number: 19387 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jul 2020 19:02:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 19:03:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 19:03:03 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Brel-1=2E2=2E1=5D=3A_Bump_version=3A_1=2E2=2E0=2E2-94ea_=E2=86=92_1=2E2=2E1?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19399 ) Change subject: Bump version: 1.2.0.2-94ea ? 1.2.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: I4ee92fecd7f1f48922c827c000742d195f78d8b9 Gerrit-Change-Number: 19399 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 26 Jul 2020 19:03:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 19:09:44 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 26 Jul 2020 19:09:44 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: silently ignore LCHAN_EV_RLL_ERR_IND In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19389 ) Change subject: lchan_fsm: silently ignore LCHAN_EV_RLL_ERR_IND ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I07aad62d25566d6068a95797915bb97fc3c66328 Gerrit-Change-Number: 19389 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 26 Jul 2020 19:09:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 19:09:57 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 26 Jul 2020 19:09:57 +0000 Subject: Change in osmo-bsc[master]: debian: Package E1 configuration file examples In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19314 ) Change subject: debian: Package E1 configuration file examples ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19314 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idf06c5fa7eb0ea6b73dcc3b67718b3a0a755796f Gerrit-Change-Number: 19314 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 26 Jul 2020 19:09:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 19:11:43 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 26 Jul 2020 19:11:43 +0000 Subject: Change in osmo-bts[rel-1.2.1]: fix compilation with gcc-10 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19387 ) Change subject: fix compilation with gcc-10 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: I4a9896153876fcda496365776883827746205f00 Gerrit-Change-Number: 19387 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 26 Jul 2020 19:11:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 19:12:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 19:12:09 +0000 Subject: Change in osmo-bts[rel-1.2.1]: fix compilation with gcc-10 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19387 ) Change subject: fix compilation with gcc-10 ...................................................................... fix compilation with gcc-10 /usr/bin/ld: /home/laforge/projects/git/osmo-bts/tests/sysmobts/../../src/osmo-bts-sysmo/tch.c:584: undefined reference to `femtobts_tch_pl_names' /usr/bin/ld: l1_transp_hw.o:/home/laforge/projects/git/osmo-bts/src/osmo-bts-sysmo/femtobts.h:108: multiple definition of `pdch_msu_size'; main.o:/home/laforge/projects/git/osmo-bts/src/osmo-bts-sysmo/femtobts.h:108: first defined here /usr/bin/ld: l1_transp_hw.o:/home/laforge/projects/git/osmo-bts/src/osmo-bts-sysmo/femtobts.h:71: multiple definition of `femtobts_l1prim_type'; main.o:/home/laforge/projects/git/osmo-bts/src/osmo-bts-sysmo/femtobts.h:71: first defined here see also: https://alioth-lists.debian.net/pipermail/debian-mobcom-maintainers/Week-of-Mon-20200413/000651.html Change-Id: I4a9896153876fcda496365776883827746205f00 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/osmo-bts-litecell15/lc15bts.h M src/osmo-bts-oc2g/oc2gbts.h M src/osmo-bts-sysmo/femtobts.h M tests/sysmobts/Makefile.am 6 files changed, 43 insertions(+), 42 deletions(-) Approvals: laforge: Looks good to me, approved; Verified fixeria: Looks good to me, approved diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 41998ad..3943e50 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -342,13 +342,13 @@ return get_value_string(lchan_ciph_state_names, state); } -enum { +enum gsm_bts_trx_ts_flags { TS_F_PDCH_ACTIVE = 0x1000, TS_F_PDCH_ACT_PENDING = 0x2000, TS_F_PDCH_DEACT_PENDING = 0x4000, TS_F_PDCH_PENDING_MASK = 0x6000 /*< TS_F_PDCH_ACT_PENDING | TS_F_PDCH_DEACT_PENDING */ -} gsm_bts_trx_ts_flags; +}; /* One Timeslot in a TRX */ struct gsm_bts_trx_ts { @@ -793,8 +793,8 @@ const char *btsvariant2str(enum gsm_bts_type_variant v); extern const struct value_string gsm_chreq_descs[]; -const struct value_string gsm_pchant_names[13]; -const struct value_string gsm_pchant_descs[13]; +extern const struct value_string gsm_pchant_names[13]; +extern const struct value_string gsm_pchant_descs[13]; const char *gsm_pchan_name(enum gsm_phys_chan_config c); enum gsm_phys_chan_config gsm_pchan_parse(const char *name); const char *gsm_lchant_name(enum gsm_chan_t c); diff --git a/include/osmo-bts/scheduler_backend.h b/include/osmo-bts/scheduler_backend.h index 51c957c..c52bc70 100644 --- a/include/osmo-bts/scheduler_backend.h +++ b/include/osmo-bts/scheduler_backend.h @@ -40,8 +40,8 @@ extern const ubit_t _sched_tsc[8][26]; extern const ubit_t _sched_egprs_tsc[8][78]; -const ubit_t _sched_fcch_burst[148]; -const ubit_t _sched_sch_train[64]; +extern const ubit_t _sched_fcch_burst[148]; +extern const ubit_t _sched_sch_train[64]; struct msgb *_sched_dequeue_prim(struct l1sched_trx *l1t, int8_t tn, uint32_t fn, enum trx_chan_type chan); diff --git a/src/osmo-bts-litecell15/lc15bts.h b/src/osmo-bts-litecell15/lc15bts.h index 4c40db0..31ca923 100644 --- a/src/osmo-bts-litecell15/lc15bts.h +++ b/src/osmo-bts-litecell15/lc15bts.h @@ -23,24 +23,24 @@ }; enum l1prim_type lc15bts_get_l1prim_type(GsmL1_PrimId_t id); -const struct value_string lc15bts_l1prim_names[GsmL1_PrimId_NUM+1]; +extern const struct value_string lc15bts_l1prim_names[GsmL1_PrimId_NUM+1]; GsmL1_PrimId_t lc15bts_get_l1prim_conf(GsmL1_PrimId_t id); enum l1prim_type lc15bts_get_sysprim_type(Litecell15_PrimId_t id); -const struct value_string lc15bts_sysprim_names[Litecell15_PrimId_NUM+1]; +extern const struct value_string lc15bts_sysprim_names[Litecell15_PrimId_NUM+1]; Litecell15_PrimId_t lc15bts_get_sysprim_conf(Litecell15_PrimId_t id); -const struct value_string lc15bts_l1sapi_names[GsmL1_Sapi_NUM+1]; -const struct value_string lc15bts_l1status_names[GSML1_STATUS_NUM+1]; +extern const struct value_string lc15bts_l1sapi_names[GsmL1_Sapi_NUM+1]; +extern const struct value_string lc15bts_l1status_names[GSML1_STATUS_NUM+1]; -const struct value_string lc15bts_tracef_names[29]; -const struct value_string lc15bts_tracef_docs[29]; +extern const struct value_string lc15bts_tracef_names[29]; +extern const struct value_string lc15bts_tracef_docs[29]; -const struct value_string lc15bts_tch_pl_names[15]; +extern const struct value_string lc15bts_tch_pl_names[15]; -const struct value_string lc15bts_clksrc_names[10]; +extern const struct value_string lc15bts_clksrc_names[10]; -const struct value_string lc15bts_dir_names[6]; +extern const struct value_string lc15bts_dir_names[6]; enum pdch_cs { PDCH_CS_1, @@ -59,6 +59,6 @@ _NUM_PDCH_CS }; -const uint8_t pdch_msu_size[_NUM_PDCH_CS]; +extern const uint8_t pdch_msu_size[_NUM_PDCH_CS]; #endif /* LC15BTS_H */ diff --git a/src/osmo-bts-oc2g/oc2gbts.h b/src/osmo-bts-oc2g/oc2gbts.h index 9eb8745..80fd1d5 100644 --- a/src/osmo-bts-oc2g/oc2gbts.h +++ b/src/osmo-bts-oc2g/oc2gbts.h @@ -39,26 +39,26 @@ }; enum l1prim_type oc2gbts_get_l1prim_type(GsmL1_PrimId_t id); -const struct value_string oc2gbts_l1prim_names[GsmL1_PrimId_NUM+1]; +extern const struct value_string oc2gbts_l1prim_names[GsmL1_PrimId_NUM+1]; GsmL1_PrimId_t oc2gbts_get_l1prim_conf(GsmL1_PrimId_t id); enum l1prim_type oc2gbts_get_sysprim_type(Oc2g_PrimId_t id); -const struct value_string oc2gbts_sysprim_names[Oc2g_PrimId_NUM+1]; +extern const struct value_string oc2gbts_sysprim_names[Oc2g_PrimId_NUM+1]; Oc2g_PrimId_t oc2gbts_get_sysprim_conf(Oc2g_PrimId_t id); -const struct value_string oc2gbts_l1sapi_names[GsmL1_Sapi_NUM+1]; -const struct value_string oc2gbts_l1status_names[GSML1_STATUS_NUM+1]; +extern const struct value_string oc2gbts_l1sapi_names[GsmL1_Sapi_NUM+1]; +extern const struct value_string oc2gbts_l1status_names[GSML1_STATUS_NUM+1]; -const struct value_string oc2gbts_tracef_names[29]; -const struct value_string oc2gbts_tracef_docs[29]; +extern const struct value_string oc2gbts_tracef_names[29]; +extern const struct value_string oc2gbts_tracef_docs[29]; -const struct value_string oc2gbts_tch_pl_names[15]; +extern const struct value_string oc2gbts_tch_pl_names[15]; -const struct value_string oc2gbts_clksrc_names[10]; +extern const struct value_string oc2gbts_clksrc_names[10]; -const struct value_string oc2gbts_dir_names[6]; +extern const struct value_string oc2gbts_dir_names[6]; -const struct value_string oc2gbts_rsl_ho_causes[IPAC_HO_RQD_CAUSE_MAX]; +extern const struct value_string oc2gbts_rsl_ho_causes[IPAC_HO_RQD_CAUSE_MAX]; enum pdch_cs { PDCH_CS_1, @@ -77,7 +77,7 @@ _NUM_PDCH_CS }; -const uint8_t pdch_msu_size[_NUM_PDCH_CS]; +extern const uint8_t pdch_msu_size[_NUM_PDCH_CS]; /* OC2G default parameters */ #define OC2G_BTS_MAX_CELL_SIZE_DEFAULT 166 /* 166 qbits is default value */ diff --git a/src/osmo-bts-sysmo/femtobts.h b/src/osmo-bts-sysmo/femtobts.h index 9163ebb..b048fc4 100644 --- a/src/osmo-bts-sysmo/femtobts.h +++ b/src/osmo-bts-sysmo/femtobts.h @@ -68,25 +68,25 @@ }; #endif -const enum l1prim_type femtobts_l1prim_type[GsmL1_PrimId_NUM]; -const struct value_string femtobts_l1prim_names[GsmL1_PrimId_NUM+1]; -const GsmL1_PrimId_t femtobts_l1prim_req2conf[GsmL1_PrimId_NUM]; +extern const enum l1prim_type femtobts_l1prim_type[GsmL1_PrimId_NUM]; +extern const struct value_string femtobts_l1prim_names[GsmL1_PrimId_NUM+1]; +extern const GsmL1_PrimId_t femtobts_l1prim_req2conf[GsmL1_PrimId_NUM]; -const enum l1prim_type femtobts_sysprim_type[SuperFemto_PrimId_NUM]; -const struct value_string femtobts_sysprim_names[SuperFemto_PrimId_NUM+1]; -const SuperFemto_PrimId_t femtobts_sysprim_req2conf[SuperFemto_PrimId_NUM]; +extern const enum l1prim_type femtobts_sysprim_type[SuperFemto_PrimId_NUM]; +extern const struct value_string femtobts_sysprim_names[SuperFemto_PrimId_NUM+1]; +extern const SuperFemto_PrimId_t femtobts_sysprim_req2conf[SuperFemto_PrimId_NUM]; -const struct value_string femtobts_l1sapi_names[GsmL1_Sapi_NUM+1]; -const struct value_string femtobts_l1status_names[GSML1_STATUS_NUM+1]; +extern const struct value_string femtobts_l1sapi_names[GsmL1_Sapi_NUM+1]; +extern const struct value_string femtobts_l1status_names[GSML1_STATUS_NUM+1]; -const struct value_string femtobts_tracef_names[29]; -const struct value_string femtobts_tracef_docs[29]; +extern const struct value_string femtobts_tracef_names[29]; +extern const struct value_string femtobts_tracef_docs[29]; -const struct value_string femtobts_tch_pl_names[15]; -const struct value_string femtobts_chcomb_names[8]; -const struct value_string femtobts_clksrc_names[10]; +extern const struct value_string femtobts_tch_pl_names[15]; +extern const struct value_string femtobts_chcomb_names[8]; +extern const struct value_string femtobts_clksrc_names[10]; -const struct value_string femtobts_dir_names[6]; +extern const struct value_string femtobts_dir_names[6]; enum pdch_cs { PDCH_CS_1, @@ -105,6 +105,6 @@ _NUM_PDCH_CS }; -const uint8_t pdch_msu_size[_NUM_PDCH_CS]; +extern const uint8_t pdch_msu_size[_NUM_PDCH_CS]; #endif /* FEMTOBTS_H */ diff --git a/tests/sysmobts/Makefile.am b/tests/sysmobts/Makefile.am index 0829ca5..53180d1 100644 --- a/tests/sysmobts/Makefile.am +++ b/tests/sysmobts/Makefile.am @@ -13,5 +13,6 @@ $(top_srcdir)/src/osmo-bts-sysmo/calib_file.c \ $(top_srcdir)/src/osmo-bts-sysmo/calib_fixup.c \ $(top_srcdir)/src/osmo-bts-sysmo/misc/sysmobts_par.c \ + $(top_srcdir)/src/osmo-bts-sysmo/femtobts.c \ $(top_srcdir)/src/osmo-bts-sysmo/eeprom.c sysmobts_test_LDADD = $(top_builddir)/src/common/libbts.a $(LIBOSMOABIS_LIBS) $(LDADD) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: I4a9896153876fcda496365776883827746205f00 Gerrit-Change-Number: 19387 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 19:12:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 19:12:10 +0000 Subject: Change in osmo-bts[rel-1.2.1]: bts-trx: trx_if.c: Fix some printf formats In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19398 ) Change subject: bts-trx: trx_if.c: Fix some printf formats ...................................................................... bts-trx: trx_if.c: Fix some printf formats Compiler from raspberrypi4 warns/errors about those. Change-Id: I4f973eb4ffdf8869b522d14e25853357fcd1e984 --- M src/osmo-bts-trx/trx_if.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index 099c330..f717a0c 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -394,8 +394,8 @@ goto parse_err; if (p - buf_in >= sizeof(rsp->cmd)) { - LOGP(DTRX, LOGL_ERROR, "cmd buffer too small %lu >= %lu\n", - p - buf_in, sizeof(rsp->cmd)); + LOGP(DTRX, LOGL_ERROR, "cmd buffer too small %lu >= %zu\n", + (long unsigned) (p - buf_in), sizeof(rsp->cmd)); goto parse_err; } @@ -415,7 +415,7 @@ k = p + strlen(p); if (strlen(k) >= sizeof(rsp->params)) { - LOGP(DTRX, LOGL_ERROR, "params buffer too small %lu >= %lu\n", + LOGP(DTRX, LOGL_ERROR, "params buffer too small %zu >= %zu\n", strlen(k), sizeof(rsp->params)); goto parse_err; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: I4f973eb4ffdf8869b522d14e25853357fcd1e984 Gerrit-Change-Number: 19398 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 19:12:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 26 Jul 2020 19:12:10 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Brel-1=2E2=2E1=5D=3A_Bump_version=3A_1=2E2=2E0=2E2-94ea_=E2=86=92_1=2E2=2E1?= In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19399 ) Change subject: Bump version: 1.2.0.2-94ea ? 1.2.1 ...................................................................... Bump version: 1.2.0.2-94ea ? 1.2.1 Cherry-pick gcc-10 compilation fixes. Change-Id: I4ee92fecd7f1f48922c827c000742d195f78d8b9 --- M debian/changelog 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index aa3269b..7d7b882 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +osmo-bts (1.2.1) unstable; urgency=medium + + [ Harald Welte ] + * fix compilation with gcc-10 + + [ Pau Espin Pedrol ] + * bts-trx: trx_if.c: Fix some printf formats + + -- Harald Welte Sun, 26 Jul 2020 20:50:12 +0200 + osmo-bts (1.2.0) unstable; urgency=medium [ Oliver Smith ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: rel-1.2.1 Gerrit-Change-Id: I4ee92fecd7f1f48922c827c000742d195f78d8b9 Gerrit-Change-Number: 19399 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 19:59:56 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 26 Jul 2020 19:59:56 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_if.py: do not validate TRXD message twice References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19400 ) Change subject: trx_toolkit/data_if.py: do not validate TRXD message twice ...................................................................... trx_toolkit/data_if.py: do not validate TRXD message twice DATAMSG.gen_msg() does validete the message before encoding. Change-Id: Ia3691b3c18778cf7a1f16c71bef5c0b2e6241190 Related: OS#4681 --- M src/target/trx_toolkit/data_if.py 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/00/19400/1 diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py index 18e53ed..b1b1ecb 100644 --- a/src/target/trx_toolkit/data_if.py +++ b/src/target/trx_toolkit/data_if.py @@ -105,10 +105,7 @@ return msg def send_msg(self, msg, legacy = False): - # Validate a message - msg.validate() - - # Generate TRX message + # Validate and encode TRXD message payload = msg.gen_msg(legacy) # Send message -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia3691b3c18778cf7a1f16c71bef5c0b2e6241190 Gerrit-Change-Number: 19400 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 19:59:56 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 26 Jul 2020 19:59:56 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_if.py: fix: handle encoding exceptions References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19401 ) Change subject: trx_toolkit/data_if.py: fix: handle encoding exceptions ...................................................................... trx_toolkit/data_if.py: fix: handle encoding exceptions Change-Id: I78163d41be3a912da1dd8c0543b1c3af3a0649fa Related: OS#4681 --- M src/target/trx_toolkit/data_if.py 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/01/19401/1 diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py index b1b1ecb..cab25aa 100644 --- a/src/target/trx_toolkit/data_if.py +++ b/src/target/trx_toolkit/data_if.py @@ -105,8 +105,14 @@ return msg def send_msg(self, msg, legacy = False): - # Validate and encode TRXD message - payload = msg.gen_msg(legacy) + try: + # Validate and encode TRXD message + payload = msg.gen_msg(legacy) + except ValueError as e: + log.error("Failed to encode a TRX2L1 message ('%s') " + "due to error: %s" % (msg.desc_hdr(), e)) + # TODO: we may want to send a NOPE.ind here + return # Send message self.send(payload) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I78163d41be3a912da1dd8c0543b1c3af3a0649fa Gerrit-Change-Number: 19401 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 20:28:42 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 26 Jul 2020 20:28:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test RR Channel Release EARFCNs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 ) Change subject: bsc: test RR Channel Release EARFCNs ...................................................................... Patch Set 3: (4 comments) Sorry for not sending all warnings at once, didn't have time to do more detailed review. In general, I am ok with this change, but I don't like that instead of introducing a separate test case for (RR) Channel Release EARFCNs, you're integrating more checks into the existing tests. I suggest to make f_expect_chan_rel() return the received Channel Release message (instead of overloading it with even more functionality), and introduce a separate test case verifying the EARFCN list it contains. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/3/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/3/bsc/BSC_Tests.ttcn at 1463 PS3, Line 1463: ispresent I think you should use istemplatekind(csfb_expect_cells, "omit") here. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/3/bsc/BSC_Tests.ttcn at 1472 PS3, Line 1472: ws https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/3/bsc/BSC_Tests.ttcn at 1774 PS3, Line 1774: ispresent Same here. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/3/bsc/BSC_Tests.ttcn at 1794 PS3, Line 1794: ws -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I882c5e1f70bcc4833fc837a95c900ce291919cc5 Gerrit-Change-Number: 19216 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Sun, 26 Jul 2020 20:28:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 20:38:14 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 26 Jul 2020 20:38:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test RR Channel Release cause codes from Clear Command cause codes In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217 ) Change subject: bsc: test RR Channel Release cause codes from Clear Command cause codes ...................................................................... Patch Set 3: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217/3/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217/3/bsc/BSC_Tests.ttcn at 1446 PS3, Line 1446: template RR_Cause expect_rr_cause := ? See my comment to the preceding change. This function should do as little as possible, in particular - expect channel release (and return it to the caller, so he/she can do further checks if needed). Yes, it's already overloaded with additional functionality, but it does not mean we should turn it into a swiss knife... -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie6c99f28b610a67f2d59ec00b3541940e882251b Gerrit-Change-Number: 19217 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 26 Jul 2020 20:38:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 20:54:11 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 26 Jul 2020 20:54:11 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_if.py: do not validate TRXD message twice In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19400 ) Change subject: trx_toolkit/data_if.py: do not validate TRXD message twice ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia3691b3c18778cf7a1f16c71bef5c0b2e6241190 Gerrit-Change-Number: 19400 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 26 Jul 2020 20:54:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 20:54:33 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 26 Jul 2020 20:54:33 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_if.py: fix: handle encoding exceptions In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19401 ) Change subject: trx_toolkit/data_if.py: fix: handle encoding exceptions ...................................................................... Patch Set 1: Verified+1 Code-Review+2 Tested on my machine, fixes the problem. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I78163d41be3a912da1dd8c0543b1c3af3a0649fa Gerrit-Change-Number: 19401 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 26 Jul 2020 20:54:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 20:55:02 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 26 Jul 2020 20:55:02 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_if.py: do not validate TRXD message twice In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19400 ) Change subject: trx_toolkit/data_if.py: do not validate TRXD message twice ...................................................................... trx_toolkit/data_if.py: do not validate TRXD message twice DATAMSG.gen_msg() does validete the message before encoding. Change-Id: Ia3691b3c18778cf7a1f16c71bef5c0b2e6241190 Related: OS#4681 --- M src/target/trx_toolkit/data_if.py 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py index 18e53ed..b1b1ecb 100644 --- a/src/target/trx_toolkit/data_if.py +++ b/src/target/trx_toolkit/data_if.py @@ -105,10 +105,7 @@ return msg def send_msg(self, msg, legacy = False): - # Validate a message - msg.validate() - - # Generate TRX message + # Validate and encode TRXD message payload = msg.gen_msg(legacy) # Send message -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia3691b3c18778cf7a1f16c71bef5c0b2e6241190 Gerrit-Change-Number: 19400 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Jul 26 20:55:03 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 26 Jul 2020 20:55:03 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_if.py: fix: handle encoding exceptions In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19401 ) Change subject: trx_toolkit/data_if.py: fix: handle encoding exceptions ...................................................................... trx_toolkit/data_if.py: fix: handle encoding exceptions Change-Id: I78163d41be3a912da1dd8c0543b1c3af3a0649fa Related: OS#4681 --- M src/target/trx_toolkit/data_if.py 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved; Verified diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py index b1b1ecb..cab25aa 100644 --- a/src/target/trx_toolkit/data_if.py +++ b/src/target/trx_toolkit/data_if.py @@ -105,8 +105,14 @@ return msg def send_msg(self, msg, legacy = False): - # Validate and encode TRXD message - payload = msg.gen_msg(legacy) + try: + # Validate and encode TRXD message + payload = msg.gen_msg(legacy) + except ValueError as e: + log.error("Failed to encode a TRX2L1 message ('%s') " + "due to error: %s" % (msg.desc_hdr(), e)) + # TODO: we may want to send a NOPE.ind here + return # Send message self.send(payload) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I78163d41be3a912da1dd8c0543b1c3af3a0649fa Gerrit-Change-Number: 19401 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Jul 27 01:40:02 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 27 Jul 2020 01:40:02 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1e3084283bd_2bd02ac693dbc6105996d7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 69s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 69s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 69s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 69s] | | [ 69s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 69s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 69s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 69s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 69s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 69s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 69s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 69s] cc1: all warnings being treated as errors [ 69s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 69s] make[3]: *** Waiting for unfinished jobs.... [ 69s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 69s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 69s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 69s] make[1]: *** [Makefile:166: all] Error 2 [ 69s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 69s] dh_auto_build: error: cd build && make -j16 "INSTALL=install --strip-program=true" returned exit code 2 [ 69s] make: *** [debian/rules:9: build] Error 25 [ 69s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 69s] ### VM INTERACTION START ### [ 72s] [ 64.307448] sysrq: SysRq : Power Off [ 72s] [ 64.313176] reboot: Power down [ 73s] ### VM INTERACTION END ### [ 73s] [ 73s] goat05 failed "build ulfius_2.5.2-4.1.dsc" at Mon Jul 27 01:39:46 UTC 2020. [ 73s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jul 27 02:05:11 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 27 Jul 2020 02:05:11 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1e366138064_2bd02ac693dbc61060316d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 118s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 118s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 118s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 118s] | | [ 118s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 118s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 118s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 118s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 118s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 118s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 118s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 118s] cc1: all warnings being treated as errors [ 118s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 118s] make[3]: *** Waiting for unfinished jobs.... [ 119s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 119s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 119s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 119s] make[1]: *** [Makefile:166: all] Error 2 [ 119s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 119s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 119s] make: *** [debian/rules:9: build] Error 25 [ 119s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 119s] ### VM INTERACTION START ### [ 122s] [ 102.027913] sysrq: SysRq : Power Off [ 122s] [ 102.033390] reboot: Power down [ 122s] ### VM INTERACTION END ### [ 122s] [ 122s] cloud136 failed "build ulfius_2.5.2-4.1.dsc" at Mon Jul 27 02:05:09 UTC 2020. [ 122s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Jul 27 08:37:51 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jul 2020 08:37:51 +0000 Subject: Change in osmo-sgsn[master]: Send a BVC-RESET to all presistent Gb interfaces at start-up In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 ) Change subject: Send a BVC-RESET to all presistent Gb interfaces at start-up ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-sgsn/+/19027/3/src/sgsn/sgsn_main.c File src/sgsn/sgsn_main.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/19027/3/src/sgsn/sgsn_main.c at 215 PS3, Line 215: nsvc->state |= NSE_S_ALIVE; This looks like a hack. Is it really becoming ALIVE? if we cannot send data over it, why do we send a RESET? Shouldn't this specific case (send RESET) be handled inside bssgp_tx_bvc_reset2? -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Gerrit-Change-Number: 19027 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 27 Jul 2020 08:37:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 09:00:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jul 2020 09:00:01 +0000 Subject: Change in osmo-trx[master]: Transceiver: Check log level before generating burst str representation References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/19402 ) Change subject: Transceiver: Check log level before generating burst str representation ...................................................................... Transceiver: Check log level before generating burst str representation Avoid entering the logRxBurst() function and running a long loop even if not used. Change-Id: I67408bc8643d5d97355f277c4a2007064a83ae90 --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/02/19402/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 55d0acd..c92a61b 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -1165,7 +1165,7 @@ return false; /* other errors: we want to stop the process */ } - if (!bi.idle) + if (!bi.idle && log_check_level(DTRXDUL, LOGL_DEBUG)) logRxBurst(chan, &bi); switch (mVersionTRXD[chan]) { -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I67408bc8643d5d97355f277c4a2007064a83ae90 Gerrit-Change-Number: 19402 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 09:09:56 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 27 Jul 2020 09:09:56 +0000 Subject: Change in osmo-gsm-manuals[master]: Drop common/chapters/{bts, bsc}.adoc In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19330 ) Change subject: Drop common/chapters/{bts,bsc}.adoc ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I4d98049f6b49871bf5aabe4392da7a608fbc1fe9 Gerrit-Change-Number: 19330 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jul 2020 09:09:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 09:50:37 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jul 2020 09:50:37 +0000 Subject: Change in osmo-gsm-manuals[master]: Drop common/chapters/{bts, bsc}.adoc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19330 ) Change subject: Drop common/chapters/{bts,bsc}.adoc ...................................................................... Patch Set 1: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I4d98049f6b49871bf5aabe4392da7a608fbc1fe9 Gerrit-Change-Number: 19330 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jul 2020 09:50:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 09:50:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jul 2020 09:50:41 +0000 Subject: Change in osmo-gsm-manuals[master]: Drop common/chapters/{bts, bsc}.adoc In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19330 ) Change subject: Drop common/chapters/{bts,bsc}.adoc ...................................................................... Drop common/chapters/{bts,bsc}.adoc Those files were only used by osmo-bsc.git and openbsc.git, the later being depreacted and not maintained. Hence, new features are added to the first one only, and documentation diverges over time, so it makes no sense to keep it shared. Files were copied over in: openbsc.git Change-Id Ic3b4192238be3147f61779845521eae84511fb7e osmo-bsc.git Change-Id I20aa60d2f4111d66e922f3e2a73a20352ec1f7e4 Change-Id: I4d98049f6b49871bf5aabe4392da7a608fbc1fe9 --- D common/chapters/bsc.adoc D common/chapters/bts.adoc 2 files changed, 0 insertions(+), 625 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/common/chapters/bsc.adoc b/common/chapters/bsc.adoc deleted file mode 100644 index 49d25e5..0000000 --- a/common/chapters/bsc.adoc +++ /dev/null @@ -1,120 +0,0 @@ -== BSC level configuration - -The BSC component is shared between OsmoBSC and OsmoNITB. This chapter -describes some of the configuration options related to this shared BSC -component. - -=== Hand-over - -==== Hand-over in GSM - -Hand-over is the process of changing a MS with a currently active -dedicated channel from one BTS to another BTS. As opposed to idle mode, -where the MS autonomously performs cell re-selection, in dedicated mode -this happens under network control. - -In order to determine when to perform hand-over, and to which cells, the -network requests the MS to perform measurements on a list of neighbor -cell channels, which the MS then reports back to the network in the form -of GSM RR 'Measurement Result' messages. Those messages contain the -downlink measurements as determined by the MS. - -Furthermore, the BTS also performs measurements on the uplink, and -communicates those by means of RSL to the BSC. - -The hand-over decision is made by an algorithm that processes those -measurement results and determines when to perform the hand-over. - -==== Configuration of hand-over in OsmoBSC/OsmoNITB - -OsmoBSC (like the internal BSC component of OsmoNITB) only support -so-called intra-BSC hand-over, where the hand-over is performed between -two BTSs within the same BSC. - -Hand-over is enabled and configured by the use of a set of `handover` -commands. Using those, you can tune the key parameters of the hand-over -algorithm and adapt it to your specific environment. - -.Example handover configuration snippet ----- - handover 1 <1> - handover window rxlev averaging 10 <2> - handover window rxqual averaging 1 <3> - handover window rxlev neighbor averaging 10 <4> - handover power budget interval 6 <5> - handover power budget hysteresis 3 <6> - handover maximum distance 9999 <7> ----- -<1> Enable hand-over -<2> Set the RxLev averaging window for the serving cell to 10 measurements -<3> Set the RxQual averaging window for the serving cell to 1 - measurement (no window) -<4> Set the RxLev averaging for neighbor cells to 10 measurements -<5> Check for the conditions of a power budget hand-over every 6 SACCH - frames -<6> A neighbor cell must be at least 3 dB stronger than the serving cell - to be considered a candidate for hand-over -<7> Perform a maximum distance hand-over if TA is larger 9999 (i.e. never) - -//TODO: Move all to BSC node - -=== Timer Configuration - -The GSM specification specifies a variety of timers both on the network -as well as on the mobile station side. - -Those timers can be configured using the `timer tXXXX` command. - -.Configurable Timers -|=== -|node|timer|default|description -|network|t3101|10|Timeout for 'Immediate Assignment' (sec) -|network|t3103|?|Timeout for Handover (sec) -|network|t3105|40|Repetition of 'Physical Information' (sec) -|network|t3107|?|? -|network|t3109|?|RSL SACCH deactivation timeout (sec) -|network|t3111|?|RSL timeout to wait before releasing the RF channel (sec) -|network|t3113|60|Time to try paging for a subscriber (sec) -|network|t3115|?|? -|network|t3117|?|? -|network|t3119|?|? -|network|t3122|10|Waiting time after 'Immediate Assignment Reject' -|network|t3141|?|? -|=== - -//TODO: split between BSC and MSC timers - -=== Discontinuous Transmission (DTX) - -GSM provides a full-duplex voice call service. However, in any -civilized communication between human beings, only one of the -participants is speaking at any given point in time. This means that -most of the time, one of the two directions of the radio link is -transmitting so-called 'silence frames'. - -During such periods of quiescence in one of the two directions, it is -possible to suppress transmission of most of the radio bursts, as there -is no voice signal to transport. GSM calls this feature 'Discontinuous -Transmission'. It exists separately for uplink (DTXu) and downlink -(DTXd). - -Downlink DTX is only permitted on non-primary transceivers (!= TRX0), as -TRX0 must always transmit at constant output power to ensure it is -detected during cell selection. - -Uplink DTX is possible on any TRX, and serves primarily two uses: - -possible on any TRX, and serves primarily two uses: - -. reducing the MS battery consumption by transmitting at a lower duty cycle -. reducing the uplink interference caused in surrounding cells that - re-use the same ARFCN. - -DTS for both uplink and downlink is implemented in the BTS. Not all BTS -models support it. - -The Osmocom BSC component can instruct the BTS to enable or disable -uplink and/or downlink DTX by means of A-bis OML. - -//TODO: Test/implement, at least for uplink -//TODO: Move to BSC diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc deleted file mode 100644 index 223cec1..0000000 --- a/common/chapters/bts.adoc +++ /dev/null @@ -1,505 +0,0 @@ -[[bts]] -== Reviewing and Provisioning BTS configuration - -The main functionality of the BSC component is to manage BTSs. As such, -provisioning BTSs within the BSC is one of the most common tasks during -BSC operation. Just like about anything else in OsmoBSC, they are -configured using the VTY. - -BTSs are internally numbered with integer numbers starting from "0" for -the first BTS. BTS numbers have to be contiguous, so you cannot -configure 0,1,2 and then 5. - - -=== Reviewing current BTS status and configuration - -In order to view the status and properties of a BTS, you can issue the -`show bts` command. If used without any BTS number, it will display -information about all provisioned BTS numbers. - ----- -OsmoBSC> show bts 0 -BTS 0 is of nanobts type in band DCS1800, has CI 0 LAC 1, BSIC 63, TSC 7 and 1 TRX -Description: (null) -MS Max power: 15 dBm -Minimum Rx Level for Access: -110 dBm -Cell Reselection Hysteresis: 4 dBm -RACH TX-Integer: 9 -RACH Max transmissions: 7 -System Information present: 0x0000007e, static: 0x00000000 - Unit ID: 200/0/0, OML Stream ID 0xff - NM State: Oper 'Enabled', Admin 2, Avail 'OK' - Site Mgr NM State: Oper 'Enabled', Admin 0, Avail 'OK' - Paging: 0 pending requests, 0 free slots - OML Link state: connected. - Current Channel Load: - TCH/F: 0% (0/5) - SDCCH8: 0% (0/8) ----- - -You can also review the status of the TRXs configured within the BTSs of -this BSC by using `show trx`: - ----- -OsmoBSC> show trx 0 0 -TRX 0 of BTS 0 is on ARFCN 871 -Description: (null) - RF Nominal Power: 23 dBm, reduced by 0 dB, resulting BS power: 23 dBm - NM State: Oper 'Enabled', Admin 2, Avail 'OK' - Baseband Transceiver NM State: Oper 'Enabled', Admin 2, Avail 'OK' - ip.access stream ID: 0x00 ----- - -The output can be restricted to the TRXs of one specified BTS number -(`show trx 0`) or even that of a single specified TRX within a -specified BTS (`show trx 0 0`). - -Furthermore, information on the individual timeslots can be shown by -means of `show timeslot`. The output can be restricted to the -timeslots of a single BTS (`show timeslot 0`) or that of a single -TRX (`show timeslot 0 0`). Finally, you can restrict the output to -a single timeslot by specifying the BTS, TRX and TS numbers (`show -timeslot 0 0 4`). - ----- -OsmoBSC> show timeslot 0 0 0 -BTS 0, TRX 0, Timeslot 0, phys cfg CCCH, TSC 7 - NM State: Oper 'Enabled', Admin 2, Avail 'OK' -OsmoBSC> show timeslot 0 0 1 -BTS 0, TRX 0, Timeslot 1, phys cfg SDCCH8, TSC 7 - NM State: Oper 'Enabled', Admin 2, Avail 'OK' ----- - - -=== Provisioning a new BTS - -In order to provision BTSs, you have to enter the BTS config node of the -VTY. In order to configure BTS 0, you can issue the following sequence -of commands: - ----- -OsmoBSC> enable -OsmoBSC# configure terminal -OsmoBSC(config)# network -OsmoBSC(config-net)# bts 0 -OsmoBSC(config-net-bts)# ----- - -At this point, you have a plethora of commands, in fact an entire -hierarchy of commands to configure all aspects of the BTS, as well as -each of its TRX and each timeslot within each TRX. For a full -reference, please consult the telnet VTY integrated help or the respective -chapter in the VTY reference. - -BTS configuration depends quite a bit on the specific BTS vendor and -model. The section below provides just one possible example for the -case of a sysmoBTS. - -Note that from the `configure terminal` command onwards, the telnet VTY -commands above are identical to configuration file settings, for details see -<>. - -Starting with `network` as above, your complete sysmoBTS configuration may look -like this: - ----- -network - bts 0 - type sysmobts - band DCS1800 - description The new BTS in Baikonur - location_area_code 2342 - cell_identity 5 - base_station_id_code 63 - ip.access unit_id 8888 0 - ms max power 40 - trx 0 - arfcn 871 - nominal power 23 - max_power_red 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - timeslot 1 - phys_chan_config TCH/F - timeslot 2 - phys_chan_config TCH/F - timeslot 3 - phys_chan_config TCH/F - timeslot 4 - phys_chan_config TCH/F - timeslot 5 - phys_chan_config TCH/F - timeslot 6 - phys_chan_config TCH/F - timeslot 7 - phys_chan_config PDCH ----- - - -=== System Information configuration - -A GSM BTS periodically transmits a series of 'SYSTEM INFORMATION' -messages to mobile stations, both via the BCCH in idle mode, was well as -via the SACCH in dedicated mode. There are many different types of such -messages. For their detailed contents and encoding, please see _3GPP TS -24.008_ <<3gpp-ts-24-008>>. - -For each of the 'SYSTEM INFORMATION' message types, you can configure to -have the BSC generate it automatically ('computed'), or you can specify -the respective binary message as a string of hexadecimal digits. - -The default configuration is to compute all (required) 'SYSTEM -INFORMATION' messages automatically. - -Please see the _OsmoBSC VTY Reference Manual_ <> for -further information, particularly on the following commands: - -* `system-information (1|2|3|4|5|6|7|8|9|10|13|16|17|18|19|20|2bis|2ter|2quater|5bis|5ter) mode (static|computed)` -* `system-information (1|2|3|4|5|6|7|8|9|10|13|16|17|18|19|20|2bis|2ter|2quater|5bis|5ter) static HEXSTRING` - - -=== Neighbor List configuration - -Every BTS sends a list of ARFCNs of neighbor cells -. within its 'SYSTEM INFORMATION 2' (and 2bis/2ter) messages on the BCCH -. within its 'SYSTEM INFORMATION 5' messages on SACCH in dedicated mode - -For every BTS config node in the VTY, you can specify the behavior of -the neighbor list using the `neighbor list mode` VTY command: - -automatic:: - Automatically generate a list of neighbor cells using all other - BTSs configured in the VTY -manual:: - Manually specify the neighbor list by means of `neighbor-list -(add|del) arfcn <0-1023>` commands, having identical neighbor lists on -BCCH (SI2) and SACCH (SI5) - -manual-si5:: - Manually specify the neighbor list by means of `neighbor-list -(add|del) arfcn <0-1023>` for BCCH (SI2) and a separate neighbor list by -means of `si5 neighbor-list (add|del) arfcn <0-1023>` for SACCH (SI5). - - -=== Configuring GPRS PCU parameters of a BTS - -In the case of BTS models using Abis/IP (IPA), the GPRS PCU is located -inside the BTS. The BTS then establishes a Gb connection to the SGSN. - -All the BTS-internal PCU configuration is performed via A-bis OML by -means of configuring the 'CELL', 'NSVC' (NS Virtual Connection and 'NSE' -(NS Entity). - -There is one 'CELL' node and one 'NSE' node, but there are two 'NSVC' -nodes. At the time of this writing, only the NSVC 0 is supported by -OsmoBTS, while both NSVC are supported by the ip.access nanoBTS. - -The respective VTY configuration parameters are described below. They -all exist beneath each BTS VTY config node. - -But let's first start with a small example - -.Example configuration of GPRS PCU parameters at VTY BTS node ----- -OsmoBSC(config-net-bts)# gprs mode gprs -OsmoBSC(config-net-bts)# gprs routing area 1 -OsmoBSC(config-net-bts)# gprs cell bvci 1234 -OsmoBSC(config-net-bts)# gprs nsei 1234 -OsmoBSC(config-net-bts)# gprs nsvc 0 nsvci 1234 -OsmoBSC(config-net-bts)# gprs nsvc 0 local udp port 23000 -OsmoBSC(config-net-bts)# gprs nsvc 0 remote udp port 23000 -OsmoBSC(config-net-bts)# gprs nsvc 0 remote ip 192.168.100.239 ----- - - -=== More explanation about the PCU config parameters - -//FIXME: should this go into VTY additions? - -==== `gprs mode (none|gprs|egprs)` - -This command determines if GPRS (or EGPRS) services are to be enabled in -this cell at all. - - -==== `gprs cell bvci <2-65535>` - -Configures the 'BSSGP Virtual Circuit Identifier'. It must be unique -between all BGSGP connections to one SGSN. - -NOTE: It is up to the system administrator to ensure all PCUs are -allocated an unique bvci. OsmoBSC will not ensure this policy. - - -==== `gprs nsei <0-65535>` - -Configures the 'NS Entity Identifier'. It must be unique between all NS -connections to one SGSN. - -NOTE: It is up to the system administrator to ensure all PCUs are -allocated an unique bvci. OsmoBSC will not ensure this policy. - - -==== `gprs nsvc <0-1> nsvci <0-65535>` - -Configures the 'NS Virtual Connection Identifier'. It must be unique -between all NS virtual connections to one SGSN. - -NOTE: It is up to the system administrator to ensure all PCUs are -allocated an unique nsvci. OsmoBSC will not ensure this policy. - - -==== `gprs nsvc <0-1> local udp port <0-65535>` - -Configures the local (PCU side) UDP port for the NS-over-UDP link. - - -==== `gprs nsvc <0-1> remote udp port <0-65535>` - -Configures the remote (SGSN side) UDP port for the NS-over-UDP link. - - -==== `gprs nsvc <0-1> remote ip A.B.C.D` - -Configures the remote (SGSN side) UDP port for the NS-over-UDP link. - - -==== `gprs ns timer (tns-block|tns-block-retries|tns-reset|tns-reset-retries|tns-test|tns-alive|tns-alive-retries)` <0-255> - -Configures the various GPRS NS related timers. Please check the GPRS NS -specification for the detailed meaning of those timers. - - -=== Dynamic Timeslot Configuration (TCH / PDCH) - -A dynamic timeslot is in principle a voice timeslot (TCH) that is used to serve -GPRS data (PDCH) when no voice call is active on it. This enhances GPRS -bandwidth while no voice calls are active, which is dynamically scaled down as -voice calls need to be served. This is a tremendous improvement in service over -statically assigning a fixed number of timeslots for voice and data. - -The causality is as follows: to establish a voice call, the -MSC requests a logical channel of a given TCH kind from the BSC. The BSC -assigns such a channel from a BTS' TRX's timeslot of its choice. The knowledge -that a given timeslot is dynamic exists only on the BSC level. When the MSC -asks for a logical channel, the BSC may switch off PDCH on a dynamic timeslot -and then assign a logical TCH channel on it. Hence, though compatibility with -the BTS needs to be ensured, any MSC is compatible with dynamic timeslots by -definition. - -OsmoBSC and OsmoNITB support two kinds of dynamic timeslot handling, configured -via the `network` / `bts` / `trx` / `timeslot` / `phys_chan_config` -configuration. Not all BTS models support dynamic channels. - -[[dyn_ts_compat]] -.Dynamic timeslot support by various BTS models -[cols="50%,25%,25%"] -|=== -| |`TCH/F_TCH/H_PDCH` |`TCH/F_PDCH` -|ip.access nanoBTS |- |supported -|Ericsson RBS |supported |- -|sysmoBTS using _osmo-bts-sysmo_ |supported |supported -|various SDR platforms using _osmo-bts-trx_ |supported |supported -|Nutaq Litecell 1.5 using _osmo-bts-litecell15_ |supported |supported -|Octasic OctBTS using _osmo-bts-octphy_ | supported | supported -|=== - -The _OsmoBTS Abis Protocol Specification_ <> describes the -non-standard RSL messages used for these timeslot kinds. - -NOTE: Same as for dedicated PDCH timeslots, you need to enable GPRS and operate -a PCU, SGSN and GGSN to provide the actual data service. - -==== Osmocom Style Dynamic Timeslots (TCH/F_TCH/H_PDCH) - -Timeslots of the `TCH/F_TCH/H_PDCH` type dynamically switch between TCH/F, -TCH/H and PDCH, depending on the channel kind requested by the MSC. The RSL -messaging for `TCH/F_TCH/H_PDCH` timeslots is compatible with Ericsson RBS. - -BTS models supporting this timeslot kind are shown in <>. - -In the lack of transcoding capabilities, this timeslot type may cause -mismatching codecs to be selected for two parties of the same call, which would -cause call routing to fail ("`Cannot patch through call with different channel -types: local = TCH_F, remote = TCH_H`"). A workaround is to disable TCH/F on -this timeslot type, i.e. to allow only TCH/H. To disable TCH/F on Osmocom -style dynamic timeslots, use a configuration of - ----- -network - dyn_ts_allow_tch_f 0 ----- - -In OsmoNITB, disabling TCH/F on Osmocom dynamic timeslots is the default. In -OsmoBSC, the default is to allow both. - -==== ip.access Style Dynamic Timeslots (TCH/F_PDCH) - -Timeslots of the `TCH/F_PDCH` type dynamically switch between TCH/F and PDCH. -The RSL messaging for `TCH/F_PDCH` timeslots is compatible with ip.access -nanoBTS. - -BTS models supporting this timeslot kind are shown in <>. - -==== Avoid PDCH Exhaustion - -To avoid disrupting GPRS, configure at least one timeslot as dedicated PDCH. -With only dynamic timeslots, a given number of voice calls would convert all -timeslots to TCH, and no PDCH timeslots would be left for GPRS service. - -==== Dynamic Timeslot Configuration Examples - -This is an extract of an `osmo-bsc` or `osmo-nitb` config file. A timeslot -configuration with five Osmocom style dynamic timeslots and one dedicated PDCH -may look like this: - ----- -network - bts 0 - trx 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - timeslot 1 - phys_chan_config SDCCH8 - timeslot 2 - phys_chan_config TCH/F_TCH/H_PDCH - timeslot 3 - phys_chan_config TCH/F_TCH/H_PDCH - timeslot 4 - phys_chan_config TCH/F_TCH/H_PDCH - timeslot 5 - phys_chan_config TCH/F_TCH/H_PDCH - timeslot 6 - phys_chan_config TCH/F_TCH/H_PDCH - timeslot 7 - phys_chan_config PDCH ----- - -With the ip.access nanoBTS, only `TCH/F_PDCH` dynamic timeslots are supported, -and hence a nanoBTS configuration may look like this: - ----- -network - bts 0 - trx 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - timeslot 1 - phys_chan_config SDCCH8 - timeslot 2 - phys_chan_config TCH/F_PDCH - timeslot 3 - phys_chan_config TCH/F_PDCH - timeslot 4 - phys_chan_config TCH/F_PDCH - timeslot 5 - phys_chan_config TCH/F_PDCH - timeslot 6 - phys_chan_config TCH/F_PDCH - timeslot 7 - phys_chan_config PDCH ----- - -=== Tuning Access to the BTS - -OsmoBSC offers several configuration options to fine-tune access to the BTS. -It can allow only a portion of the subscribers access to the network. -This can also be used to ramp up access to the network on startup by slowly -letting in more and more subscribers. This is especially useful for isolated -cells with a huge number of subscribers. - -Other options control the behaviour of the MS when it needs to access the -random access channel before a dedicated channel is established. - -If the BTS is connected to the BSC via a high-latency connection the MS should -wait longer for an answer to a RACH request. If it does not the network will -have to deal with an increased load due to duplicate RACH requests. However, -in order to minimize the delay when a RACH request or response gets lost the -MS should not wait too long before retransmitting. - -==== Load Management - -Every SIM card is member of one of the ten regular ACCs (0-9). Access to the -BTS can be restricted to SIMs that are members of certain ACCs. - -Since the ACCs are distributed uniformly across all SIMs allowing only ACCs -0-4 to connect to the BTS should reduce its load by 50%. - -The default is to allow all ACCs to connect. - -.Example: Restrict access to the BTS by ACC ----- -network - bts 0 - rach access-control-class 1 barred <1> - rach access-control-class 9 allowed <2> ----- -<1> Disallow SIMs with access-class 1 from connecting to the BTS -<2> Permit SIMs with access-class 9 to connect to the BTS. - - -Smaller cells with lots of subscribers can be overwhelmed with traffic after -the network is turned on. This is especially true in areas with little to no -reception from other networks. To manage the load OsmoBSC has an option to -enable one Access Class at a time so initial access to the network is -distributed across a longer time. - -.Example: Ramp up access to the BTS after startup ----- -network - bts 0 - access-control-class-ramping <1> - access-control-class-ramping-step-interval 30 <2> - access-control-class-ramping-step-size 1 <3> ----- -<1> Turn on access-control-class ramping -<2> Enable more ACCs every 30 seconds -<3> At each step enable one more ACC - - -==== RACH Parameter Configuration - -The following parameters allow control over how the MS can access the random -access channel (RACH). It is possible to set a minimum receive level under -which the MS will not even attempt to access the network. - -The RACH is a shared channel which means multiple MS can choose to send a -request at the same time. To minimize the risk of a collision each MS will -choose a random number of RACH slots to wait before trying to send a RACH -request. - -On very busy networks the range this number is chosen from should be -high to avoid collisions, but a lower range reduces the overall delay when -trying to establish a channel. - -The option `rach tx integer N` controls the range from which this number X -is chosen. It is `0 <= X < max(8,N)`. - -After sending a RACH request the MS will wait a random amount of slots before -retransmitting its RACH request. The range it will wait is also determined by -the option `rach tx integer N`, but calculating it is not so straightforward. -It is defined as `S <= X < S+N` where `S` is determined from a table. - -In particular `S` is lowest when `N` is one of 3, 8, 14 or 50 and highest when -`N` is 7, 12 or 32. - -For more information see _3GPP TA 44.018_ <<3gpp-ts-44-018>> Ch. 3.3.1.1.2 and -Table 3.3.1.1.2.1 in particular. - -The amount of times the MS attempts to retransmit RACH requests can also be -changed. A higher number means more load on the RACH while a lower number can -cause channel establishment to fail due to collisions or bad reception. - -.Example: Configure RACH Access Parameters ----- -network - bts 0 - rxlev access min 20 <1> - rach tx integer 50<2> - rach max transmission <3> ----- -<1> Allow access to the network if the MS receives the BCCH of the cell at --90dBm or better (20dB above -110dBm). -<2> This number affects how long the MS waits before (re-)transmitting RACH -requests. -<3> How often to retransmit the RACH request. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I4d98049f6b49871bf5aabe4392da7a608fbc1fe9 Gerrit-Change-Number: 19330 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 09:55:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jul 2020 09:55:20 +0000 Subject: Change in osmo-trx[master]: Transceiver: Add several rate_ctr for rx error conditions References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/19403 ) Change subject: Transceiver: Add several rate_ctr for rx error conditions ...................................................................... Transceiver: Add several rate_ctr for rx error conditions Since there's now a rate counter, we can drop log level for those events which can be bursty and hence print lots of output in short periods of time, which may affect performance. This way setting them to INFO it's enough to avoid getting them in stderr unless explicitly configured by the user (for instance to debug stuff), while still allowing a good enough level to be enabled for other targets such as gsmtap. Related: OS#4679 Change-Id: I000f7112e35ac68d3d922444f78468b1ea74cbba --- M CommonLibs/osmo_signal.h M CommonLibs/trx_rate_ctr.cpp M CommonLibs/trx_rate_ctr.h M Transceiver52M/Transceiver.cpp 4 files changed, 33 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/03/19403/1 diff --git a/CommonLibs/osmo_signal.h b/CommonLibs/osmo_signal.h index 13646a1..003e7af 100644 --- a/CommonLibs/osmo_signal.h +++ b/CommonLibs/osmo_signal.h @@ -65,4 +65,7 @@ unsigned int tx_trxd_fn_repeated; unsigned int tx_trxd_fn_outoforder; unsigned int tx_trxd_fn_skipped; + unsigned int rx_empty_burst; + unsigned int rx_clipping; + unsigned int rx_no_burst_detected; }; diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp index 1f44404..e902ff1 100644 --- a/CommonLibs/trx_rate_ctr.cpp +++ b/CommonLibs/trx_rate_ctr.cpp @@ -107,6 +107,9 @@ { TRX_CTR_TRX_TRXD_FN_REPEATED, "tx_trxd_fn_repeated" }, { TRX_CTR_TRX_TRXD_FN_OUTOFORDER, "tx_trxd_fn_outoforder" }, { TRX_CTR_TRX_TRXD_FN_SKIPPED, "tx_trxd_fn_skipped" }, + { TRX_CTR_TRX_RX_EMPTY_BURST, "rx_empty_burst" }, + { TRX_CTR_TRX_RX_CLIPPING, "rx_clipping" }, + { TRX_CTR_TRX_RX_NO_BURST_DETECTED, "rx_no_burst_detected" }, { 0, NULL } }; @@ -122,6 +125,9 @@ [TRX_CTR_TRX_TRXD_FN_REPEATED] = { "trx:tx_trxd_fn_repeated", "Number of Tx burts received from TRXD with repeated FN" }, [TRX_CTR_TRX_TRXD_FN_OUTOFORDER] = { "trx:tx_trxd_fn_outoforder","Number of Tx burts received from TRXD with a past FN" }, [TRX_CTR_TRX_TRXD_FN_SKIPPED] = { "trx:tx_trxd_fn_skipped", "Number of Tx burts potentially skipped due to FN jumps" }, + [TRX_CTR_TRX_RX_EMPTY_BURST] = { "trx:rx_empty_burst", "Number of Rx bursts empty" }, + [TRX_CTR_TRX_RX_CLIPPING] = { "trx:rx_clipping", "Number of Rx bursts discarded due to clipping" }, + [TRX_CTR_TRX_RX_NO_BURST_DETECTED] = { "trx:rx_no_burst_detected", "Number of Rx burts discarded due to burst detection error" }, }; static const struct rate_ctr_group_desc trx_chan_ctr_group_desc = { @@ -182,6 +188,12 @@ rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_trxd_fn_outoforder - ctr->current); ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TRXD_FN_SKIPPED]; rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_trxd_fn_skipped - ctr->current); + ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_RX_EMPTY_BURST]; + rate_ctr_add(ctr, trx_ctrs_pending[chan].rx_empty_burst - ctr->current); + ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_RX_CLIPPING]; + rate_ctr_add(ctr, trx_ctrs_pending[chan].rx_clipping - ctr->current); + ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_RX_NO_BURST_DETECTED]; + rate_ctr_add(ctr, trx_ctrs_pending[chan].rx_no_burst_detected - ctr->current); /* Mark as done */ trx_ctrs_pending[chan].chan = PENDING_CHAN_NONE; } diff --git a/CommonLibs/trx_rate_ctr.h b/CommonLibs/trx_rate_ctr.h index c4c05ef..72125c2 100644 --- a/CommonLibs/trx_rate_ctr.h +++ b/CommonLibs/trx_rate_ctr.h @@ -15,6 +15,9 @@ TRX_CTR_TRX_TRXD_FN_REPEATED, TRX_CTR_TRX_TRXD_FN_OUTOFORDER, TRX_CTR_TRX_TRXD_FN_SKIPPED, + TRX_CTR_TRX_RX_EMPTY_BURST, + TRX_CTR_TRX_RX_CLIPPING, + TRX_CTR_TRX_RX_NO_BURST_DETECTED, }; struct ctr_threshold { diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index c92a61b..c3ef377 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -638,6 +638,7 @@ GSM::Time burstTime; SoftVector *rxBurst; TransceiverState *state = &mStates[chan]; + bool ctr_changed = false; /* Blocking FIFO read */ radioVector *radio_burst = mReceiveFIFO[chan]->read(); @@ -687,7 +688,9 @@ } if (max_i < 0) { - LOGCHAN(chan, DTRXDUL, FATAL) << "Received empty burst"; + LOGCHAN(chan, DTRXDUL, INFO) << "Received empty burst"; + state->ctrs.rx_empty_burst++; + ctr_changed = true; goto ret_idle; } @@ -713,10 +716,15 @@ /* Detect normal or RACH bursts */ rc = detectAnyBurst(*burst, mTSC, BURST_THRESH, mSPSRx, type, max_toa, &ebp); if (rc <= 0) { - if (rc == -SIGERR_CLIP) - LOGCHAN(chan, DTRXDUL, NOTICE) << "Clipping detected on received RACH or Normal Burst"; - else if (rc != SIGERR_NONE) - LOGCHAN(chan, DTRXDUL, NOTICE) << "Unhandled RACH or Normal Burst detection error"; + if (rc == -SIGERR_CLIP) { + LOGCHAN(chan, DTRXDUL, INFO) << "Clipping detected on received RACH or Normal Burst"; + state->ctrs.rx_clipping++; + ctr_changed = true; + } else if (rc != SIGERR_NONE) { + LOGCHAN(chan, DTRXDUL, INFO) << "Unhandled RACH or Normal Burst detection error"; + state->ctrs.rx_no_burst_detected++; + ctr_changed = true; + } goto ret_idle; } @@ -743,6 +751,8 @@ return 0; ret_idle: + if (ctr_changed) + dispatch_trx_rate_ctr_change(state, chan); bi->idle = true; delete radio_burst; return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I000f7112e35ac68d3d922444f78468b1ea74cbba Gerrit-Change-Number: 19403 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 10:38:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jul 2020 10:38:20 +0000 Subject: Change in osmo-bts[master]: common: Avoid call to bts_model_chg_adm_state() if there's no ADM sta... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19404 ) Change subject: common: Avoid call to bts_model_chg_adm_state() if there's no ADM state change ...................................................................... common: Avoid call to bts_model_chg_adm_state() if there's no ADM state change Let's handle it in common code to simplify and avoid duplication in model specific code. Change-Id: Icea3ea1108d360193cac478f366be97ff38246d4 --- M src/common/oml.c 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/04/19404/1 diff --git a/src/common/oml.c b/src/common/oml.c index 1be4f89..39304f1 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1032,13 +1032,14 @@ return oml_fom_ack_nack(msg, NM_NACK_OBJINST_UNKN); /* Step 2: Do some global dependency/consistency checking */ - if (mo->nm_state.administrative == adm_state) + if (mo->nm_state.administrative == adm_state) { LOGPFOH(DOML, LOGL_NOTICE, foh, "ADM state already was %s\n", get_value_string(abis_nm_adm_state_names, adm_state)); - else - LOGPFOH(DOML, LOGL_NOTICE, foh, "ADM STATE %s -> %s\n", - get_value_string(abis_nm_adm_state_names, mo->nm_state.administrative), - get_value_string(abis_nm_adm_state_names, adm_state)); + return oml_mo_statechg_ack(mo); + } + LOGPFOH(DOML, LOGL_NOTICE, foh, "ADM STATE %s -> %s\n", + get_value_string(abis_nm_adm_state_names, mo->nm_state.administrative), + get_value_string(abis_nm_adm_state_names, adm_state)); /* Step 3: Ask BTS driver to apply the state chg */ return bts_model_chg_adm_state(bts, mo, obj, adm_state); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icea3ea1108d360193cac478f366be97ff38246d4 Gerrit-Change-Number: 19404 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 10:38:21 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jul 2020 10:38:21 +0000 Subject: Change in osmo-bts[master]: bts-trx: Fix handling ADM state change while previous one WIP References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19405 ) Change subject: bts-trx: Fix handling ADM state change while previous one WIP ...................................................................... bts-trx: Fix handling ADM state change while previous one WIP Fix power ramping if administrative state changes while previous opposite change was already ACKED but powe ramping was still ongoing. With previous code, osmo-bts-trx would have sent a NACK and BSc would drop the BTs link as a result. Change-Id: I6c5240710ef6d223651dfb4a8db939b5d2f974ca --- M src/osmo-bts-trx/l1_if.c 1 file changed, 24 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/05/19405/1 diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index cd7ecc0..6b93825 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -662,11 +662,29 @@ break; if (mo->procedure_pending) { - LOGPTRX(trx, DL1C, LOGL_ERROR, "Discarding adm change command: " - "pending procedure on RC %d\n", - ((struct gsm_bts_trx *)obj)->nr); - rc = -1; - break; + LOGPTRX(trx, DL1C, LOGL_INFO, + "ADM change received while previus one still WIP\n"); + + if (mo->nm_state.administrative == NM_STATE_LOCKED && + adm_state == NM_STATE_UNLOCKED) { + /* Previous change was UNLOCKED->LOCKED, so we + * were ramping down and we didn't deactivate + * yet, so now simply skip old ramp down compl + * cb, skip TS activation and go for ramp up + * directly. */ + goto ramp_up; + } else if (mo->nm_state.administrative == NM_STATE_UNLOCKED && + adm_state == NM_STATE_LOCKED) { + /* Previous change was LOCKED->UNLOCKED, which + * means TS were also enabled during start of + * ramping up. So we simply need to skip + * ramping up and start ramping down instead, + * disabling TS at the end as usual. Fall + * through usual procedure below. + */ + } else if (mo->nm_state.administrative == adm_state) { + OSMO_ASSERT(0); + } } switch (adm_state) { case NM_STATE_LOCKED: @@ -687,6 +705,7 @@ } trx_set_ts(ts); } +ramp_up: rc = l1if_trx_start_power_ramp(trx, bts_model_chg_adm_state_ramp_compl_cb); if (rc == 0) { mo->nm_state.administrative = adm_state; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6c5240710ef6d223651dfb4a8db939b5d2f974ca Gerrit-Change-Number: 19405 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 10:39:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jul 2020 10:39:03 +0000 Subject: Change in osmo-bts[master]: bts-trx: Fix handling ADM state change while previous one WIP In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/19405 ) Change subject: bts-trx: Fix handling ADM state change while previous one WIP ...................................................................... bts-trx: Fix handling ADM state change while previous one WIP Fix power ramping if administrative state changes while previous opposite change was already ACKED but powe ramping was still ongoing. With previous code, osmo-bts-trx would have sent a NACK and BSc would drop the BTs link as a result. Change-Id: I6c5240710ef6d223651dfb4a8db939b5d2f974ca --- M src/osmo-bts-trx/l1_if.c 1 file changed, 24 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/05/19405/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6c5240710ef6d223651dfb4a8db939b5d2f974ca Gerrit-Change-Number: 19405 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 10:40:19 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jul 2020 10:40:19 +0000 Subject: Change in osmo-bts[master]: bts-trx: Fix handling ADM state change while previous one WIP In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/c/osmo-bts/+/19405 ) Change subject: bts-trx: Fix handling ADM state change while previous one WIP ...................................................................... bts-trx: Fix handling ADM state change while previous one WIP Fix power ramping if administrative state changes while previous opposite change was already ACKED but power ramping was still ongoing. With previous code, osmo-bts-trx would have sent a NACK and BSc would drop the BTs link as a result. Change-Id: I6c5240710ef6d223651dfb4a8db939b5d2f974ca --- M src/osmo-bts-trx/l1_if.c 1 file changed, 24 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/05/19405/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6c5240710ef6d223651dfb4a8db939b5d2f974ca Gerrit-Change-Number: 19405 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 10:42:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jul 2020 10:42:23 +0000 Subject: Change in osmo-bts[master]: bts_shutdown_fsm: Fix switching too quickly to state WAIT_TRX_CLOSED In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19380 ) Change subject: bts_shutdown_fsm: Fix switching too quickly to state WAIT_TRX_CLOSED ...................................................................... Patch Set 1: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7af0b138efe78ec591c199a19fc22b304416a13 Gerrit-Change-Number: 19380 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jul 2020 10:42:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 10:42:26 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jul 2020 10:42:26 +0000 Subject: Change in osmo-bts[master]: bts_shutdown_fsm: Fix switching too quickly to state WAIT_TRX_CLOSED In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19380 ) Change subject: bts_shutdown_fsm: Fix switching too quickly to state WAIT_TRX_CLOSED ...................................................................... bts_shutdown_fsm: Fix switching too quickly to state WAIT_TRX_CLOSED Ramping down was set up with a target of -10 dBm, but then the code only waited for all TRXs to be at least 0dBm, meaning that if operating more than 1 TRX, the FSM could transit to state ST_WAIT_TRX_CLOSED when one TRX reached -10 and other were already equal or below 0 (but not yet -10). As a result, later on, when other TRXs reached -10 dBm they would trigger EV_TRX_RAMP_COMPL which was not expected (no use) in ST_WAIT_TRX_CLOSED. Related: SYS#4864 Change-Id: If7af0b138efe78ec591c199a19fc22b304416a13 --- M src/common/bts_shutdown_fsm.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, approved diff --git a/src/common/bts_shutdown_fsm.c b/src/common/bts_shutdown_fsm.c index c81a4ab..0ac3078 100644 --- a/src/common/bts_shutdown_fsm.c +++ b/src/common/bts_shutdown_fsm.c @@ -32,6 +32,8 @@ #define X(s) (1 << (s)) +#define BTS_SHUTDOWN_POWER_RAMP_TGT -10 + static const struct osmo_tdef_state_timeout bts_shutdown_fsm_timeouts[32] = { [BTS_SHUTDOWN_ST_WAIT_RAMP_DOWN_COMPL] = { .T = -1 }, [BTS_SHUTDOWN_ST_WAIT_TRX_CLOSED] = { .T = -2 }, @@ -83,7 +85,7 @@ llist_for_each_entry(trx, &bts->trx_list, list) { if (trx->mo.nm_state.operational != NM_OPSTATE_ENABLED) continue; - power_ramp_start(trx, to_mdB(-10), 1, ramp_down_compl_cb); + power_ramp_start(trx, to_mdB(BTS_SHUTDOWN_POWER_RAMP_TGT), 1, ramp_down_compl_cb); } } @@ -100,7 +102,7 @@ llist_for_each_entry(trx, &bts->trx_list, list) { if (trx->mo.nm_state.operational == NM_OPSTATE_ENABLED && - trx->power_params.p_total_cur_mdBm > 0) + trx->power_params.p_total_cur_mdBm > BTS_SHUTDOWN_POWER_RAMP_TGT) remaining++; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7af0b138efe78ec591c199a19fc22b304416a13 Gerrit-Change-Number: 19380 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 11:11:09 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jul 2020 11:11:09 +0000 Subject: Change in osmo-bts[master]: vty: Allow setting power-ramp max-initial to negative values References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19406 ) Change subject: vty: Allow setting power-ramp max-initial to negative values ...................................................................... vty: Allow setting power-ramp max-initial to negative values This allows for instance ramping up from -10 dBm -> -4 dBm if NOMTXPOWER of SDR is really low (below 0dBm) or because the max_power_red is >= NOMTXPOWER. Related: SYS#4920 Change-Id: I0f27fb7b86b58c5a80f5342b66ff4f5d1b775498 --- M src/common/tx_power.c M src/common/vty.c 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/06/19406/1 diff --git a/src/common/tx_power.c b/src/common/tx_power.c index 8f50b0f..93aec7d 100644 --- a/src/common/tx_power.c +++ b/src/common/tx_power.c @@ -268,8 +268,8 @@ if (we_are_ramping_up(trx)) { if (tpp->p_total_tgt_mdBm <= tpp->ramp.max_initial_pout_mdBm) { LOGPTRX(trx, DL1C, LOGL_INFO, - "target_power(%d) is below max.initial power\n", - tpp->p_total_tgt_mdBm); + "target_power (%d mdBm) is below or equal to 'power ramp max-initial' power (%d mDbm)\n", + tpp->p_total_tgt_mdBm, tpp->ramp.max_initial_pout_mdBm); /* new setting is below the maximum initial output * power, so we can directly jump to this level */ tpp->p_total_cur_mdBm = tpp->p_total_tgt_mdBm; diff --git a/src/common/vty.c b/src/common/vty.c index 91f3706..3f24d66 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -723,7 +723,7 @@ #define PR_STR "Power-Ramp settings\n" DEFUN(cfg_trx_pr_max_initial, cfg_trx_pr_max_initial_cmd, - "power-ramp max-initial <0-100000> (dBm|mdBm)", + "power-ramp max-initial <-10000-100000> (dBm|mdBm)", PR_STR "Maximum initial power\n" "Value\n" DB_MDB_STR) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0f27fb7b86b58c5a80f5342b66ff4f5d1b775498 Gerrit-Change-Number: 19406 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 14:43:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 27 Jul 2020 14:43:36 +0000 Subject: Change in osmo-sgsn[master]: Send a BVC-RESET to all persistent Gb interfaces at start-up In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 to look at the new patch set (#4). Change subject: Send a BVC-RESET to all persistent Gb interfaces at start-up ...................................................................... Send a BVC-RESET to all persistent Gb interfaces at start-up 3GPP TS 48.018 Section 8.4: > After any failure affecting the NSE, the party (BSS or SGSN) where > the failure resided shall reset the signalling BVC. After sending or > receiving a BVC-RESET PDU for the signalling BVC, the BSS shall stop all > traffic and initiate the BVC-RESET procedure for all BVCs corresponding > to PTP functional entities of the underlying network service entity. The > BSS must complete the BVC-RESET procedure for signalling BVC before > starting PTP BVC-RESET procedures. TODO: We should not just trigger a single outbound BVC-RESET message, but we should re-transmit them until we get a response. This would likely entail adding FSMs to libosmogb, which we will leave for a later point - it's anticipated that the NS + BSSGP code is undergoing quite some changes in the coming months anyway, so leave it for then. Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Closes: OS#4629 Depends: libosmocore.git I353adc1aa72377f7d4b3336d2ff47791fb73d62c --- M src/sgsn/sgsn_main.c 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/27/19027/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Gerrit-Change-Number: 19027 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 14:47:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jul 2020 14:47:15 +0000 Subject: Change in osmo-bts[master]: bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19407 ) Change subject: bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH ...................................................................... bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH If TRX is administratively locked during startup, for TS conigured as TCH/F_PDCH the BSC will send a ACT PDCH message, but osmo-bts-trx won't apply it by signalling it as available to the PCU, since the TRX is locked. That means the ts->flags contains the pending action to activate it until it is unlocked. As a result, calling trx_set_ts() on it was hitting the assert inside which expects not to apply the TS until it has been confirmed by the PCU. Let's still skip setting the TS and let pcu_tx_info_ind() trigger the activation confirmation from PCU, since the TRX has just been unlocked. Fixes following assert: Assert failed (ts->flags & TS_F_PDCH_PENDING_MASK) == 0 /osmo-bts/src/osmo-bts-trx/l1_if.c:34 Change-Id: Ie3cad15d31870346d03a6e2f6dd32a9d2dd3067e --- M src/osmo-bts-trx/l1_if.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/07/19407/1 diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 48305b5..a2b3415 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -702,6 +702,13 @@ * internally restore the old status here. */ ts->dyn.pchan_is = ts->dyn.pchan_want; + } else if (ts->pchan == GSM_PCHAN_TCH_F_PDCH && ts->flags & TS_F_PDCH_PENDING_MASK) { + /* TS configuration already in progress, + * waiting for PCU response, let it be + * de/activated later by PCU ACT CNF as a + * response to pcu_tx_info_ind() + */ + continue; } trx_set_ts(ts); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie3cad15d31870346d03a6e2f6dd32a9d2dd3067e Gerrit-Change-Number: 19407 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 14:47:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 27 Jul 2020 14:47:17 +0000 Subject: Change in osmo-sgsn[master]: Send a BVC-RESET to all persistent Gb interfaces at start-up In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 ) Change subject: Send a BVC-RESET to all persistent Gb interfaces at start-up ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-sgsn/+/19027/3/src/sgsn/sgsn_main.c File src/sgsn/sgsn_main.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/19027/3/src/sgsn/sgsn_main.c at 215 PS3, Line 215: nsvc->state |= NSE_S_ALIVE; > This looks like a hack. [?] I think the very notion of a "persistent" NS-VC is that it doesn't use the ALIVE/BLOCK/UNBLOCK procedure. We are sending a RESET to reset state, not because we cannot send data over it. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Gerrit-Change-Number: 19027 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 27 Jul 2020 14:47:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 14:47:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 27 Jul 2020 14:47:34 +0000 Subject: Change in osmo-trx[master]: Transceiver: Check log level before generating burst str representation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19402 ) Change subject: Transceiver: Check log level before generating burst str representation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I67408bc8643d5d97355f277c4a2007064a83ae90 Gerrit-Change-Number: 19402 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 27 Jul 2020 14:47:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 14:48:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 27 Jul 2020 14:48:22 +0000 Subject: Change in osmo-trx[master]: Transceiver: Add several rate_ctr for rx error conditions In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19403 ) Change subject: Transceiver: Add several rate_ctr for rx error conditions ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I000f7112e35ac68d3d922444f78468b1ea74cbba Gerrit-Change-Number: 19403 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 27 Jul 2020 14:48:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 14:48:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 27 Jul 2020 14:48:56 +0000 Subject: Change in osmo-bts[master]: common: Avoid call to bts_model_chg_adm_state() if there's no ADM sta... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19404 ) Change subject: common: Avoid call to bts_model_chg_adm_state() if there's no ADM state change ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icea3ea1108d360193cac478f366be97ff38246d4 Gerrit-Change-Number: 19404 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jul 2020 14:48:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 14:49:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 27 Jul 2020 14:49:21 +0000 Subject: Change in osmo-bts[master]: bts-trx: Fix handling ADM state change while previous one WIP In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19405 ) Change subject: bts-trx: Fix handling ADM state change while previous one WIP ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6c5240710ef6d223651dfb4a8db939b5d2f974ca Gerrit-Change-Number: 19405 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jul 2020 14:49:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 14:49:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 27 Jul 2020 14:49:35 +0000 Subject: Change in osmo-bts[master]: vty: Allow setting power-ramp max-initial to negative values In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19406 ) Change subject: vty: Allow setting power-ramp max-initial to negative values ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0f27fb7b86b58c5a80f5342b66ff4f5d1b775498 Gerrit-Change-Number: 19406 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jul 2020 14:49:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 14:50:02 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jul 2020 14:50:02 +0000 Subject: Change in osmo-sgsn[master]: Send a BVC-RESET to all persistent Gb interfaces at start-up In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 ) Change subject: Send a BVC-RESET to all persistent Gb interfaces at start-up ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Gerrit-Change-Number: 19027 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jul 2020 14:50:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 14:50:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 27 Jul 2020 14:50:08 +0000 Subject: Change in osmo-bts[master]: bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19407 ) Change subject: bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie3cad15d31870346d03a6e2f6dd32a9d2dd3067e Gerrit-Change-Number: 19407 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 27 Jul 2020 14:50:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 14:58:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jul 2020 14:58:53 +0000 Subject: Change in osmo-bts[master]: vty: Allow setting power-ramp max-initial to negative values In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, Hoernchen, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19406 to look at the new patch set (#2). Change subject: vty: Allow setting power-ramp max-initial to negative values ...................................................................... vty: Allow setting power-ramp max-initial to negative values This allows for instance ramping up from -10 dBm -> -4 dBm if NOMTXPOWER of SDR is really low (below 0dBm) or because the max_power_red is >= NOMTXPOWER. Related: SYS#4920 Change-Id: I0f27fb7b86b58c5a80f5342b66ff4f5d1b775498 --- M src/common/tx_power.c M src/common/vty.c 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/06/19406/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0f27fb7b86b58c5a80f5342b66ff4f5d1b775498 Gerrit-Change-Number: 19406 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 15:42:01 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 27 Jul 2020 15:42:01 +0000 Subject: Change in osmo-bts[master]: tx_power: Take into account max-initial when ramping up bigger power ... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19408 ) Change subject: tx_power: Take into account max-initial when ramping up bigger power lvl intervals ...................................................................... tx_power: Take into account max-initial when ramping up bigger power lvl intervals Until now, power-ramp max-initial was only taken into account in order to skip ramping if the desired target level was below it, in order to forbid growin too quickly or applying directly to much power given power amplifier requirements. However, in the event that a higher tx power level is desired, max-initial was not taking into account and ramping simply started from current tx power level, which could be a lot lower than max-initial. Allow shortcutting the ramping in that case so that max-initial is applied directly, and ramping continues from there, in order to have a more expected behavior (max-initial applied the same). Since max-initial can since a few commits before handle a negative value, this means One can for instance set max-initial to -10 and still keep the old behavior of ramping step by step from -10 (rf-locked in osmo-bts-trx) to 0 or 7 or whatever is the nominal power (max_power_red). Change-Id: I4e5742ecdbf66d77ff9445999f6fff43bbf4856a --- M src/common/tx_power.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/08/19408/1 diff --git a/src/common/tx_power.c b/src/common/tx_power.c index 7f134ca..c5ea7ed 100644 --- a/src/common/tx_power.c +++ b/src/common/tx_power.c @@ -276,8 +276,10 @@ tpp->ramp.attenuation_mdB = 0; power_ramp_timer_cb(trx); } else { - /* We need to step it up. Start from the current value */ + /* We need to step it up. Start from the current value, shortcutting to max-initial. */ /* Set attenuation to cause no power change right now */ + if (tpp->p_total_cur_mdBm + tpp->ramp.step_size_mdB < tpp->ramp.max_initial_pout_mdBm) + tpp->p_total_cur_mdBm = tpp->ramp.max_initial_pout_mdBm - tpp->ramp.step_size_mdB; tpp->ramp.attenuation_mdB = tpp->p_total_tgt_mdBm - tpp->p_total_cur_mdBm; /* start with the first step */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4e5742ecdbf66d77ff9445999f6fff43bbf4856a Gerrit-Change-Number: 19408 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 16:33:33 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 27 Jul 2020 16:33:33 +0000 Subject: Change in osmo-bts[master]: tx_power: Take into account max-initial when ramping up bigger power ... In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19408 ) Change subject: tx_power: Take into account max-initial when ramping up bigger power lvl intervals ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4e5742ecdbf66d77ff9445999f6fff43bbf4856a Gerrit-Change-Number: 19408 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 27 Jul 2020 16:33:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 16:33:39 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 27 Jul 2020 16:33:39 +0000 Subject: Change in osmo-bts[master]: bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19407 ) Change subject: bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie3cad15d31870346d03a6e2f6dd32a9d2dd3067e Gerrit-Change-Number: 19407 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 27 Jul 2020 16:33:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 16:33:50 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 27 Jul 2020 16:33:50 +0000 Subject: Change in osmo-bts[master]: vty: Allow setting power-ramp max-initial to negative values In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19406 ) Change subject: vty: Allow setting power-ramp max-initial to negative values ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0f27fb7b86b58c5a80f5342b66ff4f5d1b775498 Gerrit-Change-Number: 19406 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 27 Jul 2020 16:33:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Jul 27 20:26:26 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 27 Jul 2020 20:26:26 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1f388898b8b_2bd02ac693dbc61077956c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 81s] /usr/src/packages/BUILD/src/ulfius.c: In function 'ulfius_run_mhd_daemon': [ 81s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 81s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 81s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 81s] | | [ 81s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 81s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 81s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 81s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 81s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 81s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 81s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 82s] cc1: all warnings being treated as errors [ 82s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 82s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 82s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 82s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 82s] make[1]: *** [Makefile:166: all] Error 2 [ 82s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 82s] dh_auto_build: error: cd build && make -j6 "INSTALL=install --strip-program=true" returned exit code 2 [ 82s] make: *** [debian/rules:9: build] Error 25 [ 82s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 82s] ### VM INTERACTION START ### [ 85s] [ 75.332150] sysrq: SysRq : Power Off [ 85s] [ 75.336936] reboot: Power down [ 85s] ### VM INTERACTION END ### [ 85s] [ 85s] sheep87 failed "build ulfius_2.5.2-4.1.dsc" at Mon Jul 27 20:26:23 UTC 2020. [ 85s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Jul 27 20:26:44 2020 From: admin at opensuse.org (OBS Notification) Date: Mon, 27 Jul 2020 20:26:44 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1f3888f2e41_2bd02ac693dbc61077969e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 93s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 93s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 93s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 93s] | | [ 93s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 93s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 93s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 93s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 93s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 93s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 93s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 94s] cc1: all warnings being treated as errors [ 94s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 94s] make[3]: *** Waiting for unfinished jobs.... [ 94s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 94s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 94s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 94s] make[1]: *** [Makefile:166: all] Error 2 [ 94s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 94s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 94s] make: *** [debian/rules:9: build] Error 25 [ 94s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 94s] ### VM INTERACTION START ### [ 97s] [ 84.917098] sysrq: SysRq : Power Off [ 97s] [ 84.920578] reboot: Power down [ 97s] ### VM INTERACTION END ### [ 97s] [ 97s] old-atreju2 failed "build ulfius_2.5.2-4.1.dsc" at Mon Jul 27 20:26:35 UTC 2020. [ 97s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Jul 27 21:17:20 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 27 Jul 2020 21:17:20 +0000 Subject: Change in osmo-trx[master]: Transceiver: Check log level before generating burst str representation In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19402 ) Change subject: Transceiver: Check log level before generating burst str representation ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I67408bc8643d5d97355f277c4a2007064a83ae90 Gerrit-Change-Number: 19402 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 27 Jul 2020 21:17:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Jul 27 22:27:13 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 27 Jul 2020 22:27:13 +0000 Subject: Change in pysim[master]: pySim-read.py: decode contents of EF.AD (Administrative data) References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/19409 ) Change subject: pySim-read.py: decode contents of EF.AD (Administrative data) ...................................................................... pySim-read.py: decode contents of EF.AD (Administrative data) Change-Id: I938667bdf99d238eefac205d6dd70db1d714d842 --- M pySim-read.py M pySim/ts_51_011.py 2 files changed, 21 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/09/19409/1 diff --git a/pySim-read.py b/pySim-read.py index 69cab4d..81d6b46 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -28,7 +28,7 @@ import random import re import sys -from pySim.ts_51_011 import EF, DF, EF_SST_map +from pySim.ts_51_011 import EF, DF, EF_SST_map, EF_AD_mode_map from pySim.ts_31_102 import EF_UST_map, EF_USIM_ADF_map from pySim.ts_31_103 import EF_IST_map @@ -225,7 +225,15 @@ # EF.AD (res, sw) = card.read_binary('AD') if sw == '9000': - print("AD: %s" % (res,)) + print("Administrative data: %s" % (res,)) + if res[:2] in EF_AD_mode_map: + print("\tMS operation mode: %s" % (EF_AD_mode_map[res[:2]],)) + else: + print("\tMS operation mode: (unknown 0x%s)" % (res[:2],)) + if int(res[4:6], 16) & 0x01: + print("\tCiphering Indicator: enabled") + else: + print("\tCiphering Indicator: disabled") else: print("AD: Can't read, response code = %s" % (sw,)) diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 37d2bc8..8b73f02 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -313,4 +313,14 @@ 57: 'Multimedia Messaging Service (MMS)', 58: 'Extension 8', 59: 'MMS User Connectivity Parameters', -} \ No newline at end of file +} + +# 10.3.18 "EF.AD (Administrative data) " +EF_AD_mode_map = { + '00' : 'normal operation', + '80' : 'type approval operations', + '01' : 'normal operation + specific facilities', + '81' : 'type approval operations + specific facilities', + '02' : 'maintenance (off line)', + '04' : 'cell test operation', +} -- To view, visit https://gerrit.osmocom.org/c/pysim/+/19409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I938667bdf99d238eefac205d6dd70db1d714d842 Gerrit-Change-Number: 19409 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Jul 28 03:01:01 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 28 Jul 2020 03:01:01 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1f94fe582b4_2bd02ac693dbc610802758@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 85s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 85s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 85s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 86s] | | [ 86s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 86s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 86s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 86s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 86s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 86s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 86s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 86s] cc1: all warnings being treated as errors [ 86s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 86s] make[3]: *** Waiting for unfinished jobs.... [ 86s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 86s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 86s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 86s] make[1]: *** [Makefile:166: all] Error 2 [ 86s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 86s] dh_auto_build: error: cd build && make -j6 "INSTALL=install --strip-program=true" returned exit code 2 [ 86s] make: *** [debian/rules:9: build] Error 25 [ 86s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 86s] ### VM INTERACTION START ### [ 89s] [ 79.107018] sysrq: SysRq : Power Off [ 89s] [ 79.111017] reboot: Power down [ 89s] ### VM INTERACTION END ### [ 89s] [ 89s] sheep86 failed "build ulfius_2.5.2-4.1.dsc" at Tue Jul 28 03:00:45 UTC 2020. [ 89s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jul 28 03:02:11 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 28 Jul 2020 03:02:11 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f1f9538c8257_2bd02ac693dbc610802833@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 114s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 114s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 114s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 114s] | | [ 114s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 114s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 114s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 114s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 114s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 114s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 114s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 115s] cc1: all warnings being treated as errors [ 115s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 115s] make[3]: *** Waiting for unfinished jobs.... [ 115s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 115s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 115s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 115s] make[1]: *** [Makefile:166: all] Error 2 [ 115s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 115s] dh_auto_build: error: cd build && make -j12 "INSTALL=install --strip-program=true" returned exit code 2 [ 115s] make: *** [debian/rules:9: build] Error 25 [ 115s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 115s] ### VM INTERACTION START ### [ 118s] [ 102.090097] sysrq: SysRq : Power Off [ 118s] [ 102.093493] reboot: Power down [ 118s] ### VM INTERACTION END ### [ 118s] [ 118s] cumulus2 failed "build ulfius_2.5.2-4.1.dsc" at Tue Jul 28 03:01:56 UTC 2020. [ 118s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Jul 28 08:17:22 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jul 2020 08:17:22 +0000 Subject: Change in osmo-trx[master]: Transceiver: Check log level before generating burst str representation In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19402 ) Change subject: Transceiver: Check log level before generating burst str representation ...................................................................... Transceiver: Check log level before generating burst str representation Avoid entering the logRxBurst() function and running a long loop even if not used. Change-Id: I67408bc8643d5d97355f277c4a2007064a83ae90 --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 55d0acd..c92a61b 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -1165,7 +1165,7 @@ return false; /* other errors: we want to stop the process */ } - if (!bi.idle) + if (!bi.idle && log_check_level(DTRXDUL, LOGL_DEBUG)) logRxBurst(chan, &bi); switch (mVersionTRXD[chan]) { -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I67408bc8643d5d97355f277c4a2007064a83ae90 Gerrit-Change-Number: 19402 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 09:13:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jul 2020 09:13:06 +0000 Subject: Change in osmo-bts[master]: doc: configuration.adoc: Document ramping down feature References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19410 ) Change subject: doc: configuration.adoc: Document ramping down feature ...................................................................... doc: configuration.adoc: Document ramping down feature Change-Id: I3c7df0d914587bdde2aef9919f75d507a0e5884b --- M doc/manuals/chapters/configuration.adoc 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/10/19410/1 diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc index 2b78620..772d8da 100644 --- a/doc/manuals/chapters/configuration.adoc +++ b/doc/manuals/chapters/configuration.adoc @@ -158,6 +158,12 @@ OsmoBTS can ramp up the power of its trx over time. This helps reduce cell congestion in busy environments. +Some models of OsmoBTS (such as osmo-bts-trx) also support ramping down the +transmit power over time until finally ceasing broadcast, for instance due to a +trx becoming administratively locked or due to the whole BTS being gracefully +shut down. This allows for mobile stations camping on the cell to gradually move +to other cells in the area once the signal drop is detected. + In this example, the trx starts with 5dBm output power which increases by 1dB every two seconds until it reaches nominal power. Power ramping can use the power-ramp commands at the CONFIG TRX node of the -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3c7df0d914587bdde2aef9919f75d507a0e5884b Gerrit-Change-Number: 19410 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 09:15:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jul 2020 09:15:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_si_acc_rotate In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 ) Change subject: bsc: Introduce test TC_si_acc_rotate ...................................................................... Patch Set 4: ping -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I18d0243353fce547d126d62c34415628a21cb52b Gerrit-Change-Number: 19359 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 09:15:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 09:32:10 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 09:32:10 +0000 Subject: Change in libosmocore[master]: gsm 12.21: add osmocom specific NM_ATT_OSMO_NS_LINK_CFG In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19146 ) Change subject: gsm 12.21: add osmocom specific NM_ATT_OSMO_NS_LINK_CFG ...................................................................... Patch Set 2: (3 comments) https://gerrit.osmocom.org/c/libosmocore/+/19146/2/include/osmocom/gsm/protocol/gsm_12_21.h File include/osmocom/gsm/protocol/gsm_12_21.h: https://gerrit.osmocom.org/c/libosmocore/+/19146/2/include/osmocom/gsm/protocol/gsm_12_21.h at 428 PS2, Line 428: NM_ATT_IPACC_PAGING_CFG = 0x8f, NM_ATT_IPACC_PAGING_CFG = NM_ATT_BS11_RF_RES_IND_PER https://gerrit.osmocom.org/c/libosmocore/+/19146/2/include/osmocom/gsm/protocol/gsm_12_21.h at 464 PS2, Line 464: NM_ATT_BS11_RF_RES_IND_PER = 0x8f, NM_ATT_IPACC_PAGING_CFG = NM_ATT_BS11_RF_RES_IND_PER https://gerrit.osmocom.org/c/libosmocore/+/19146/2/include/osmocom/gsm/protocol/gsm_12_21.h at 514 PS2, Line 514: , /* > not sure if it is legal to have two enum members map to the same value (NM_ATT_BS11_PASSWORD just a [?] we're doing it already with 0x8f. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic261bc43a07fa741b97a9c6ec5a9ed6f5ecae588 Gerrit-Change-Number: 19146 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 09:32:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 10:00:19 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 10:00:19 +0000 Subject: Change in libosmocore[master]: bts_features: add feature BTS_FEAT_IPV6_NSVC In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19145 to look at the new patch set (#3). Change subject: bts_features: add feature BTS_FEAT_IPV6_NSVC ...................................................................... bts_features: add feature BTS_FEAT_IPV6_NSVC Previous both the IPA nanobts and the sysmobts has been using the IPv4 only OML attribute NM_ATT_IPACC_NS_LINK_CFG. A bts with BTS_FEAT_IPV6_NSVC supports IPv6 for NSVC (PCUSGSN) using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG. Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 --- M include/osmocom/gsm/bts_features.h M src/gsm/bts_features.c 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/19145/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 Gerrit-Change-Number: 19145 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 10:06:09 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 10:06:09 +0000 Subject: Change in libosmocore[master]: sockaddr_str: add osmo_sockaddr_str_from_str2() which doesn't set the... In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19142 ) Change subject: sockaddr_str: add osmo_sockaddr_str_from_str2() which doesn't set the port ...................................................................... Patch Set 1: > Patch Set 1: > > I think this is actually 2 patches, one changing the behavior of existing APIs by using memset, and the other adding the new API. It's not changing the behaviour. It's preserving it. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifd4e282586b8bd40b912a9f1c25f9e8208420106 Gerrit-Change-Number: 19142 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 10:06:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 10:07:24 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 10:07:24 +0000 Subject: Change in libosmocore[master]: sockaddr_str: add osmo_sockaddr_str_from_str2() which doesn't set the... In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19142 ) Change subject: sockaddr_str: add osmo_sockaddr_str_from_str2() which doesn't set the port ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/19142/1/src/sockaddr_str.c File src/sockaddr_str.c: https://gerrit.osmocom.org/c/libosmocore/+/19142/1/src/sockaddr_str.c at a206 PS1, Line 206: *sockaddr_str = (struct osmo_sockaddr_str){ implicit memset() https://gerrit.osmocom.org/c/libosmocore/+/19142/1/src/sockaddr_str.c at 208 PS1, Line 208: memset(sockaddr_str->ip, 0x0, sizeof(sockaddr_str->ip)); The memset here is preserving behavior because of the initializer in line 206. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifd4e282586b8bd40b912a9f1c25f9e8208420106 Gerrit-Change-Number: 19142 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 10:07:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 10:45:05 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 10:45:05 +0000 Subject: Change in libosmocore[master]: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19143 to look at the new patch set (#3). Change subject: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd ...................................................................... socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd osmo_sock_init3() takes osmo_sockaddr* as local and remote endpoints to setup a socket. Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 --- M include/osmocom/core/socket.h M src/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.ok 4 files changed, 279 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/19143/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 10:45:06 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 10:45:06 +0000 Subject: Change in libosmocore[master]: gprs_ns: fix typo in comment References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19411 ) Change subject: gprs_ns: fix typo in comment ...................................................................... gprs_ns: fix typo in comment Change-Id: Ie9d8decea18542cb0e1641dcb5fca5e4850910eb --- M src/gb/gprs_ns.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/19411/1 diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index 14fe661..a6ef6d4 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -619,7 +619,7 @@ return gprs_ns_tx(nsvc, msg); } -/*! Transmit a NS-BLOCK on a tiven NS-VC +/*! Transmit a NS-BLOCK on a given NS-VC * \param[in] nsvc NS-VC on which the NS-BLOCK is to be transmitted * \param[in] cause Numeric NS Cause value * \returns 0 in case of success -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie9d8decea18542cb0e1641dcb5fca5e4850910eb Gerrit-Change-Number: 19411 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 10:45:06 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 10:45:06 +0000 Subject: Change in libosmocore[master]: gprs_ns_frgre.h: add missing declaration of structs References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19412 ) Change subject: gprs_ns_frgre.h: add missing declaration of structs ...................................................................... gprs_ns_frgre.h: add missing declaration of structs Change-Id: I47b3458ff7dc7ab1fcb7e4dd690142e2bc44ed46 --- M include/osmocom/gprs/gprs_ns_frgre.h 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/12/19412/1 diff --git a/include/osmocom/gprs/gprs_ns_frgre.h b/include/osmocom/gprs/gprs_ns_frgre.h index d48ce08..8cf54c7 100644 --- a/include/osmocom/gprs/gprs_ns_frgre.h +++ b/include/osmocom/gprs/gprs_ns_frgre.h @@ -2,4 +2,7 @@ #pragma once +struct gprs_nsvc; +struct msgb; + int gprs_ns_frgre_sendmsg(struct gprs_nsvc *nsvc, struct msgb *msg); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I47b3458ff7dc7ab1fcb7e4dd690142e2bc44ed46 Gerrit-Change-Number: 19412 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 10:45:07 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 10:45:07 +0000 Subject: Change in libosmocore[master]: socket: osmo_sock_local_ip: correct doxygen comment References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19413 ) Change subject: socket: osmo_sock_local_ip: correct doxygen comment ...................................................................... socket: osmo_sock_local_ip: correct doxygen comment There is no parameter fd. Change-Id: I1e31fcbf40d8abf99214b87e70e867b5ab66bd75 --- M src/socket.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/19413/1 diff --git a/src/socket.c b/src/socket.c index 503ceaf..7fa9ab3 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1286,7 +1286,6 @@ /*! Determine the matching local IP-address for a given remote IP-Address. * \param[out] local_ip caller provided memory for resulting local IP-address * \param[in] remote_ip remote IP-address - * \param[in] fd file descriptor of related scoket * \returns 0 on success; negative otherwise * * The function accepts IPv4 and IPv6 address strings. The caller must provide -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1e31fcbf40d8abf99214b87e70e867b5ab66bd75 Gerrit-Change-Number: 19413 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 10:45:07 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 10:45:07 +0000 Subject: Change in libosmocore[master]: Gb/BSSGP: replace hardcoded Tx into NS library by a callback References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19414 ) Change subject: Gb/BSSGP: replace hardcoded Tx into NS library by a callback ...................................................................... Gb/BSSGP: replace hardcoded Tx into NS library by a callback Add bssgp_ns_send callback() to set the transmission path into the NS library. This allows to use the Gb implementation with the old NS and the new upcoming NS implementation. Users of the old NS implementation don't have to set the callback as the default is the old NS implementation. Only users of the new NS implementation need to set the callback and the callback data. Change-Id: I3a498e6a0d68b87fed80c64199b22395796761b4 --- M include/osmocom/gprs/gprs_bssgp.h M src/gb/gprs_bssgp.c M src/gb/gprs_bssgp_bss.c A src/gb/gprs_bssgp_internal.h M src/gb/gprs_bssgp_util.c M src/gb/libosmogb.map 6 files changed, 53 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/19414/1 diff --git a/include/osmocom/gprs/gprs_bssgp.h b/include/osmocom/gprs/gprs_bssgp.h index 0f87333..d64a6f5 100644 --- a/include/osmocom/gprs/gprs_bssgp.h +++ b/include/osmocom/gprs/gprs_bssgp.h @@ -12,7 +12,10 @@ #include /* gprs_bssgp_util.c */ +typedef int bssgp_bvc_send(void *ctx, struct msgb *msg); + extern struct gprs_ns_inst *bssgp_nsi; +void bssgp_set_bssgp_callback(bssgp_bvc_send *ns_send, void *data); struct msgb *bssgp_msgb_alloc(void); struct msgb *bssgp_msgb_copy(const struct msgb *msg, const char *name); const char *bssgp_cause_str(enum gprs_bssgp_cause cause); diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index 38794c2..4ac54e3 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -44,6 +44,11 @@ void *bssgp_tall_ctx = NULL; +static int _gprs_ns_sendmsg(void *ctx, struct msgb *msg); + +bssgp_bvc_send *bssgp_ns_send = _gprs_ns_sendmsg; +void *bssgp_ns_send_data = NULL; + static const struct rate_ctr_desc bssgp_ctr_description[] = { { "packets:in", "Packets at BSSGP Level ( In)" }, { "packets:out","Packets at BSSGP Level (Out)" }, @@ -67,6 +72,13 @@ static int _bssgp_tx_dl_ud(struct bssgp_flow_control *fc, struct msgb *msg, uint32_t llc_pdu_len, void *priv); + +/* callback to be compatible with users which do not set the bssgp_ns_send function */ +static int _gprs_ns_sendmsg(void *ctx, struct msgb *msg) +{ + return gprs_ns_sendmsg(bssgp_nsi, msg); +} + /* Find a BTS Context based on parsed RA ID and Cell ID */ struct bssgp_bvc_ctx *btsctx_by_raid_cid(const struct gprs_ra_id *raid, uint16_t cid) { @@ -117,6 +129,12 @@ return NULL; } +void bssgp_set_bssgp_callback(bssgp_bvc_send *ns_send, void *data) +{ + bssgp_ns_send = ns_send; + bssgp_ns_send_data = data; +} + struct bssgp_bvc_ctx *btsctx_alloc(uint16_t bvci, uint16_t nsei) { struct bssgp_bvc_ctx *ctx; @@ -163,7 +181,7 @@ bgph->pdu_type = BSSGP_PDUT_FLOW_CONTROL_BVC_ACK; msgb_tvlv_put(msg, BSSGP_IE_TAG, 1, &tag); - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } /* 10.3.7 SUSPEND-ACK PDU */ @@ -182,7 +200,7 @@ bssgp_msgb_ra_put(msg, ra_id); msgb_tvlv_put(msg, BSSGP_IE_SUSPEND_REF_NR, 1, &suspend_ref); - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } /* 10.3.8 SUSPEND-NACK PDU */ @@ -204,7 +222,7 @@ if (cause) msgb_tvlv_put(msg, BSSGP_IE_CAUSE, 1, cause); - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } /* 10.3.10 RESUME-ACK PDU */ @@ -222,7 +240,7 @@ bssgp_msgb_tlli_put(msg, tlli); bssgp_msgb_ra_put(msg, ra_id); - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } /* 10.3.11 RESUME-NACK PDU */ @@ -243,7 +261,7 @@ if (cause) msgb_tvlv_put(msg, BSSGP_IE_CAUSE, 1, cause); - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } uint16_t bssgp_parse_cell_id(struct gprs_ra_id *raid, const uint8_t *buf) @@ -266,7 +284,7 @@ } /* Chapter 8.4 BVC-Reset Procedure */ -static int bssgp_rx_bvc_reset(struct msgb *msg, struct tlv_parsed *tp, +static int bssgp_rx_bvc_reset(struct msgb *msg, struct tlv_parsed *tp, uint16_t ns_bvci) { struct osmo_bssgp_prim nmp; @@ -744,7 +762,7 @@ static int _bssgp_tx_dl_ud(struct bssgp_flow_control *fc, struct msgb *msg, uint32_t llc_pdu_len, void *priv) { - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } /* input function of the flow control implementation, called first @@ -1286,7 +1304,7 @@ msgb_tvlv_put(msg, BSSGP_IE_TMSI, 4, (uint8_t *) &ptmsi); } - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } void bssgp_set_log_ss(int ss) diff --git a/src/gb/gprs_bssgp_bss.c b/src/gb/gprs_bssgp_bss.c index 5a1ffb9..94b1812 100644 --- a/src/gb/gprs_bssgp_bss.c +++ b/src/gb/gprs_bssgp_bss.c @@ -34,6 +34,7 @@ #include #include +#include "gprs_bssgp_internal.h" #include "common_vty.h" #define GSM_IMSI_LENGTH 17 @@ -69,7 +70,7 @@ bssgp_msgb_tlli_put(msg, tlli); bssgp_msgb_ra_put(msg, ra_id); - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } /*! GMM-RESUME.req (Chapter 10.3.9) */ @@ -91,7 +92,7 @@ msgb_tvlv_put(msg, BSSGP_IE_SUSPEND_REF_NR, 1, &suspend_ref); - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } /*! Transmit RA-CAPABILITY-UPDATE (10.3.3) */ @@ -113,7 +114,7 @@ msgb_tvlv_put(msg, BSSGP_IE_TAG, 1, &tag); - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } /* first common part of RADIO-STATUS */ @@ -141,7 +142,7 @@ msgb_tvlv_put(msg, BSSGP_IE_CAUSE, 1, &cause); LOGPC(DBSSGP, LOGL_NOTICE, "CAUSE=%s\n", bssgp_cause_str(cause)); - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } /*! Transmit RADIO-STATUS for TLLI (10.3.5) */ @@ -220,7 +221,7 @@ msgb_tvlv_put(msg, BSSGP_IE_BVCI, 2, (uint8_t *) &_bvci_new); msgb_tvlv_put(msg, BSSGP_IE_NUM_OCT_AFF, 3, (uint8_t *) &_oct_aff); - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } /*! Transmit LLC-DISCARDED (Chapter 10.4.3) */ @@ -246,7 +247,7 @@ msgb_tvlv_put(msg, BSSGP_IE_BVCI, 2, (uint8_t *) &_bvci); msgb_tvlv_put(msg, BSSGP_IE_NUM_OCT_AFF, 3, ((uint8_t *) &_oct_aff) + 1); - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } /*! Transmit a BVC-BLOCK message (Chapter 10.4.8) */ @@ -267,7 +268,7 @@ msgb_tvlv_put(msg, BSSGP_IE_BVCI, 2, (uint8_t *) &_bvci); msgb_tvlv_put(msg, BSSGP_IE_CAUSE, 1, &cause); - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } /*! Transmit a BVC-UNBLOCK message (Chapter 10.4.10) */ @@ -286,7 +287,7 @@ msgb_tvlv_put(msg, BSSGP_IE_BVCI, 2, (uint8_t *) &_bvci); - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } /*! Transmit a BVC-RESET message (Chapter 10.4.12) */ @@ -313,7 +314,7 @@ } /* Optional: Feature Bitmap */ - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } int bssgp_tx_bvc_reset(struct bssgp_bvc_ctx *bctx, uint16_t bvci, uint8_t cause) { @@ -389,7 +390,7 @@ sizeof(e_queue_delay), (uint8_t *) &e_queue_delay); - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } /*! Transmit a FLOW_CONTROL-MS (Chapter 10.4.6) @@ -432,7 +433,7 @@ msgb_tvlv_put(msg, BSSGP_IE_BUCKET_FULL_RATIO, 1, bucket_full_ratio); - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } /*! RL-UL-UNITDATA.req (Chapter 10.2.2) @@ -478,7 +479,7 @@ rate_ctr_inc(&bctx->ctrg->ctr[BSSGP_CTR_PKTS_OUT]); rate_ctr_add(&bctx->ctrg->ctr[BSSGP_CTR_BYTES_OUT], msg->len); - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } /* Parse a single GMM-PAGING.req to a given NSEI/NS-BVCI */ diff --git a/src/gb/gprs_bssgp_internal.h b/src/gb/gprs_bssgp_internal.h new file mode 100644 index 0000000..872d35e --- /dev/null +++ b/src/gb/gprs_bssgp_internal.h @@ -0,0 +1,7 @@ + +#pragma once + +#include + +extern bssgp_bvc_send *bssgp_ns_send; +extern void *bssgp_ns_send_data; diff --git a/src/gb/gprs_bssgp_util.c b/src/gb/gprs_bssgp_util.c index 7708949..917f1f3 100644 --- a/src/gb/gprs_bssgp_util.c +++ b/src/gb/gprs_bssgp_util.c @@ -32,6 +32,7 @@ #include #include +#include "gprs_bssgp_internal.h" #include "common_vty.h" struct gprs_ns_inst *bssgp_nsi; @@ -210,7 +211,7 @@ _bvci = osmo_htons(bvci); msgb_tvlv_put(msg, BSSGP_IE_BVCI, 2, (uint8_t *) &_bvci); - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } /* Chapter 10.4.14: Status */ @@ -248,5 +249,5 @@ msgb_tvlv_put(msg, BSSGP_IE_PDU_IN_ERROR, msgb_bssgp_len(orig_msg), msgb_bssgph(orig_msg)); - return gprs_ns_sendmsg(bssgp_nsi, msg); + return bssgp_ns_send(bssgp_ns_send_data, msg); } diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map index 7a231db..0c0c5c4 100644 --- a/src/gb/libosmogb.map +++ b/src/gb/libosmogb.map @@ -13,6 +13,7 @@ bssgp_msgb_tlli_put; bssgp_msgb_ra_put; bssgp_parse_cell_id; +bssgp_set_bssgp_callback; bssgp_tx_bvc_block; bssgp_tx_bvc_reset; bssgp_tx_bvc_reset2; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3a498e6a0d68b87fed80c64199b22395796761b4 Gerrit-Change-Number: 19414 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 10:45:08 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 10:45:08 +0000 Subject: Change in libosmocore[master]: socket.c: add osmo_sockaddr_cmp() References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19415 ) Change subject: socket.c: add osmo_sockaddr_cmp() ...................................................................... socket.c: add osmo_sockaddr_cmp() Compare two osmo_sockaddr. Change-Id: I2d12ebae2710ffd17cf071e6ada0804e73f87dd6 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/19415/1 diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 6bfcc4c..b162066 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -110,4 +110,6 @@ int osmo_sock_local_ip(char *local_ip, const char *remote_ip); +int osmo_sockaddr_cmp(struct osmo_sockaddr *a, struct osmo_sockaddr *b); + /*! @} */ diff --git a/src/socket.c b/src/socket.c index 80d0996..70f96c4 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1529,6 +1529,37 @@ return 0; } +/*! Compare two osmo_sockaddr. Return 0 if they are same + * \brief osmo_sockaddr_cmp + * \param[in] a + * \param[in] b + * \return 0 if a and b are equal. + */ +int osmo_sockaddr_cmp(struct osmo_sockaddr *a, struct osmo_sockaddr *b) +{ + if (!a && !b) + return 0; + if (!a) + return 1; + if (!b) + return 1; + if (a->u.sa.sa_family != b->u.sa.sa_family) + return 1; + + switch (a->u.sa.sa_family) { + case AF_INET: + /* AF_INET has padding, ignore padding */ + return !(a->u.sin.sin_addr.s_addr == b->u.sin.sin_addr.s_addr && + a->u.sin.sin_port == b->u.sin.sin_port); + case AF_INET6: + /* AF_INET6 usally not contain any padding */ + return memcmp(&a->u.sin6, &b->u.sin6, sizeof(struct sockaddr_in6)); + } + + /* fallback to memcmp for remaing AF */ + return memcmp(a, b, sizeof(struct osmo_sockaddr)); +} + #endif /* HAVE_SYS_SOCKET_H */ /*! @} */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d12ebae2710ffd17cf071e6ada0804e73f87dd6 Gerrit-Change-Number: 19415 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 10:45:09 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 10:45:09 +0000 Subject: Change in libosmocore[master]: add osmo_sockaddr_local_ip() to determine the local address for a rem... References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19416 ) Change subject: add osmo_sockaddr_local_ip() to determine the local address for a remote. ...................................................................... add osmo_sockaddr_local_ip() to determine the local address for a remote. Similiar to osmo_sock_local_ip but for osmo_sockaddr. Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/16/19416/1 diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index b162066..e5383ba 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -110,6 +110,8 @@ int osmo_sock_local_ip(char *local_ip, const char *remote_ip); +int osmo_sockaddr_local_ip(struct osmo_sockaddr *local_ip, + struct osmo_sockaddr *remote_ip); int osmo_sockaddr_cmp(struct osmo_sockaddr *a, struct osmo_sockaddr *b); /*! @} */ diff --git a/src/socket.c b/src/socket.c index 70f96c4..bc0f904 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1529,6 +1529,31 @@ return 0; } +/*! Determine the matching local address for a given remote address. + * \param[out] local_ip caller provided memory for resulting local address + * \param[in] remote_ip remote address + * \returns 0 on success; negative otherwise + */ +int osmo_sockaddr_local_ip(struct osmo_sockaddr *local_ip, struct osmo_sockaddr *remote_ip) +{ + int sfd; + int rc; + socklen_t local_ip_len; + + sfd = osmo_sock_init3(SOCK_DGRAM, IPPROTO_UDP, NULL, remote_ip, OSMO_SOCK_F_CONNECT); + if (sfd < 0) + return -EINVAL; + + memset(local_ip, 0, sizeof(*local_ip)); + local_ip_len = sizeof(*local_ip); + rc = getsockname(sfd, (struct sockaddr *)local_ip, &local_ip_len); + close(sfd); + if (rc < 0) + return -EINVAL; + + return rc; +} + /*! Compare two osmo_sockaddr. Return 0 if they are same * \brief osmo_sockaddr_cmp * \param[in] a -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 Gerrit-Change-Number: 19416 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 10:45:09 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 10:45:09 +0000 Subject: Change in libosmocore[master]: Gb: add a second NS implementation References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19417 ) Change subject: Gb: add a second NS implementation ...................................................................... Gb: add a second NS implementation Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 --- M include/Makefile.am M include/osmocom/core/logging.h A include/osmocom/gprs/gprs_ns2.h A include/osmocom/gprs/gprs_ns_common.h M src/gb/Makefile.am A src/gb/gprs_ns2.c A src/gb/gprs_ns2_driver.c A src/gb/gprs_ns2_driver.h A src/gb/gprs_ns2_internal.h A src/gb/gprs_ns2_sns.c A src/gb/gprs_ns2_vc_fsm.c A src/gb/gprs_ns2_vc_fsm.h A src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map 14 files changed, 4,251 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/19417/1 diff --git a/include/Makefile.am b/include/Makefile.am index 7af7e01..f961bb4 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -65,6 +65,8 @@ osmocom/gprs/gprs_msgb.h \ osmocom/gprs/gprs_ns.h \ osmocom/gprs/gprs_ns_frgre.h \ + osmocom/gprs/gprs_ns2.h \ + osmocom/gprs/gprs_ns_common.h \ osmocom/gprs/gprs_rlc.h \ osmocom/gprs/protocol/gsm_04_60.h \ osmocom/gprs/protocol/gsm_08_16.h \ diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 79eec10..00d4a68 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -187,6 +187,7 @@ LOG_FLT_BSC_SUBSCR, LOG_FLT_VLR_SUBSCR, LOG_FLT_L1_SAPI, + LOG_FLT_GB_NSE, _LOG_FLT_COUNT }; diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h new file mode 100644 index 0000000..4db34c0 --- /dev/null +++ b/include/osmocom/gprs/gprs_ns2.h @@ -0,0 +1,131 @@ +/*! \file gprs_ns2.h */ + + +#ifndef OSMO_GPRS_NS2_H +#define OSMO_GPRS_NS2_H + +#include + +/* Our Implementation */ +#include +#include +#include +#include +#include +#include +#include +#include + +struct gprs_ns2_inst; +struct gprs_ns2_nse; +struct gprs_ns2_vc; +struct gprs_ns2_vc_bind; +struct gprs_ns2_vc_driver; +struct gprs_ns_ie_ip4_elem; + +/* callbacks for messages transfer */ +/*! Osmocom GPRS callback function type */ +typedef int gprs_ns2_cb_t(enum gprs_ns_evt event, struct msgb *msg, + uint16_t nsei, uint16_t bvci); + +/* instance */ +struct gprs_ns2_inst *gprs_ns2_instantiate(gprs_ns2_cb_t *cb, void *ctx); +void gprs_ns2_free(struct gprs_ns2_inst *inst); +int gprs_ns2_dynamic_create_nse(struct gprs_ns2_inst *nsi, bool create_nse); + +/* NSE */ +/*! Send a UNIT DATA over an NSE. Should be used by higher layers */ +int gprs_ns2_send(struct gprs_ns2_inst *inst,struct msgb *msg); +int gprs_ns2_send_nse(struct gprs_ns2_nse *nse, struct msgb *msg); +int gprs_ns2_send_nsei(struct gprs_ns2_inst *nsi, uint16_t nsei, struct msgb *msg); +int gprs_ns2_recv_vc(struct gprs_ns2_inst *nsi, + struct gprs_ns2_vc *nsvc, + struct msgb *msg); +struct gprs_ns2_nse *gprs_ns2_nse_by_nsei(struct gprs_ns2_inst *nsi, uint16_t nsei); +struct gprs_ns2_nse *gprs_ns2_create_nse(struct gprs_ns2_inst *nsi, uint16_t nsei); +void gprs_ns2_free_nse(struct gprs_ns2_nse *nse); + +/* create vc */ +void gprs_ns2_free_nsvc(struct gprs_ns2_vc *nsvc); +struct gprs_ns2_vc *gprs_ns2_nsvc_by_nsvci(struct gprs_ns2_inst *nsi, uint16_t nsvci); + +/* transmit message over a VC */ +int gprs_ns2_tx_block(struct gprs_ns2_vc *nsvc, uint8_t cause); +int gprs_ns2_tx_block_ack(struct gprs_ns2_vc *nsvc); + +int gprs_ns2_tx_reset(struct gprs_ns2_vc *nsvc, uint8_t cause); +int gprs_ns2_tx_reset_ack(struct gprs_ns2_vc *nsvc); + +int gprs_ns2_tx_unblock(struct gprs_ns2_vc *nsvc); +int gprs_ns2_tx_unblock_ack(struct gprs_ns2_vc *nsvc); + +int gprs_ns2_tx_alive(struct gprs_ns2_vc *nsvc); +int gprs_ns2_tx_alive_ack(struct gprs_ns2_vc *nsvc); + +int gprs_ns2_tx_unit_data(struct gprs_ns2_vc *nsvc, struct msgb *msg); + +int gprs_ns2_tx_status(struct gprs_ns2_vc *nsvc, uint8_t cause, + uint16_t bvci, struct msgb *orig_msg); + +/* SNS messages */ +int gprs_ns2_tx_sns_ack(struct gprs_ns2_vc *nsvc, uint8_t trans_id, uint8_t *cause, + const struct gprs_ns_ie_ip4_elem *ip4_elems, + unsigned int num_ip4_elems); +int gprs_ns2_tx_sns_config(struct gprs_ns2_vc *nsvc, bool end_flag, + const struct gprs_ns_ie_ip4_elem *ip4_elems, + unsigned int num_ip4_elems); +int gprs_ns2_tx_sns_config_ack(struct gprs_ns2_vc *nsvc, uint8_t *cause); +int gprs_ns2_tx_sns_size(struct gprs_ns2_vc *nsvc, bool reset_flag, uint16_t max_nr_nsvc, + uint16_t *ip4_ep_nr, uint16_t *ip6_ep_nr); +int gprs_ns2_tx_sns_size_ack(struct gprs_ns2_vc *nsvc, uint8_t *cause); + +/* IP VL driver */ +int gprs_ns2_ip_bind(struct gprs_ns2_inst *nsi, + struct osmo_sockaddr *local, + int dscp, + struct gprs_ns2_vc_bind **result); +void gprs_ns2_bind_set_mode(struct gprs_ns2_vc_bind *bind, enum gprs_ns2_vc_mode mode); + +/* create a VC connection */ +struct gprs_ns2_vc *gprs_ns2_ip_connect(struct gprs_ns2_vc_bind *bind, + struct osmo_sockaddr *remote, + struct gprs_ns2_nse *nse, + uint16_t nsvci); + +struct gprs_ns2_vc *gprs_ns2_ip_connect2(struct gprs_ns2_vc_bind *bind, + struct osmo_sockaddr *remote, + uint16_t nsei, + uint16_t nsvci); +/* TODO: should the inactive prviate */ +struct gprs_ns2_vc *gprs_ns2_ip_connect_inactive(struct gprs_ns2_vc_bind *bind, + struct osmo_sockaddr *remote, + struct gprs_ns2_nse *nse, + uint16_t nsvci); + +void gprs_ns2_free_bind(struct gprs_ns2_vc_bind *bind); + +/* create a VC SNS connection */ +int gprs_ns2_ip_connect_sns(struct gprs_ns2_vc_bind *bind, + struct osmo_sockaddr *remote, + uint16_t nsei); + +struct osmo_sockaddr *gprs_ns2_ip_vc_sockaddr(struct gprs_ns2_vc *nsvc); +struct osmo_sockaddr *gprs_ns2_ip_bind_sockaddr(struct gprs_ns2_vc_bind *bind); +int gprs_ns2_is_ip_bind(struct gprs_ns2_vc_bind *bind); +int gprs_ns2_ip_bind_set_dscp(struct gprs_ns2_vc_bind *bind, int dscp); + +struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr(struct gprs_ns2_nse *nsei, + struct osmo_sockaddr *sockaddr); +void gprs_ns2_start_alive_all_nsvcs(struct gprs_ns2_nse *nse); +void gprs_ns2_set_log_ss(int ss); +const char *gprs_ns2_cause_str(int cause); +const char *gprs_ns2_ll_str(const struct gprs_ns2_vc *nsvc); + +/* vty */ +int gprs_ns2_vty_init(struct gprs_ns2_inst *nsi); +int gprs_ns2_vty_create(); + + +#endif /* OSMO_GPRS_NS2_H */ + +/*! @} */ diff --git a/include/osmocom/gprs/gprs_ns_common.h b/include/osmocom/gprs/gprs_ns_common.h new file mode 100644 index 0000000..7bc7492 --- /dev/null +++ b/include/osmocom/gprs/gprs_ns_common.h @@ -0,0 +1,104 @@ +/*! \file gprs_ns_common.h */ + +#ifndef OSMO_GPRS_NS_COMMON_H +#define OSMO_GPRS_NS_COMMON_H + +#include + +struct gprs_ns2_nse; +struct gprs_ns2_vc; +struct msgb; + +#define NS_TIMERS_COUNT 8 +#define NS_TIMERS "(tns-block|tns-block-retries|tns-reset|tns-reset-retries|tns-test|tns-alive|tns-alive-retries|tsns-prov)" +#define NS_TIMERS_HELP \ + "(un)blocking Timer (Tns-block) timeout\n" \ + "(un)blocking Timer (Tns-block) number of retries\n" \ + "Reset Timer (Tns-reset) timeout\n" \ + "Reset Timer (Tns-reset) number of retries\n" \ + "Test Timer (Tns-test) timeout\n" \ + "Alive Timer (Tns-alive) timeout\n" \ + "Alive Timer (Tns-alive) number of retries\n" \ + "SNS Provision Timer (Tsns-prov) timeout\n" + +/* Educated guess - LLC user payload is 1500 bytes plus possible headers */ +#define NS_ALLOC_SIZE 3072 +#define NS_ALLOC_HEADROOM 20 + +enum ns2_timeout { + NS_TOUT_TNS_BLOCK, + NS_TOUT_TNS_BLOCK_RETRIES, + NS_TOUT_TNS_RESET, + NS_TOUT_TNS_RESET_RETRIES, + NS_TOUT_TNS_TEST, + NS_TOUT_TNS_ALIVE, + NS_TOUT_TNS_ALIVE_RETRIES, + NS_TOUT_TSNS_PROV, +}; + +#define NSE_S_BLOCKED 0x0001 +#define NSE_S_ALIVE 0x0002 +#define NSE_S_RESET 0x0004 + +#define NS_DESC_B(st) ((st) & NSE_S_BLOCKED ? "BLOCKED" : "UNBLOCKED") +#define NS_DESC_A(st) ((st) & NSE_S_ALIVE ? "ALIVE" : "DEAD") +#define NS_DESC_R(st) ((st) & NSE_S_RESET ? "RESET" : "UNRESET") + +/*! Osmocom NS link layer types */ +enum gprs_ns_ll { + GPRS_NS_LL_UDP, /*!< NS/UDP/IP */ + GPRS_NS_LL_E1, /*!< NS/E1 */ + GPRS_NS_LL_FR_GRE, /*!< NS/FR/GRE/IP */ +}; + +/*! Osmoco NS events */ +enum gprs_ns_evt { + GPRS_NS_EVT_UNIT_DATA, +}; + +/*! Osmocom NS VC create status */ +enum gprs_ns_cs { + GPRS_NS_CS_CREATED, /*!< A NSVC object has been created */ + GPRS_NS_CS_FOUND, /*!< A NSVC object has been found */ + GPRS_NS_CS_REJECTED, /*!< Rejected and answered message */ + GPRS_NS_CS_SKIPPED, /*!< Skipped message */ + GPRS_NS_CS_ERROR, /*!< Failed to process message */ +}; + +enum nsvc_timer_mode { + /* standard timers */ + NSVC_TIMER_TNS_TEST, + NSVC_TIMER_TNS_ALIVE, + NSVC_TIMER_TNS_RESET, + _NSVC_TIMER_NR, +}; + +enum gprs_ns2_signal_ns { + S_NS_RESET, + S_NS_BLOCK, + S_NS_UNBLOCK, + S_NS_ALIVE_EXP, /* Tns-alive expired more than N times */ + S_NS_REPLACED, /* nsvc object is replaced (sets old_nsvc) */ + S_NS_MISMATCH, /* got an unexpected IE (sets msg, pdu_type, ie_type) */ + S_SNS_CONFIGURED, /* IP-SNS configuration completed */ + S_NSE_AVAILABLE, /* NS2 NSE came alive */ + S_NSE_UNAVAILABLE, /* */ +}; + +struct gprs_ns2_signal_data { + struct gprs_ns2_nse *nse; + uint16_t nsei; + struct gprs_ns2_vc *nsvc; + struct gprs_ns2_vc *old_nsvc; + uint8_t cause; + uint8_t pdu_type; + uint8_t ie_type; + struct msgb *msg; +}; + +enum gprs_ns2_vc_mode { + NS2_VC_MODE_ALIVE, /* The VC will use RESET/BLOCK/UNBLOCK to start the connection and do ALIVE/ACK */ + NS2_VC_MODE_BLOCKRESET, /* The will only use ALIVE/ACK no initiation */ +}; + +#endif /* OSMO_GPRS_NS_COMMON_H */ diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am index 7248413..40df58e 100644 --- a/src/gb/Makefile.am +++ b/src/gb/Makefile.am @@ -20,7 +20,10 @@ libosmogb_la_SOURCES = gprs_ns.c gprs_ns_frgre.c gprs_ns_vty.c gprs_ns_sns.c \ gprs_bssgp.c gprs_bssgp_util.c gprs_bssgp_vty.c \ - gprs_bssgp_bss.c common_vty.c + gprs_bssgp_bss.c \ + gprs_ns2.c gprs_ns2_driver.c gprs_ns2_vc_fsm.c gprs_ns2_sns.c \ + gprs_ns2_message.c gprs_ns2_vty.c \ + common_vty.c endif EXTRA_DIST = libosmogb.map diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c new file mode 100644 index 0000000..583ca24 --- /dev/null +++ b/src/gb/gprs_ns2.c @@ -0,0 +1,933 @@ +/*! \file gprs_ns.c + * GPRS Networks Service (NS) messages on the Gb interface. + * 3GPP TS 08.16 version 8.0.1 Release 1999 / ETSI TS 101 299 V8.0.1 (2002-05) + * as well as its successor 3GPP TS 48.016 */ +/* + * (C) 2009-2018 by Harald Welte + * (C) 2016-2017,2020 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, see . + * + */ + +/*! \addtogroup libgb + * @{ + * + * GPRS Networks Service (NS) messages on the Gb interface + * 3GPP TS 08.16 version 8.0.1 Release 1999 / ETSI TS 101 299 V8.0.1 (2002-05) + * + * Some introduction into NS: NS is used typically on top of frame relay, + * but in the ip.access world it is encapsulated in UDP packets. It serves + * as an intermediate shim betwen BSSGP and the underlying medium. It doesn't + * do much, apart from providing congestion notification and status indication. + * + * Terms: + * + * NS Network Service + * NSVC NS Virtual Connection + * NSEI NS Entity Identifier + * NSVL NS Virtual Link + * NSVLI NS Virtual Link Identifier + * BVC BSSGP Virtual Connection + * BVCI BSSGP Virtual Connection Identifier + * NSVCG NS Virtual Connection Goup + * Blocked NS-VC cannot be used for user traffic + * Alive Ability of a NS-VC to provide communication + * + * There can be multiple BSSGP virtual connections over one (group of) NSVC's. BSSGP will + * therefore identify the BSSGP virtual connection by a BVCI passed down to NS. + * NS then has to figure out which NSVC's are responsible for this BVCI. + * Those mappings are administratively configured. + * + * This implementation has the following limitations: + * - Only one NS-VC for each NSE: No load-sharing function + * - NSVCI 65535 and 65534 are reserved for internal use + * - Only UDP is supported as of now, no frame relay support + * - There are no BLOCK and UNBLOCK timers (yet?) + * + * \file gprs_ns.c */ + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "common_vty.h" +#include "gprs_ns2_internal.h" +#include "gprs_ns2_vc_fsm.h" +#include "gprs_ns2_driver.h" + +#define ns_set_state(ns_, st_) ns_set_state_with_log(ns_, st_, false, __FILE__, __LINE__) +#define ns_set_remote_state(ns_, st_) ns_set_state_with_log(ns_, st_, true, __FILE__, __LINE__) +#define ns_mark_blocked(ns_) ns_set_state(ns_, (ns_)->state | NSE_S_BLOCKED) +#define ns_mark_unblocked(ns_) ns_set_state(ns_, (ns_)->state & (~NSE_S_BLOCKED)); +#define ns_mark_alive(ns_) ns_set_state(ns_, (ns_)->state | NSE_S_ALIVE) +#define ns_mark_dead(ns_) ns_set_state(ns_, (ns_)->state & (~NSE_S_ALIVE)); + +static const struct tlv_definition ns_att_tlvdef = { + .def = { + [NS_IE_CAUSE] = { TLV_TYPE_TvLV, 0 }, + [NS_IE_VCI] = { TLV_TYPE_TvLV, 0 }, + [NS_IE_PDU] = { TLV_TYPE_TvLV, 0 }, + [NS_IE_BVCI] = { TLV_TYPE_TvLV, 0 }, + [NS_IE_NSEI] = { TLV_TYPE_TvLV, 0 }, + [NS_IE_IPv4_LIST] = { TLV_TYPE_TvLV, 0 }, + [NS_IE_IPv6_LIST] = { TLV_TYPE_TvLV, 0 }, + [NS_IE_MAX_NR_NSVC] = { TLV_TYPE_FIXED, 2 }, + [NS_IE_IPv4_EP_NR] = { TLV_TYPE_FIXED, 2 }, + [NS_IE_IPv6_EP_NR] = { TLV_TYPE_FIXED, 2 }, + [ NS_IE_RESET_FLAG] = { TLV_TYPE_TV, 0 }, + /* TODO: IP_ADDR can be 5 or 17 bytes long, depending on first byte. This + * cannot be expressed in our TLV parser. However, we don't do IPv6 anyway */ + [NS_IE_IP_ADDR] = { TLV_TYPE_FIXED, 5 }, + }, +}; + +/* TODO: move into common part */ + +/* Section 10.3.2, Table 13 */ +static const struct value_string ns2_cause_str[] = { + { NS_CAUSE_TRANSIT_FAIL, "Transit network failure" }, + { NS_CAUSE_OM_INTERVENTION, "O&M intervention" }, + { NS_CAUSE_EQUIP_FAIL, "Equipment failure" }, + { NS_CAUSE_NSVC_BLOCKED, "NS-VC blocked" }, + { NS_CAUSE_NSVC_UNKNOWN, "NS-VC unknown" }, + { NS_CAUSE_BVCI_UNKNOWN, "BVCI unknown" }, + { NS_CAUSE_SEM_INCORR_PDU, "Semantically incorrect PDU" }, + { NS_CAUSE_PDU_INCOMP_PSTATE, "PDU not compatible with protocol state" }, + { NS_CAUSE_PROTO_ERR_UNSPEC, "Protocol error, unspecified" }, + { NS_CAUSE_INVAL_ESSENT_IE, "Invalid essential IE" }, + { NS_CAUSE_MISSING_ESSENT_IE, "Missing essential IE" }, + { NS_CAUSE_INVAL_NR_IPv4_EP, "Invalid Number of IPv4 Endpoints" }, + { NS_CAUSE_INVAL_NR_IPv6_EP, "Invalid Number of IPv6 Endpoints" }, + { NS_CAUSE_INVAL_NR_NS_VC, "Invalid Number of NS-VCs" }, + { NS_CAUSE_INVAL_WEIGH, "Invalid Weights" }, + { NS_CAUSE_UNKN_IP_EP, "Unknown IP Endpoint" }, + { NS_CAUSE_UNKN_IP_ADDR, "Unknown IP Address" }, + { NS_CAUSE_UNKN_IP_TEST_FAILED, "IP Test Failed" }, + { 0, NULL } +}; + +/*! Obtain a human-readable string for NS cause value */ +const char *gprs_ns2_cause_str(int cause) +{ + enum ns_cause _cause = cause; + return get_value_string(ns2_cause_str, _cause); +} + +static const struct rate_ctr_desc nsvc_ctr_description[] = { + { "packets:in", "Packets at NS Level ( In)" }, + { "packets:out","Packets at NS Level (Out)" }, + { "bytes:in", "Bytes at NS Level ( In)" }, + { "bytes:out", "Bytes at NS Level (Out)" }, + { "blocked", "NS-VC Block count " }, + { "dead", "NS-VC gone dead count " }, + { "replaced", "NS-VC replaced other count" }, + { "nsei-chg", "NS-VC changed NSEI count " }, + { "inv-nsvci", "NS-VCI was invalid count " }, + { "inv-nsei", "NSEI was invalid count " }, + { "lost:alive", "ALIVE ACK missing count " }, + { "lost:reset", "RESET ACK missing count " }, +}; + +static const struct rate_ctr_group_desc nsvc_ctrg_desc = { + .group_name_prefix = "ns:nsvc", + .group_description = "NSVC Peer Statistics", + .num_ctr = ARRAY_SIZE(nsvc_ctr_description), + .ctr_desc = nsvc_ctr_description, + .class_id = OSMO_STATS_CLASS_PEER, +}; + +enum ns_stat { + NS_STAT_ALIVE_DELAY, +}; + +static const struct osmo_stat_item_desc nsvc_stat_description[] = { + { "alive.delay", "ALIVE response time ", "ms", 16, 0 }, +}; + +static const struct osmo_stat_item_group_desc nsvc_statg_desc = { + .group_name_prefix = "ns.nsvc", + .group_description = "NSVC Peer Statistics", + .num_items = ARRAY_SIZE(nsvc_stat_description), + .item_desc = nsvc_stat_description, + .class_id = OSMO_STATS_CLASS_PEER, +}; + +const struct value_string gprs_ns2_signal_ns_names[] = { + { S_NS_RESET, "NS-RESET" }, + { S_NS_BLOCK, "NS-BLOCK" }, + { S_NS_UNBLOCK, "NS-UNBLOCK" }, + { S_NS_ALIVE_EXP, "NS-ALIVE expired" }, + { S_NS_REPLACED, "NSVC replaced" }, + { S_NS_MISMATCH, "Unexpected IE" }, + { S_SNS_CONFIGURED, "SNS Configured" }, + { 0, NULL } +}; + +void gprs_ns2_set_log_ss(int ss) +{ + DNS = ss; +} + +const char *gprs_ns2_ll_str(const struct gprs_ns2_vc *nsvc) +{ + static __thread char buf[80] = ""; + /* TODO ns2_ll_str */ +// return gprs_ns_ll_str_buf(buf, sizeof(buf), nsvc); + return &buf[0]; +} + +/*! + * \brief gprs_ns2_send_nse send PDU for a NSE + * The bvci is encoded in the message. See msg_bvci() + * \param nse + * \param msg + * \return + */ +int gprs_ns2_send_nse(struct gprs_ns2_nse *nse, struct msgb *msg) +{ + /* TODO: do loadbalancing in here and bvci stickyness */ + struct gprs_ns2_vc *nsvc = NULL, *tmp; + uint16_t bvci = msgb_bvci(msg); + + llist_for_each_entry(tmp, &nse->vc, list) { + if (!gprs_ns2_vc_is_unblocked(tmp)) + continue; + if (bvci == 0 && tmp->sig_weight == 0) + continue; + if (bvci != 0 && tmp->data_weight == 0) + continue; + + nsvc = tmp; + } + + if (!nsvc) + return -1; + + return gprs_ns2_tx_unit_data(nsvc, msg); +} + +int gprs_ns2_send_nsei(struct gprs_ns2_inst *nsi, uint16_t nsei, struct msgb *msg) +{ + struct gprs_ns2_nse *nse; + + nse = gprs_ns2_nse_by_nsei(nsi, nsei); + if (!nse) + return -ENOENT; + + return gprs_ns2_send_nse(nse, msg); +} + +int gprs_ns2_send(struct gprs_ns2_inst *nsi, struct msgb *msg) +{ + struct gprs_ns2_nse *nse; + + nse = gprs_ns2_nse_by_nsei(nsi, msgb_nsei(msg)); + if (!nse) + return -1; + + return gprs_ns2_send_nse(nse, msg); +} + +/*! + * \brief ns2_vc_alloc + * \param bind + * \param nse + * \param initiater - if this is an incoming remote (!initiater) or a local outgoing connection (initater) + * \return + */ +struct gprs_ns2_vc *ns2_vc_alloc(struct gprs_ns2_vc_bind *bind, struct gprs_ns2_nse *nse, bool initiater) +{ + struct gprs_ns2_vc *vc = talloc_zero(bind, struct gprs_ns2_vc); + int nsvci = 0; + + if (!vc) + return NULL; + + vc->bind = bind; + vc->nse = nse; + vc->mode = bind->use_reset_block_unblock ? NS2_VC_MODE_BLOCKRESET : NS2_VC_MODE_ALIVE; + vc->sig_weight = 1; + vc->data_weight = 1; + llist_add(&vc->list, &nse->vc); + llist_add(&vc->blist, &bind->vc); + + /* TODO: fix ctrg index. It must be != 0. Maybe use a integer at nsi level? */ + vc->ctrg = rate_ctr_group_alloc(vc, &nsvc_ctrg_desc, nsvci); + if (!vc->ctrg) { + goto err; + } + /* TODO: fix statg index. It must be != 0 */ + vc->statg = osmo_stat_item_group_alloc(vc, &nsvc_statg_desc, nsvci); + if (!vc->statg) + goto err_group; + if (!gprs_ns2_vc_fsm_alloc(vc, NULL, initiater)) + goto err_statg; + + return vc; + +err_statg: + osmo_stat_item_group_free(vc->statg); +err_group: + rate_ctr_group_free(vc->ctrg); +err: + llist_del(&vc->list); + llist_del(&vc->blist); + talloc_free(vc); + + return NULL; +} + + +void gprs_ns2_free_nsvc(struct gprs_ns2_vc *nsvc) +{ + if (!nsvc) + return; + + llist_del(&nsvc->list); + llist_del(&nsvc->blist); + + /* TODO: signal to the user the removal of this vc */ + /* TODO: communicate to the NSE the loss, e.g. if all VCs are freed, the user space might want to know */ + + /* notify nse this nsvc is unavailable */ + ns2_nse_notify_unblocked(nsvc, false); + + /* check if sns is using this VC */ + ns2_sns_free_nsvc(nsvc); + osmo_fsm_inst_term(nsvc->fi, OSMO_FSM_TERM_REQUEST, NULL); + + /* let the driver/bind clean up it's internal state */ + if (nsvc->priv && nsvc->bind->free_vc) { + nsvc->bind->free_vc(nsvc); + } + + talloc_free(nsvc); +} + +struct msgb *gprs_ns2_msgb_alloc(void) +{ + struct msgb *msg = msgb_alloc_headroom(NS_ALLOC_SIZE, NS_ALLOC_HEADROOM, + "GPRS/NS"); + if (!msg) { + LOGP(DNS, LOGL_ERROR, "Failed to allocate NS message of size %d\n", + NS_ALLOC_SIZE); + } + return msg; +} + +/*! + * \brief gprs_ns2_cerate_status_msg create a status message to be sent over a new connection. + * \param[in] orig_msg the original message + * \param[in] tp TLVP parsed of the original message + * \param[out] result + * \param[in] cause + * \return + */ +static int reject_status_msg(struct msgb *orig_msg, struct tlv_parsed *tp, struct msgb **reject, enum ns_cause cause) +{ + /* TODO has to create all messages. It might append NSVCI */ + struct msgb *msg = gprs_ns2_msgb_alloc(); + struct gprs_ns_hdr *nsh; + bool have_vci = false; + uint8_t _cause = cause; + + if (!msg) + return -ENOMEM; + +// LOGP(DNS, LOGL_NOTICE, "NSEI=%u Tx NS STATUS (NSVCI=%u, cause=%s)\n", +// nsvc->nsei, nsvc->nsvci, gprs_ns_cause_str(cause)); + + msg->l2h = msgb_put(msg, sizeof(*nsh)); + nsh = (struct gprs_ns_hdr *) msg->l2h; + nsh->pdu_type = NS_PDUT_STATUS; + + msgb_tvlv_put(msg, NS_IE_CAUSE, 1, &_cause); + + have_vci = TLVP_PRESENT(tp, NS_IE_VCI); + + /* Section 9.2.7.1: Static conditions for NS-VCI */ + if (cause == NS_CAUSE_NSVC_BLOCKED || + cause == NS_CAUSE_NSVC_UNKNOWN) { + if (!have_vci) { + msgb_free(msg); + return -EINVAL; + } + + msgb_tvlv_put(msg, NS_IE_VCI, 2, TLVP_VAL(tp, NS_IE_VCI)); + } + + /* Section 9.2.7.2: Static conditions for NS PDU */ + switch (cause) { + case NS_CAUSE_SEM_INCORR_PDU: + case NS_CAUSE_PDU_INCOMP_PSTATE: + case NS_CAUSE_PROTO_ERR_UNSPEC: + case NS_CAUSE_INVAL_ESSENT_IE: + case NS_CAUSE_MISSING_ESSENT_IE: + msgb_tvlv_put(msg, NS_IE_PDU, msgb_l2len(orig_msg), + orig_msg->l2h); + break; + default: + break; + } + + *reject = msg; + return 0; +} + + +struct gprs_ns2_nse *gprs_ns2_nse_by_nsei(struct gprs_ns2_inst *nsi, uint16_t nsei) +{ + struct gprs_ns2_nse *nse; + + llist_for_each_entry(nse, &nsi->nse, list) { + if (nse->nsei == nsei) + return nse; + } + + return NULL; +} + +struct gprs_ns2_vc *gprs_ns2_nsvc_by_nsvci(struct gprs_ns2_inst *nsi, uint16_t nsvci) +{ + struct gprs_ns2_nse *nse; + struct gprs_ns2_vc *nsvc; + + llist_for_each_entry(nse, &nsi->nse, list) { + llist_for_each_entry(nsvc, &nse->vc, list) { + if (nsvc->nsvci_is_valid && nsvc->nsvci == nsvci) + return nsvc; + } + } + + return NULL; +} + +struct gprs_ns2_nse *gprs_ns2_create_nse(struct gprs_ns2_inst *nsi, uint16_t nsei) +{ + struct gprs_ns2_nse *nse = talloc_zero(nsi, struct gprs_ns2_nse); + + OSMO_ASSERT(nsi); + + if (!nse) + return NULL; + + /* TODO: check if nsei already taken! */ + + nse->nsei = nsei; + nse->nsi = nsi; + llist_add(&nse->list, &nsi->nse); + INIT_LLIST_HEAD(&nse->vc); + + nse->bss_sns_fi = ns2_sns_bss_fsm_alloc(nse, NULL); + if (!nse->bss_sns_fi) { + llist_del(&nse->list); + return NULL; + } + + return nse; +} + +void gprs_ns2_free_nse(struct gprs_ns2_nse *nse) +{ + struct gprs_ns2_vc *vc, *tmp; + struct gprs_ns2_signal_data nssd = {0}; + + if (!nse) + return; + + /* inform the user */ + nssd.nse = nse; + nssd.nsei = nse->nsei; + nse->unblocked = false; + osmo_signal_dispatch(SS_L_NS, S_NSE_UNAVAILABLE, &nssd); + + llist_for_each_entry_safe(vc, tmp, &nse->vc, list) { + gprs_ns2_free_nsvc(vc); + } + + llist_del(&nse->list); + osmo_fsm_inst_term(nse->bss_sns_fi, OSMO_FSM_TERM_REQUEST, NULL); + talloc_free(nse); +} + + +/*! + * \brief gprs_ns2_create_vc create a new VC from a message. might also create a new NSEI + * \param[in] nsi + * \param[in] msg + * \param[in] logname A name to describe the VC. E.g. ip address pair + * \param[in] do_block_reset If the VC is doing BLOCK/UNBLOCK/RESET. + * \param[out] reject A message filled to be sent back. Only used in failure cases. + * \return + */ +int ns2_create_vc(struct gprs_ns2_vc_bind *bind, + struct msgb *msg, + const char *logname, + enum gprs_ns2_vc_mode mode, + struct msgb **reject, + struct gprs_ns2_vc **success) +{ + struct gprs_ns_hdr *nsh = (struct gprs_ns_hdr *)msg->l2h; + struct tlv_parsed tp; + struct gprs_ns2_vc *vc; + struct gprs_ns2_nse *nse; + uint16_t nsvci; + uint16_t nsei; + + int rc; + + /* TODO: length check on msgb */ + if (nsh->pdu_type == NS_PDUT_STATUS) { + /* Do not respond, see 3GPP TS 08.16, 7.5.1 */ + LOGP(DNS, LOGL_INFO, "Ignoring NS STATUS from %s " + "for non-existing NS-VC\n", + logname); + return GPRS_NS2_CS_SKIPPED; + } + + if (nsh->pdu_type == NS_PDUT_ALIVE_ACK) { + /* Ignore this, see 3GPP TS 08.16, 7.4.1 */ + LOGP(DNS, LOGL_INFO, "Ignoring NS ALIVE ACK from %s " + "for non-existing NS-VC\n", + logname); + return GPRS_NS2_CS_SKIPPED; + } + + if (nsh->pdu_type == NS_PDUT_RESET_ACK) { + /* Ignore this, see 3GPP TS 08.16, 7.3.1 */ + LOGP(DNS, LOGL_INFO, "Ignoring NS RESET ACK from %s " + "for non-existing NS-VC\n", + logname); + return GPRS_NS2_CS_SKIPPED; + } + + /* Only the RESET procedure creates a new NSVC */ + if (nsh->pdu_type != NS_PDUT_RESET) { + rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_PDU_INCOMP_PSTATE); + + if (rc < 0) { + LOGP(DNS, LOGL_ERROR, "Failed to generate reject message (%d)\n", rc); + return rc; + } + return GPRS_NS2_CS_REJECTED; + } + + rc = tlv_parse(&tp, &ns_att_tlvdef, nsh->data, + msgb_l2len(msg) - sizeof(*nsh), 0, 0); + if (rc < 0) { + LOGP(DNS, LOGL_ERROR, "Rx NS RESET Error %d during " + "TLV Parse\n", rc); + /* TODO: send invalid message back */ + return GPRS_NS2_CS_REJECTED; + } + + if (!TLVP_PRESENT(&tp, NS_IE_CAUSE) || + !TLVP_PRESENT(&tp, NS_IE_VCI) || !TLVP_PRESENT(&tp, NS_IE_NSEI)) { + LOGP(DNS, LOGL_ERROR, "NS RESET Missing mandatory IE\n"); + rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_MISSING_ESSENT_IE); + return GPRS_NS2_CS_REJECTED; + } + + /* find or create NSE */ + nsei = tlvp_val16be(&tp, NS_IE_NSEI); + nse = gprs_ns2_nse_by_nsei(bind->nsi, nsei); + if (!nse) { + if (!bind->nsi->create_nse) { + return GPRS_NS2_CS_SKIPPED; + } + + nse = gprs_ns2_create_nse(bind->nsi, nsei); + if (!nse) { + return GPRS_NS_CS_ERROR; + } + } + + vc = ns2_vc_alloc(bind, nse, false); + if (!vc) + return GPRS_NS_CS_SKIPPED; + + vc->mode = mode; + vc->ll = GPRS_NS_LL_UDP; + + nsvci = tlvp_val16be(&tp, NS_IE_VCI); + vc->nsvci = nsvci; + vc->nsvci_is_valid = true; + + *success = vc; + + return GPRS_NS2_CS_CREATED; +} + +struct gprs_ns2_vc *gprs_ns2_ip_connect_inactive(struct gprs_ns2_vc_bind *bind, + struct osmo_sockaddr *remote, + struct gprs_ns2_nse *nse, + uint16_t nsvci) +{ + struct gprs_ns2_vc *nsvc; + + nsvc = gprs_ns2_ip_bind_connect(bind, nse, remote); + if (!nsvc) + return NULL; + + if (nsvc->mode == NS2_VC_MODE_BLOCKRESET) { + nsvc->nsvci = nsvci; + nsvc->nsvci_is_valid = true; + } + + return nsvc; +} + +/*! + * \brief gprs_ns2_ip_connect + * \param bind + * \param remote + * \param nse + * \param nsvci only required when mode == NS2_VC_MODE_BLOCKRESET + * \param mode + * \return + */ +struct gprs_ns2_vc *gprs_ns2_ip_connect(struct gprs_ns2_vc_bind *bind, + struct osmo_sockaddr *remote, + struct gprs_ns2_nse *nse, + uint16_t nsvci) +{ + struct gprs_ns2_vc *nsvc; + nsvc = gprs_ns2_ip_connect_inactive(bind, remote, nse, nsvci); + if (!nsvc) + return NULL; + + gprs_ns2_vc_fsm_start(nsvc); + + return nsvc; +} + +/*! + * \brief gprs_ns2_ip_connect2 + * \param bind + * \param remote + * \param nsei + * \param nsvci only required when mode == NS2_VC_MODE_BLOCKRESET + * \param mode + * \return + */ +struct gprs_ns2_vc *gprs_ns2_ip_connect2(struct gprs_ns2_vc_bind *bind, + struct osmo_sockaddr *remote, + uint16_t nsei, + uint16_t nsvci) +{ + struct gprs_ns2_nse *nse = gprs_ns2_nse_by_nsei(bind->nsi, nsei); + + if (!nse) { + nse = gprs_ns2_create_nse(bind->nsi, nsei); + if (!nse) + return NULL; + } + + return gprs_ns2_ip_connect(bind, remote, nse, nsvci); +} + +int gprs_ns2_ip_connect_sns(struct gprs_ns2_vc_bind *bind, + struct osmo_sockaddr *remote, + uint16_t nsei) +{ + struct gprs_ns2_nse *nse = gprs_ns2_nse_by_nsei(bind->nsi, nsei); + struct gprs_ns2_vc *nsvc; + + if (!nse) { + nse = gprs_ns2_create_nse(bind->nsi, nsei); + if (!nse) + return -1; + } + + nsvc = gprs_ns2_ip_bind_connect(bind, nse, remote); + if (!nsvc) + return -1; + + ns2_sns_bss_fsm_start(nse, nsvc, remote); + + return 0; +} + +/* TODO: vc start */ + +struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr(struct gprs_ns2_nse *nse, + struct osmo_sockaddr *sockaddr) +{ + struct gprs_ns2_vc *nsvc; + struct osmo_sockaddr *remote; + + OSMO_ASSERT(nse); + OSMO_ASSERT(sockaddr); + + llist_for_each_entry(nsvc, &nse->vc, list) { + remote = gprs_ns2_ip_vc_sockaddr(nsvc); + if (!osmo_sockaddr_cmp(sockaddr, remote)) + return nsvc; + } + + return NULL; +} + + +/*! + * \brief gprs_ns2_recv_vc entrypoint of received NS PDU from the driver/bind + * \param nsi + * \param vc + * \param msg the received message. Must not be freeded. + * \return + */ +int ns2_recv_vc(struct gprs_ns2_inst *nsi, + struct gprs_ns2_vc *vc, + struct msgb *msg) +{ + struct gprs_ns_hdr *nsh = (struct gprs_ns_hdr *) msg->l2h; + struct tlv_parsed tp; + int rc = 0; + + if (msg->len < sizeof(struct gprs_ns_hdr)) + return -EINVAL; + + switch (nsh->pdu_type) { + case SNS_PDUT_CONFIG: + /* TODO */ +// if (!nsi->bss_sns_fi) +// goto unexpected_sns; + /* one additional byte ('end flag') before the TLV part starts */ + rc = tlv_parse(&tp, &ns_att_tlvdef, nsh->data+1, + msgb_l2len(msg) - sizeof(*nsh)-1, 0, 0); + if (rc < 0) { + LOGPC(DNS, LOGL_NOTICE, "Error during TLV Parse in %s\n", msgb_hexdump(msg)); + return rc; + } + /* All sub-network service related message types */ + rc = gprs_ns2_sns_rx(vc, msg, &tp); + break; + case SNS_PDUT_ACK: + case SNS_PDUT_ADD: + case SNS_PDUT_CHANGE_WEIGHT: + case SNS_PDUT_DELETE: + /* TODO */ +// if (!nsi->bss_sns_fi) +// goto unexpected_sns; + /* weird layout: NSEI TLV, then value-only transaction IE, then TLV again */ + rc = tlv_parse(&tp, &ns_att_tlvdef, nsh->data+5, + msgb_l2len(msg) - sizeof(*nsh)-5, 0, 0); + if (rc < 0) { + LOGPC(DNS, LOGL_NOTICE, "Error during TLV Parse in %s\n", msgb_hexdump(msg)); + return rc; + } + tp.lv[NS_IE_NSEI].val = nsh->data+2; + tp.lv[NS_IE_NSEI].len = 2; + tp.lv[NS_IE_TRANS_ID].val = nsh->data+4; + tp.lv[NS_IE_TRANS_ID].len = 1; + rc = gprs_ns2_sns_rx(vc, msg, &tp); + break; + case SNS_PDUT_CONFIG_ACK: + case SNS_PDUT_SIZE: + case SNS_PDUT_SIZE_ACK: + /* TODO */ +// if (!nsi->bss_sns_fi) +// goto unexpected_sns; + rc = tlv_parse(&tp, &ns_att_tlvdef, nsh->data, + msgb_l2len(msg) - sizeof(*nsh), 0, 0); + if (rc < 0) { + LOGPC(DNS, LOGL_NOTICE, "Error during TLV Parse in %s\n", msgb_hexdump(msg)); + return rc; + } + /* All sub-network service related message types */ + rc = gprs_ns2_sns_rx(vc, msg, &tp); + break; + + case NS_PDUT_UNITDATA: + rc = gprs_ns2_vc_rx(vc, msg, NULL); + break; + default: + rc = tlv_parse(&tp, &ns_att_tlvdef, nsh->data, + msgb_l2len(msg) - sizeof(*nsh), 0, 0); + if (rc < 0) { + LOGPC(DNS, LOGL_NOTICE, "Error during TLV Parse\n"); + if (nsh->pdu_type != NS_PDUT_STATUS) + gprs_ns2_tx_status(vc, NS_CAUSE_PROTO_ERR_UNSPEC, 0, msg); + return rc; + } + rc = gprs_ns2_vc_rx(vc, msg, &tp); + } + + return rc; +} + +void ns2_nse_notify_unblocked(struct gprs_ns2_vc *nsvc, bool unblocked) +{ + struct gprs_ns2_nse *nse = nsvc->nse; + struct gprs_ns2_vc *tmp; + struct gprs_ns2_signal_data nssd = {0}; + + if (nse->unblocked == unblocked) + return; + + nssd.nse = nse; + nssd.nsei = nse->nsei; + + /* this is the first unblocked NSVC on a unavaiable NSE */ + if (!nse->unblocked) { + nse->unblocked = true; + osmo_signal_dispatch(SS_L_NS, S_NSE_AVAILABLE, &nssd); + return; + } + + /* check if there are any remaining alive vcs */ + llist_for_each_entry(tmp, &nse->vc, list) { + if (gprs_ns2_vc_is_unblocked(tmp)) { + return; + } + } + + /* nse became unavailable */ + nse->unblocked = false; + osmo_signal_dispatch(SS_L_NS, S_NSE_UNAVAILABLE, &nssd); +} + +/* TODO: remove this global, why the hell do I use it */ +static bool gprs_fsm_vc_registered = false; +static bool gprs_fsm_sns_registered = false; + + +/*! Create a new GPRS NS instance + * \param[in] cb Call-back function for incoming BSSGP data + * \returns dynamically allocated gprs_ns_inst + */ +struct gprs_ns2_inst *gprs_ns2_instantiate(gprs_ns2_cb_t *cb, void *ctx) +{ + struct gprs_ns2_inst *nsi; + + if (!gprs_fsm_vc_registered) { + if (gprs_ns2_vc_fsm_init() < 0) + return NULL; + gprs_fsm_vc_registered = true; + } + if (!gprs_fsm_sns_registered) { + if (gprs_ns2_sns_init() < 0) + return NULL; + gprs_fsm_sns_registered = true; + } + + nsi = talloc_zero(ctx, struct gprs_ns2_inst); + if (!nsi) + return NULL; + + nsi->cb = cb; + INIT_LLIST_HEAD(&nsi->binding); + INIT_LLIST_HEAD(&nsi->nse); + + nsi->timeout[NS_TOUT_TNS_BLOCK] = 3; + nsi->timeout[NS_TOUT_TNS_BLOCK_RETRIES] = 3; + nsi->timeout[NS_TOUT_TNS_RESET] = 3; + nsi->timeout[NS_TOUT_TNS_RESET_RETRIES] = 3; + nsi->timeout[NS_TOUT_TNS_TEST] = 30; + nsi->timeout[NS_TOUT_TNS_ALIVE] = 3; + nsi->timeout[NS_TOUT_TNS_ALIVE_RETRIES] = 10; + nsi->timeout[NS_TOUT_TSNS_PROV] = 3; /* 1..10 */ + + return nsi; +} + +void gprs_ns2_free(struct gprs_ns2_inst *nsi) +{ + struct gprs_ns2_vc_bind *bind, *tbind; + struct gprs_ns2_nse *nse, *ntmp; + + if (!nsi) + return; + + llist_for_each_entry_safe(nse, ntmp, &nsi->nse, list) { + gprs_ns2_free_nse(nse); + } + + llist_for_each_entry_safe(bind, tbind, &nsi->binding, list) { + gprs_ns2_free_bind(bind); + } +} + +/*! + * \brief gprs_ns2_dynamic_create_nse + * \param nsi the instance to modify + * \param create_nse if NSE can be created on receiving package. SGSN set this. + * \return + */ +int gprs_ns2_dynamic_create_nse(struct gprs_ns2_inst *nsi, bool create_nse) +{ + nsi->create_nse = create_nse; + + return 0; +} + +void gprs_ns2_start_alive_all_nsvcs(struct gprs_ns2_nse *nse) +{ + struct gprs_ns2_vc *nsvc; + OSMO_ASSERT(nse); + + llist_for_each_entry(nsvc, &nse->vc, list) { + if (nsvc->sns_only) + continue; + + gprs_ns2_vc_fsm_start(nsvc); + } +} + +void gprs_ns2_bind_set_mode(struct gprs_ns2_vc_bind *bind, enum gprs_ns2_vc_mode mode) +{ + bind->use_reset_block_unblock = mode == NS2_VC_MODE_BLOCKRESET ? true : false; +} + +void gprs_ns2_free_bind(struct gprs_ns2_vc_bind *bind) +{ + struct gprs_ns2_vc *nsvc, *tmp; + if (!bind) + return; + + llist_for_each_entry_safe(nsvc, tmp, &bind->vc, blist) { + gprs_ns2_free_nsvc(nsvc); + } + + if (bind->driver->free_bind) + bind->driver->free_bind(bind); + + llist_del(&bind->list); + talloc_free(bind); +} +/*! @} */ diff --git a/src/gb/gprs_ns2_driver.c b/src/gb/gprs_ns2_driver.c new file mode 100644 index 0000000..e576550 --- /dev/null +++ b/src/gb/gprs_ns2_driver.c @@ -0,0 +1,372 @@ + +#include + +#include +#include +#include + +#include "common_vty.h" +#include "gprs_ns2_internal.h" +#include "gprs_ns2_driver.h" +#include "gprs_ns2_vc_fsm.h" + + +static void free_bind(struct gprs_ns2_vc_bind *bind); + + +struct gprs_ns2_vc_driver vc_driver_ip = { + .name = "GB UDP IPv4/IPv6", + .free_bind = free_bind, +}; + +struct priv_bind { + struct osmo_fd fd; + struct osmo_sockaddr addr; + int dscp; +}; + +struct priv_vc { + struct osmo_sockaddr remote; +}; + +/*! clean up all private driver state. Should be only called by gprs_ns2_free_bind() */ +static void free_bind(struct gprs_ns2_vc_bind *bind) +{ + struct priv_bind *priv; + + if (!bind) + return; + + priv = bind->priv; + + OSMO_ASSERT(llist_empty(&bind->vc)); + + osmo_fd_close(&priv->fd); + talloc_free(priv); +} + +static void free_vc(struct gprs_ns2_vc *vc) +{ + OSMO_ASSERT(vc); + + if (!vc->priv) + return; + + talloc_free(vc->priv); + vc->priv = NULL; +} + +int gprs_ns2_find_vc_by_sockaddr(struct gprs_ns2_vc_bind *bind, struct osmo_sockaddr *saddr, struct gprs_ns2_vc **result) +{ + struct gprs_ns2_vc *vc1; + struct priv_vc *vcpriv; + + if (!result) + return -EINVAL; + + llist_for_each_entry(vc1, &bind->vc, blist) { + vcpriv = vc1->priv; + if (vcpriv->remote.u.sa.sa_family != saddr->u.sa.sa_family) + continue; + if (osmo_sockaddr_cmp(&vcpriv->remote, saddr)) + continue; + + *result = vc1; + return 0; + } + + return 1; +} + +static inline int nsip_sendmsg(struct gprs_ns2_vc_bind *bind, + struct msgb *msg, + struct osmo_sockaddr *dest) +{ + int rc; + struct priv_bind *priv = bind->priv; + + rc = sendto(priv->fd.fd, msg->data, msg->len, 0, + &dest->u.sa, sizeof(*dest)); + + msgb_free(msg); + + return rc; +} + +/*! + * \brief nsip_vc_sendmsg will send the msg and free msgb afterwards. + * \param vc + * \param msg + * \return < 0 on erros, otherwise the bytes sent. + */ +static int nsip_vc_sendmsg(struct gprs_ns2_vc *vc, struct msgb *msg) +{ + int rc; + struct gprs_ns2_vc_bind *bind = vc->bind; + struct priv_vc *priv = vc->priv; + + rc = nsip_sendmsg(bind, msg, &priv->remote); + + return rc; +} + +/* Read a single NS-over-IP message */ +static struct msgb *read_nsip_msg(struct osmo_fd *bfd, int *error, + struct osmo_sockaddr *saddr) +{ + struct msgb *msg = gprs_ns2_msgb_alloc(); + int ret = 0; + socklen_t saddr_len = sizeof(*saddr); + + if (!msg) { + *error = -ENOMEM; + return NULL; + } + + ret = recvfrom(bfd->fd, msg->data, NS_ALLOC_SIZE - NS_ALLOC_HEADROOM, 0, + &saddr->u.sa, &saddr_len); + if (ret < 0) { + LOGP(DNS, LOGL_ERROR, "recv error %s during NSIP recvfrom %s\n", + strerror(errno), osmo_sock_get_name2(bfd->fd)); + msgb_free(msg); + *error = ret; + return NULL; + } else if (ret == 0) { + msgb_free(msg); + *error = ret; + return NULL; + } + + msg->l2h = msg->data; + msgb_put(msg, ret); + + return msg; +} + +static struct priv_vc *ns2_driver_alloc_vc(struct gprs_ns2_vc_bind *bind, struct gprs_ns2_vc *vc, struct osmo_sockaddr *remote) +{ + struct priv_vc *priv = talloc_zero(bind, struct priv_vc); + if (!priv) + return NULL; + + vc->priv = priv; + priv->remote = *remote; + + return priv; +} + +static int handle_nsip_read(struct osmo_fd *bfd) +{ + int rc; + int error = 0; + struct gprs_ns2_vc_bind *bind = bfd->data; + struct osmo_sockaddr saddr; + struct gprs_ns2_vc *vc; + struct msgb *msg = read_nsip_msg(bfd, &error, &saddr); + struct msgb *reject; + + if (!msg) + return -EINVAL; + + /* check if a vc is available */ + rc = gprs_ns2_find_vc_by_sockaddr(bind, &saddr, &vc); + if (rc) { + /* VC not found */ + rc = ns2_create_vc(bind, msg, "newconnection", true, &reject, &vc); + switch (rc) { + case GPRS_NS2_CS_FOUND: + rc = ns2_recv_vc(bind->nsi, vc, msg); + break; + case GPRS_NS2_CS_ERROR: + case GPRS_NS2_CS_SKIPPED: + rc = 0; + break; + case GPRS_NS2_CS_REJECTED: + /* nsip_sendmsg will free reject */ + nsip_sendmsg(bind, reject, &saddr); + return 0; + case GPRS_NS2_CS_CREATED: + /* TODO: check if we need to call recv_vc(). It might be already enough to be parsed by create_vc() */ + ns2_driver_alloc_vc(bind, vc, &saddr); + gprs_ns2_vc_fsm_start(vc); + rc = ns2_recv_vc(bind->nsi, vc, msg); + break; + } + } else { + /* VC found */ + rc = ns2_recv_vc(bind->nsi, vc, msg); + } + + msgb_free(msg); + + return rc; +} + +static int handle_nsip_write(struct osmo_fd *bfd) +{ + /* FIXME: actually send the data here instead of nsip_sendmsg() */ + return -EIO; +} + +static int nsip_fd_cb(struct osmo_fd *bfd, unsigned int what) +{ + int rc = 0; + + if (what & OSMO_FD_READ) + rc = handle_nsip_read(bfd); + if (what & OSMO_FD_WRITE) + rc = handle_nsip_write(bfd); + + return rc; +} + +/*! + * \brief bind to an IPv4/IPv6 address + * \param[in] nsi NS Instance in which to create the NSVC + * \param[in] address the address to bind to + * \param[out] result if set, returns the bind object + * \return + */ +int gprs_ns2_ip_bind(struct gprs_ns2_inst *nsi, + struct osmo_sockaddr *local, + int dscp, + struct gprs_ns2_vc_bind **result) +{ + struct gprs_ns2_vc_bind *bind = talloc_zero(nsi, struct gprs_ns2_vc_bind); + struct priv_bind *priv; + int rc; + + if (!bind) + return -ENOSPC; + + if (local->u.sa.sa_family != AF_INET && local->u.sa.sa_family != AF_INET6) { + talloc_free(bind); + return -EINVAL; + } + + bind->driver = &vc_driver_ip; + bind->send_vc = nsip_vc_sendmsg; + bind->free_vc = free_vc; + bind->nsi = nsi; + + priv = bind->priv = talloc_zero(bind, struct priv_bind); + if (!priv) { + talloc_free(bind); + return -ENOSPC; + } + priv->fd.cb = nsip_fd_cb; + priv->fd.data = bind; + priv->addr = *local; + INIT_LLIST_HEAD(&bind->vc); + + llist_add(&bind->list, &nsi->binding); + + rc = osmo_sock_init3_ofd(&priv->fd, SOCK_DGRAM, IPPROTO_UDP, + local, NULL, + OSMO_SOCK_F_BIND); + if (rc < 0) { + talloc_free(priv); + talloc_free(bind); + return rc; + } + + if (dscp > 0) { + priv->dscp = dscp; + + rc = setsockopt(priv->fd.fd, IPPROTO_IP, IP_TOS, + &dscp, sizeof(dscp)); + if (rc < 0) + LOGP(DNS, LOGL_ERROR, + "Failed to set the DSCP to %d with ret(%d) errno(%d)\n", + dscp, rc, errno); + } + + ns2_vty_bind_apply(bind); + + if (result) + *result = bind; + + return 0; +} + +struct gprs_ns2_vc *gprs_ns2_ip_bind_connect(struct gprs_ns2_vc_bind *bind, + struct gprs_ns2_nse *nse, + struct osmo_sockaddr *remote) +{ + struct gprs_ns2_vc *nsvc; + struct priv_vc *priv; + + OSMO_ASSERT(bind); + OSMO_ASSERT(nse); + OSMO_ASSERT(remote); + + nsvc = ns2_vc_alloc(bind, nse, true); + nsvc->priv = talloc_zero(bind, struct priv_vc); + if (!nsvc->priv) { + gprs_ns2_free_nsvc(nsvc); + return NULL; + } + + priv = nsvc->priv; + priv->remote = *remote; + + nsvc->ll = GPRS_NS_LL_UDP; + + return nsvc; +} + +struct osmo_sockaddr *gprs_ns2_ip_vc_sockaddr(struct gprs_ns2_vc *nsvc) +{ + struct priv_vc *priv; + + if (nsvc->ll != GPRS_NS_LL_UDP) + return NULL; + + priv = nsvc->priv; + return &priv->remote; +} + +struct osmo_sockaddr *gprs_ns2_ip_bind_sockaddr(struct gprs_ns2_vc_bind *bind) +{ + struct priv_bind *priv; + + OSMO_ASSERT(bind); + + priv = bind->priv; + return &priv->addr; +} + +int gprs_ns2_is_ip_bind(struct gprs_ns2_vc_bind *bind) +{ + return (bind->driver == &vc_driver_ip); +} + +int gprs_ns2_ip_bind_set_dscp(struct gprs_ns2_vc_bind *bind, int dscp) +{ + struct priv_bind *priv; + int rc; + + OSMO_ASSERT(bind); + + priv = bind->priv; + + if (dscp != priv->dscp) { + priv->dscp = dscp; + + rc = setsockopt(priv->fd.fd, IPPROTO_IP, IP_TOS, + &dscp, sizeof(dscp)); + if (rc < 0) + LOGP(DNS, LOGL_ERROR, + "Failed to set the DSCP to %d with ret(%d) errno(%d)\n", + dscp, rc, errno); + } + + return rc; +} + +void gprs_ns2_ip_bind_reset_block_unblock( + struct gprs_ns2_vc_bind *bind, + bool use_reset_block_unblock) +{ + bind->use_reset_block_unblock = use_reset_block_unblock; +} diff --git a/src/gb/gprs_ns2_driver.h b/src/gb/gprs_ns2_driver.h new file mode 100644 index 0000000..339f16b --- /dev/null +++ b/src/gb/gprs_ns2_driver.h @@ -0,0 +1,9 @@ +#pragma once + +#include + +struct osmo_sockaddr; + +struct gprs_ns2_inst; +struct gprs_ns2_nse; +struct gprs_ns2_vc_bind; diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h new file mode 100644 index 0000000..f226788 --- /dev/null +++ b/src/gb/gprs_ns2_internal.h @@ -0,0 +1,199 @@ +/*! \file gprs_ns2_internal.h */ + +#pragma once + +#include +#include + +#include + +#include +#include + +struct gprs_ns2_vc_driver; +struct gprs_ns2_vc_bind; + +struct tlv_parsed; + +/*! An instance of the NS protocol stack */ +struct gprs_ns2_inst { + /*! callback to the user for incoming UNIT DATA IND */ + gprs_ns2_cb_t *cb; + + /*! linked lists of all NSVC binds (e.g. IPv4 bind, but could be also E1 */ + struct llist_head binding; + + /*! linked lists of all NSVC in this instance */ + struct llist_head nse; + + /*! create dynamic NSE on receiving packages */ + bool create_nse; + + uint16_t timeout[NS_TIMERS_COUNT]; +}; + +/*! Structure repesenting a NSE. The BSS/PCU will only have a single NSE, while SGSN has one for each BSS/PCU */ +struct gprs_ns2_nse { + uint16_t nsei; + + /*! entry back to ns2_inst */ + struct gprs_ns2_inst *nsi; + + /*! llist entry for gprs_ns2_inst */ + struct llist_head list; + + /*! llist head to hold all nsvc */ + struct llist_head vc; + + /*! true if this NS was created by VTY or pcu socket) */ + bool persistant; + + /*! true if this NS has at an alive VC */ + bool unblocked; + + struct osmo_fsm_inst *bss_sns_fi; +}; + +/*! Structure representing a single NS-VC */ +struct gprs_ns2_vc { + /*! list of NS-VCs within NSE */ + struct llist_head list; + + /*! list of NS-VCs within bind, bind is the owner! */ + struct llist_head blist; + + /*! pointer to NS Instance */ + struct gprs_ns2_nse *nse; + + /*! pointer to NS VL bind. bind own the memory of this instance */ + struct gprs_ns2_vc_bind *bind; + + /*! true if this NS was created by VTY or pcu socket) */ + bool persistant; + + /*! uniquely identifies NS-VC if VC contains nsvci */ + uint16_t nsvci; + + /*! signalling weight. 0 = don't use for signalling (BVCI == 0)*/ + uint8_t sig_weight; + + /*! signaling weight. 0 = don't use for user data (BVCI != 0) */ + uint8_t data_weight; + + /*! can be used by the bind/driver of the virtual circuit. e.g. ipv4/ipv6/frgre/e1 */ + void *priv; + + uint32_t state; + uint32_t remote_state; + + struct osmo_timer_list timer; + enum nsvc_timer_mode timer_mode; + struct timeval timer_started; + int alive_retries; + + unsigned int remote_end_is_sgsn:1; + unsigned int persistent:1; + unsigned int nsvci_is_valid:1; + unsigned int sns_only:1; + + struct rate_ctr_group *ctrg; + struct osmo_stat_item_group *statg; + + /*! which link-layer are we based on? */ + enum gprs_ns_ll ll; + + enum gprs_ns2_vc_mode mode; + + struct osmo_fsm_inst *fi; +}; + +/*! Structure repesenting a bind instance. E.g. IPv4 listen port. */ +struct gprs_ns2_vc_bind { + /*! list entry in nsi */ + struct llist_head list; + /*! list of all VC */ + struct llist_head vc; + /*! driver private structure */ + void *priv; + /*! a pointer back to the nsi */ + struct gprs_ns2_inst *nsi; + struct gprs_ns2_vc_driver *driver; + + /*! if VCs use reset/block/unblock method. IP shall not use this */ + bool use_reset_block_unblock; + + /*! send a msg over a VC */ + int (*send_vc)(struct gprs_ns2_vc *vc, struct msgb *msg); + + /*! free the vc priv data */ + void (*free_vc)(struct gprs_ns2_vc *vc); +}; + +/*! Osmocom NS VC create status */ +enum gprs_ns2_cs { + GPRS_NS2_CS_CREATED, /*!< A NSVC object has been created */ + GPRS_NS2_CS_FOUND, /*!< A NSVC object has been found */ + GPRS_NS2_CS_REJECTED, /*!< Rejected and answered message */ + GPRS_NS2_CS_SKIPPED, /*!< Skipped message */ + GPRS_NS2_CS_ERROR, /*!< Failed to process message */ +}; + +struct gprs_ns2_vc_driver { + const char *name; + void *priv; + void (*free_bind)(struct gprs_ns2_vc_bind *driver); +}; + +int ns2_create_vc(struct gprs_ns2_vc_bind *bind, + struct msgb *msg, + const char *logname, + enum gprs_ns2_vc_mode mode, + struct msgb **reject, + struct gprs_ns2_vc **success); + +int ns2_recv_vc(struct gprs_ns2_inst *nsi, + struct gprs_ns2_vc *vc, + struct msgb *msg); + +struct gprs_ns2_vc *ns2_vc_alloc(struct gprs_ns2_vc_bind *bind, + struct gprs_ns2_nse *nse, + bool initiater); + +struct msgb *gprs_ns2_msgb_alloc(void); + +static inline int ns2_is_sns(uint8_t pdu_type) +{ + return pdu_type >= SNS_PDUT_ACK && pdu_type <= SNS_PDUT_SIZE_ACK; +} + +static inline int ns2_is_ns(uint8_t pdu_type) +{ + return pdu_type < SNS_PDUT_ACK || pdu_type > SNS_PDUT_SIZE_ACK; +} + +void gprs_ns2_dump_vty(struct vty *vty, const struct gprs_ns2_nse *nse, bool stats); + +void ns2_nse_notify_alive(struct gprs_ns2_vc *vc, bool alive); + +/* driver */ +struct gprs_ns2_vc *gprs_ns2_ip_bind_connect(struct gprs_ns2_vc_bind *bind, + struct gprs_ns2_nse *nse, + struct osmo_sockaddr *remote); +void gprs_ns2_ip_bind_reset_block_unblock( + struct gprs_ns2_vc_bind *bind, + bool use_reset_block_unblock); + +/* sns */ +int gprs_ns2_sns_rx(struct gprs_ns2_vc *vc, struct msgb *msg, struct tlv_parsed *tp); +int gprs_ns2_sns_init(void); +struct osmo_fsm_inst *ns2_sns_bss_fsm_alloc(struct gprs_ns2_nse *nse, + const char *id); +int ns2_sns_bss_fsm_start(struct gprs_ns2_nse *nse, struct gprs_ns2_vc *nsvc, + struct osmo_sockaddr *remote); +void ns2_sns_free_nsvc(struct gprs_ns2_vc *nsvc); + +/* vty.c */ +void ns2_vty_bind_apply(struct gprs_ns2_vc_bind *bind); + +/* nse */ +void ns2_nse_notify_unblocked(struct gprs_ns2_vc *nsvc, bool unblocked); diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c new file mode 100644 index 0000000..8bae68f --- /dev/null +++ b/src/gb/gprs_ns2_sns.c @@ -0,0 +1,924 @@ +/* Implementation of 3GPP TS 48.016 NS IP Sub-Network Service */ +/* (C) 2018 by Harald Welte */ + +/* The BSS NSE only has one SGSN IP address configured, and it will use the SNS procedures + * to communicated its local IPs/ports as well as all the SGSN side IPs/ports and + * associated weights. In theory, the BSS then uses this to establish a full mesh + * of NSVCs between all BSS-side IPs/ports and SGSN-side IPs/ports */ + +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "common_vty.h" +#include "gprs_ns2_internal.h" +#include "gprs_ns2_vc_fsm.h" + +#define S(x) (1 << (x)) + +struct ns2_sns_state { + struct gprs_ns2_nse *nse; + + /* initial connection. the initial connection will be terminated + * in configured state or moved into NSE if valid */ + struct osmo_sockaddr initial; + /* all SNS PDU will be sent over this nsvc */ + struct gprs_ns2_vc *sns_nsvc; + + /* local configuration to send to the remote end */ + struct gprs_ns_ie_ip4_elem *ip4_local; + size_t num_ip4_local; + + /* local configuration to send to the remote end */ + struct gprs_ns_ie_ip6_elem *ip6_local; + size_t num_ip6_local; + + /* local configuration about our capabilities in terms of connections to + * remote (SGSN) side */ + size_t num_max_nsvcs; + size_t num_max_ip4_remote; + size_t num_max_ip6_remote; + + /* remote configuration as received */ + struct gprs_ns_ie_ip4_elem *ip4_remote; + unsigned int num_ip4_remote; + + /* remote configuration as received */ + struct gprs_ns_ie_ip6_elem *ip6_remote; + unsigned int num_ip6_remote; +}; + +static inline struct gprs_ns2_nse *nse_inst_from_fi(struct osmo_fsm_inst *fi) +{ + struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; + return gss->nse; +} + +/* helper function to compute the sum of all (data or signaling) weights */ +static int ip4_weight_sum(const struct gprs_ns_ie_ip4_elem *ip4, unsigned int num, + bool data_weight) +{ + unsigned int i; + int weight_sum = 0; + + for (i = 0; i < num; i++) { + if (data_weight) + weight_sum += ip4[i].data_weight; + else + weight_sum += ip4[i].sig_weight; + } + return weight_sum; +} +#define ip4_weight_sum_data(x,y) ip4_weight_sum(x, y, true) +#define ip4_weight_sum_sig(x,y) ip4_weight_sum(x, y, false) + +static struct gprs_ns2_vc *nsvc_by_ip4_elem(struct gprs_ns2_nse *nse, + const struct gprs_ns_ie_ip4_elem *ip4) +{ + struct osmo_sockaddr sa; + /* copy over. Both data structures use network byte order */ + sa.u.sin.sin_addr.s_addr = ip4->ip_addr; + sa.u.sin.sin_port = ip4->udp_port; + sa.u.sin.sin_family = AF_INET; + + return gprs_ns2_nsvc_by_sockaddr(nse, &sa); +} + +/*! called when a nsvc is beeing freed */ +void ns2_sns_free_nsvc(struct gprs_ns2_vc *nsvc) +{ + struct gprs_ns2_nse *nse; + struct gprs_ns2_vc *tmp; + struct ns2_sns_state *gss = (struct ns2_sns_state *) nsvc->nse->bss_sns_fi->priv; + + if (nsvc != gss->sns_nsvc) + return; + + if (nsvc->nse->unblocked) { + /* choose a different signal nsvc */ + llist_for_each_entry(tmp, &nse->vc, list) { + if (gprs_ns2_vc_is_unblocked(tmp)) + gss->sns_nsvc = tmp; + } + } + + gss->sns_nsvc = NULL; + /* TODO: state change */ +} + +static void ns2_nsvc_create_ip4(struct osmo_fsm_inst *fi, + struct gprs_ns2_nse *nse, + const struct gprs_ns_ie_ip4_elem *ip4) +{ + struct ns2_sns_state *gss = (struct ns2_sns_state *) nse->bss_sns_fi->priv; + struct gprs_ns2_inst *nsi = nse->nsi; + struct gprs_ns2_vc *nsvc; + struct gprs_ns2_vc_bind *bind; + struct osmo_sockaddr remote; + /* copy over. Both data structures use network byte order */ + remote.u.sin.sin_family = AF_INET; + remote.u.sin.sin_addr.s_addr = ip4->ip_addr; + remote.u.sin.sin_port = ip4->udp_port; + + /* for every bind, create a connection if bind type == IP */ + llist_for_each_entry(bind, &nsi->binding, list) { + /* ignore failed connection */ + nsvc = gprs_ns2_ip_connect_inactive(bind, + &remote, + nse, 0); + if (!nsvc) { + LOGPFSML(fi, LOGL_ERROR, "SNS-CONFIG: Failed to create NSVC\n"); + continue; + } + + nsvc->sig_weight = ip4->sig_weight; + nsvc->data_weight = ip4->data_weight; + + /* TODO: check if we have to start the VC FSM here */ + } +} + +static int create_missing_nsvcs(struct osmo_fsm_inst *fi) +{ + struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; + struct gprs_ns2_nse *nse = nse_inst_from_fi(fi); + struct gprs_ns2_vc *nsvc; + struct gprs_ns2_vc_bind *bind; + struct osmo_sockaddr *tmpaddr, remote; + unsigned int i; + + for (i = 0; i < gss->num_ip4_remote; i++) { + const struct gprs_ns_ie_ip4_elem *ip4 = &gss->ip4_remote[i]; + + remote.u.sin.sin_family = AF_INET; + remote.u.sin.sin_addr.s_addr = ip4->ip_addr; + remote.u.sin.sin_port = ip4->udp_port; + + llist_for_each_entry(bind, &nse->nsi->binding, list) { + bool found = false; + + llist_for_each_entry(nsvc, &nse->vc, list) { + if (nsvc->bind != bind) + continue; + + if (!osmo_sockaddr_cmp(&remote, gprs_ns2_ip_vc_sockaddr(nsvc))) { + found = true; + break; + } + } + + if (!found) { + nsvc = gprs_ns2_ip_connect_inactive(bind, &remote, nse, 0); + if (!nsvc) { + /* TODO: add to a list to send back a NS-STATUS */ + continue; + } + } + + /* update data / signalling weight */ + nsvc->data_weight = ip4->data_weight; + nsvc->sig_weight = ip4->sig_weight; + nsvc->sns_only = 0; + } + } + + return 0; +} + +/* Add a given remote IPv4 element to gprs_sns_state */ +static int add_remote_ip4_elem(struct ns2_sns_state *gss, const struct gprs_ns_ie_ip4_elem *ip4) +{ + if (gss->num_ip4_remote >= gss->num_max_ip4_remote) + return -E2BIG; + + gss->ip4_remote = talloc_realloc(gss, gss->ip4_remote, struct gprs_ns_ie_ip4_elem, + gss->num_ip4_remote+1); + gss->ip4_remote[gss->num_ip4_remote] = *ip4; + gss->num_ip4_remote += 1; + return 0; +} + +/* Remove a given remote IPv4 element from gprs_sns_state */ +static int remove_remote_ip4_elem(struct ns2_sns_state *gss, const struct gprs_ns_ie_ip4_elem *ip4) +{ + unsigned int i; + + for (i = 0; i < gss->num_ip4_remote; i++) { + if (memcmp(&gss->ip4_remote[i], ip4, sizeof(*ip4))) + continue; + /* all array elements < i remain as they are; all > i are shifted left by one */ + memmove(&gss->ip4_remote[i], &gss->ip4_remote[i+1], gss->num_ip4_remote-i-1); + gss->num_ip4_remote -= 1; + return 0; + } + return -1; +} + +/* update the weights for specified remote IPv4 */ +static int update_remote_ip4_elem(struct ns2_sns_state *gss, const struct gprs_ns_ie_ip4_elem *ip4) +{ + unsigned int i; + + for (i = 0; i < gss->num_ip4_remote; i++) { + if (gss->ip4_remote[i].ip_addr != ip4->ip_addr || + gss->ip4_remote[i].udp_port != ip4->udp_port) + continue; + gss->ip4_remote[i].sig_weight = ip4->sig_weight; + gss->ip4_remote[i].data_weight = ip4->data_weight; + return 0; + } + return -1; +} + + +static int do_sns_change_weight(struct osmo_fsm_inst *fi, const struct gprs_ns_ie_ip4_elem *ip4) +{ + struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; + struct gprs_ns2_nse *nse = nse_inst_from_fi(fi); + struct gprs_ns2_vc *nsvc = nsvc_by_ip4_elem(nse, ip4); + + /* TODO: Upon receiving an SNS-CHANGEWEIGHT PDU, if the resulting sum of the + * signalling weights of all the peer IP endpoints configured for this NSE is + * equal to zero or if the resulting sum of the data weights of all the peer IP + * endpoints configured for this NSE is equal to zero, the BSS/SGSN shall send an + * SNS-ACK PDU with a cause code of "Invalid weights". */ + + update_remote_ip4_elem(gss, ip4); + + if (!nsvc) { + LOGPFSML(fi, LOGL_NOTICE, "Couldn't find NS-VC for SNS-CHANGE_WEIGHT\n"); + return -NS_CAUSE_NSVC_UNKNOWN; + } + + LOGPFSML(fi, LOGL_INFO, "CHANGE-WEIGHT NS-VC %s data_weight %u->%u, sig_weight %u->%u\n", + gprs_ns2_ll_str(nsvc), nsvc->data_weight, ip4->data_weight, + nsvc->sig_weight, ip4->sig_weight); + + nsvc->data_weight = ip4->data_weight; + nsvc->sig_weight = ip4->sig_weight; + + return 0; +} + +static int do_sns_delete(struct osmo_fsm_inst *fi, const struct gprs_ns_ie_ip4_elem *ip4) +{ + struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; + struct gprs_ns2_nse *nse = nse_inst_from_fi(fi); + struct gprs_ns2_vc *nsvc = nsvc_by_ip4_elem(nse, ip4); + + if (remove_remote_ip4_elem(gss, ip4) < 0) + return -NS_CAUSE_UNKN_IP_EP; + + if (!nsvc) { + LOGPFSML(fi, LOGL_NOTICE, "Couldn't find NS-VC for SNS-DELETE\n"); + return -NS_CAUSE_NSVC_UNKNOWN; + } + LOGPFSML(fi, LOGL_INFO, "DELETE NS-VC %s\n", gprs_ns2_ll_str(nsvc)); + gprs_ns2_free_nsvc(nsvc); + + return 0; +} + +static int do_sns_add(struct osmo_fsm_inst *fi, const struct gprs_ns_ie_ip4_elem *ip4) +{ + struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; + struct gprs_ns2_nse *nse = nse_inst_from_fi(fi); + struct gprs_ns2_vc *nsvc; + + /* Upon receiving an SNS-ADD PDU, if the consequent number of IPv4 endpoints + * exceeds the number of IPv4 endpoints supported by the NSE, the NSE shall send + * an SNS-ACK PDU with a cause code set to "Invalid number of IP4 Endpoints". */ + if (add_remote_ip4_elem(gss, ip4) < 0) + return -NS_CAUSE_INVAL_NR_NS_VC; + + /* Upon receiving an SNS-ADD PDU containing an already configured IP endpoint the + * NSE shall send an SNS-ACK PDU with the cause code "Protocol error - + * unspecified" */ + nsvc = nsvc_by_ip4_elem(nse, ip4); + if (nsvc) + return -NS_CAUSE_PROTO_ERR_UNSPEC; + + /* TODO: failure case */ + ns2_nsvc_create_ip4(fi, nse, ip4); + + gprs_ns2_start_alive_all_nsvcs(nse); + + return 0; +} + + + +/*********************************************************************** + * BSS-side FSM for IP Sub-Network Service + ***********************************************************************/ + +enum gprs_sns_bss_state { + GPRS_SNS_ST_UNCONFIGURED, + GPRS_SNS_ST_SIZE, /*!< SNS-SIZE procedure ongoing */ + GPRS_SNS_ST_CONFIG_BSS, /*!< SNS-CONFIG procedure (BSS->SGSN) ongoing */ + GPRS_SNS_ST_CONFIG_SGSN, /*!< SNS-CONFIG procedure (SGSN->BSS) ongoing */ + GPRS_SNS_ST_CONFIGURED, +}; + +enum gprs_sns_event { + GPRS_SNS_EV_START, + GPRS_SNS_EV_SIZE, + GPRS_SNS_EV_SIZE_ACK, + GPRS_SNS_EV_CONFIG, + GPRS_SNS_EV_CONFIG_END, /*!< SNS-CONFIG with end flag received */ + GPRS_SNS_EV_CONFIG_ACK, + GPRS_SNS_EV_ADD, + GPRS_SNS_EV_DELETE, + GPRS_SNS_EV_CHANGE_WEIGHT, +}; + +static const struct value_string gprs_sns_event_names[] = { + { GPRS_SNS_EV_START, "START" }, + { GPRS_SNS_EV_SIZE, "SIZE" }, + { GPRS_SNS_EV_SIZE_ACK, "SIZE_ACK" }, + { GPRS_SNS_EV_CONFIG, "CONFIG" }, + { GPRS_SNS_EV_CONFIG_END, "CONFIG_END" }, + { GPRS_SNS_EV_CONFIG_ACK, "CONFIG_ACK" }, + { GPRS_SNS_EV_ADD, "ADD" }, + { GPRS_SNS_EV_DELETE, "DELETE" }, + { GPRS_SNS_EV_CHANGE_WEIGHT, "CHANGE_WEIGHT" }, + { 0, NULL } +}; + +static void ns2_sns_st_unconfigured(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gprs_ns2_nse *nse = nse_inst_from_fi(fi); + struct gprs_ns2_inst *nsi = nse->nsi; + + switch (event) { + case GPRS_SNS_EV_START: + osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_SIZE, nsi->timeout[NS_TOUT_TSNS_PROV], 1); + break; + default: + OSMO_ASSERT(0); + } +} + +static void ns2_sns_st_size(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gprs_ns2_nse *nse = nse_inst_from_fi(fi); + struct gprs_ns2_inst *nsi = nse->nsi; + struct tlv_parsed *tp = NULL; + + switch (event) { + case GPRS_SNS_EV_SIZE_ACK: + tp = data; + if (TLVP_VAL_MINLEN(tp, NS_IE_CAUSE, 1)) { + LOGPFSML(fi, LOGL_ERROR, "SNS-SIZE-ACK with cause %s\n", + gprs_ns2_cause_str(*TLVP_VAL(tp, NS_IE_CAUSE))); + /* FIXME: What to do? */ + } else { + osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_BSS, + nsi->timeout[NS_TOUT_TSNS_PROV], 2); + } + break; + default: + OSMO_ASSERT(0); + } +} +static void ns2_sns_st_size_onenter(struct osmo_fsm_inst *fi, uint32_t old_state) +{ + struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; + uint16_t num_max_ip4_remote = gss->num_max_ip4_remote; + + gprs_ns2_tx_sns_size(gss->sns_nsvc, true, gss->num_max_nsvcs, &num_max_ip4_remote, NULL); +} + + +static void ns2_sns_st_config_bss(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + //struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; + //struct gprs_ns2_nse *nse = ns_inst_from_fi(fi); + struct tlv_parsed *tp = NULL; + + switch (event) { + case GPRS_SNS_EV_CONFIG_ACK: + tp = data; + if (TLVP_VAL_MINLEN(tp, NS_IE_CAUSE, 1)) { + LOGPFSML(fi, LOGL_ERROR, "SNS-CONFIG-ACK with cause %s\n", + gprs_ns2_cause_str(*TLVP_VAL(tp, NS_IE_CAUSE))); + /* FIXME: What to do? */ + } else { + osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_SGSN, 0, 0); + } + break; + default: + OSMO_ASSERT(0); + } +} +static void ns2_sns_st_config_bss_onenter(struct osmo_fsm_inst *fi, uint32_t old_state) +{ + struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; + /* Transmit SNS-CONFIG */ + gprs_ns2_tx_sns_config(gss->sns_nsvc, true, gss->ip4_local, gss->num_ip4_local); +} + +static void ns2_sns_st_config_sgsn(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; + struct tlv_parsed *tp = NULL; + struct gprs_ns2_nse *nse = nse_inst_from_fi(fi); + const struct gprs_ns_ie_ip4_elem *v4_list; + unsigned int num_v4; + uint8_t cause; + + switch (event) { + case GPRS_SNS_EV_CONFIG_END: + case GPRS_SNS_EV_CONFIG: + tp = data; +#if 0 /* part of incoming SNS-SIZE (doesn't happen on BSS side */ + if (TLVP_PRESENT(tp, NS_IE_RESET_FLAG)) { + /* reset all existing config */ + if (gss->ip4_remote) + talloc_free(gss->ip4_remote); + gss->num_ip4_remote = 0; + } +#endif + if (!TLVP_PRESENT(tp, NS_IE_IPv4_LIST)) { + cause = NS_CAUSE_INVAL_NR_IPv4_EP; + gprs_ns2_tx_sns_config_ack(gss->sns_nsvc, &cause); + osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_UNCONFIGURED, 0, 0); + break; + } + v4_list = (const struct gprs_ns_ie_ip4_elem *) TLVP_VAL(tp, NS_IE_IPv4_LIST); + num_v4 = TLVP_LEN(tp, NS_IE_IPv4_LIST) / sizeof(*v4_list); + /* realloc to the new size */ + gss->ip4_remote = talloc_realloc(gss, gss->ip4_remote, + struct gprs_ns_ie_ip4_elem, + gss->num_ip4_remote+num_v4); + /* append the new entries to the end of the list */ + memcpy(&gss->ip4_remote[gss->num_ip4_remote], v4_list, num_v4*sizeof(*v4_list)); + gss->num_ip4_remote += num_v4; + + LOGPFSML(fi, LOGL_INFO, "Rx SNS-CONFIG: Remote IPv4 list now %u entries\n", + gss->num_ip4_remote); + if (event == GPRS_SNS_EV_CONFIG_END) { + /* check if sum of data / sig weights == 0 */ + if (ip4_weight_sum_data(gss->ip4_remote, gss->num_ip4_remote) == 0 || + ip4_weight_sum_sig(gss->ip4_remote, gss->num_ip4_remote) == 0) { + cause = NS_CAUSE_INVAL_WEIGH; + gprs_ns2_tx_sns_config_ack(gss->sns_nsvc, &cause); + osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_UNCONFIGURED, 0, 0); + break; + } + create_missing_nsvcs(fi); + gprs_ns2_tx_sns_config_ack(gss->sns_nsvc, NULL); + /* start the test procedure on ALL NSVCs! */ + gprs_ns2_start_alive_all_nsvcs(nse); + osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIGURED, 0, 0); + } else { + /* just send CONFIG-ACK */ + gprs_ns2_tx_sns_config_ack(gss->sns_nsvc, NULL); + } + break; + default: + OSMO_ASSERT(0); + } +} + +static void ns2_sns_st_configured(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; + struct tlv_parsed *tp = NULL; + const struct gprs_ns_ie_ip4_elem *v4_list = NULL; + unsigned int num_v4 = 0; + uint8_t trans_id; + uint8_t cause = 0xff; + unsigned int i; + int rc; + + switch (event) { + case GPRS_SNS_EV_ADD: + tp = data; + trans_id = *TLVP_VAL(tp, NS_IE_TRANS_ID); + if (TLVP_PRESENT(tp, NS_IE_IPv4_LIST)) { + v4_list = (const struct gprs_ns_ie_ip4_elem *) TLVP_VAL(tp, NS_IE_IPv4_LIST); + num_v4 = TLVP_LEN(tp, NS_IE_IPv4_LIST) / sizeof(*v4_list); + for (i = 0; i < num_v4; i++) { + rc = do_sns_add(fi, &v4_list[i]); + if (rc < 0) { + unsigned int j; + /* rollback/undo to restore previous state */ + for (j = 0; j < i; j++) + do_sns_delete(fi, &v4_list[j]); + cause = -rc; + gprs_ns2_tx_sns_ack(gss->sns_nsvc, trans_id, &cause, NULL, 0); + break; + } + } + } else { + cause = NS_CAUSE_INVAL_NR_IPv4_EP; + gprs_ns2_tx_sns_ack(gss->sns_nsvc, trans_id, &cause, NULL, 0); + break; + } + gprs_ns2_tx_sns_ack(gss->sns_nsvc, trans_id, NULL, v4_list, num_v4); + break; + case GPRS_SNS_EV_DELETE: + tp = data; + trans_id = *TLVP_VAL(tp, NS_IE_TRANS_ID); + if (TLVP_PRESENT(tp, NS_IE_IPv4_LIST)) { + v4_list = (const struct gprs_ns_ie_ip4_elem *) TLVP_VAL(tp, NS_IE_IPv4_LIST); + num_v4 = TLVP_LEN(tp, NS_IE_IPv4_LIST) / sizeof(*v4_list); + for (i = 0; i < num_v4; i++) { + rc = do_sns_delete(fi, &v4_list[i]); + if (rc < 0) { + cause = -rc; + /* continue to delete others */ + } + } + if (cause != 0xff) { + /* TODO: create list of not-deleted and return it */ + gprs_ns2_tx_sns_ack(gss->sns_nsvc, trans_id, &cause, NULL, 0); + break; + } + } else if (TLVP_PRES_LEN(tp, NS_IE_IP_ADDR, 5)) { + /* delete all NS-VCs for given IP address */ + const uint8_t *ie = TLVP_VAL(tp, NS_IE_IP_ADDR); + struct gprs_ns_ie_ip4_elem *ip4_remote; + uint32_t ip_addr = *(uint32_t *)(ie+1); + if (ie[0] != 0x01) { /* Address Type != IPv4 */ + cause = NS_CAUSE_UNKN_IP_ADDR; + gprs_ns2_tx_sns_ack(gss->sns_nsvc, trans_id, &cause, NULL, 0); + break; + } + /* make a copy as do_sns_delete() will change the array underneath us */ + ip4_remote = talloc_memdup(fi, gss->ip4_remote, + gss->num_ip4_remote*sizeof(*v4_list)); + for (i = 0; i < gss->num_ip4_remote; i++) { + if (ip4_remote[i].ip_addr == ip_addr) { + rc = do_sns_delete(fi, &ip4_remote[i]); + if (rc < 0) { + cause = -rc; + /* continue to delete others */ + } + } + } + talloc_free(ip4_remote); + if (cause != 0xff) { + /* TODO: create list of not-deleted and return it */ + gprs_ns2_tx_sns_ack(gss->sns_nsvc, trans_id, &cause, NULL, 0); + break; + } + } else { + cause = NS_CAUSE_INVAL_NR_IPv4_EP; + gprs_ns2_tx_sns_ack(gss->sns_nsvc, trans_id, &cause, NULL, 0); + break; + } + gprs_ns2_tx_sns_ack(gss->sns_nsvc, trans_id, NULL, v4_list, num_v4); + break; + case GPRS_SNS_EV_CHANGE_WEIGHT: + tp = data; + trans_id = *TLVP_VAL(tp, NS_IE_TRANS_ID); + if (TLVP_PRESENT(tp, NS_IE_IPv4_LIST)) { + v4_list = (const struct gprs_ns_ie_ip4_elem *) TLVP_VAL(tp, NS_IE_IPv4_LIST); + num_v4 = TLVP_LEN(tp, NS_IE_IPv4_LIST) / sizeof(*v4_list); + for (i = 0; i < num_v4; i++) { + rc = do_sns_change_weight(fi, &v4_list[i]); + if (rc < 0) { + cause = -rc; + /* continue to others */ + } + } + if (cause != 0xff) { + gprs_ns2_tx_sns_ack(gss->sns_nsvc, trans_id, &cause, NULL, 0); + break; + } + } else { + cause = NS_CAUSE_INVAL_NR_IPv4_EP; + gprs_ns2_tx_sns_ack(gss->sns_nsvc, trans_id, &cause, NULL, 0); + break; + } + gprs_ns2_tx_sns_ack(gss->sns_nsvc, trans_id, NULL, v4_list, num_v4); + break; + } +} + +static void ns2_sns_st_configured_onenter(struct osmo_fsm_inst *fi, uint32_t old_state) +{ + struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; + struct gprs_ns2_signal_data nssd = {0}; +// struct gprs_ns2_nse *nse = gss->nse; +// struct gprs_ns2_vc *nsvc; +// struct gprs_ns_ie_ip4_elem *ipv4; +// struct osmo_sockaddr remote, *tmp; + + nssd.nse = gss->nse; + nssd.nsei = gss->nse->nsei; + +// remote.u.sin.sin_family = AF_INET; + +// /* drop initial connection */ +// bool found = false; +// for (int i = 0; i < gss->num_ip4_local; i++) +// { +// ipv4 = &gss->ip4_remote[i]; +// remote.u.sin.sin_addr.s_addr = ipv4->ip_addr; +// remote.u.sin.sin_port = ipv4->udp_port; + +// if (!osmo_sockaddr_cmp(&remote, gprs_ns2_ip_vc_sockaddr(gss->sns_nsvc))) { +// found = true; +// break; +// } +// } + +// if (!found) { +// /* it will update the sns by callback from free_nsvc */ +// gprs_ns2_free_nsvc(gss->sns_nsvc); +// } + + osmo_signal_dispatch(SS_L_NS, S_SNS_CONFIGURED, &nssd); +} + +static const struct osmo_fsm_state ns2_sns_bss_states[] = { + [GPRS_SNS_ST_UNCONFIGURED] = { + .in_event_mask = S(GPRS_SNS_EV_START), + .out_state_mask = S(GPRS_SNS_ST_SIZE), + .name = "UNCONFIGURED", + .action = ns2_sns_st_unconfigured, + }, + [GPRS_SNS_ST_SIZE] = { + .in_event_mask = S(GPRS_SNS_EV_SIZE_ACK), + .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED) | + S(GPRS_SNS_ST_SIZE) | + S(GPRS_SNS_ST_CONFIG_BSS), + .name = "SIZE", + .action = ns2_sns_st_size, + .onenter = ns2_sns_st_size_onenter, + }, + [GPRS_SNS_ST_CONFIG_BSS] = { + .in_event_mask = S(GPRS_SNS_EV_CONFIG_ACK), + .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED) | + S(GPRS_SNS_ST_CONFIG_BSS) | + S(GPRS_SNS_ST_CONFIG_SGSN), + .name = "CONFIG_BSS", + .action = ns2_sns_st_config_bss, + .onenter = ns2_sns_st_config_bss_onenter, + }, + [GPRS_SNS_ST_CONFIG_SGSN] = { + .in_event_mask = S(GPRS_SNS_EV_CONFIG) | + S(GPRS_SNS_EV_CONFIG_END), + .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED) | + S(GPRS_SNS_ST_CONFIG_SGSN) | + S(GPRS_SNS_ST_CONFIGURED), + .name = "CONFIG_SGSN", + .action = ns2_sns_st_config_sgsn, + }, + [GPRS_SNS_ST_CONFIGURED] = { + .in_event_mask = S(GPRS_SNS_EV_ADD) | + S(GPRS_SNS_EV_DELETE) | + S(GPRS_SNS_EV_CHANGE_WEIGHT), + .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED), + .name = "CONFIGURED", + .action = ns2_sns_st_configured, + .onenter = ns2_sns_st_configured_onenter, + }, +}; + +static int ns2_sns_fsm_bss_timer_cb(struct osmo_fsm_inst *fi) +{ + struct gprs_ns2_nse *nse = nse_inst_from_fi(fi); + struct gprs_ns2_inst *nsi = nse->nsi; + + switch (fi->T) { + case 1: + osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_SIZE, nsi->timeout[NS_TOUT_TSNS_PROV], 1); + break; + case 2: + osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_BSS, nsi->timeout[NS_TOUT_TSNS_PROV], 2); + break; + } + return 0; +} + +static struct osmo_fsm gprs_ns2_sns_bss_fsm = { + .name = "GPRS-NS2-SNS-BSS", + .states = ns2_sns_bss_states, + .num_states = ARRAY_SIZE(ns2_sns_bss_states), + .allstate_event_mask = 0, + .allstate_action = NULL, + .cleanup = NULL, + .timer_cb = ns2_sns_fsm_bss_timer_cb, + /* .log_subsys = DNS, "is not constant" */ + .event_names = gprs_sns_event_names, + .pre_term = NULL, +}; + + +static struct gprs_ns_ie_ip4_elem *alloc_ip4_elem(void *ctx, struct osmo_sockaddr *sockaddr, + uint8_t sig_weight, uint8_t data_weight) +{ + struct gprs_ns_ie_ip4_elem *ip4; + + if (sockaddr->u.sa.sa_family != AF_INET) + return NULL; + + ip4 = talloc_zero(ctx, struct gprs_ns_ie_ip4_elem); + if (!ip4) + return NULL; + + ip4->ip_addr = sockaddr->u.sin.sin_addr.s_addr; + ip4->udp_port = sockaddr->u.sin.sin_port; + ip4->sig_weight = sig_weight; + ip4->data_weight = data_weight; + + return ip4; +} + +struct osmo_fsm_inst *ns2_sns_bss_fsm_alloc(struct gprs_ns2_nse *nse, + const char *id) +{ + struct osmo_fsm_inst *fi; + struct ns2_sns_state *gss; + + fi = osmo_fsm_inst_alloc(&gprs_ns2_sns_bss_fsm, nse, NULL, LOGL_DEBUG, id); + if (!fi) + return fi; + + gss = talloc_zero(fi, struct ns2_sns_state); + if (!gss) + goto err; + + fi->priv = gss; + gss->nse = nse; + + return fi; +err: + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); + return NULL; +} + +int ns2_sns_bss_fsm_start(struct gprs_ns2_nse *nse, struct gprs_ns2_vc *nsvc, struct osmo_sockaddr *remote) +{ + struct osmo_fsm_inst *fi = nse->bss_sns_fi; + struct ns2_sns_state *gss = (struct ns2_sns_state *) nse->bss_sns_fi->priv; + struct gprs_ns_ie_ip4_elem *ip4; + struct gprs_ns2_vc_bind *bind; + struct gprs_ns2_inst *nsi = nse->nsi; + struct osmo_sockaddr *sa, local; + + gss->initial = *remote; + gss->sns_nsvc = nsvc; + nsvc->sns_only = 1; + + /* TODO: create IPv4 list from the one IP/port the NS instance has */ + int count = 0; + llist_for_each_entry(bind, &nsi->binding, list) { + if (!gprs_ns2_is_ip_bind(bind)) + continue; + + sa = gprs_ns2_ip_bind_sockaddr(bind); + if (!sa) + continue; + count++; + } + + ip4 = talloc_zero_size(fi, sizeof(struct gprs_ns_ie_ip4_elem) * count); + if (!ip4) + goto err; + + gss->ip4_local = ip4; + + llist_for_each_entry(bind, &nsi->binding, list) { + if (!gprs_ns2_is_ip_bind(bind)) + continue; + + sa = gprs_ns2_ip_bind_sockaddr(bind); + if (!sa) + continue; + + /* check if this is an specific bind */ + if ((sa->u.sas.ss_family == AF_INET && sa->u.sin.sin_addr.s_addr == 0) || + (sa->u.sas.ss_family == AF_INET6 && IN6_IS_ADDR_UNSPECIFIED(&sa->u.sin6.sin6_addr) )) + { + if (osmo_sockaddr_local_ip(&local, remote)) + continue; + + ip4->ip_addr = local.u.sin.sin_addr.s_addr; + } else { + ip4->ip_addr = sa->u.sin.sin_addr.s_addr; + } + + ip4->udp_port = sa->u.sin.sin_port; + ip4->sig_weight = 2; + ip4->data_weight = 1; + + ip4++; + } + + gss->num_ip4_local = count; + gss->num_max_nsvcs = 8; + gss->num_max_ip4_remote = 4; + + return osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_START, NULL); + +err: + return -1; +} + +/* main entry point for receiving SNS messages from the network */ +int gprs_ns2_sns_rx(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp) +{ + struct gprs_ns2_nse *nse = nsvc->nse; + struct gprs_ns_hdr *nsh = (struct gprs_ns_hdr *) msg->l2h; + uint16_t nsei = msgb_nsei(msg); + struct osmo_fsm_inst *fi; + + LOGP(DNS, LOGL_DEBUG, "NSEI=%u Rx SNS PDU type %s\n", nsei, + get_value_string(gprs_ns_pdu_strings, nsh->pdu_type)); + + /* FIXME: how to resolve SNS FSM Instance by NSEI (SGSN)? */ + fi = nse->bss_sns_fi; + + switch (nsh->pdu_type) { + case SNS_PDUT_SIZE: + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SIZE, tp); + break; + case SNS_PDUT_SIZE_ACK: + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SIZE_ACK, tp); + break; + case SNS_PDUT_CONFIG: + if (nsh->data[0] & 0x01) + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_CONFIG_END, tp); + else + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_CONFIG, tp); + break; + case SNS_PDUT_CONFIG_ACK: + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_CONFIG_ACK, tp); + break; + case SNS_PDUT_ADD: + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_ADD, tp); + break; + case SNS_PDUT_DELETE: + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_DELETE, tp); + break; + case SNS_PDUT_CHANGE_WEIGHT: + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_CHANGE_WEIGHT, tp); + break; + case SNS_PDUT_ACK: + LOGP(DNS, LOGL_NOTICE, "NSEI=%u Rx unsupported SNS PDU type %s\n", nsei, + get_value_string(gprs_ns_pdu_strings, nsh->pdu_type)); + break; + default: + LOGP(DNS, LOGL_ERROR, "NSEI=%u Rx unknown SNS PDU type %s\n", nsei, + get_value_string(gprs_ns_pdu_strings, nsh->pdu_type)); + return -EINVAL; + } + + return 0; +} + +int gprs_ns2_sns_init(void) +{ + /* "DNS" is not a constant/#define, but an integer variable set by the client app */ + gprs_ns2_sns_bss_fsm.log_subsys = DNS; + return osmo_fsm_register(&gprs_ns2_sns_bss_fsm); +} + +#include +#include + +static void vty_dump_sns_ip4(struct vty *vty, const struct gprs_ns_ie_ip4_elem *ip4) +{ + struct in_addr in = { .s_addr = ip4->ip_addr }; + vty_out(vty, " %s:%u, Signalling Weight: %u, Data Weight: %u%s", + inet_ntoa(in), ntohs(ip4->udp_port), ip4->sig_weight, ip4->data_weight, VTY_NEWLINE); +} + +void gprs_ns2_dump_vty(struct vty *vty, const struct gprs_ns2_nse *nse, bool stats) +{ + struct ns2_sns_state *gss; + unsigned int i; + + if (!nse->bss_sns_fi) + return; + + vty_out_fsm_inst(vty, nse->bss_sns_fi); + gss = (struct ns2_sns_state *) nse->bss_sns_fi->priv; + + vty_out(vty, "Maximum number of remote NS-VCs: %zu, IPv4 Endpoints: %zu%s", + gss->num_max_nsvcs, gss->num_max_ip4_remote, VTY_NEWLINE); + + vty_out(vty, "Local IPv4 Endpoints:%s", VTY_NEWLINE); + for (i = 0; i < gss->num_ip4_local; i++) + vty_dump_sns_ip4(vty, &gss->ip4_local[i]); + + vty_out(vty, "Remote IPv4 Endpoints:%s", VTY_NEWLINE); + for (i = 0; i < gss->num_ip4_remote; i++) + vty_dump_sns_ip4(vty, &gss->ip4_remote[i]); +} diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c new file mode 100644 index 0000000..77806ca --- /dev/null +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -0,0 +1,671 @@ +/* Implementation of 3GPP TS 48.016 NS IP Sub-Network Service + * based on gprs_ns_sns.c by Harald Welte + * (C) 2020 by sysmocom - s.f.m.c. GmbH + * Author: Alexander Couzens */ + +/* The BSS NSE only has one SGSN IP address configured, and it will use the SNS procedures + * to communicated its local IPs/ports as well as all the SGSN side IPs/ports and + * associated weights. In theory, the BSS then uses this to establish a full mesh + * of NSVCs between all BSS-side IPs/ports and SGSN-side IPs/ports */ + +#include + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include + +#include "gprs_ns2_internal.h" +#include "gprs_ns2_vc_fsm.h" +#include "gprs_ns2_message.h" + +#define S(x) (1 << (x)) + +#define DNS 10 + +struct gprs_ns2_vc_priv { + struct gprs_ns2_vc *vc;\ + /* how often the timer was triggered */ + int N; + /* The initiater is responsible to UNBLOCK the VC. The BSS is usually the initiater. + * It can change while runtime. The side which blocks an unblocked side.*/ + bool initiater; + + /* the alive counter is present in all states */ + struct { + struct osmo_timer_list timer; + enum ns2_timeout mode; + int N; + } alive; +}; + + +/* The FSM covers both the VC with RESET/BLOCK and without RESET/BLOCK procedure.. + * + * With RESET/BLOCK, the state should follow: + * - UNCONFIGURED -> RESET -> BLOCK -> UNBLOCKED + * + * Without RESET/BLOCK, the state should follow: + * - UNCONFIGURED -> ALIVE -> UNBLOCKED + * + * The UNBLOCKED and TEST states are used to send ALIVE PDU using the timeout Tns-test and Tns-alive. + * UNBLOCKED -> TEST: on expire of Tns-Test, send Alive PDU. + * TEST -> UNBLOCKED: on receive of Alive_Ack PDU, go into UNBLOCKED. + * + * The ALIVE state is used as intermediate, because a VC is only valid if it received an Alive ACK when + * not using RESET/BLOCK procedure. + */ + +enum gprs_ns2_vc_state { + GPRS_NS2_ST_UNCONFIGURED, + GPRS_NS2_ST_RESET, + GPRS_NS2_ST_BLOCKED, + GPRS_NS2_ST_UNBLOCKED, /* allows sending NS_UNITDATA */ + + GPRS_NS2_ST_ALIVE, /* only used when not using RESET/BLOCK procedure */ +}; + +enum gprs_ns2_vc_event { + GPRS_NS2_EV_START, + + /* received messages */ + GPRS_NS2_EV_RESET, + GPRS_NS2_EV_RESET_ACK, + GPRS_NS2_EV_UNBLOCK, + GPRS_NS2_EV_UNBLOCK_ACK, + GPRS_NS2_EV_BLOCK, + GPRS_NS2_EV_BLOCK_ACK, + GPRS_NS2_EV_ALIVE, + GPRS_NS2_EV_ALIVE_ACK, + GPRS_NS2_EV_STATUS, + + GPRS_NS2_EV_UNITDATA, +}; + +static const struct value_string gprs_ns2_vc_event_names[] = { + { GPRS_NS2_EV_START, "START" }, + { GPRS_NS2_EV_RESET, "RESET" }, + { GPRS_NS2_EV_RESET_ACK, "RESET_ACK" }, + { GPRS_NS2_EV_UNBLOCK, "UNBLOCK" }, + { GPRS_NS2_EV_UNBLOCK_ACK, "UNBLOCK_ACK" }, + { GPRS_NS2_EV_BLOCK, "BLOCK" }, + { GPRS_NS2_EV_BLOCK_ACK, "BLOCK_ACK" }, + { GPRS_NS2_EV_ALIVE, "ALIVE" }, + { GPRS_NS2_EV_ALIVE_ACK, "ALIVE_ACK" }, + { GPRS_NS2_EV_STATUS, "STATUS" }, + { GPRS_NS2_EV_UNITDATA, "UNITDATA" }, + { 0, NULL } +}; + +static void signal_dispatch(struct gprs_ns2_vc *nsvc, unsigned int signal, + uint8_t cause) +{ + struct gprs_ns2_signal_data nssd = {0}; + + nssd.nse = nsvc->nse; + nssd.nsei = nsvc->nse->nsei; + nssd.nsvc = nsvc; + nssd.cause = cause; + + osmo_signal_dispatch(SS_L_NS, signal, &nssd); +} + +static inline struct gprs_ns2_inst *ns_inst_from_fi(struct osmo_fsm_inst *fi) +{ + struct gprs_ns2_vc_priv *priv = fi->priv; + return priv->vc->nse->nsi; +} + +static void start_test_procedure(struct osmo_fsm_inst *fi) +{ + struct gprs_ns2_vc_priv *priv = fi->priv; + struct gprs_ns2_inst *nsi = ns_inst_from_fi(fi); + + if (osmo_timer_pending(&priv->alive.timer)) + return; + + priv->alive.mode = NS_TOUT_TNS_ALIVE; + priv->alive.N = 0; + + gprs_ns2_tx_alive(priv->vc); + osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_ALIVE], 0); +} + +static void stop_test_procedure(struct osmo_fsm_inst *fi) +{ + struct gprs_ns2_vc_priv *priv = fi->priv; + + osmo_timer_del(&priv->alive.timer); +} + +static void recv_test_procedure(struct osmo_fsm_inst *fi) +{ + struct gprs_ns2_vc_priv *priv = fi->priv; + struct gprs_ns2_inst *nsi = ns_inst_from_fi(fi); + + /* ignoring ACKs without sending an ALIVE */ + if (priv->alive.mode != NS_TOUT_TNS_ALIVE) + return; + + priv->alive.mode = NS_TOUT_TNS_TEST; + osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_TEST], 0); +} + + +static void alive_timeout_handler(void *data) +{ + struct osmo_fsm_inst *fi = data; + struct gprs_ns2_inst *nsi = ns_inst_from_fi(fi); + struct gprs_ns2_vc_priv *priv = fi->priv; + + switch (priv->alive.mode) { + case NS_TOUT_TNS_TEST: + priv->alive.mode = NS_TOUT_TNS_ALIVE; + gprs_ns2_tx_alive(priv->vc); + osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_ALIVE], 0); + break; + case NS_TOUT_TNS_ALIVE: + priv->alive.N++; + + if (priv->alive.N <= nsi->timeout[NS_TOUT_TNS_ALIVE_RETRIES]) { + gprs_ns2_tx_alive(priv->vc); + osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_ALIVE], 0); + } else { + if (priv->vc->mode == NS2_VC_MODE_BLOCKRESET) { + /* lost connection */ + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], 0); + } else { + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_ALIVE, nsi->timeout[NS_TOUT_TNS_ALIVE], 0); + } + signal_dispatch(priv->vc, S_NS_ALIVE_EXP, 0); + } + break; + default: + break; + } +} + +static void gprs_ns2_st_unconfigured(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gprs_ns2_vc_priv *priv = fi->priv; + struct gprs_ns2_inst *nsi = priv->vc->nse->nsi; + + switch (event) { + case GPRS_NS2_EV_START: + switch (priv->vc->mode) { + case NS2_VC_MODE_ALIVE: + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_ALIVE, nsi->timeout[NS_TOUT_TNS_ALIVE], NS_TOUT_TNS_ALIVE); + break; + case NS2_VC_MODE_BLOCKRESET: + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], NS_TOUT_TNS_RESET); + break; + } + + break; + default: + OSMO_ASSERT(0); + } +} + + +static void gprs_ns2_st_reset_onenter(struct osmo_fsm_inst *fi, uint32_t old_state) +{ + struct gprs_ns2_vc_priv *priv = fi->priv; + + if (old_state != GPRS_NS2_ST_RESET) + priv->N = 0; + + if (priv->initiater) + gprs_ns2_tx_reset(priv->vc, NS_CAUSE_OM_INTERVENTION); + + stop_test_procedure(fi); + signal_dispatch(priv->vc, S_NS_RESET, 0); + ns2_nse_notify_unblocked(priv->vc, false); +} + +static void gprs_ns2_st_reset(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gprs_ns2_inst *nsi = ns_inst_from_fi(fi); + struct gprs_ns2_vc_priv *priv = fi->priv; + + if (priv->initiater) { + switch (event) { + case GPRS_NS2_EV_RESET_ACK: + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_BLOCKED, + nsi->timeout[NS_TOUT_TNS_BLOCK], NS_TOUT_TNS_BLOCK); + break; + default: + OSMO_ASSERT(0); + } + } else { + /* we are on the receiving end */ + switch (event) { + case GPRS_NS2_EV_RESET: + gprs_ns2_tx_reset_ack(priv->vc); + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_BLOCKED, + 0, 0); + break; + default: + OSMO_ASSERT(0); + } + } +} + +static void gprs_ns2_st_blocked_onenter(struct osmo_fsm_inst *fi, uint32_t old_state) +{ + struct gprs_ns2_vc_priv *priv = fi->priv; + + if (old_state != GPRS_NS2_ST_BLOCKED) + priv->N = 0; + + if (priv->initiater) + gprs_ns2_tx_unblock(priv->vc); + + start_test_procedure(fi); + signal_dispatch(priv->vc, S_NS_BLOCK, 0); +} + +static void gprs_ns2_st_blocked(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gprs_ns2_inst *nsi = ns_inst_from_fi(fi); + struct gprs_ns2_vc_priv *priv = fi->priv; + + if (priv->initiater) { + switch (event) { + case GPRS_NS2_EV_BLOCK: + /* TODO: BLOCK is a BLOCK_NACK */ + gprs_ns2_tx_block_ack(priv->vc); + break; + case GPRS_NS2_EV_UNBLOCK: + gprs_ns2_tx_unblock_ack(priv->vc); + /* fall through */ + case GPRS_NS2_EV_UNBLOCK_ACK: + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_UNBLOCKED, + 0, NS_TOUT_TNS_TEST); + break; + } + } else { + /* we are on the receiving end. The initiator who sent RESET is responsible to UNBLOCK! */ + switch (event) { + case GPRS_NS2_EV_UNBLOCK: + gprs_ns2_tx_unblock_ack(priv->vc); + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_UNBLOCKED, + 0, 0); + break; + } + } +} + +static void gprs_ns2_st_unblocked_on_enter(struct osmo_fsm_inst *fi, uint32_t old_state) +{ + struct gprs_ns2_vc_priv *priv = fi->priv; + + signal_dispatch(priv->vc, S_NS_UNBLOCK, 0); + ns2_nse_notify_unblocked(priv->vc, true); +} + +static void gprs_ns2_st_unblocked(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gprs_ns2_vc_priv *priv = fi->priv; + + switch (event) { + case GPRS_NS2_EV_BLOCK: + priv->initiater = false; + gprs_ns2_tx_block_ack(priv->vc); + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_BLOCKED, + 0, 2); + break; + default: + OSMO_ASSERT(0); + } +} + +static void gprs_ns2_st_alive(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gprs_ns2_inst *nsi = ns_inst_from_fi(fi); + + switch (event) { + case GPRS_NS2_EV_ALIVE_ACK: + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_UNBLOCKED, + 0, 0); + break; + default: + OSMO_ASSERT(0); + } +} + +static void gprs_ns2_st_alive_onenter(struct osmo_fsm_inst *fi, uint32_t old_state) +{ + struct gprs_ns2_vc_priv *priv = fi->priv; + struct gprs_ns2_inst *nsi = ns_inst_from_fi(fi); + + priv->alive.mode = NS_TOUT_TNS_TEST; + osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_TEST], 0); + + if (old_state != GPRS_NS2_ST_ALIVE) + priv->N = 0; + + gprs_ns2_tx_alive(priv->vc); + ns2_nse_notify_unblocked(priv->vc, false); +} + +static void gprs_ns2_st_alive_onleave(struct osmo_fsm_inst *fi, uint32_t next_state) +{ + start_test_procedure(fi); +} + +static const struct osmo_fsm_state gprs_ns2_vc_states[] = { + [GPRS_NS2_ST_UNCONFIGURED] = { + .in_event_mask = S(GPRS_NS2_EV_START), + .out_state_mask = S(GPRS_NS2_ST_RESET) | S(GPRS_NS2_ST_ALIVE), + .name = "UNCONFIGURED", + .action = gprs_ns2_st_unconfigured, + }, + [GPRS_NS2_ST_RESET] = { + .in_event_mask = S(GPRS_NS2_EV_RESET_ACK) | S(GPRS_NS2_EV_RESET), + .out_state_mask = S(GPRS_NS2_ST_RESET) | + S(GPRS_NS2_ST_BLOCKED), + .name = "RESET", + .action = gprs_ns2_st_reset, + .onenter = gprs_ns2_st_reset_onenter, + }, + [GPRS_NS2_ST_BLOCKED] = { + .in_event_mask = S(GPRS_NS2_EV_BLOCK) | S(GPRS_NS2_EV_BLOCK_ACK) | + S(GPRS_NS2_EV_UNBLOCK) | S(GPRS_NS2_EV_UNBLOCK_ACK), + .out_state_mask = S(GPRS_NS2_ST_RESET) | + S(GPRS_NS2_ST_UNBLOCKED) | + S(GPRS_NS2_ST_BLOCKED), + .name = "BLOCKED", + .action = gprs_ns2_st_blocked, + .onenter = gprs_ns2_st_blocked_onenter, + }, + [GPRS_NS2_ST_UNBLOCKED] = { + .in_event_mask = S(GPRS_NS2_EV_BLOCK), + .out_state_mask = S(GPRS_NS2_ST_RESET) | S(GPRS_NS2_ST_ALIVE) | + S(GPRS_NS2_ST_BLOCKED), + .name = "UNBLOCKED", + .action = gprs_ns2_st_unblocked, + .onenter = gprs_ns2_st_unblocked_on_enter, + }, + + /* ST_ALIVE is only used on VC without RESET/BLOCK */ + [GPRS_NS2_ST_ALIVE] = { + .in_event_mask = S(GPRS_NS2_EV_ALIVE_ACK), + .out_state_mask = S(GPRS_NS2_ST_RESET) | + S(GPRS_NS2_ST_UNBLOCKED), + .name = "ALIVE", + .action = gprs_ns2_st_alive, + .onenter = gprs_ns2_st_alive_onenter, + .onleave = gprs_ns2_st_alive_onleave, + }, +}; + +static int gprs_ns2_vc_fsm_timer_cb(struct osmo_fsm_inst *fi) +{ + struct gprs_ns2_inst *nsi = ns_inst_from_fi(fi); + struct gprs_ns2_vc_priv *priv = fi->priv; + + if (priv->initiater) { + /* PCU timeouts */ + switch (fi->state) { + case GPRS_NS2_ST_RESET: + priv->N++; + if (priv->N <= nsi->timeout[NS_TOUT_TNS_RESET_RETRIES]) { + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], 0); + } else { + priv->N = 0; + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], 0); + } + break; + case GPRS_NS2_ST_BLOCKED: + priv->N++; + if (priv->N <= nsi->timeout[NS_TOUT_TNS_BLOCK_RETRIES]) { + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_BLOCKED, nsi->timeout[NS_TOUT_TNS_BLOCK], 0); + } else { + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], 0); + } + break; + case GPRS_NS2_ST_ALIVE: + priv->N++; + if (priv->N <= nsi->timeout[NS_TOUT_TNS_ALIVE_RETRIES]) { + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_ALIVE, 0, 0); + } else { + priv->N = 0; + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_ALIVE, 0, 0); + } + break; + } + } + return 0; +} + +static void gprs_ns2_recv_unitdata(struct osmo_fsm_inst *fi, + struct msgb *msg) +{ + struct gprs_ns2_inst *nsi = ns_inst_from_fi(fi); + struct gprs_ns2_vc_priv *priv = fi->priv; + struct gprs_ns_hdr *nsh = (struct gprs_ns_hdr *) msg->l2h; + + uint16_t bvci; + + if (msgb_l2len(msg) < sizeof(*nsh) + 3) + return; + + /* TODO: 7.1: For an IP sub-network, an NS-UNITDATA PDU for a PTP BVC may indicate a request to change the IP endpoint + * and/or a response to a change in the IP endpoint. */ + + /* TODO: nsh->data[0] -> C/R only valid in IP SNS */ + bvci = nsh->data[1] << 8 | nsh->data[2]; + + msgb_bssgph(msg) = &nsh->data[3]; + msgb_bvci(msg) = bvci; + msgb_nsei(msg) = priv->vc->nse->nsei; + + nsi->cb(GPRS_NS_EVT_UNIT_DATA, msg, priv->vc->nse->nsei, bvci); +} + +static void gprs_ns2_vc_fsm_allstate_action(struct osmo_fsm_inst *fi, + uint32_t event, + void *data) +{ + struct gprs_ns2_vc_priv *priv = fi->priv; + struct gprs_ns2_inst *nsi = ns_inst_from_fi(fi); + + switch (event) { + case GPRS_NS2_EV_RESET: + if (priv->vc->mode != NS2_VC_MODE_BLOCKRESET) + break; + + /* move the FSM into reset */ + if (fi->state != GPRS_NS2_ST_RESET) { + priv->initiater = false; + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], NS_TOUT_TNS_RESET); + } + /* pass the event down into FSM action */ + gprs_ns2_st_reset(fi, event, data); + break; + case GPRS_NS2_EV_ALIVE: + switch (fi->state) { + case GPRS_NS2_ST_UNCONFIGURED: + case GPRS_NS2_ST_RESET: + /* ignore ALIVE */ + break; + default: + gprs_ns2_tx_alive_ack(priv->vc); + } + break; + case GPRS_NS2_EV_ALIVE_ACK: + /* for VCs without RESET/BLOCK/UNBLOCK, the connections comes after ALIVE_ACK unblocked */ + if (fi->state == GPRS_NS2_ST_ALIVE) + gprs_ns2_st_alive(fi, event, data); + else + recv_test_procedure(fi); + break; + case GPRS_NS2_EV_UNITDATA: + switch (fi->state) { + case GPRS_NS2_ST_BLOCKED: + /* 7.2.1: the BLOCKED_ACK might be lost */ + if (priv->initiater) + gprs_ns2_recv_unitdata(fi, data); + else + gprs_ns2_tx_status(priv->vc, + NS_CAUSE_NSVC_BLOCKED, + 0, data); + break; + /* ALIVE can receive UNITDATA if the ALIVE_ACK is lost */ + case GPRS_NS2_ST_ALIVE: + case GPRS_NS2_ST_UNBLOCKED: + gprs_ns2_recv_unitdata(fi, data); + break; + } + break; + } +} + +static struct osmo_fsm gprs_ns2_vc_fsm = { + .name = "GPRS-NS2-VC", + .states = gprs_ns2_vc_states, + .num_states = ARRAY_SIZE(gprs_ns2_vc_states), + .allstate_event_mask = S(GPRS_NS2_EV_UNITDATA) | + S(GPRS_NS2_EV_RESET) | + S(GPRS_NS2_EV_ALIVE) | + S(GPRS_NS2_EV_ALIVE_ACK), + .allstate_action = gprs_ns2_vc_fsm_allstate_action, + .cleanup = NULL, + .timer_cb = gprs_ns2_vc_fsm_timer_cb, + /* .log_subsys = DNS, "is not constant" */ + .event_names = gprs_ns2_vc_event_names, + .pre_term = NULL, +}; + +/*! + * \brief gprs_ns2_vc_fsm_alloc + * \param ctx + * \param vc + * \param id a char representation of the virtual curcuit + * \param initiater initiater is the site which starts the connection. Usually the BSS. + * \return NULL on error, otherwise the fsm + */ +struct osmo_fsm_inst *gprs_ns2_vc_fsm_alloc(struct gprs_ns2_vc *vc, + const char *id, bool initiater) +{ + struct osmo_fsm_inst *fi; + struct gprs_ns2_vc_priv *priv; + + fi = osmo_fsm_inst_alloc(&gprs_ns2_vc_fsm, vc, NULL, LOGL_DEBUG, id); + if (!fi) + return fi; + + vc->fi = fi; + priv = fi->priv = talloc_zero(fi, struct gprs_ns2_vc_priv); + priv->vc = vc; + priv->initiater = initiater; + + osmo_timer_setup(&priv->alive.timer, alive_timeout_handler, fi); + + return fi; +} + +/*! + * \brief gprs_ns2_vc_fsm_start start the FSM + * \param vc the virtual circuit + * \return 0 on success + */ +int gprs_ns2_vc_fsm_start(struct gprs_ns2_vc *nsvc) +{ + /* allows to call this function even for started nsvc by gprs_ns2_start_alive_all_nsvcs */ + if (nsvc->fi->state == GPRS_NS2_ST_UNCONFIGURED) + return osmo_fsm_inst_dispatch(nsvc->fi, GPRS_NS2_EV_START, NULL); + return 0; +} + +/*! + * \brief gprs_ns2_vc_rx entry point for messages from the driver/VL + * \param vc the virtual circuit on which is recived + * \param msg the message + * \param tp the parsed TLVs + * \return 0 on success + */ +int gprs_ns2_vc_rx(struct gprs_ns2_vc *vc, struct msgb *msg, struct tlv_parsed *tp) +{ + struct gprs_ns_hdr *nsh = (struct gprs_ns_hdr *) msg->l2h; + struct osmo_fsm_inst *fi = vc->fi; + uint8_t cause; + + /* TODO: 7.2: on UNBLOCK/BLOCK: check if NS-VCI is correct, if not answer STATUS with "NS-VC unknown" */ + /* TODO: handle RESET with different VCI */ + /* TODO: handle BLOCK/UNBLOCK/ALIVE with different VCI */ + + OSMO_ASSERT(vc); + OSMO_ASSERT(fi); + + if (gprs_ns2_validate(vc, nsh->pdu_type, msg, tp, &cause)) { + if (nsh->pdu_type != NS_PDUT_STATUS) { + return gprs_ns2_tx_status(vc, cause, 0, msg); + } + } + + switch (nsh->pdu_type) { + case NS_PDUT_RESET: + osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RESET, tp); + break; + case NS_PDUT_RESET_ACK: + osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RESET_ACK, tp); + break; + case NS_PDUT_BLOCK: + osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_BLOCK, tp); + break; + case NS_PDUT_BLOCK_ACK: + osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_BLOCK_ACK, tp); + break; + case NS_PDUT_UNBLOCK: + osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_UNBLOCK, tp); + break; + case NS_PDUT_UNBLOCK_ACK: + osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_UNBLOCK_ACK, tp); + break; + case NS_PDUT_ALIVE: + osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_ALIVE, tp); + break; + case NS_PDUT_ALIVE_ACK: + osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_ALIVE_ACK, tp); + break; + case NS_PDUT_UNITDATA: + osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_UNITDATA, msg); + break; + default: + LOGP(DNS, LOGL_ERROR, "NSEI=%u Rx unknown NS PDU type %s\n", vc->nse->nsei, + get_value_string(gprs_ns_pdu_strings, nsh->pdu_type)); + return -EINVAL; + } + + return 0; +} + +/*! + * \brief gprs_ns2_vc_fsm_init must be called once in a library/executable + * \return 0 on success + */ +int gprs_ns2_vc_fsm_init(void) +{ + /* "DNS" is not a constant/#define, but an integer variable set by the client app */ + gprs_ns2_vc_fsm.log_subsys = DNS; + return osmo_fsm_register(&gprs_ns2_vc_fsm); +} + +/*! + * \brief gprs_ns2_vc_is_alive says if this + * \param vc + * \return + */ +int gprs_ns2_vc_is_unblocked(struct gprs_ns2_vc *vc) +{ + return (vc->fi->state == GPRS_NS2_ST_UNBLOCKED); +} diff --git a/src/gb/gprs_ns2_vc_fsm.h b/src/gb/gprs_ns2_vc_fsm.h new file mode 100644 index 0000000..7a67181 --- /dev/null +++ b/src/gb/gprs_ns2_vc_fsm.h @@ -0,0 +1,16 @@ + +#pragma once + +#include + +struct gprs_ns2_vc; +struct msgb; +struct tlv_parsed; + +int gprs_ns2_vc_fsm_init(void); +struct osmo_fsm_inst *gprs_ns2_vc_fsm_alloc(struct gprs_ns2_vc *vc, + const char *id, bool initiate); +int gprs_ns2_vc_fsm_start(struct gprs_ns2_vc *vc); +int gprs_ns2_vc_rx(struct gprs_ns2_vc *vc, struct msgb *msg, struct tlv_parsed *tp); +int gprs_ns2_vc_is_alive(struct gprs_ns2_vc *vc); +int gprs_ns2_vc_is_unblocked(struct gprs_ns2_vc *vc); diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c new file mode 100644 index 0000000..9e6e5b9 --- /dev/null +++ b/src/gb/gprs_ns2_vty.c @@ -0,0 +1,851 @@ +/*! \file gprs_ns_vty.c + * VTY interface for our GPRS Networks Service (NS) implementation. */ +/* + * (C) 2009-2014 by Harald Welte + * (C) 2016-2017 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, see . + * + */ + +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "gprs_ns2_internal.h" +#include "common_vty.h" + +struct ns2_vty_priv { + /* global listen */ + struct osmo_sockaddr_str udp; + struct osmo_sockaddr_str frgreaddr; + int dscp; + bool use_reset_block_unblock; + bool frgre; + + struct llist_head vtyvc; +}; + +struct ns2_vty_vc { + struct llist_head list; + + struct osmo_sockaddr_str remote; + enum gprs_ns_ll ll; + + /* old vty code doesnt support multiple NSVCI per NSEI */ + uint16_t nsei; + uint16_t nsvci; + uint16_t frdlci; + + bool remote_end_is_sgsn; + bool configured; +}; + +static struct gprs_ns2_inst *vty_nsi = NULL; +static struct ns2_vty_priv priv; + +/* FIXME: this should go to some common file as it is copied + * in vty_interface.c of the BSC */ +static const struct value_string gprs_ns_timer_strs[] = { + { 0, "tns-block" }, + { 1, "tns-block-retries" }, + { 2, "tns-reset" }, + { 3, "tns-reset-retries" }, + { 4, "tns-test" }, + { 5, "tns-alive" }, + { 6, "tns-alive-retries" }, + { 7, "tsns-prov" }, + { 0, NULL } +}; + +static void log_set_nsvc_filter(struct log_target *target, + struct gprs_ns2_vc *nsvc) +{ + if (nsvc) { + target->filter_map |= (1 << LOG_FLT_GB_NSVC); + target->filter_data[LOG_FLT_GB_NSVC] = nsvc; + } else if (target->filter_data[LOG_FLT_GB_NSVC]) { + target->filter_map = ~(1 << LOG_FLT_GB_NSVC); + target->filter_data[LOG_FLT_GB_NSVC] = NULL; + } +} + +static struct cmd_node ns_node = { + L_NS_NODE, + "%s(config-ns)# ", + 1, +}; + +static struct ns2_vty_vc *vtyvc_alloc(uint16_t nsei) { + struct ns2_vty_vc *vtyvc = talloc_zero(vty_nsi, struct ns2_vty_vc); + if (!vtyvc) + return vtyvc; + + vtyvc->nsei = nsei; + + llist_add(&vtyvc->list, &priv.vtyvc); + + return NULL; +} + +static void ns2_vc_free(struct ns2_vty_vc *vtyvc) { + if (!vtyvc) + return; + + llist_del(&vtyvc->list); + talloc_free(vtyvc); +} + +static struct ns2_vty_vc *vtyvc_by_nsvci(uint16_t nsvci) { + struct ns2_vty_vc *vtyvc; + llist_for_each_entry(vtyvc, &priv.vtyvc, list) { + if (vtyvc->nsvci == nsvci) + return vtyvc; + } + + return NULL; +} + +static struct ns2_vty_vc *vtyvc_by_nsei(uint16_t nsei, bool alloc_missing) { + struct ns2_vty_vc *vtyvc; + llist_for_each_entry(vtyvc, &priv.vtyvc, list) { + if (vtyvc->nsei == nsei) + return vtyvc; + } + + if (alloc_missing) { + vtyvc = vtyvc_alloc(nsei); + if (!vtyvc) + return vtyvc; + + vtyvc->nsei = nsei; + } + + return NULL; +} + +static int config_write_ns(struct vty *vty) +{ + struct ns2_vty_vc *vtyvc; + unsigned int i; + struct osmo_sockaddr_str sockstr; + + vty_out(vty, "ns%s", VTY_NEWLINE); + + /* global configuration must be written first, as some of it may be + * relevant when creating the NSE/NSVC later below */ + + vty_out(vty, " encapsulation framerelay-gre enabled %u%s", + priv.frgre ? 1 : 0, VTY_NEWLINE); + + if (priv.frgre) { + if (strlen(priv.frgreaddr.ip)) { + vty_out(vty, " encapsulation framerelay-gre local-ip %s%s", + sockstr.ip, VTY_NEWLINE); + } + } else { + if (strlen(priv.udp.ip)) { + vty_out(vty, " encapsulation udp local-ip %s%s", + priv.udp.ip, VTY_NEWLINE); + } + + if (priv.udp.port) + vty_out(vty, " encapsulation udp local-port %u%s", + priv.udp.port, VTY_NEWLINE); + } + + if (priv.dscp) + vty_out(vty, " encapsulation udp dscp %d%s", + priv.dscp, VTY_NEWLINE); + + vty_out(vty, " encapsulation udp use-reset-block-unblock %s%s", + priv.use_reset_block_unblock ? "enabled" : "disabled", VTY_NEWLINE); + + llist_for_each_entry(vtyvc, &priv.vtyvc, list) { + vty_out(vty, " nse %u nsvci %u%s", + vtyvc->nsei, vtyvc->nsvci, VTY_NEWLINE); + + vty_out(vty, " nse %u remote-role %s%s", + vtyvc->nsei, vtyvc->remote_end_is_sgsn ? "sgsn" : "bss", + VTY_NEWLINE); + + switch (vtyvc->ll) { + case GPRS_NS_LL_UDP: + vty_out(vty, " nse %u encapsulation udp%s", vtyvc->nsei, VTY_NEWLINE); + vty_out(vty, " nse %u remote-ip %s%s", + vtyvc->nsei, + vtyvc->remote.ip, + VTY_NEWLINE); + vty_out(vty, " nse %u remote-port %u%s", + vtyvc->nsei, vtyvc->remote.port, + VTY_NEWLINE); + break; + case GPRS_NS_LL_FR_GRE: + // vty_out(vty, " nse %u encapsulation framerelay-gre%s", + // nse->nsei, VTY_NEWLINE); + // vty_out(vty, " nse %u remote-ip %s%s", + // nse->nsei, + // inet_ntoa(nsvc->frgre.bts_addr.sin_addr), + // VTY_NEWLINE); + // vty_out(vty, " nse %u fr-dlci %u%s", + // nsvc->nsei, osmo_ntohs(nsvc->frgre.bts_addr.sin_port), + // VTY_NEWLINE); + break; + default: + break; + } + } + + for (i = 0; i < ARRAY_SIZE(vty_nsi->timeout); i++) + vty_out(vty, " timer %s %u%s", + get_value_string(gprs_ns_timer_strs, i), + vty_nsi->timeout[i], VTY_NEWLINE); + + return CMD_SUCCESS; +} + +DEFUN(cfg_ns, cfg_ns_cmd, + "ns", + "Configure the GPRS Network Service") +{ + vty->node = L_NS_NODE; + return CMD_SUCCESS; +} + +static void dump_nse(struct vty *vty, const struct gprs_ns2_nse *nse, bool stats, bool persistent_only) +{ + struct gprs_ns2_vc *nsvc; + struct osmo_sockaddr_str remote; + struct osmo_sockaddr_str local; + struct osmo_sockaddr *sockaddr; + + vty_out(vty, "NSEI %5u%s", + nse->nsei, VTY_NEWLINE); + + llist_for_each_entry(nsvc, &nse->vc, list) { + switch (nsvc->ll) { + case GPRS_NS_LL_UDP: { + sockaddr = gprs_ns2_ip_vc_sockaddr(nsvc); + if (!sockaddr) { + vty_out(vty, "unknown"); + break; + } + + if (osmo_sockaddr_str_from_sockaddr( + &remote, + &sockaddr->u.sas)) { + vty_out(vty, "unknown"); + break; + } + + vty_out(vty, "%s:%u <> %s:%u", local.ip, local.port, remote.ip, remote.port); + break; + } + case GPRS_NS_LL_FR_GRE: + case GPRS_NS_LL_E1: + break; + } + +// vty_out(vty, "Remote: %-4s, %5s %9s, %s ", +// nsvc->remote_end_is_sgsn ? "SGSN" : "BSS", +// NS_DESC_A(nsvc->remote_state), +// NS_DESC_B(nsvc->remote_state), gprs_ns2_ll_str(nsvc)); + +// vty_out(vty, "%s%s", nsvc->ll == GPRS_NS_LL_UDP ? "UDP" : "FR-GRE", VTY_NEWLINE); + + if (stats) { + vty_out_rate_ctr_group(vty, " ", nsvc->ctrg); + vty_out_stat_item_group(vty, " ", nsvc->statg); + } + } +} + +static void dump_ns(struct vty *vty, const struct gprs_ns2_inst *nsi, bool stats, bool persistent_only) +{ + struct gprs_ns2_nse *nse; + + llist_for_each_entry(nse, &nsi->nse, list) { + gprs_ns2_dump_vty(vty, nse, stats); + break; + } + +} + +DEFUN(show_ns, show_ns_cmd, "show ns", + SHOW_STR "Display information about the NS protocol") +{ + dump_ns(vty, vty_nsi, false, false); + return CMD_SUCCESS; +} + +DEFUN(show_ns_stats, show_ns_stats_cmd, "show ns stats", + SHOW_STR + "Display information about the NS protocol\n" + "Include statistics\n") +{ + dump_ns(vty, vty_nsi, true, false); + return CMD_SUCCESS; +} + +DEFUN(show_ns_pers, show_ns_pers_cmd, "show ns persistent", + SHOW_STR + "Display information about the NS protocol\n" + "Show only persistent NS\n") +{ + dump_ns(vty, vty_nsi, true, true); + return CMD_SUCCESS; +} + +DEFUN(show_nse, show_nse_cmd, "show ns (nsei|nsvc) <0-65535> [stats]", + SHOW_STR "Display information about the NS protocol\n" + "Select one NSE by its NSE Identifier\n" + "Select one NSE by its NS-VC Identifier\n" + "The Identifier of selected type\n" + "Include Statistics\n") +{ + struct gprs_ns2_inst *nsi = vty_nsi; + struct gprs_ns2_nse *nse; + struct gprs_ns2_vc *nsvc; + uint16_t id = atoi(argv[1]); + bool show_stats = false; + + if (argc >= 3) + show_stats = true; + + if (!strcmp(argv[0], "nsei")) { + nse = gprs_ns2_nse_by_nsei(nsi, id); + if (!nse) { + return CMD_WARNING; + } + + dump_nse(vty, nse, show_stats, false); + } else { + nsvc = gprs_ns2_nsvc_by_nsvci(nsi, id); + + if (!nsvc) { + vty_out(vty, "No such NS Entity%s", VTY_NEWLINE); + return CMD_WARNING; + } + + vty_out(vty, "TODO: dump nsvc%s", VTY_NEWLINE); + /* TODO: dump nsvc */ + } + + return CMD_SUCCESS; +} + +#define NSE_CMD_STR "Persistent NS Entity\n" "NS Entity ID (NSEI)\n" + +DEFUN(cfg_nse_nsvc, cfg_nse_nsvci_cmd, + "nse <0-65535> nsvci <0-65535>", + NSE_CMD_STR + "NS Virtual Connection\n" + "NS Virtual Connection ID (NSVCI)\n" + ) +{ + struct ns2_vty_vc *vtyvc; + + uint16_t nsei = atoi(argv[0]); + uint16_t nsvci = atoi(argv[1]); + + vtyvc = vtyvc_by_nsei(nsei, true); + if (!vtyvc) { + vty_out(vty, "Can not allocate space %s", VTY_NEWLINE); + return CMD_WARNING; + } + + vtyvc->nsvci = nsvci; + + return CMD_SUCCESS; +} + +DEFUN(cfg_nse_remoteip, cfg_nse_remoteip_cmd, + "nse <0-65535> remote-ip " VTY_IPV46_CMD, + NSE_CMD_STR + "Remote IP Address\n" + "Remote IP Address\n") +{ + uint16_t nsei = atoi(argv[0]); + struct ns2_vty_vc *vtyvc; + + vtyvc = vtyvc_by_nsei(nsei, true); + if (!vtyvc) { + vty_out(vty, "Can not allocate space %s", VTY_NEWLINE); + return CMD_WARNING; + } + + osmo_sockaddr_str_from_str2(&vtyvc->remote, argv[1]); + + return CMD_SUCCESS; +} + +DEFUN(cfg_nse_remoteport, cfg_nse_remoteport_cmd, + "nse <0-65535> remote-port <0-65535>", + NSE_CMD_STR + "Remote UDP Port\n" + "Remote UDP Port Number\n") +{ + uint16_t nsei = atoi(argv[0]); + uint16_t port = atoi(argv[1]); + struct ns2_vty_vc *vtyvc; + + vtyvc = vtyvc_by_nsei(nsei, true); + if (!vtyvc) { + vty_out(vty, "Can not allocate space %s", VTY_NEWLINE); + return CMD_WARNING; + } + + vtyvc->remote.port = port; + + return CMD_SUCCESS; +} + +DEFUN(cfg_nse_fr_dlci, cfg_nse_fr_dlci_cmd, + "nse <0-65535> fr-dlci <16-1007>", + NSE_CMD_STR + "Frame Relay DLCI\n" + "Frame Relay DLCI Number\n") +{ + uint16_t nsei = atoi(argv[0]); + uint16_t dlci = atoi(argv[1]); + struct ns2_vty_vc *vtyvc; + + vtyvc = vtyvc_by_nsei(nsei, true); + if (!vtyvc) { + vty_out(vty, "Can not allocate space %s", VTY_NEWLINE); + return CMD_WARNING; + } + + if (vtyvc->ll != GPRS_NS_LL_FR_GRE) { + vty_out(vty, "Warning: seting FR DLCI on non-FR NSE%s", + VTY_NEWLINE); + } + + vtyvc->frdlci = dlci; + + return CMD_SUCCESS; +} + +DEFUN(cfg_nse_encaps, cfg_nse_encaps_cmd, + "nse <0-65535> encapsulation (udp|framerelay-gre)", + NSE_CMD_STR + "Encapsulation for NS\n" + "UDP/IP Encapsulation\n" "Frame-Relay/GRE/IP Encapsulation\n") +{ + uint16_t nsei = atoi(argv[0]); + struct ns2_vty_vc *vtyvc; + + vtyvc = vtyvc_by_nsei(nsei, true); + if (!vtyvc) { + vty_out(vty, "Can not allocate space %s", VTY_NEWLINE); + return CMD_WARNING; + } + + if (!strcmp(argv[1], "udp")) + vtyvc->ll = GPRS_NS_LL_UDP; + else + vtyvc->ll = GPRS_NS_LL_FR_GRE; + + return CMD_SUCCESS; +} + +DEFUN(cfg_nse_remoterole, cfg_nse_remoterole_cmd, + "nse <0-65535> remote-role (sgsn|bss)", + NSE_CMD_STR + "Remote NSE Role\n" + "Remote Peer is SGSN\n" + "Remote Peer is BSS\n") +{ + uint16_t nsei = atoi(argv[0]); + struct ns2_vty_vc *vtyvc; + + vtyvc = vtyvc_by_nsei(nsei, true); + if (!vtyvc) { + vty_out(vty, "Can not allocate space %s", VTY_NEWLINE); + return CMD_WARNING; + } + + if (!strcmp(argv[1], "sgsn")) + vtyvc->remote_end_is_sgsn = 1; + else + vtyvc->remote_end_is_sgsn = 0; + + return CMD_SUCCESS; +} + +DEFUN(cfg_no_nse, cfg_no_nse_cmd, + "no nse <0-65535>", + "Delete Persistent NS Entity\n" + "Delete " NSE_CMD_STR) +{ + uint16_t nsei = atoi(argv[0]); + struct ns2_vty_vc *vtyvc; + + vtyvc = vtyvc_by_nsei(nsei, false); + if (!vtyvc) { + vty_out(vty, "The NSE %d does not exists.%s", nsei, VTY_NEWLINE); + return CMD_WARNING; + } + + ns2_vc_free(vtyvc); + + return CMD_SUCCESS; +} + +DEFUN(cfg_ns_timer, cfg_ns_timer_cmd, + "timer " NS_TIMERS " <0-65535>", + "Network Service Timer\n" + NS_TIMERS_HELP "Timer Value\n") +{ + int idx = get_string_value(gprs_ns_timer_strs, argv[0]); + int val = atoi(argv[1]); + + if (idx < 0 || idx >= ARRAY_SIZE(vty_nsi->timeout)) + return CMD_WARNING; + + vty_nsi->timeout[idx] = val; + + return CMD_SUCCESS; +} + +#define ENCAPS_STR "NS encapsulation options\n" + +DEFUN(cfg_nsip_local_ip, cfg_nsip_local_ip_cmd, + "encapsulation udp local-ip " VTY_IPV46_CMD, + ENCAPS_STR "NS over UDP Encapsulation\n" + "Set the IP address on which we listen for NS/UDP\n" + "IP Address\n") +{ + osmo_sockaddr_str_from_str2(&priv.udp, argv[0]); + + return CMD_SUCCESS; +} + +DEFUN(cfg_nsip_local_port, cfg_nsip_local_port_cmd, + "encapsulation udp local-port <0-65535>", + ENCAPS_STR "NS over UDP Encapsulation\n" + "Set the UDP port on which we listen for NS/UDP\n" + "UDP port number\n") +{ + unsigned int port = atoi(argv[0]); + + priv.udp.port = port; + + return CMD_SUCCESS; +} + +DEFUN(cfg_nsip_dscp, cfg_nsip_dscp_cmd, + "encapsulation udp dscp <0-255>", + ENCAPS_STR "NS over UDP Encapsulation\n" + "Set DSCP/TOS on the UDP socket\n" "DSCP Value\n") +{ + int dscp = atoi(argv[0]); + struct gprs_ns2_vc_bind *bind; + + priv.dscp = dscp; + + llist_for_each_entry(bind, &vty_nsi->binding, list) { + if (gprs_ns2_is_ip_bind(bind)) + gprs_ns2_ip_bind_set_dscp(bind, dscp); + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_nsip_res_block_unblock, cfg_nsip_res_block_unblock_cmd, + "encapsulation udp use-reset-block-unblock (enabled|disabled)", + ENCAPS_STR "NS over UDP Encapsulation\n" + "Use NS-{RESET,BLOCK,UNBLOCK} procedures in violation of 3GPP TS 48.016\n" + "Enable NS-{RESET,BLOCK,UNBLOCK}\n" + "Disable NS-{RESET,BLOCK,UNBLOCK}\n") +{ + bool use_reset_block_unblock; + struct gprs_ns2_vc_bind *bind; + + if (!strcmp(argv[0], "enabled")) + use_reset_block_unblock = true; + else + use_reset_block_unblock = false; + + priv.use_reset_block_unblock = use_reset_block_unblock; + + llist_for_each_entry(bind, &vty_nsi->binding, list) { + bind->use_reset_block_unblock = use_reset_block_unblock; + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_frgre_local_ip, cfg_frgre_local_ip_cmd, + "encapsulation framerelay-gre local-ip " VTY_IPV46_CMD, + ENCAPS_STR "NS over Frame Relay over GRE Encapsulation\n" + "Set the IP address on which we listen for NS/FR/GRE\n" + "IP Address\n") +{ + osmo_sockaddr_str_from_str2(&priv.frgreaddr, argv[0]); + + return CMD_SUCCESS; +} + +DEFUN(cfg_frgre_enable, cfg_frgre_enable_cmd, + "encapsulation framerelay-gre enabled (1|0)", + ENCAPS_STR "NS over Frame Relay over GRE Encapsulation\n" + "Enable or disable Frame Relay over GRE\n" + "Enable\n" "Disable\n") +{ + int enabled = atoi(argv[0]); + + priv.frgre = enabled; + + return CMD_SUCCESS; +} + + +//DEFUN(nsvc_nsei, nsvc_nsei_cmd, +// "nsvc (nsei|nsvci) <0-65535> (block|unblock|reset)", +// "Perform an operation on a NSVC\n" +// "NSEI to identify NS-VC Identifier (NS-VCI)\n" +// "NS-VC Identifier (NS-VCI)\n" +// "The NSEI\n" +// "Initiate BLOCK procedure\n" +// "Initiate UNBLOCK procedure\n" +// "Initiate RESET procedure\n") +//{ +// const char *id_type = argv[0]; +// uint16_t id = atoi(argv[1]); +// const char *operation = argv[2]; +// struct gprs_ns2_vc *nsvc; + +// if (!strcmp(id_type, "nsei")) +// nsvc = gprs_ns2_vc_by_nsei(vty_nsi, id); +// else if (!strcmp(id_type, "nsvci")) +// nsvc = gprs_ns2_vc_by_nsvci(vty_nsi, id); +// else { +// vty_out(vty, "%%No such id_type '%s'%s", id_type, VTY_NEWLINE); +// return CMD_WARNING; +// } + +// if (!nsvc) { +// vty_out(vty, "No such %s (%u)%s", id_type, id, VTY_NEWLINE); +// return CMD_WARNING; +// } + +// if (nsvc->nsi->bss_sns_fi) { +// vty_out(vty, "A NS Instance using the IP Sub-Network doesn't use BLOCK/UNBLOCK/RESET%s", +// VTY_NEWLINE); +// return CMD_WARNING; +// } + +// if (!strcmp(operation, "block")) +// gprs_ns_tx_block(nsvc, NS_CAUSE_OM_INTERVENTION); +// else if (!strcmp(operation, "unblock")) +// gprs_ns_tx_unblock(nsvc); +// else if (!strcmp(operation, "reset")) +// gprs_ns2_vc_reset(nsvc, NS_CAUSE_OM_INTERVENTION); +// else +// return CMD_WARNING; + +// return CMD_SUCCESS; +//} + +//DEFUN(logging_fltr_nsvc, +// logging_fltr_nsvc_cmd, +// "logging filter nsvc (nsei|nsvci) <0-65535>", +// LOGGING_STR FILTER_STR +// "Filter based on NS Virtual Connection\n" +// "Identify NS-VC by NSEI\n" +// "Identify NS-VC by NSVCI\n" +// "Numeric identifier\n") +//{ +// struct log_target *tgt; +// struct gprs_ns2_vc *nsvc; +// uint16_t id = atoi(argv[1]); + +// log_tgt_mutex_lock(); +// tgt = osmo_log_vty2tgt(vty); +// if (!tgt) { +// log_tgt_mutex_unlock(); +// return CMD_WARNING; +// } + +// if (!strcmp(argv[0], "nsei")) +// nsvc = gprs_ns2_vc_by_nsei(vty_nsi, id); +// else +// nsvc = gprs_ns2_vc_by_nsvci(vty_nsi, id); + +// if (!nsvc) {remote_end_is_sgsn +// vty_out(vty, "No NS-VC by that identifier%s", VTY_NEWLINE); +// log_tgt_mutex_unlock(); +// return CMD_WARNING; +// } + +// log_set_nsvc_filter(tgt, nsvc); +// log_tgt_mutex_unlock(); +// return CMD_SUCCESS; +//} + +int gprs_ns2_vty_init(struct gprs_ns2_inst *nsi) +{ + static bool vty_elements_installed = false; + + vty_nsi = nsi; + memset(&priv, 0, sizeof(struct ns2_vty_priv)); + INIT_LLIST_HEAD(&priv.vtyvc); + priv.use_reset_block_unblock = true; + + /* Regression test code may call this function repeatedly, so make sure + * that VTY elements are not duplicated, which would assert. */ + if (vty_elements_installed) + return 0; + vty_elements_installed = true; + + install_element_ve(&show_ns_cmd); + install_element_ve(&show_ns_stats_cmd); + install_element_ve(&show_ns_pers_cmd); + install_element_ve(&show_nse_cmd); +// install_element_ve(&logging_fltr_nsvc_cmd); + +// install_element(CFG_LOG_NODE, &logging_fltr_nsvc_cmd); + + install_element(CONFIG_NODE, &cfg_ns_cmd); + install_node(&ns_node, config_write_ns); + install_element(L_NS_NODE, &cfg_nse_nsvci_cmd); + install_element(L_NS_NODE, &cfg_nse_remoteip_cmd); + install_element(L_NS_NODE, &cfg_nse_remoteport_cmd); + install_element(L_NS_NODE, &cfg_nse_fr_dlci_cmd); + install_element(L_NS_NODE, &cfg_nse_encaps_cmd); + install_element(L_NS_NODE, &cfg_nse_remoterole_cmd); + install_element(L_NS_NODE, &cfg_no_nse_cmd); + install_element(L_NS_NODE, &cfg_ns_timer_cmd); + install_element(L_NS_NODE, &cfg_nsip_local_ip_cmd); + install_element(L_NS_NODE, &cfg_nsip_local_port_cmd); + install_element(L_NS_NODE, &cfg_nsip_dscp_cmd); + install_element(L_NS_NODE, &cfg_nsip_res_block_unblock_cmd); + install_element(L_NS_NODE, &cfg_frgre_enable_cmd); + install_element(L_NS_NODE, &cfg_frgre_local_ip_cmd); + +// install_element(ENABLE_NODE, &nsvc_nsei_cmd); + + return 0; +} + +/*! + * \brief gprs_ns2_vty_create parse the vty tree into ns nodes + * It has to be in different steps to ensure the bind is created before creating VCs. + * \return 0 on success + */ +int gprs_ns2_vty_create() { + struct ns2_vty_vc *vtyvc; + struct gprs_ns2_vc_bind *bind; + struct gprs_ns2_nse *nse; + struct gprs_ns2_vc *nsvc; + struct osmo_sockaddr sockaddr; + + if (!vty_nsi) + return -1; + + /* create binds, only support a single bind. either FR or UDP */ + if (priv.frgre) { + /* TODO not yet supported !*/ + return -1; + } else { + /* UDP */ + osmo_sockaddr_str_to_sockaddr(&priv.udp, &sockaddr.u.sas); + gprs_ns2_ip_bind(vty_nsi, &sockaddr, priv.dscp, &bind); + if (!bind) { + /* TODO: could not bind on the specific address */ + return -1; + } + gprs_ns2_ip_bind_reset_block_unblock(bind, + priv.use_reset_block_unblock); + } + + /* create vcs */ + llist_for_each_entry(vtyvc, &priv.vtyvc, list) { + if (strlen(vtyvc->remote.ip) == 0) { + /* Invalid IP for VC */ + continue; + } + + if (!vtyvc->remote.port) { + /* Invalid port for VC */ + continue; + } + + if (osmo_sockaddr_str_to_sockaddr(&vtyvc->remote, &sockaddr.u.sas)) { + /* Invalid sockaddr for VC */ + continue; + } + + nse = gprs_ns2_nse_by_nsei(vty_nsi, vtyvc->nsei); + if (!nse) { + nse = gprs_ns2_create_nse(vty_nsi, vtyvc->nsei); + if (!nse) { + /* Could not create NSE for VTY */ + continue; + } + } + + if (bind) { + nsvc = gprs_ns2_ip_connect(bind, + &sockaddr, + nse, + vtyvc->nsvci); + if (!nsvc) { + /* Could not create NSVC, connect failed */ + continue; + } + } + } + + + return 0; +} + +/*! + * \brief ns2_vty_bind_apply will be called when a new bind is created to apply vty settings + * \param bind + * \return + */ +void ns2_vty_bind_apply(struct gprs_ns2_vc_bind *bind) +{ + gprs_ns2_ip_bind_reset_block_unblock(bind, + priv.use_reset_block_unblock); +} diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map index 0c0c5c4..4137a0b 100644 --- a/src/gb/libosmogb.map +++ b/src/gb/libosmogb.map @@ -72,6 +72,40 @@ gprs_ns_ll_clear; gprs_ns_msgb_alloc; +gprs_ns2_bind_set_mode; +gprs_ns2_close; +gprs_ns2_instantiate; +gprs_ns2_create_connect; +gprs_ns2_dynamic_create_nse; +gprs_ns2_free; +gprs_ns2_free_nse; +gprs_ns2_free_bind; +gprs_ns2_free_nsvc; +gprs_ns2_ip_bind; +gprs_ns2_ip_connect_inactive; +gprs_ns2_ip_connect; +gprs_ns2_ip_connect2; +gprs_ns2_ip_connect_sns; +gprs_ns2_recv_vc; +gprs_ns2_send; +gprs_ns2_send_nse; +gprs_ns2_send_nsei; +gprs_ns2_set_log_ss; +gprs_ns2_nse_by_nsei; +gprs_ns2_create_nse; +gprs_ns2_tx_alive; +gprs_ns2_tx_alive_ack; +gprs_ns2_tx_block; +gprs_ns2_tx_block_ack; +gprs_ns2_tx_reset; +gprs_ns2_tx_reset_ack; +gprs_ns2_tx_status; +gprs_ns2_tx_unblock; +gprs_ns2_tx_unblock_ack; +gprs_ns2_tx_unit_data; +gprs_ns2_vty_create; +gprs_ns2_vty_init; + gprs_nsvc_create2; gprs_nsvc_delete; gprs_nsvc_reset; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3525beef205588dfab9d3880a34115f1a2676e48 Gerrit-Change-Number: 19417 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 10:45:19 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 10:45:19 +0000 Subject: Change in libosmocore[master]: vty: add a define VTY_IPV46_CMD to require a IPv4/6 address In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19139 ) Change subject: vty: add a define VTY_IPV46_CMD to require a IPv4/6 address ...................................................................... Patch Set 2: (1 comment) This change is ready for review. https://gerrit.osmocom.org/c/libosmocore/+/19139/1/include/osmocom/vty/command.h File include/osmocom/vty/command.h: https://gerrit.osmocom.org/c/libosmocore/+/19139/1/include/osmocom/vty/command.h at 307 PS1, Line 307: CMD_IPV46 > The problem is that FOO_STR below are used for help strings, and not for commands. [?] Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I86e399aea86b68b48e627f11e1de48fdfad16525 Gerrit-Change-Number: 19139 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 10:45:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 10:48:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jul 2020 10:48:33 +0000 Subject: Change in libosmocore[master]: bts_features: add feature BTS_FEAT_IPV6_NSVC In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19145 ) Change subject: bts_features: add feature BTS_FEAT_IPV6_NSVC ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19145/4/src/gsm/bts_features.c File src/gsm/bts_features.c: https://gerrit.osmocom.org/c/libosmocore/+/19145/4/src/gsm/bts_features.c at 43 PS4, Line 43: { BTS_FEAT_IPV6_NSVC, "NSVC IPV6" }, IPv6 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 Gerrit-Change-Number: 19145 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 10:48:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 10:50:38 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 10:50:38 +0000 Subject: Change in libosmocore[master]: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19143 ) Change subject: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/19143/2/src/socket.c File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/19143/2/src/socket.c at 870 PS2, Line 870: if (sfd < 0) see here https://gerrit.osmocom.org/c/libosmocore/+/19143/2/src/socket.c at 931 PS2, Line 931: return osmo_fd_init_ofd(ofd, osmo_sock_init3(type, proto, local, remote, flags)); > Ack It's not a problem, if osmo_sock_init3() fails, osmo_fd_init_ofd() will return immediately. It's the same as in osmo_sock_init2(). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 10:50:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 10:52:12 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jul 2020 10:52:12 +0000 Subject: Change in libosmocore[master]: gprs_ns: fix typo in comment In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19411 ) Change subject: gprs_ns: fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie9d8decea18542cb0e1641dcb5fca5e4850910eb Gerrit-Change-Number: 19411 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 10:52:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 10:52:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jul 2020 10:52:24 +0000 Subject: Change in libosmocore[master]: gprs_ns_frgre.h: add missing declaration of structs In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19412 ) Change subject: gprs_ns_frgre.h: add missing declaration of structs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I47b3458ff7dc7ab1fcb7e4dd690142e2bc44ed46 Gerrit-Change-Number: 19412 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 10:52:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 10:53:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jul 2020 10:53:20 +0000 Subject: Change in libosmocore[master]: gprs_ns_frgre.h: add missing declaration of structs In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19412 ) Change subject: gprs_ns_frgre.h: add missing declaration of structs ...................................................................... Patch Set 1: Code-Review+1 Preferrably use includes rather than redeclaring structs please. This way the relation chain between headers becomes clearer. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I47b3458ff7dc7ab1fcb7e4dd690142e2bc44ed46 Gerrit-Change-Number: 19412 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 10:53:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 10:53:41 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jul 2020 10:53:41 +0000 Subject: Change in libosmocore[master]: socket: osmo_sock_local_ip: correct doxygen comment In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19413 ) Change subject: socket: osmo_sock_local_ip: correct doxygen comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1e31fcbf40d8abf99214b87e70e867b5ab66bd75 Gerrit-Change-Number: 19413 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 10:53:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 10:54:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jul 2020 10:54:36 +0000 Subject: Change in libosmocore[master]: vty: add a define VTY_IPV46_CMD to require a IPv4/6 address In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19139 ) Change subject: vty: add a define VTY_IPV46_CMD to require a IPv4/6 address ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I86e399aea86b68b48e627f11e1de48fdfad16525 Gerrit-Change-Number: 19139 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 10:54:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 11:00:34 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 11:00:34 +0000 Subject: Change in libosmocore[master]: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19143 to look at the new patch set (#4). Change subject: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd ...................................................................... socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd osmo_sock_init3() takes osmo_sockaddr* as local and remote endpoints to setup a socket. Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 --- M include/osmocom/core/socket.h M src/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.ok 4 files changed, 305 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/19143/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 11:18:22 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 11:18:22 +0000 Subject: Change in libosmocore[master]: osmo_sock_init2: improve support for AF_UNSPEC In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19140 to look at the new patch set (#3). Change subject: osmo_sock_init2: improve support for AF_UNSPEC ...................................................................... osmo_sock_init2: improve support for AF_UNSPEC osmo_sock_init2 abstract two calls of getaddrinfo into one. While there aren't problems with AF_INET or AF_INET6. When using AF_UNSPEC there are corner cases when this fails. E.g. calling local_host with "" and remote_host with an IPv6 only address results in setting up a local socket with AF_INET while trying to connect from there towards AF_INET6 will most likely fail. To prevent such cases with AF_UNSPEC, search prio calling any syscalls if local and remote site supports AF_INET or AF_INET6. In case both supported, prefer AF_INET6 Change-Id: I397c633931fd00d4f083955a3c49a40fb002d766 --- M src/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.err M tests/socket/socket_test.ok 4 files changed, 101 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/40/19140/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I397c633931fd00d4f083955a3c49a40fb002d766 Gerrit-Change-Number: 19140 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 11:18:22 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 11:18:22 +0000 Subject: Change in libosmocore[master]: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19143 to look at the new patch set (#5). Change subject: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd ...................................................................... socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd osmo_sock_init3() takes osmo_sockaddr* as local and remote endpoints to setup a socket. Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 --- M include/osmocom/core/socket.h M src/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.err M tests/socket/socket_test.ok 5 files changed, 309 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/19143/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 11:46:10 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 11:46:10 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19418 ) Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support ...................................................................... pcuif_proto: version 0xa: add support for NSVC IPv6 support Introduce a remote_proto to define the given protocol. IPPROTO is more universal than address_family and is defined by an RFC. IPPROTO_IPIP is used for IPv4, IPPROTO_IPV6 for IPv6. 0 means unset or unused entry. The remote_ip is network byte order, the default encoding for in_addr and in6_addr. Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/19418/1 diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index e977914..9e3b801 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -2,10 +2,11 @@ #define _PCUIF_PROTO_H #include +#include #define PCU_SOCK_DEFAULT "/tmp/pcu_bts" -#define PCU_IF_VERSION 0x09 +#define PCU_IF_VERSION 0x0a #define TXT_MAX_LEN 128 /* msg_type */ @@ -155,7 +156,13 @@ uint16_t nsvci[2]; uint16_t local_port[2]; uint16_t remote_port[2]; - uint32_t remote_ip[2]; + /* use IP PROTOCOL instead of address_family, because address_family is + * OS dependent. IPIP => v4, IPV6 => v6, 0 => unused */ + uint8_t remote_proto[2]; + union { + struct in_addr ipv4; + struct in6_addr ipv6; + } remote_ip[2]; } __attribute__ ((packed)); struct gsm_pcu_if_act_req { diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 5fa0e19..a983d88 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -210,7 +210,8 @@ info_ind->nsvci[i] = nsvc->nsvci; info_ind->local_port[i] = nsvc->local_port; info_ind->remote_port[i] = nsvc->remote_port; - info_ind->remote_ip[i] = nsvc->remote_ip; + info_ind->remote_ip[i].ipv4.s_addr = htonl(nsvc->remote_ip); + info_ind->remote_proto[i] = IPPROTO_IPIP; } for (i = 0; i < 8; i++) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd Gerrit-Change-Number: 19418 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 11:47:32 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 11:47:32 +0000 Subject: Change in osmo-pcu[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19419 ) Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support ...................................................................... pcuif_proto: version 0xa: add support for NSVC IPv6 support Introduce a remote_proto to define the given protocol. IPPROTO is more universal than address_family and is defined by an RFC. IPPROTO_IPIP is used for IPv4, IPPROTO_IPV6 for IPv6. 0 means unset or unused entry. The remote_ip is network byte order, the default encoding for in_addr and in6_addr. Change-Id: If26958d5b584973dca79159cf9e7f3f266519ce9 --- M include/osmocom/pcu/pcuif_proto.h M src/pcu_l1_if.cpp 2 files changed, 15 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/19/19419/1 diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index e88607e..c5ab8f6 100644 --- a/include/osmocom/pcu/pcuif_proto.h +++ b/include/osmocom/pcu/pcuif_proto.h @@ -2,10 +2,11 @@ #define _PCUIF_PROTO_H #include +#include #define PCU_SOCK_DEFAULT "/tmp/pcu_bts" -#define PCU_IF_VERSION 0x09 +#define PCU_IF_VERSION 0x0a #define TXT_MAX_LEN 128 /* msg_type */ @@ -155,7 +156,13 @@ uint16_t nsvci[2]; uint16_t local_port[2]; uint16_t remote_port[2]; - uint32_t remote_ip[2]; + /* use IP PROTOCOL instead of address_family, because address_family is + * OS dependent. IPIP => v4, IPV6 => v6, 0 => unused */ + uint8_t remote_proto[2]; + union { + struct in_addr ipv4; + struct in6_addr ipv6; + } remote_ip[2]; } __attribute__ ((packed)); struct gsm_pcu_if_act_req { diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 7fa82fb..8df9156 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -568,11 +568,15 @@ LOGP(DL1IF, LOGL_DEBUG, " nsvci=%d\n", info_ind->nsvci[0]); LOGP(DL1IF, LOGL_DEBUG, " local_port=%d\n", info_ind->local_port[0]); LOGP(DL1IF, LOGL_DEBUG, " remote_port=%d\n", info_ind->remote_port[0]); - ia.s_addr = htonl(info_ind->remote_ip[0]); + ia.s_addr = info_ind->remote_ip[0].ipv4.s_addr; LOGP(DL1IF, LOGL_DEBUG, " remote_ip=%s\n", inet_ntoa(ia)); + if (info_ind->remote_proto[0] != IPPROTO_IPIP) { + goto bssgp_failed; + } + pcu = gprs_bssgp_create_and_connect(bts, info_ind->local_port[0], - info_ind->remote_ip[0], info_ind->remote_port[0], + ntohl(info_ind->remote_ip[0].ipv4.s_addr), info_ind->remote_port[0], info_ind->nsei, info_ind->nsvci[0], info_ind->bvci, info_ind->mcc, info_ind->mnc, info_ind->mnc_3_digits, info_ind->lac, info_ind->rac, info_ind->cell_id); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If26958d5b584973dca79159cf9e7f3f266519ce9 Gerrit-Change-Number: 19419 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 11:50:33 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 11:50:33 +0000 Subject: Change in osmo-pcu[master]: WIP add IPv6 support for the PCU SOCKET In-Reply-To: References: Message-ID: lynxis lazus has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19236 ) Change subject: WIP add IPv6 support for the PCU SOCKET ...................................................................... Abandoned was only meant as example for fixeria. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iaa2113644fcb4e6ff38649ca7f3abb6469f33d48 Gerrit-Change-Number: 19236 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 11:58:55 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 11:58:55 +0000 Subject: Change in libosmocore[master]: bts_features: add feature BTS_FEAT_IPV6_NSVC In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19145 to look at the new patch set (#5). Change subject: bts_features: add feature BTS_FEAT_IPV6_NSVC ...................................................................... bts_features: add feature BTS_FEAT_IPV6_NSVC Previous both the IPA nanobts and the sysmobts has been using the IPv4 only OML attribute NM_ATT_IPACC_NS_LINK_CFG. A bts with BTS_FEAT_IPV6_NSVC supports IPv6 for NSVC (PCUSGSN) using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG. Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 --- M include/osmocom/gsm/bts_features.h M src/gsm/bts_features.c 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/19145/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 Gerrit-Change-Number: 19145 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 12:01:54 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 12:01:54 +0000 Subject: Change in libosmocore[master]: gprs_ns: fix typo in comment In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19411 ) Change subject: gprs_ns: fix typo in comment ...................................................................... gprs_ns: fix typo in comment Change-Id: Ie9d8decea18542cb0e1641dcb5fca5e4850910eb --- M src/gb/gprs_ns.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index 14fe661..a6ef6d4 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -619,7 +619,7 @@ return gprs_ns_tx(nsvc, msg); } -/*! Transmit a NS-BLOCK on a tiven NS-VC +/*! Transmit a NS-BLOCK on a given NS-VC * \param[in] nsvc NS-VC on which the NS-BLOCK is to be transmitted * \param[in] cause Numeric NS Cause value * \returns 0 in case of success -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie9d8decea18542cb0e1641dcb5fca5e4850910eb Gerrit-Change-Number: 19411 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 12:13:51 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 12:13:51 +0000 Subject: Change in libosmocore[master]: Gb/BSSGP: replace hardcoded Tx into NS library by a callback In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19414 to look at the new patch set (#3). Change subject: Gb/BSSGP: replace hardcoded Tx into NS library by a callback ...................................................................... Gb/BSSGP: replace hardcoded Tx into NS library by a callback Add bssgp_ns_send callback() to set the transmission path into the NS library. This allows to use the Gb implementation with the old NS and the new upcoming NS implementation. Users of the old NS implementation don't have to set the callback as the default is the old NS implementation. Only users of the new NS implementation need to set the callback and the callback data. Change-Id: I3a498e6a0d68b87fed80c64199b22395796761b4 --- M include/osmocom/gprs/gprs_bssgp.h M src/gb/Makefile.am M src/gb/gprs_bssgp.c M src/gb/gprs_bssgp_bss.c A src/gb/gprs_bssgp_internal.h M src/gb/gprs_bssgp_util.c M src/gb/libosmogb.map 7 files changed, 54 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/19414/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3a498e6a0d68b87fed80c64199b22395796761b4 Gerrit-Change-Number: 19414 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 12:15:10 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 12:15:10 +0000 Subject: Change in libosmocore[master]: Gb/BSSGP: replace hardcoded Tx into NS library by a callback In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19414 to look at the new patch set (#4). Change subject: Gb/BSSGP: replace hardcoded Tx into NS library by a callback ...................................................................... Gb/BSSGP: replace hardcoded Tx into NS library by a callback Add bssgp_ns_send callback() to set the transmission path into the NS library. This allows to use the Gb implementation with the old NS and the new upcoming NS implementation. Users of the old NS implementation don't have to set the callback as the default is the old NS implementation. Only users of the new NS implementation need to set the callback and the callback data. Change-Id: I3a498e6a0d68b87fed80c64199b22395796761b4 --- M include/osmocom/gprs/gprs_bssgp.h M src/gb/Makefile.am M src/gb/gprs_bssgp.c M src/gb/gprs_bssgp_bss.c A src/gb/gprs_bssgp_internal.h M src/gb/gprs_bssgp_util.c M src/gb/libosmogb.map 7 files changed, 54 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/19414/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3a498e6a0d68b87fed80c64199b22395796761b4 Gerrit-Change-Number: 19414 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 13:10:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jul 2020 13:10:15 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19418 ) Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support ...................................................................... Patch Set 1: Code-Review-1 (3 comments) https://gerrit.osmocom.org/c/osmo-bts/+/19418/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/19418/1//COMMIT_MSG at 11 PS1, Line 11: IPPROTO_IPIP is used for IPv4, IPPROTO_IPV6 for IPv6. 0 means unset or This doesn't make sense to me, you are using something from the wrong layer afaiu. That's for stuff on top of IP(v4 or v6), while in here we need to specify IPv4 or IPv6 themselves. https://gerrit.osmocom.org/c/osmo-bts/+/19418/1/include/osmo-bts/pcuif_proto.h File include/osmo-bts/pcuif_proto.h: https://gerrit.osmocom.org/c/osmo-bts/+/19418/1/include/osmo-bts/pcuif_proto.h at 160 PS1, Line 160: * OS dependent. IPIP => v4, IPV6 => v6, 0 => unused */ So what? it goes over unix sockets, so same host/system on both sides... https://gerrit.osmocom.org/c/osmo-bts/+/19418/1/include/osmo-bts/pcuif_proto.h at 163 PS1, Line 163: struct in_addr ipv4; simply call the fields v4 and v6? So you have remote_ip.v6 ... Same as we do in in46_addr in libgtp. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd Gerrit-Change-Number: 19418 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 13:10:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 13:11:00 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jul 2020 13:11:00 +0000 Subject: Change in osmo-pcu[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19419 ) Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support ...................................................................... Patch Set 1: Code-Review-1 See my comments in https://gerrit.osmocom.org/c/osmo-bts/+/19418 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If26958d5b584973dca79159cf9e7f3f266519ce9 Gerrit-Change-Number: 19419 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 13:11:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 13:11:25 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jul 2020 13:11:25 +0000 Subject: Change in libosmocore[master]: bts_features: add feature BTS_FEAT_IPV6_NSVC In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19145 ) Change subject: bts_features: add feature BTS_FEAT_IPV6_NSVC ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 Gerrit-Change-Number: 19145 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 13:11:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 13:16:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jul 2020 13:16:46 +0000 Subject: Change in libosmocore[master]: Gb/BSSGP: replace hardcoded Tx into NS library by a callback In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19414 ) Change subject: Gb/BSSGP: replace hardcoded Tx into NS library by a callback ...................................................................... Patch Set 4: Code-Review-1 (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/19414/4/include/osmocom/gprs/gprs_bssgp.h File include/osmocom/gprs/gprs_bssgp.h: https://gerrit.osmocom.org/c/libosmocore/+/19414/4/include/osmocom/gprs/gprs_bssgp.h at 15 PS4, Line 15: typedef int bssgp_bvc_send(void *ctx, struct msgb *msg); Usually one uses: typedef int (*bssgp_bvc_send)(void *ctx, struct msgb *msg); Then: void bssgp_set_bssgp_callback(bssgp_bvc_send ns_send, void *data); https://gerrit.osmocom.org/c/libosmocore/+/19414/4/src/gb/gprs_bssgp.c File src/gb/gprs_bssgp.c: https://gerrit.osmocom.org/c/libosmocore/+/19414/4/src/gb/gprs_bssgp.c at 76 PS4, Line 76: /* callback to be compatible with users which do not set the bssgp_ns_send function */ to be backward-compatible with old users -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3a498e6a0d68b87fed80c64199b22395796761b4 Gerrit-Change-Number: 19414 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 13:16:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 13:40:27 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 13:40:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: update PCUIF_Types References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19420 ) Change subject: WIP: update PCUIF_Types ...................................................................... WIP: update PCUIF_Types Change-Id: I13b03c380edc2dc609c5e4053462a3cd6f78ce72 --- M library/PCUIF_Types.ttcn 1 file changed, 18 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/19420/1 diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 089403c..674c6d4 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -20,7 +20,14 @@ }; const charstring PCU_SOCK_DEFAULT := "/tmp/pcu_bts"; -type integer PCUIF_Version (9); /* supported versions */ + +type integer PCUIF_Version (10); /* supported versions */ + +type enumerated PCUIF_RemoteProtocol { + PCU_IF_ADRESS_UNSPEC ('00'O), + PCU_IF_ADRESS_IPV4 ('04'O), + PCU_IF_ADRESS_IPV6 ('2a'O) +} with { variant "FIELDLENGTH(8)" }; type enumerated PCUIF_MsgType { PCU_IF_MSG_DATA_REQ ('00'O), @@ -186,8 +193,14 @@ record length(2) of uint16_t nsvci, record length(2) of uint16_t local_pprt, record length(2) of uint16_t remote_port, - record length(2) of OCT4 remote_ip -} with { variant "" } + record length(2) of PCUIF_RemoteProtocol remote_protocol, + record length(2) of octetstring remote_ip length(16) +}; + +type union PCUIF_RemoteIPu { + OCT4 ipv4, + octetstring ipv6 length(16) +}; type record PCUIF_act_req { uint8_t is_activate, @@ -258,7 +271,7 @@ time_ind, msg_type = PCU_IF_MSG_TIME_IND; pag_req, msg_type = PCU_IF_MSG_PAG_REQ; app_info_req, msg_type = PCU_IF_MSG_APP_INFO_REQ)" - variant "PADDING(1696)" /* 212 * 8 */ + variant "PADDING(1904)" /* 238 * 8 */ }; external function enc_PCUIF_Message(in PCUIF_Message pdu) return octetstring @@ -741,6 +754,7 @@ nsvci := ?, local_pprt := ?, remote_port := ?, + remote_protocol := ?, remote_ip := ? } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I13b03c380edc2dc609c5e4053462a3cd6f78ce72 Gerrit-Change-Number: 19420 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 13:40:28 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 13:40:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: PCU socket: test NSVC IPv4/IPv6 References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19421 ) Change subject: WIP: PCU socket: test NSVC IPv4/IPv6 ...................................................................... WIP: PCU socket: test NSVC IPv4/IPv6 Change-Id: Iae854875a45dbc29cd46a267ccaf60f1f2ac2973 --- M bts/BTS_Tests.ttcn 1 file changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/21/19421/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 1c8127b..9038924 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -35,6 +35,7 @@ import from L1CTL_Types all; import from LAPDm_Types all; import from LAPDm_RAW_PT all; +import from Native_Functions all; import from Osmocom_CTRL_Adapter all; import from Osmocom_CTRL_Functions all; @@ -5434,6 +5435,41 @@ setverdict(pass); } +testcase TC_pcu_socket_nsvc_ipv4() runs on test_CT { + f_init_vty_bsc(); + f_vty_config2(BSCVTY, {"network", "bts 0"} , "gprs nsvc 0 remote ip 127.127.127.127"); + f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); + + f_init(); + + if (g_pcu_last_info.u.info_ind.remote_protocol[0] != PCU_IF_ADRESS_IPV4) { + setverdict(fail, "Expected address family = IPV4"); + } + + if (substr(g_pcu_last_info.u.info_ind.remote_ip[0], 0, 4) != f_inet_addr("127.127.127.127")) { + setverdict(fail, "Invalid remote_ip!"); + } + + setverdict(pass); +} + +testcase TC_pcu_socket_nsvc_ipv6() runs on test_CT { + f_init_vty_bsc(); + f_vty_config2(BSCVTY, {"network", "bts 0"} , "gprs nsvc 0 remote ip fd00::ca:ff:ee"); + + f_init(); + + if (g_pcu_last_info.u.info_ind.remote_protocol[0] != PCU_IF_ADRESS_IPV6) { + setverdict(fail, "Expected address family = IPV6"); + } + + if (g_pcu_last_info.u.info_ind.remote_ip[0] != f_inet6_addr("fd00::ca:ff:ee")) { + setverdict(fail, "Invalid remote_ip!"); + } + + setverdict(pass); +} + /*********************************************************************** * Osmocom Style Dynamic Timeslot Support ***********************************************************************/ @@ -6831,6 +6867,8 @@ execute( TC_pcu_socket_disconnect_nosi3gprs() ); execute( TC_pcu_socket_disconnect_nosi4gprs() ); execute( TC_pcu_socket_verify_info_ind() ); + execute( TC_pcu_socket_nsvc_ipv4() ); + execute( TC_pcu_socket_nsvc_ipv6() ); execute( TC_dyn_osmo_pdch_act_deact() ); execute( TC_dyn_osmo_pdch_double_act() ); execute( TC_dyn_ipa_pdch_act_deact() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iae854875a45dbc29cd46a267ccaf60f1f2ac2973 Gerrit-Change-Number: 19421 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 14:12:28 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 14:12:28 +0000 Subject: Change in osmo-bts[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19418 ) Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-bts/+/19418/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/19418/1//COMMIT_MSG at 11 PS1, Line 11: IPPROTO_IPIP is used for IPv4, IPPROTO_IPV6 for IPv6. 0 means unset or > This doesn't make sense to me, you are using something from the wrong layer afaiu. [?] Yes, it's for a different layer. But I didn't want to invent new enums etc if there are good known values. So I found the IPPROTO which suites the case. https://gerrit.osmocom.org/c/osmo-bts/+/19418/1/include/osmo-bts/pcuif_proto.h File include/osmo-bts/pcuif_proto.h: https://gerrit.osmocom.org/c/osmo-bts/+/19418/1/include/osmo-bts/pcuif_proto.h at 160 PS1, Line 160: * OS dependent. IPIP => v4, IPV6 => v6, 0 => unused */ > So what? it goes over unix sockets, so same host/system on both sides... Maybe it still goes over an unix socket. But if we move further around I like to have well defined values. I looked for a more specified value and found the IPPROTO values. https://gerrit.osmocom.org/c/osmo-bts/+/19418/1/include/osmo-bts/pcuif_proto.h at 163 PS1, Line 163: struct in_addr ipv4; > simply call the fields v4 and v6? So you have remote_ip.v6 ... Same as we do in in46_addr in libgtp. Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd Gerrit-Change-Number: 19418 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 14:12:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 14:13:46 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 14:13:46 +0000 Subject: Change in libosmocore[master]: bts_features: add feature BTS_FEAT_IPV6_NSVC In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19145 ) Change subject: bts_features: add feature BTS_FEAT_IPV6_NSVC ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19145/4/src/gsm/bts_features.c File src/gsm/bts_features.c: https://gerrit.osmocom.org/c/libosmocore/+/19145/4/src/gsm/bts_features.c at 43 PS4, Line 43: { BTS_FEAT_IPV6_NSVC, "NSVC IPV6" }, > IPv6 Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 Gerrit-Change-Number: 19145 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 14:13:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 14:14:12 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 14:14:12 +0000 Subject: Change in libosmocore[master]: bts_features: add feature BTS_FEAT_IPV6_NSVC In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19145 ) Change subject: bts_features: add feature BTS_FEAT_IPV6_NSVC ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19145/2/include/osmocom/gsm/bts_features.h File include/osmocom/gsm/bts_features.h: https://gerrit.osmocom.org/c/libosmocore/+/19145/2/include/osmocom/gsm/bts_features.h at 28 PS2, Line 28: BTS_FEAT_IPV6_NSVC, > The NSVC remote IP address is specified in the BSC config file. [?] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 Gerrit-Change-Number: 19145 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 14:14:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 14:16:28 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 14:16:28 +0000 Subject: Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments In-Reply-To: References: Message-ID: lynxis lazus has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 14:20:51 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 14:20:51 +0000 Subject: Change in osmo-sgsn[master]: Send a BVC-RESET to all persistent Gb interfaces at start-up In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 ) Change subject: Send a BVC-RESET to all persistent Gb interfaces at start-up ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Gerrit-Change-Number: 19027 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 14:20:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 14:21:45 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 14:21:45 +0000 Subject: Change in osmo-sgsn[master]: Send a BVC-RESET to all persistent Gb interfaces at start-up In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 ) Change subject: Send a BVC-RESET to all persistent Gb interfaces at start-up ...................................................................... Patch Set 4: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Gerrit-Change-Number: 19027 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 14:21:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 14:22:18 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 14:22:18 +0000 Subject: Change in osmo-sgsn[master]: Send a BVC-RESET to all persistent Gb interfaces at start-up In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 ) Change subject: Send a BVC-RESET to all persistent Gb interfaces at start-up ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-sgsn/+/19027/4/src/sgsn/sgsn_main.c File src/sgsn/sgsn_main.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/19027/4/src/sgsn/sgsn_main.c at 215 PS4, Line 215: nsvc->state |= NSE_S_ALIVE; we shouldn't sent messages over dead nsvc's -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Gerrit-Change-Number: 19027 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 14:22:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 14:23:48 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 14:23:48 +0000 Subject: Change in libosmocore[master]: socket.c add osmo_sockaddr_valid() In-Reply-To: References: Message-ID: lynxis lazus has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19144 ) Change subject: socket.c add osmo_sockaddr_valid() ...................................................................... Abandoned it's not used. let's drop it until someone want's to use it. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib6fb050e1bfe3f3a8d8bbe5e762351ce6b7cc48c Gerrit-Change-Number: 19144 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 14:28:00 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 14:28:00 +0000 Subject: Change in osmo-sgsn[master]: Send a BVC-RESET to all persistent Gb interfaces at start-up In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 ) Change subject: Send a BVC-RESET to all persistent Gb interfaces at start-up ...................................................................... Patch Set 4: The SGSN could react on S_NS_UNBLOCK signal and check if the NSVC is persistant. We should ensure we don't reset a running BSVC. The new NS code can react on NSE_AVAILABLE which matches the case more likely. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Gerrit-Change-Number: 19027 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 14:28:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 14:28:13 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 14:28:13 +0000 Subject: Change in osmo-sgsn[master]: Send a BVC-RESET to all persistent Gb interfaces at start-up In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 ) Change subject: Send a BVC-RESET to all persistent Gb interfaces at start-up ...................................................................... Patch Set 4: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Gerrit-Change-Number: 19027 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 14:28:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 15:42:02 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jul 2020 15:42:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_si_acc_rotate In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 ) Change subject: bsc: Introduce test TC_si_acc_rotate ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I18d0243353fce547d126d62c34415628a21cb52b Gerrit-Change-Number: 19359 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 15:42:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 15:44:24 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 15:44:24 +0000 Subject: Change in libosmocore[master]: osmo_sock_init2: improve support for AF_UNSPEC In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19140 to look at the new patch set (#7). Change subject: osmo_sock_init2: improve support for AF_UNSPEC ...................................................................... osmo_sock_init2: improve support for AF_UNSPEC osmo_sock_init2 abstract two calls of getaddrinfo into one. While there aren't problems with AF_INET or AF_INET6. When using AF_UNSPEC there are corner cases when this fails. E.g. calling local_host with "" and remote_host with an IPv6 only address results in setting up a local socket with AF_INET while trying to connect from there towards AF_INET6 will most likely fail. To prevent such cases with AF_UNSPEC, search prio calling any syscalls if local and remote site supports AF_INET or AF_INET6. In case both supported, prefer AF_INET6 Change-Id: I397c633931fd00d4f083955a3c49a40fb002d766 --- M src/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.err M tests/socket/socket_test.ok 4 files changed, 105 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/40/19140/7 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I397c633931fd00d4f083955a3c49a40fb002d766 Gerrit-Change-Number: 19140 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 15:53:35 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jul 2020 15:53:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Introduce test TC_si_acc_ramp_rotate In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378 ) Change subject: Introduce test TC_si_acc_ramp_rotate ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378/1/bsc/BSC_Tests.ttcn at 1869 PS1, Line 1869: f_si_recv_one_si Huh, this function looks pretty much like an altstep. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378/1/bsc/BSC_Tests.ttcn at 1884 PS1, Line 1884: while While this could be an alt statement with the timer, calling 'repeat' while 'last_si.si1 == omit'. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I29acf4f117ccea53028c780cc9feb1da1fc16739 Gerrit-Change-Number: 19378 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 28 Jul 2020 15:53:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 15:55:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jul 2020 15:55:31 +0000 Subject: Change in libosmocore[master]: vty: Allow using hex and octal representations in cmd numeric ranges References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19422 ) Change subject: vty: Allow using hex and octal representations in cmd numeric ranges ...................................................................... vty: Allow using hex and octal representations in cmd numeric ranges Change-Id: Ia2b7fbbf5502c28374c21dbff548232680da27d4 --- M src/vty/command.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/22/19422/1 diff --git a/src/vty/command.c b/src/vty/command.c index 9b32d22..256f1db 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -1276,7 +1276,7 @@ if (range[1] == '-') { signed long min = 0, max = 0, val; - val = strtol(str, &endptr, 10); + val = strtol(str, &endptr, 0); if (*endptr != '\0') return 0; @@ -1288,7 +1288,7 @@ return 0; strncpy(buf, range, p - range); buf[p - range] = '\0'; - min = -strtol(buf, &endptr, 10); + min = -strtol(buf, &endptr, 0); if (*endptr != '\0') return 0; @@ -1300,7 +1300,7 @@ return 0; strncpy(buf, range, p - range); buf[p - range] = '\0'; - max = strtol(buf, &endptr, 10); + max = strtol(buf, &endptr, 0); if (*endptr != '\0') return 0; @@ -1309,7 +1309,7 @@ } else { unsigned long min, max, val; - val = strtoul(str, &endptr, 10); + val = strtoul(str, &endptr, 0); if (*endptr != '\0') return 0; @@ -1321,7 +1321,7 @@ return 0; strncpy(buf, range, p - range); buf[p - range] = '\0'; - min = strtoul(buf, &endptr, 10); + min = strtoul(buf, &endptr, 0); if (*endptr != '\0') return 0; @@ -1333,7 +1333,7 @@ return 0; strncpy(buf, range, p - range); buf[p - range] = '\0'; - max = strtoul(buf, &endptr, 10); + max = strtoul(buf, &endptr, 0); if (*endptr != '\0') return 0; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia2b7fbbf5502c28374c21dbff548232680da27d4 Gerrit-Change-Number: 19422 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 15:55:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jul 2020 15:55:32 +0000 Subject: Change in libosmocore[master]: vty: Allow larger strlen parsing numerical range values References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19423 ) Change subject: vty: Allow larger strlen parsing numerical range values ...................................................................... vty: Allow larger strlen parsing numerical range values This allows for instance accepting a range: <0x00-0xffffffffffffffff>, which is a 64bit mask. Change-Id: Id053acd6bf5e8fb7c468959f0b78b778f8c5e6c2 --- M src/vty/command.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/23/19423/1 diff --git a/src/vty/command.c b/src/vty/command.c index 256f1db..cc52c14 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -1262,12 +1262,12 @@ #endif /* HAVE_IPV6 */ -#define DECIMAL_STRLEN_MAX 10 +#define NUMERIC_STRLEN_MAX 18 static int cmd_range_match(const char *range, const char *str) { char *p; - char buf[DECIMAL_STRLEN_MAX + 1]; + char buf[NUMERIC_STRLEN_MAX + 1]; char *endptr = NULL; if (str == NULL) @@ -1284,7 +1284,7 @@ p = strchr(range, '-'); if (p == NULL) return 0; - if (p - range > DECIMAL_STRLEN_MAX) + if (p - range > NUMERIC_STRLEN_MAX) return 0; strncpy(buf, range, p - range); buf[p - range] = '\0'; @@ -1296,7 +1296,7 @@ p = strchr(range, '>'); if (p == NULL) return 0; - if (p - range > DECIMAL_STRLEN_MAX) + if (p - range > NUMERIC_STRLEN_MAX) return 0; strncpy(buf, range, p - range); buf[p - range] = '\0'; @@ -1317,7 +1317,7 @@ p = strchr(range, '-'); if (p == NULL) return 0; - if (p - range > DECIMAL_STRLEN_MAX) + if (p - range > NUMERIC_STRLEN_MAX) return 0; strncpy(buf, range, p - range); buf[p - range] = '\0'; @@ -1329,7 +1329,7 @@ p = strchr(range, '>'); if (p == NULL) return 0; - if (p - range > DECIMAL_STRLEN_MAX) + if (p - range > NUMERIC_STRLEN_MAX) return 0; strncpy(buf, range, p - range); buf[p - range] = '\0'; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id053acd6bf5e8fb7c468959f0b78b778f8c5e6c2 Gerrit-Change-Number: 19423 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 15:55:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 28 Jul 2020 15:55:32 +0000 Subject: Change in libosmocore[master]: vty: Don't match negative values on purely positive ranges References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19424 ) Change subject: vty: Don't match negative values on purely positive ranges ...................................................................... vty: Don't match negative values on purely positive ranges Without this patch, for instance having a range 0-ULONG_MAX would match if someones types value -3, which would be converted to unsigned but that's clearly what is expected here from user point of view. Change-Id: Ia95f6314a2dd3f94d21fc219cf69bb8d39b8e7f0 --- M src/vty/command.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/19424/1 diff --git a/src/vty/command.c b/src/vty/command.c index cc52c14..7522c1d 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -1309,6 +1309,9 @@ } else { unsigned long min, max, val; + if (str[0] == '-') + return 0; + val = strtoul(str, &endptr, 0); if (*endptr != '\0') return 0; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia95f6314a2dd3f94d21fc219cf69bb8d39b8e7f0 Gerrit-Change-Number: 19424 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 16:04:26 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jul 2020 16:04:26 +0000 Subject: Change in libosmocore[master]: gprs_ns_frgre.h: add missing declaration of structs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19412 ) Change subject: gprs_ns_frgre.h: add missing declaration of structs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I47b3458ff7dc7ab1fcb7e4dd690142e2bc44ed46 Gerrit-Change-Number: 19412 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 16:04:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 16:07:21 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jul 2020 16:07:21 +0000 Subject: Change in libosmocore[master]: bts_features: add feature BTS_FEAT_IPV6_NSVC In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19145 ) Change subject: bts_features: add feature BTS_FEAT_IPV6_NSVC ...................................................................... Patch Set 5: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19145/5//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/19145/5//COMMIT_MSG at 9 PS5, Line 9: has both ... have -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 Gerrit-Change-Number: 19145 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 16:07:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 16:08:03 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jul 2020 16:08:03 +0000 Subject: Change in libosmocore[master]: socket: osmo_sock_local_ip: correct doxygen comment In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19413 ) Change subject: socket: osmo_sock_local_ip: correct doxygen comment ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1e31fcbf40d8abf99214b87e70e867b5ab66bd75 Gerrit-Change-Number: 19413 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 16:08:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 16:09:18 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jul 2020 16:09:18 +0000 Subject: Change in libosmocore[master]: vty: add a define VTY_IPV46_CMD to require a IPv4/6 address In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19139 ) Change subject: vty: add a define VTY_IPV46_CMD to require a IPv4/6 address ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I86e399aea86b68b48e627f11e1de48fdfad16525 Gerrit-Change-Number: 19139 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 16:09:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 16:30:44 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 16:30:44 +0000 Subject: Change in osmo-msc[master]: Clear Command: set cause value to "Call Control" In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/19213 to look at the new patch set (#2). Change subject: Clear Command: set cause value to "Call Control" ...................................................................... Clear Command: set cause value to "Call Control" So far, by failing to initialize the cause value, we always send a Clear Command cause == 0, which actually means "Radio Interface Message Failure". This is seen in all my logged network traces of osmo-msc lab testing. "Call Control" seems to be the only cause value that remotely fits a normal release procedure, even if it was not voice call related, see 3GPP TS 48.008 3.2.1.21. Related: OS#4664 Change-Id: I1347ed72ae7d7ea73a557b866e764819c5ef8c42 --- M src/libmsc/msc_a.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/13/19213/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1347ed72ae7d7ea73a557b866e764819c5ef8c42 Gerrit-Change-Number: 19213 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 16:33:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 16:33:22 +0000 Subject: Change in osmo-msc[master]: Clear Command: set cause value to "Call Control" In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19213 ) Change subject: Clear Command: set cause value to "Call Control" ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1347ed72ae7d7ea73a557b866e764819c5ef8c42 Gerrit-Change-Number: 19213 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 28 Jul 2020 16:33:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 16:38:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 16:38:13 +0000 Subject: Change in osmo-msc[master]: Clear Command: set cause value to "Call Control" In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19213 ) Change subject: Clear Command: set cause value to "Call Control" ...................................................................... Clear Command: set cause value to "Call Control" So far, by failing to initialize the cause value, we always send a Clear Command cause == 0, which actually means "Radio Interface Message Failure". This is seen in all my logged network traces of osmo-msc lab testing. "Call Control" seems to be the only cause value that remotely fits a normal release procedure, even if it was not voice call related, see 3GPP TS 48.008 3.2.1.21. Related: OS#4664 Change-Id: I1347ed72ae7d7ea73a557b866e764819c5ef8c42 --- M src/libmsc/msc_a.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index 76c0f01..0645c54 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -779,6 +779,9 @@ struct ran_msg msg = { .msg_type = RAN_MSG_CLEAR_COMMAND, .clear_command = { + /* "Call Control" is the only cause code listed in 3GPP TS 48.008 3.2.1.21 CLEAR COMMAND + * that qualifies for a normal release situation. (OS#4664) */ + .gsm0808_cause = GSM0808_CAUSE_CALL_CONTROL, .csfb_ind = (vsub && vsub->sgs_fsm->state == SGS_UE_ST_ASSOCIATED), }, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1347ed72ae7d7ea73a557b866e764819c5ef8c42 Gerrit-Change-Number: 19213 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 17:50:01 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jul 2020 17:50:01 +0000 Subject: Change in libosmocore[master]: gsm 12.21: add osmocom specific NM_ATT_OSMO_NS_LINK_CFG In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19146 ) Change subject: gsm 12.21: add osmocom specific NM_ATT_OSMO_NS_LINK_CFG ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19146/6/src/gsm/abis_nm.c File src/gsm/abis_nm.c: https://gerrit.osmocom.org/c/libosmocore/+/19146/6/src/gsm/abis_nm.c at 515 PS6, Line 515: NM_ATT_OSMO_NS_LINK_CFG Shouldn't this be a part of abis_nm_osmo_att_tlvdef? At least NM_ATT_OSMO_REDUCEPOWER is defined there. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic261bc43a07fa741b97a9c6ec5a9ed6f5ecae588 Gerrit-Change-Number: 19146 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 28 Jul 2020 17:50:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:01:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:01:24 +0000 Subject: Change in libosmocore[master]: gprs_ns_frgre.h: add missing declaration of structs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19412 ) Change subject: gprs_ns_frgre.h: add missing declaration of structs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I47b3458ff7dc7ab1fcb7e4dd690142e2bc44ed46 Gerrit-Change-Number: 19412 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:01:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:01:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:01:46 +0000 Subject: Change in libosmocore[master]: bts_features: add feature BTS_FEAT_IPV6_NSVC In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19145 ) Change subject: bts_features: add feature BTS_FEAT_IPV6_NSVC ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 Gerrit-Change-Number: 19145 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:01:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:02:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:02:05 +0000 Subject: Change in libosmocore[master]: gprs_ns_frgre.h: add missing declaration of structs In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19412 ) Change subject: gprs_ns_frgre.h: add missing declaration of structs ...................................................................... gprs_ns_frgre.h: add missing declaration of structs Change-Id: I47b3458ff7dc7ab1fcb7e4dd690142e2bc44ed46 --- M include/osmocom/gprs/gprs_ns_frgre.h 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/gprs/gprs_ns_frgre.h b/include/osmocom/gprs/gprs_ns_frgre.h index d48ce08..8cf54c7 100644 --- a/include/osmocom/gprs/gprs_ns_frgre.h +++ b/include/osmocom/gprs/gprs_ns_frgre.h @@ -2,4 +2,7 @@ #pragma once +struct gprs_nsvc; +struct msgb; + int gprs_ns_frgre_sendmsg(struct gprs_nsvc *nsvc, struct msgb *msg); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I47b3458ff7dc7ab1fcb7e4dd690142e2bc44ed46 Gerrit-Change-Number: 19412 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:02:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:02:06 +0000 Subject: Change in libosmocore[master]: bts_features: add feature BTS_FEAT_IPV6_NSVC In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19145 ) Change subject: bts_features: add feature BTS_FEAT_IPV6_NSVC ...................................................................... bts_features: add feature BTS_FEAT_IPV6_NSVC Previous both the IPA nanobts and the sysmobts has been using the IPv4 only OML attribute NM_ATT_IPACC_NS_LINK_CFG. A bts with BTS_FEAT_IPV6_NSVC supports IPv6 for NSVC (PCUSGSN) using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG. Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 --- M include/osmocom/gsm/bts_features.h M src/gsm/bts_features.c 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/gsm/bts_features.h b/include/osmocom/gsm/bts_features.h index 22461a6..341ba40 100644 --- a/include/osmocom/gsm/bts_features.h +++ b/include/osmocom/gsm/bts_features.h @@ -25,6 +25,7 @@ BTS_FEAT_SPEECH_H_AMR, BTS_FEAT_ETWS_PN, BTS_FEAT_PAGING_COORDINATION, /* BTS hands CS paging to PCU/PACCH */ + BTS_FEAT_IPV6_NSVC, _NUM_BTS_FEAT }; diff --git a/src/gsm/bts_features.c b/src/gsm/bts_features.c index 5a4b7f6..9a5188b 100644 --- a/src/gsm/bts_features.c +++ b/src/gsm/bts_features.c @@ -40,6 +40,7 @@ { BTS_FEAT_SPEECH_H_AMR, "Halfrate speech AMR" }, { BTS_FEAT_ETWS_PN, "ETWS Primary Notification via PCH" }, { BTS_FEAT_PAGING_COORDINATION, "BSS Paging Coordination" }, + { BTS_FEAT_IPV6_NSVC, "NSVC IPv6" }, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 Gerrit-Change-Number: 19145 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:02:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:02:06 +0000 Subject: Change in libosmocore[master]: socket: osmo_sock_local_ip: correct doxygen comment In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19413 ) Change subject: socket: osmo_sock_local_ip: correct doxygen comment ...................................................................... socket: osmo_sock_local_ip: correct doxygen comment There is no parameter fd. Change-Id: I1e31fcbf40d8abf99214b87e70e867b5ab66bd75 --- M src/socket.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, approved diff --git a/src/socket.c b/src/socket.c index 503ceaf..7fa9ab3 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1286,7 +1286,6 @@ /*! Determine the matching local IP-address for a given remote IP-Address. * \param[out] local_ip caller provided memory for resulting local IP-address * \param[in] remote_ip remote IP-address - * \param[in] fd file descriptor of related scoket * \returns 0 on success; negative otherwise * * The function accepts IPv4 and IPv6 address strings. The caller must provide -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1e31fcbf40d8abf99214b87e70e867b5ab66bd75 Gerrit-Change-Number: 19413 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:02:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:02:25 +0000 Subject: Change in libosmocore[master]: vty: add a define VTY_IPV46_CMD to require a IPv4/6 address In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19139 ) Change subject: vty: add a define VTY_IPV46_CMD to require a IPv4/6 address ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I86e399aea86b68b48e627f11e1de48fdfad16525 Gerrit-Change-Number: 19139 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:02:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:02:33 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:02:33 +0000 Subject: Change in libosmocore[master]: vty: add a define VTY_IPV46_CMD to require a IPv4/6 address In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19139 ) Change subject: vty: add a define VTY_IPV46_CMD to require a IPv4/6 address ...................................................................... vty: add a define VTY_IPV46_CMD to require a IPv4/6 address Allow to use this define in vty definitions when a IPV4/6 address is required as argument. Change-Id: I86e399aea86b68b48e627f11e1de48fdfad16525 --- M include/osmocom/vty/command.h 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h index 88490f7..29206ce 100644 --- a/include/osmocom/vty/command.h +++ b/include/osmocom/vty/command.h @@ -304,6 +304,10 @@ #define CMD_IPV6(S) ((strcmp ((S), "X:X::X:X") == 0)) #define CMD_IPV6_PREFIX(S) ((strcmp ((S), "X:X::X:X/M") == 0)) +#define VTY_IPV4_CMD "A.B.C.D" +#define VTY_IPV6_CMD "X:X::X:X" +#define VTY_IPV46_CMD "(" VTY_IPV4_CMD "|" VTY_IPV6_CMD ")" + /* Common descriptions. */ #define SHOW_STR "Show running system information\n" #define IP_STR "IP information\n" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I86e399aea86b68b48e627f11e1de48fdfad16525 Gerrit-Change-Number: 19139 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:07:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:07:11 +0000 Subject: Change in libosmocore[master]: osmo_sock_init2: improve support for AF_UNSPEC In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19140 ) Change subject: osmo_sock_init2: improve support for AF_UNSPEC ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I397c633931fd00d4f083955a3c49a40fb002d766 Gerrit-Change-Number: 19140 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:07:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:07:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:07:59 +0000 Subject: Change in libosmocore[master]: sockaddr_str: add osmo_sockaddr_str_from_str2() which doesn't set the... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19142 ) Change subject: sockaddr_str: add osmo_sockaddr_str_from_str2() which doesn't set the port ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifd4e282586b8bd40b912a9f1c25f9e8208420106 Gerrit-Change-Number: 19142 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:07:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:09:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:09:16 +0000 Subject: Change in libosmocore[master]: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19143 ) Change subject: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd ...................................................................... Patch Set 9: doest it make sense to keep a completely separate implementation for osmo_sock_init2_ofd, rather than "redirecting" the old code to the new? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 20:09:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:10:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:10:08 +0000 Subject: Change in libosmocore[master]: socket.c: fix osmo_sock_get_ip_and_port for IPv6 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19147 ) Change subject: socket.c: fix osmo_sock_get_ip_and_port for IPv6 ...................................................................... Patch Set 8: would be great to have a unit test that goes along with this. We can then first show that it breaks without this fix, and that the fix makes the test working. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4e69d814367168c05f0da161ec9b705db36ad096 Gerrit-Change-Number: 19147 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:10:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:11:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:11:30 +0000 Subject: Change in libosmocore[master]: socket.c: add osmo_sockaddr_cmp() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19415 ) Change subject: socket.c: add osmo_sockaddr_cmp() ...................................................................... Patch Set 7: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19415/7/src/socket.c File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/19415/7/src/socket.c at 1589 PS7, Line 1589: /* fallback to memcmp for remaing AF */ : return memcmp(a, b, sizeof(struct osmo_sockaddr)); might be worth moving this into a "default:" clause of the switch statement to clearly see it's three different exist paths, rather than some coommon code at the end of the function. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d12ebae2710ffd17cf071e6ada0804e73f87dd6 Gerrit-Change-Number: 19415 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 20:11:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:12:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:12:18 +0000 Subject: Change in libosmocore[master]: add osmo_sockaddr_local_ip() to determine the local address for a rem... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19416 ) Change subject: add osmo_sockaddr_local_ip() to determine the local address for a remote. ...................................................................... Patch Set 7: like in a previous patch: Doesn't it make sense to turn osmo_sock_local_ip() into a wrapper around the new osmo_sockaddr_local_ip? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 Gerrit-Change-Number: 19416 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 20:12:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:13:48 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:13:48 +0000 Subject: Change in libosmocore[master]: vty: Allow using hex and octal representations in cmd numeric ranges In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19422 ) Change subject: vty: Allow using hex and octal representations in cmd numeric ranges ...................................................................... Patch Set 1: is this really an advantage? As we don't store the 'base', any write/save would store something in decimal that the user specified in hex. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia2b7fbbf5502c28374c21dbff548232680da27d4 Gerrit-Change-Number: 19422 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 20:13:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:14:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:14:35 +0000 Subject: Change in libosmocore[master]: vty: Allow larger strlen parsing numerical range values In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19423 ) Change subject: vty: Allow larger strlen parsing numerical range values ...................................................................... Patch Set 1: well, the 64bit mask would only work on a 64bit arch, right? Where do we need numeric values that large? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id053acd6bf5e8fb7c468959f0b78b778f8c5e6c2 Gerrit-Change-Number: 19423 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 20:14:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:15:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:15:09 +0000 Subject: Change in libosmocore[master]: vty: Don't match negative values on purely positive ranges In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19424 ) Change subject: vty: Don't match negative values on purely positive ranges ...................................................................... Patch Set 1: Code-Review+1 really nice catch. a unit test would be great to prevent these kind of things... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia95f6314a2dd3f94d21fc219cf69bb8d39b8e7f0 Gerrit-Change-Number: 19424 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 20:15:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:15:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:15:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_si_acc_rotate In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 ) Change subject: bsc: Introduce test TC_si_acc_rotate ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I18d0243353fce547d126d62c34415628a21cb52b Gerrit-Change-Number: 19359 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:15:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:28:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:28:07 +0000 Subject: Change in osmo-bts[master]: vty: Allow setting power-ramp max-initial to negative values In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19406 ) Change subject: vty: Allow setting power-ramp max-initial to negative values ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0f27fb7b86b58c5a80f5342b66ff4f5d1b775498 Gerrit-Change-Number: 19406 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:28:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:28:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:28:11 +0000 Subject: Change in osmo-bts[master]: bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19407 ) Change subject: bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie3cad15d31870346d03a6e2f6dd32a9d2dd3067e Gerrit-Change-Number: 19407 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 20:28:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:28:18 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:28:18 +0000 Subject: Change in osmo-bts[master]: tx_power: Take into account max-initial when ramping up bigger power ... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19408 ) Change subject: tx_power: Take into account max-initial when ramping up bigger power lvl intervals ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4e5742ecdbf66d77ff9445999f6fff43bbf4856a Gerrit-Change-Number: 19408 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 20:28:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:28:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:28:34 +0000 Subject: Change in osmo-bts[master]: doc: configuration.adoc: Document ramping down feature In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19410 ) Change subject: doc: configuration.adoc: Document ramping down feature ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3c7df0d914587bdde2aef9919f75d507a0e5884b Gerrit-Change-Number: 19410 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 20:28:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:28:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:28:39 +0000 Subject: Change in osmo-bts[master]: common: Avoid call to bts_model_chg_adm_state() if there's no ADM sta... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19404 ) Change subject: common: Avoid call to bts_model_chg_adm_state() if there's no ADM state change ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icea3ea1108d360193cac478f366be97ff38246d4 Gerrit-Change-Number: 19404 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:28:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:28:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:28:41 +0000 Subject: Change in osmo-bts[master]: bts-trx: Fix handling ADM state change while previous one WIP In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19405 ) Change subject: bts-trx: Fix handling ADM state change while previous one WIP ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6c5240710ef6d223651dfb4a8db939b5d2f974ca Gerrit-Change-Number: 19405 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:28:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:28:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:28:45 +0000 Subject: Change in osmo-bts[master]: common: Avoid call to bts_model_chg_adm_state() if there's no ADM sta... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19404 ) Change subject: common: Avoid call to bts_model_chg_adm_state() if there's no ADM state change ...................................................................... common: Avoid call to bts_model_chg_adm_state() if there's no ADM state change Let's handle it in common code to simplify and avoid duplication in model specific code. Change-Id: Icea3ea1108d360193cac478f366be97ff38246d4 --- M src/common/oml.c 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/common/oml.c b/src/common/oml.c index 1be4f89..39304f1 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1032,13 +1032,14 @@ return oml_fom_ack_nack(msg, NM_NACK_OBJINST_UNKN); /* Step 2: Do some global dependency/consistency checking */ - if (mo->nm_state.administrative == adm_state) + if (mo->nm_state.administrative == adm_state) { LOGPFOH(DOML, LOGL_NOTICE, foh, "ADM state already was %s\n", get_value_string(abis_nm_adm_state_names, adm_state)); - else - LOGPFOH(DOML, LOGL_NOTICE, foh, "ADM STATE %s -> %s\n", - get_value_string(abis_nm_adm_state_names, mo->nm_state.administrative), - get_value_string(abis_nm_adm_state_names, adm_state)); + return oml_mo_statechg_ack(mo); + } + LOGPFOH(DOML, LOGL_NOTICE, foh, "ADM STATE %s -> %s\n", + get_value_string(abis_nm_adm_state_names, mo->nm_state.administrative), + get_value_string(abis_nm_adm_state_names, adm_state)); /* Step 3: Ask BTS driver to apply the state chg */ return bts_model_chg_adm_state(bts, mo, obj, adm_state); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icea3ea1108d360193cac478f366be97ff38246d4 Gerrit-Change-Number: 19404 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:28:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:28:45 +0000 Subject: Change in osmo-bts[master]: bts-trx: Fix handling ADM state change while previous one WIP In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19405 ) Change subject: bts-trx: Fix handling ADM state change while previous one WIP ...................................................................... bts-trx: Fix handling ADM state change while previous one WIP Fix power ramping if administrative state changes while previous opposite change was already ACKED but power ramping was still ongoing. With previous code, osmo-bts-trx would have sent a NACK and BSc would drop the BTs link as a result. Change-Id: I6c5240710ef6d223651dfb4a8db939b5d2f974ca --- M src/osmo-bts-trx/l1_if.c 1 file changed, 24 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index cd7ecc0..48305b5 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -662,11 +662,29 @@ break; if (mo->procedure_pending) { - LOGPTRX(trx, DL1C, LOGL_ERROR, "Discarding adm change command: " - "pending procedure on RC %d\n", - ((struct gsm_bts_trx *)obj)->nr); - rc = -1; - break; + LOGPTRX(trx, DL1C, LOGL_INFO, + "ADM change received while previous one still WIP\n"); + + if (mo->nm_state.administrative == NM_STATE_LOCKED && + adm_state == NM_STATE_UNLOCKED) { + /* Previous change was UNLOCKED->LOCKED, so we + * were ramping down and we didn't deactivate + * yet, so now simply skip old ramp down compl + * cb, skip TS activation and go for ramp up + * directly. */ + goto ramp_up; + } else if (mo->nm_state.administrative == NM_STATE_UNLOCKED && + adm_state == NM_STATE_LOCKED) { + /* Previous change was LOCKED->UNLOCKED, which + * means TS were also enabled during start of + * ramping up. So we simply need to skip + * ramping up and start ramping down instead, + * disabling TS at the end as usual. Fall + * through usual procedure below. + */ + } else if (mo->nm_state.administrative == adm_state) { + OSMO_ASSERT(0); + } } switch (adm_state) { case NM_STATE_LOCKED: @@ -687,6 +705,7 @@ } trx_set_ts(ts); } +ramp_up: rc = l1if_trx_start_power_ramp(trx, bts_model_chg_adm_state_ramp_compl_cb); if (rc == 0) { mo->nm_state.administrative = adm_state; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6c5240710ef6d223651dfb4a8db939b5d2f974ca Gerrit-Change-Number: 19405 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:28:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:28:45 +0000 Subject: Change in osmo-bts[master]: vty: Allow setting power-ramp max-initial to negative values In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19406 ) Change subject: vty: Allow setting power-ramp max-initial to negative values ...................................................................... vty: Allow setting power-ramp max-initial to negative values This allows for instance ramping up from -10 dBm -> -4 dBm if NOMTXPOWER of SDR is really low (below 0dBm) or because the max_power_red is >= NOMTXPOWER. Related: SYS#4920 Change-Id: I0f27fb7b86b58c5a80f5342b66ff4f5d1b775498 --- M src/common/tx_power.c M src/common/vty.c 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/common/tx_power.c b/src/common/tx_power.c index 8f50b0f..7f134ca 100644 --- a/src/common/tx_power.c +++ b/src/common/tx_power.c @@ -268,8 +268,8 @@ if (we_are_ramping_up(trx)) { if (tpp->p_total_tgt_mdBm <= tpp->ramp.max_initial_pout_mdBm) { LOGPTRX(trx, DL1C, LOGL_INFO, - "target_power(%d) is below max.initial power\n", - tpp->p_total_tgt_mdBm); + "target_power (%d mdBm) is below or equal to 'power ramp max-initial' power (%d mdBm)\n", + tpp->p_total_tgt_mdBm, tpp->ramp.max_initial_pout_mdBm); /* new setting is below the maximum initial output * power, so we can directly jump to this level */ tpp->p_total_cur_mdBm = tpp->p_total_tgt_mdBm; diff --git a/src/common/vty.c b/src/common/vty.c index 91f3706..3f24d66 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -723,7 +723,7 @@ #define PR_STR "Power-Ramp settings\n" DEFUN(cfg_trx_pr_max_initial, cfg_trx_pr_max_initial_cmd, - "power-ramp max-initial <0-100000> (dBm|mdBm)", + "power-ramp max-initial <-10000-100000> (dBm|mdBm)", PR_STR "Maximum initial power\n" "Value\n" DB_MDB_STR) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0f27fb7b86b58c5a80f5342b66ff4f5d1b775498 Gerrit-Change-Number: 19406 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:28:45 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:28:45 +0000 Subject: Change in osmo-bts[master]: bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19407 ) Change subject: bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH ...................................................................... bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH If TRX is administratively locked during startup, for TS conigured as TCH/F_PDCH the BSC will send a ACT PDCH message, but osmo-bts-trx won't apply it by signalling it as available to the PCU, since the TRX is locked. That means the ts->flags contains the pending action to activate it until it is unlocked. As a result, calling trx_set_ts() on it was hitting the assert inside which expects not to apply the TS until it has been confirmed by the PCU. Let's still skip setting the TS and let pcu_tx_info_ind() trigger the activation confirmation from PCU, since the TRX has just been unlocked. Fixes following assert: Assert failed (ts->flags & TS_F_PDCH_PENDING_MASK) == 0 /osmo-bts/src/osmo-bts-trx/l1_if.c:34 Change-Id: Ie3cad15d31870346d03a6e2f6dd32a9d2dd3067e --- M src/osmo-bts-trx/l1_if.c 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 48305b5..a2b3415 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -702,6 +702,13 @@ * internally restore the old status here. */ ts->dyn.pchan_is = ts->dyn.pchan_want; + } else if (ts->pchan == GSM_PCHAN_TCH_F_PDCH && ts->flags & TS_F_PDCH_PENDING_MASK) { + /* TS configuration already in progress, + * waiting for PCU response, let it be + * de/activated later by PCU ACT CNF as a + * response to pcu_tx_info_ind() + */ + continue; } trx_set_ts(ts); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie3cad15d31870346d03a6e2f6dd32a9d2dd3067e Gerrit-Change-Number: 19407 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:28:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:28:46 +0000 Subject: Change in osmo-bts[master]: tx_power: Take into account max-initial when ramping up bigger power ... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19408 ) Change subject: tx_power: Take into account max-initial when ramping up bigger power lvl intervals ...................................................................... tx_power: Take into account max-initial when ramping up bigger power lvl intervals Until now, power-ramp max-initial was only taken into account in order to skip ramping if the desired target level was below it, in order to forbid growin too quickly or applying directly to much power given power amplifier requirements. However, in the event that a higher tx power level is desired, max-initial was not taking into account and ramping simply started from current tx power level, which could be a lot lower than max-initial. Allow shortcutting the ramping in that case so that max-initial is applied directly, and ramping continues from there, in order to have a more expected behavior (max-initial applied the same). Since max-initial can since a few commits before handle a negative value, this means One can for instance set max-initial to -10 and still keep the old behavior of ramping step by step from -10 (rf-locked in osmo-bts-trx) to 0 or 7 or whatever is the nominal power (max_power_red). Change-Id: I4e5742ecdbf66d77ff9445999f6fff43bbf4856a --- M src/common/tx_power.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/common/tx_power.c b/src/common/tx_power.c index 7f134ca..c5ea7ed 100644 --- a/src/common/tx_power.c +++ b/src/common/tx_power.c @@ -276,8 +276,10 @@ tpp->ramp.attenuation_mdB = 0; power_ramp_timer_cb(trx); } else { - /* We need to step it up. Start from the current value */ + /* We need to step it up. Start from the current value, shortcutting to max-initial. */ /* Set attenuation to cause no power change right now */ + if (tpp->p_total_cur_mdBm + tpp->ramp.step_size_mdB < tpp->ramp.max_initial_pout_mdBm) + tpp->p_total_cur_mdBm = tpp->ramp.max_initial_pout_mdBm - tpp->ramp.step_size_mdB; tpp->ramp.attenuation_mdB = tpp->p_total_tgt_mdBm - tpp->p_total_cur_mdBm; /* start with the first step */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4e5742ecdbf66d77ff9445999f6fff43bbf4856a Gerrit-Change-Number: 19408 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:28:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:28:46 +0000 Subject: Change in osmo-bts[master]: doc: configuration.adoc: Document ramping down feature In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19410 ) Change subject: doc: configuration.adoc: Document ramping down feature ...................................................................... doc: configuration.adoc: Document ramping down feature Change-Id: I3c7df0d914587bdde2aef9919f75d507a0e5884b --- M doc/manuals/chapters/configuration.adoc 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc index 2b78620..772d8da 100644 --- a/doc/manuals/chapters/configuration.adoc +++ b/doc/manuals/chapters/configuration.adoc @@ -158,6 +158,12 @@ OsmoBTS can ramp up the power of its trx over time. This helps reduce cell congestion in busy environments. +Some models of OsmoBTS (such as osmo-bts-trx) also support ramping down the +transmit power over time until finally ceasing broadcast, for instance due to a +trx becoming administratively locked or due to the whole BTS being gracefully +shut down. This allows for mobile stations camping on the cell to gradually move +to other cells in the area once the signal drop is detected. + In this example, the trx starts with 5dBm output power which increases by 1dB every two seconds until it reaches nominal power. Power ramping can use the power-ramp commands at the CONFIG TRX node of the -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3c7df0d914587bdde2aef9919f75d507a0e5884b Gerrit-Change-Number: 19410 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:29:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:29:23 +0000 Subject: Change in osmo-bsc[master]: debian: Package E1 configuration file examples In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19314 ) Change subject: debian: Package E1 configuration file examples ...................................................................... debian: Package E1 configuration file examples Change-Id: Idf06c5fa7eb0ea6b73dcc3b67718b3a0a755796f --- M debian/osmo-bsc.install 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/debian/osmo-bsc.install b/debian/osmo-bsc.install index 8f91b03..e60bb50 100644 --- a/debian/osmo-bsc.install +++ b/debian/osmo-bsc.install @@ -3,3 +3,4 @@ usr/bin/osmo-bsc usr/share/doc/osmo-bsc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg usr/share/doc/osmo-bsc/examples usr/share/doc/osmo-bsc/examples/osmo-bsc/osmo-bsc.cfg usr/share/doc/osmo-bsc/examples +usr/share/doc/osmo-bsc/examples/osmo-bsc/*/osmo-bsc*.cfg usr/share/doc/osmo-bsc/examples -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19314 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idf06c5fa7eb0ea6b73dcc3b67718b3a0a755796f Gerrit-Change-Number: 19314 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:29:23 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:29:23 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: silently ignore LCHAN_EV_RLL_ERR_IND In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19389 ) Change subject: lchan_fsm: silently ignore LCHAN_EV_RLL_ERR_IND ...................................................................... lchan_fsm: silently ignore LCHAN_EV_RLL_ERR_IND The RLL ERR IND is sent by the BTS in any number of casese that lead to a disconnect of a radio link layer, for example due to bad RF conditions. The lchan FSM currnently prints error messages about this event not being permitted, leading to confusion among users. Let's ignore this event, I don't think the lchan FSM should or could be doing anything as a result. We could also simply remove that event, but let's keep it in case we should need it in the future. Change-Id: I07aad62d25566d6068a95797915bb97fc3c66328 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index e879059..4ed95dd 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1336,6 +1336,13 @@ lchan_fail_to(LCHAN_ST_UNUSED, "LCHAN_EV_TS_ERROR"); return; + case LCHAN_EV_RLL_ERR_IND: + /* let's just ignore this. We are already logging the + * fact that this message was received inside + * abis_rsl.c. There can be any number of reasons why the + * radio link layer failed */ + return; + default: return; } @@ -1464,6 +1471,7 @@ .allstate_action = lchan_fsm_allstate_action, .allstate_event_mask = 0 | S(LCHAN_EV_TS_ERROR) + | S(LCHAN_EV_RLL_ERR_IND) , .timer_cb = lchan_fsm_timer_cb, .cleanup = lchan_fsm_cleanup, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I07aad62d25566d6068a95797915bb97fc3c66328 Gerrit-Change-Number: 19389 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:32:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 28 Jul 2020 20:32:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test RR Channel Release cause codes from Clear Command cause codes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217 ) Change subject: bsc: test RR Channel Release cause codes from Clear Command cause codes ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217/3/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217/3/bsc/BSC_Tests.ttcn at 1446 PS3, Line 1446: template RR_Cause expect_rr_cause := ? > See my comment to the preceding change. [?] I don't share this concern. It doesn't say "RSL channel release" specifically, and it actually still just expects all aspects of a channel release. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie6c99f28b610a67f2d59ec00b3541940e882251b Gerrit-Change-Number: 19217 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:32:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 20:58:43 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jul 2020 20:58:43 +0000 Subject: Change in osmocom-bb[master]: layer23/mobile: cosmetic: use GSM48_PDISC_TEST from gsm_04_08.h References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19425 ) Change subject: layer23/mobile: cosmetic: use GSM48_PDISC_TEST from gsm_04_08.h ...................................................................... layer23/mobile: cosmetic: use GSM48_PDISC_TEST from gsm_04_08.h Change-Id: Ie1f14b37f6138f5a019a25bdbc8a3531418df6c2 --- M src/host/layer23/src/mobile/gsm48_mm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/25/19425/1 diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index d3b042c..52c6fe9 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -4076,7 +4076,7 @@ msgb_free(msg); return rc; - case 0x0f: /* test TS 04.14 */ + case GSM48_PDISC_TEST: /* test TS 04.14 */ LOGP(DMM, LOGL_NOTICE, "Test protocol 0x%02x according to " "TS 04.14 is not supported.\n", pdisc); goto status; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie1f14b37f6138f5a019a25bdbc8a3531418df6c2 Gerrit-Change-Number: 19425 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Jul 28 22:03:23 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 28 Jul 2020 22:03:23 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f20a0c71e0e2_2bd02ac693dbc610103496c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Testing/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 116s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 116s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 116s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 116s] | | [ 116s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 116s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 116s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 116s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 116s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 116s] 2425 | MHD_start_daemon (unsigned int flags, [ 116s] | ^~~~~~~~~~~~~~~~ [ 116s] cc1: all warnings being treated as errors [ 116s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 116s] make[3]: *** Waiting for unfinished jobs.... [ 117s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 117s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 117s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 117s] make[1]: *** [Makefile:166: all] Error 2 [ 117s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 117s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 117s] make: *** [debian/rules:9: build] Error 25 [ 117s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 117s] ### VM INTERACTION START ### [ 120s] [ 108.399509] sysrq: SysRq : Power Off [ 120s] [ 108.404101] reboot: Power down [ 120s] ### VM INTERACTION END ### [ 120s] [ 120s] lamb70 failed "build ulfius_2.5.2-4.1.dsc" at Tue Jul 28 22:03:19 UTC 2020. [ 120s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Jul 28 22:04:31 2020 From: admin at opensuse.org (OBS Notification) Date: Tue, 28 Jul 2020 22:04:31 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f20a102b7076_2bd02ac693dbc6101035249@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Testing/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 136s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 136s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 136s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 136s] | | [ 136s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 136s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 136s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 136s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 136s] /usr/include/microhttpd.h:2425:1: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 136s] 2425 | MHD_start_daemon (unsigned int flags, [ 136s] | ^~~~~~~~~~~~~~~~ [ 136s] cc1: all warnings being treated as errors [ 136s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 136s] make[3]: *** Waiting for unfinished jobs.... [ 136s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 136s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 136s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 136s] make[1]: *** [Makefile:166: all] Error 2 [ 136s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 136s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 136s] make: *** [debian/rules:9: build] Error 25 [ 136s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 136s] ### VM INTERACTION START ### [ 140s] [ 128.140119] sysrq: SysRq : Power Off [ 140s] [ 128.145259] reboot: Power down [ 140s] ### VM INTERACTION END ### [ 140s] [ 140s] lamb56 failed "build ulfius_2.5.2-4.1.dsc" at Tue Jul 28 22:04:24 UTC 2020. [ 140s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Jul 28 22:40:02 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jul 2020 22:40:02 +0000 Subject: Change in osmo-msc[master]: gsm_04_14: fix off-by-one error in create_gsm0414_msg() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/19426 ) Change subject: gsm_04_14: fix off-by-one error in create_gsm0414_msg() ...................................................................... gsm_04_14: fix off-by-one error in create_gsm0414_msg() This byte is redundant, and must not be allocated in this function. A consequence of this error is that the MS alwats interprets the "Sub-channel" IE as test loop A regardless of the specified type. Here is an example of malformed Close TCH loop (type C) message: 0f 00 00 04 x. .. .. .. - Skip indicator (see 3GPP TS 24.007) .x .. .. .. - Protocol discriminator (see 3GPP TS 24.007) .. xx .. .. - Message type (CLOSE_TCH_LOOP_CMD) .. .. !! .. - (!) Redundant byte from create_gsm0414_msg() .. .. .. xx - (!) The actual "Sub-channel" IE (loop C, X=0) Change-Id: Ia47225b884439dcd43be307e7351994e55fcd50d --- M src/libmsc/gsm_04_14.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/26/19426/1 diff --git a/src/libmsc/gsm_04_14.c b/src/libmsc/gsm_04_14.c index 8116558..03c06fd 100644 --- a/src/libmsc/gsm_04_14.c +++ b/src/libmsc/gsm_04_14.c @@ -43,7 +43,7 @@ struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.14"); struct gsm48_hdr *gh; - gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh) + 1); + gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->proto_discr = GSM48_PDISC_TEST; gh->msg_type = msg_type; return msg; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia47225b884439dcd43be307e7351994e55fcd50d Gerrit-Change-Number: 19426 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 22:52:31 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jul 2020 22:52:31 +0000 Subject: Change in osmo-msc[master]: vty: fix vsub reference counting: call vlr_subscr_put() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/19427 ) Change subject: vty: fix vsub reference counting: call vlr_subscr_put() ...................................................................... vty: fix vsub reference counting: call vlr_subscr_put() Otherwise, each time the 3GPP TS 44.014 MS test commands (TCH loop) are invoked, both subscriber_mstest_{close,open} functiona add +1 to the subscriber's reference count, but never revoke it. Change-Id: I0cefa5b5a0cb712080ba2afd322db329f19608e3 --- M src/libmsc/msc_vty.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/27/19427/1 diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index c5e93aa..07a88c2 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -1704,6 +1704,7 @@ gsm0414_tx_close_tch_loop_cmd(msc_a, loop_mode); + vlr_subscr_put(vsub, VSUB_USE_VTY); return CMD_SUCCESS; } @@ -1732,6 +1733,7 @@ gsm0414_tx_open_loop_cmd(msc_a); + vlr_subscr_put(vsub, VSUB_USE_VTY); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0cefa5b5a0cb712080ba2afd322db329f19608e3 Gerrit-Change-Number: 19427 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 22:57:35 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 28 Jul 2020 22:57:35 +0000 Subject: Change in osmo-msc[master]: vty: fix vsub reference counting: call vlr_subscr_put() In-Reply-To: References: Message-ID: fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-msc/+/19427 ) Change subject: vty: fix vsub reference counting: call vlr_subscr_put() ...................................................................... vty: fix vsub reference counting: call vlr_subscr_put() Otherwise, each time the 3GPP TS 44.014 MS test commands (TCH loop) are invoked, both subscriber_mstest_{close,open} functions add +1 to the subscriber's reference count, but never revoke it. Change-Id: I0cefa5b5a0cb712080ba2afd322db329f19608e3 --- M src/libmsc/msc_vty.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/27/19427/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0cefa5b5a0cb712080ba2afd322db329f19608e3 Gerrit-Change-Number: 19427 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:04:49 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Jul 2020 23:04:49 +0000 Subject: Change in libosmocore[master]: Gb/BSSGP: replace hardcoded Tx into NS library by a callback In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19414 ) Change subject: Gb/BSSGP: replace hardcoded Tx into NS library by a callback ...................................................................... Patch Set 4: > Patch Set 4: > > (2 comments) > > I'm not really sure if this is worth the effort. If we have a new NS implementation, we don't need to support osage of that new implentation by old applications. So we could simply introduce a new implementation (with new API, ideally an SAP based on osmo_prim) in the library. After it's added, we can convert the users to the new API. Old applications will use the old codebase, while new applications will use the new. The new NS is also using this BSSGP. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3a498e6a0d68b87fed80c64199b22395796761b4 Gerrit-Change-Number: 19414 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 23:04:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:41:00 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 23:41:00 +0000 Subject: Change in docker-playground[master]: bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/19428 ) Change subject: bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH ...................................................................... bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH The bsc/BSC_Tests_CBSP.ttcn rely on a configuration where the first three BTS carry out SMSCB messaging, and the fourth BTS does not. That requires a CBCH channel config on bts 0, 1, 2. Related: Iac46ee2cc5bc0978d5f5baa550baf493a7c56b1b (osmo-ttcn3-hacks) Change-Id: Idbcc703ace7012fb395f0eef3e445df28b368d74 --- M ttcn3-bsc-test/osmo-bsc.cfg 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/28/19428/1 diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index d49e6f2..13e7f60 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -144,7 +144,7 @@ max_power_red 20 rsl e1 tei 0 timeslot 0 - phys_chan_config CCCH+SDCCH4 + phys_chan_config CCCH+SDCCH4+CBCH hopping enabled 0 timeslot 1 phys_chan_config TCH/F @@ -234,7 +234,7 @@ max_power_red 20 rsl e1 tei 0 timeslot 0 - phys_chan_config CCCH+SDCCH4 + phys_chan_config CCCH+SDCCH4+CBCH hopping enabled 0 timeslot 1 phys_chan_config TCH/F @@ -324,7 +324,7 @@ max_power_red 20 rsl e1 tei 0 timeslot 0 - phys_chan_config CCCH+SDCCH4 + phys_chan_config CCCH+SDCCH4+CBCH hopping enabled 0 timeslot 1 phys_chan_config TCH/F -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idbcc703ace7012fb395f0eef3e445df28b368d74 Gerrit-Change-Number: 19428 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:41:15 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 23:41:15 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: exit early on full disk References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/19429 ) Change subject: jenkins-common.sh: exit early on full disk ...................................................................... jenkins-common.sh: exit early on full disk When my disk runs full, jenkins-common.sh fails to create a VOL_BASEDIR right at the start, and hence no testsuite gets its external volumes mounted properly. However, the test suite still starts up with missing cfg files etc, and fails in non-obvious ways, until I find out the disk is full some minutes later. Instead, verify that the base dir really exists or bail out right there. Change-Id: I6540797c8e0ee3e7b09d4a80592d5e270e7d9adc --- M jenkins-common.sh 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/29/19429/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index a29720c..64ec0bb 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -135,6 +135,11 @@ mkdir -p "$VOL_BASE_DIR" fi +if [ ! -d "$VOL_BASE_DIR" ]; then + echo "ERROR: \$VOL_BASE_DIR does not exist: '$VOL_BASE_DIR'" + exit 1 +fi + # non-jenkins execution: put logs in /tmp if [ "x$BUILD_TAG" = "x" ]; then BUILD_TAG=nonjenkins -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6540797c8e0ee3e7b09d4a80592d5e270e7d9adc Gerrit-Change-Number: 19429 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:48:59 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 23:48:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: drop unused vars 'pages' References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19430 ) Change subject: bsc CBSP: drop unused vars 'pages' ...................................................................... bsc CBSP: drop unused vars 'pages' Change-Id: I252fed22cccfc77a4f9cfdd2a0e3070ceeefc547 --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/19430/1 diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index 94167ce..56e522a 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -197,7 +197,6 @@ template CBSP_FailureListItems fail_list := omit) runs on cbsp_test_CT { var template (value) CBSP_PDU tx; var template CBSP_PDU rx; - var CBSP_IEs pages := {f_gen_page()}; tx := ts_CBSP_WRITE_CBS(msg_id, ser_no, cell_list, channel_ind, category, rep_period, num_bcast_req, dcs, content); @@ -227,7 +226,6 @@ template CBSP_FailureListItems fail_list := omit) runs on cbsp_test_CT { var template (value) CBSP_PDU tx; var template CBSP_PDU rx; - var CBSP_IEs pages := {f_gen_page()}; tx := ts_CBSP_REPLACE_CBS(msg_id, new_ser_no, old_ser_no, cell_list, channel_ind, category, rep_period, num_bcast_req, dcs, content); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I252fed22cccfc77a4f9cfdd2a0e3070ceeefc547 Gerrit-Change-Number: 19430 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:48:59 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 23:48:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: add numerous mtc.stop after fail verdicts References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19431 ) Change subject: bsc CBSP: add numerous mtc.stop after fail verdicts ...................................................................... bsc CBSP: add numerous mtc.stop after fail verdicts I found that I had to wait 30 seconds after a failure verdict. Change-Id: I8314c53037948fae51028119c81ea247baed44ec --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/19431/1 diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index 56e522a..acd0b99 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -120,6 +120,7 @@ } [] T.timeout { setverdict(fail, "Timeout waiting for incoming connection to CBSP Port"); + mtc.stop; } } f_cbsp_init_tail(); @@ -183,6 +184,7 @@ } [] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], ?)) { setverdict(fail, "Received unexpected CBSP"); + mtc.stop; } } } @@ -212,6 +214,7 @@ } [] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], ?)) { setverdict(fail, "Received unexpected CBSP"); + mtc.stop; } } } @@ -243,6 +246,7 @@ } [] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], ?)) { setverdict(fail, "Received unexpected CBSP"); + mtc.stop; } } } @@ -270,6 +274,7 @@ } [] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], ?)) { setverdict(fail, "Received unexpected CBSP"); + mtc.stop; } } } @@ -573,10 +578,12 @@ } [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(?,?))) { setverdict(fail, "Received unexpected OSMO_ETWS_CMD"); + mtc.stop; } [] IPA_RSL[0].receive { repeat; } [] T.timeout { setverdict(fail, "Timeout waiting for RSL_OSMO_ETWS_CMD"); + mtc.stop; } } } @@ -602,10 +609,12 @@ } [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(?,?))) { setverdict(fail, "Received unexpected OSMO_ETWS_CMD"); + mtc.stop; } [] IPA_RSL[0].receive { repeat; } [] T.timeout { setverdict(fail, "Timeout waiting for RSL_OSMO_ETWS_CMD (enable)"); + mtc.stop; } } @@ -617,10 +626,12 @@ } [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(?,?))) { setverdict(fail, "Received unexpected OSMO_ETWS_CMD"); + mtc.stop; } [] IPA_RSL[0].receive { repeat; } [] T.timeout { setverdict(fail, "Timeout waiting for RSL_OSMO_ETWS_CMD (disable)"); + mtc.stop; } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8314c53037948fae51028119c81ea247baed44ec Gerrit-Change-Number: 19431 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:49:00 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 23:49:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: add log context for CBSP port errors References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19432 ) Change subject: bsc CBSP: add log context for CBSP port errors ...................................................................... bsc CBSP: add log context for CBSP port errors Change-Id: Ifd90e84ee65d0cb03eefc7ae1da2605650daf7ac --- M library/CBSP_Adapter.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/19432/1 diff --git a/library/CBSP_Adapter.ttcn b/library/CBSP_Adapter.ttcn index 8dbee6a..fe399aa 100644 --- a/library/CBSP_Adapter.ttcn +++ b/library/CBSP_Adapter.ttcn @@ -44,7 +44,8 @@ res := CBSP_CodecPort_CtrlFunct.f_IPL4_connect(CBSP[idx], remote_host, remote_port, local_host, local_port, 0, { tcp :={} }); if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect to CBSP port, check your configuration"); + setverdict(fail, "Could not connect to CBSP port, check your configuration ", + "{remote ", remote_host, ":", remote_port, " local ", local_host, ":", local_port, "}"); mtc.stop; } g_cbsp_conn_id[idx] := res.connId; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifd90e84ee65d0cb03eefc7ae1da2605650daf7ac Gerrit-Change-Number: 19432 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:49:00 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 23:49:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: log expected response in f_cbsp_write References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19433 ) Change subject: bsc CBSP: log expected response in f_cbsp_write ...................................................................... bsc CBSP: log expected response in f_cbsp_write This helped to find message mismatches while solving the current CBSP test failures. Change-Id: I844717b0f665496a842764b3b915ba64249cd617 --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/19433/1 diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index acd0b99..d6a4b82 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -208,6 +208,7 @@ } else { rx := tr_CBSP_WRITE_CBS_FAIL(msg_id, ser_no, fail_list, *, success_list, channel_ind); } + log("EXPECTING ", tr_CBSP_Recv(g_cbsp_conn_id[0], rx)); alt { [] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], rx)) { setverdict(pass); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I844717b0f665496a842764b3b915ba64249cd617 Gerrit-Change-Number: 19433 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:49:00 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 23:49:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19434 ) Change subject: bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH ...................................................................... bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH The bsc/BSC_Tests_CBSP.ttcn rely on a configuration where the first three BTS carry out SMSCB messaging, and the fourth BTS does not. That requires a CBCH channel config on bts 0, 1, 2. Related: Idbcc703ace7012fb395f0eef3e445df28b368d74 (docker-playground) Change-Id: Iac46ee2cc5bc0978d5f5baa550baf493a7c56b1b --- M bsc/osmo-bsc.cfg 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/34/19434/1 diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg index a4c767a..cbadece 100644 --- a/bsc/osmo-bsc.cfg +++ b/bsc/osmo-bsc.cfg @@ -140,7 +140,7 @@ max_power_red 20 rsl e1 tei 0 timeslot 0 - phys_chan_config CCCH+SDCCH4 + phys_chan_config CCCH+SDCCH4+CBCH hopping enabled 0 timeslot 1 phys_chan_config TCH/F @@ -230,7 +230,7 @@ max_power_red 20 rsl e1 tei 0 timeslot 0 - phys_chan_config CCCH+SDCCH4 + phys_chan_config CCCH+SDCCH4+CBCH hopping enabled 0 timeslot 1 phys_chan_config TCH/F @@ -320,7 +320,7 @@ max_power_red 20 rsl e1 tei 0 timeslot 0 - phys_chan_config CCCH+SDCCH4 + phys_chan_config CCCH+SDCCH4+CBCH hopping enabled 0 timeslot 1 phys_chan_config TCH/F -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iac46ee2cc5bc0978d5f5baa550baf493a7c56b1b Gerrit-Change-Number: 19434 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:49:01 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 23:49:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: quick-fix f_cbsp_init_client() References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19435 ) Change subject: bsc CBSP: quick-fix f_cbsp_init_client() ...................................................................... bsc CBSP: quick-fix f_cbsp_init_client() Expecting a CBSP RESTART when connecting as CBSP client does not work. This test should probably *send* a CBSP RESTART instead, but simply omitting that for now helps to get the CBSP tests running at all first. Change-Id: Ib93530691344c6dc4c0a8318bee2edf87e309a42 --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/19435/1 diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index d6a4b82..781bb8b 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -103,7 +103,8 @@ private function f_cbsp_init_client() runs on cbsp_test_CT { f_init(); CBSP_Adapter.f_connect(mp_bsc_ip, mp_bsc_cbsp_port, "", -1); - f_cbsp_init_tail(); + /* TODO: should this send a CBSP RESTART? */ + setverdict(pass); } private function f_cbsp_init_server() runs on cbsp_test_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib93530691344c6dc4c0a8318bee2edf87e309a42 Gerrit-Change-Number: 19435 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:49:01 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 23:49:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc cbsp: f_page2rsl: fix nr of blocks calculation References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19436 ) Change subject: bsc cbsp: f_page2rsl: fix nr of blocks calculation ...................................................................... bsc cbsp: f_page2rsl: fix nr of blocks calculation Change-Id: I06cc144bd92e94d461dac3f56a738da8e055b73a --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 31 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/36/19436/1 diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index 781bb8b..fd361bb 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -289,17 +289,43 @@ last_block := lblock } +/* translate blocks count to RSL_CB_CMD_LASTBLOCK_1..4 values */ +private function f_cbsp_block_count_enc(integer num_blocks) return integer +{ + if (num_blocks < 1 or num_blocks > 4) { + setverdict(fail, "Invalid num_blocks: ", num_blocks); + mtc.stop; + } + if (num_blocks == 4) { + return 0; + } + return num_blocks; +} + + /* build a RSL_Message receive template from a CBSP page */ -private function f_page2rsl(CBSP_IE page, uint16_t msg_id, uint16_t ser_no, boolean ext_cbch := false) +private function f_page2rsl(CBSP_IE page, uint16_t msg_id, uint16_t ser_no, boolean ext_cbch := false, integer expect_blocks := -1) return template (present) RSL_Message { var template RSL_Message tr; - var integer lblock := page.body.msg_content.user_len / 22; + var integer len; + var integer num_blocks; var octetstring payload; - if (page.body.msg_content.user_len mod 22 > 0) { - lblock := lblock + 1; - } + payload := int2oct(ser_no, 2) & int2oct(msg_id, 2) & '0011'O & page.body.msg_content.val; + len := lengthof(payload); + num_blocks := len / 22; + if (len mod 22 > 0) { + num_blocks := num_blocks + 1; + } + + if (expect_blocks > 0 and expect_blocks != num_blocks) { + setverdict(fail, "test case claims to model ", expect_blocks, " blocks, but generated ", num_blocks); + mtc.stop; + } + + var integer lblock := f_cbsp_block_count_enc(num_blocks); + tr := tr_RSL_SMSCB_CMD(tr_RslCbCmdType(lblock), f_pad_oct(payload, 88, '00'O)); if (ext_cbch) { tr.ies[3] := tr_RSL_IE(RSL_IE_Body:{smscb_chan_ind := 1}); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I06cc144bd92e94d461dac3f56a738da8e055b73a Gerrit-Change-Number: 19436 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:49:02 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 23:49:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: allow passing guard_timeout to BSC_Tests.f_init() References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19437 ) Change subject: bsc CBSP: allow passing guard_timeout to BSC_Tests.f_init() ...................................................................... bsc CBSP: allow passing guard_timeout to BSC_Tests.f_init() An upcoming patch adds a test series (of various payload lengths) to TC_cbsp_write_bss(), which then needs a bit longer than 30 seconds to run through those. That test will pass a longer guard_timeout. Change-Id: I54e1b3994074f4d0caf5b201588fce0ec41dda89 --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/19437/1 diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index fd361bb..dd57954 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -93,8 +93,8 @@ } } -private function f_init() runs on cbsp_test_CT { - BSC_Tests.f_init(); +private function f_init(float guard_timeout := 30.0) runs on cbsp_test_CT { + BSC_Tests.f_init(guard_timeout := guard_timeout); activate(as_IgnRSL((tr_RSL_BCCH_INFO, tr_RSL_SACCH_FILL, tr_RSL_NO_BCCH_INFO, tr_RSL_NO_SACCH_FILL, tr_RSL_MsgTypeD(?)))); @@ -107,11 +107,11 @@ setverdict(pass); } -private function f_cbsp_init_server() runs on cbsp_test_CT { +private function f_cbsp_init_server(float guard_timeout := 30.0) runs on cbsp_test_CT { var ASP_Event asp_evt; timer T := 10.0; - f_init(); + f_init(guard_timeout := guard_timeout); CBSP_Adapter.f_bind(mp_cbc_ip, mp_cbc_port); T.start; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I54e1b3994074f4d0caf5b201588fce0ec41dda89 Gerrit-Change-Number: 19437 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:49:02 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 23:49:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: f_gen_page(): allow passing explicit payload len References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19438 ) Change subject: bsc CBSP: f_gen_page(): allow passing explicit payload len ...................................................................... bsc CBSP: f_gen_page(): allow passing explicit payload len Keep the default of using a random payload length, but also allow picking one specifically. TC_cbsp_write_bss() will use this in a subsequent patch. Change-Id: I259da42cbcbfdfe930aabb45c9de8a2b67c69629 --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/19438/1 diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index dd57954..f1f0240 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -134,10 +134,14 @@ } } -function f_gen_page() return CBSP_IE { - var integer len := f_rnd_int(82); - var octetstring payload := f_rnd_octstring(len); - return valueof(ts_CbspMsgContent(payload, len)); +function f_gen_page(integer payload_len := -1) return CBSP_IE { + if (payload_len < 1) { + /* No payload len of zero please */ + payload_len := 1 + f_rnd_int(81); + } + log("Generating CBSP payload: ", payload_len, " octets"); + var octetstring payload := f_rnd_octstring(payload_len); + return valueof(ts_CbspMsgContent(payload, payload_len)); } function f_cbsp_reset_bss(integer idx) runs on CBSP_Adapter_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I259da42cbcbfdfe930aabb45c9de8a2b67c69629 Gerrit-Change-Number: 19438 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:49:03 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 23:49:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: cosmetic: rename f_cbsp_init_tail() to f_expect_cbsp_restart() References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19440 ) Change subject: bsc CBSP: cosmetic: rename f_cbsp_init_tail() to f_expect_cbsp_restart() ...................................................................... bsc CBSP: cosmetic: rename f_cbsp_init_tail() to f_expect_cbsp_restart() It might be part of initialization, but what this function does is expect to receive a CBSP RESTART, period. Change-Id: Ieffe70cf43eb79b798d93717bbce294ee809f0e2 --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/19440/1 diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index edbaddc..563e28f 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -124,9 +124,9 @@ mtc.stop; } } - f_cbsp_init_tail(); + f_expect_cbsp_restart(); } -private function f_cbsp_init_tail() runs on cbsp_test_CT { +private function f_expect_cbsp_restart() runs on cbsp_test_CT { interleave { [] CBSP[0].receive(tr_CBSP_Recv(?, tr_CBSP_RESTART(?, CBSP_BC_MSGT_CBS, CBSP_RI_DATA_LOST))); /* should we also expect a restart for emergency related messages? */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieffe70cf43eb79b798d93717bbce294ee809f0e2 Gerrit-Change-Number: 19440 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:49:03 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 23:49:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: TC_cbsp_write_bss: run a fixed series of payload lengths References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19439 ) Change subject: bsc CBSP: TC_cbsp_write_bss: run a fixed series of payload lengths ...................................................................... bsc CBSP: TC_cbsp_write_bss: run a fixed series of payload lengths Recently fixed errors in the last_block counting as well as encoding ask for a proper test coverage of various lengths, which also verifies the expected blocks count explicitly. Implement this in TC_cbsp_write_bss(): Run f_tc_cbsp_write_bss() multiple times with differing fixed payload lengths, at all block count transitions, plus some arbitrary lengths in-between. Before this patch, TC_cbsp_write_bss() would pick a different random payload length for every test run, which, until recently, then sporadically hit last_block value errors. That's not good for reproducability. Change-Id: I3cace19f9e5adc8ebab13ef2328a36dc150b2b31 --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 33 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/39/19439/1 diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index f1f0240..edbaddc 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -377,20 +377,46 @@ } /* Write to entire BSS; three cells succeed; one fails (no CBCH) */ -testcase TC_cbsp_write_bss() runs on cbsp_test_CT { - var CBSP_IEs pages := {f_gen_page()}; +function f_tc_cbsp_write_bss(integer payload_len := -1, integer expect_blocks := -1) runs on cbsp_test_CT { + var CBSP_IEs pages := {f_gen_page(payload_len := payload_len)}; var template (value) BSSMAP_FIELD_CellIdentificationList cell_list; cell_list := ts_BSSMAP_CIL_BSS; - f_cbsp_init_server(); f_cbsp_write(1, 1001, cell_list, content:=pages, success_list:=tr_BSSMAP_CIL_CGI({?,?,?}), fail_list:={?}); - var template RSL_Message tr := f_page2rsl(pages[0], 1, 1001); + var template RSL_Message tr := f_page2rsl(pages[0], 1, 1001, expect_blocks := expect_blocks); + log("RSL[0,1,2] EXPECTING ", tr_ASP_RSL_UD(tr)); interleave { - [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr)) {} - [] IPA_RSL[1].receive(tr_ASP_RSL_UD(tr)) {} - [] IPA_RSL[2].receive(tr_ASP_RSL_UD(tr)) {} + [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr)) { log("Got SMSCB CMD on RSL[0]"); } + [] IPA_RSL[1].receive(tr_ASP_RSL_UD(tr)) { log("Got SMSCB CMD on RSL[1]"); } + [] IPA_RSL[2].receive(tr_ASP_RSL_UD(tr)) { log("Got SMSCB CMD on RSL[2]"); } } + setverdict(pass); +} +testcase TC_cbsp_write_bss() runs on cbsp_test_CT { + f_cbsp_init_server(guard_timeout := 60.0); + /* In the SMSCB message, there is a head followed by payload, + * and the resulting data is segmented in blocks of 22 octets (<= 4 blocks). + * + * [head][...payload....]|[....................]|[....................]|[....................] + * 0 |16 |38 |60 |82 + * 0 5 |22 |44 |66 |88 + * + * blocks count: 1 | 2 | 3 | 4 + * payload octets count: 1..16 | 17..38 | 39..60 | 61..82 + */ + f_tc_cbsp_write_bss(payload_len := 1, expect_blocks := 1); + f_tc_cbsp_write_bss(payload_len := 2, expect_blocks := 1); + f_tc_cbsp_write_bss(payload_len := 16, expect_blocks := 1); + f_tc_cbsp_write_bss(payload_len := 17, expect_blocks := 2); + f_tc_cbsp_write_bss(payload_len := 23, expect_blocks := 2); + f_tc_cbsp_write_bss(payload_len := 38, expect_blocks := 2); + f_tc_cbsp_write_bss(payload_len := 39, expect_blocks := 3); + f_tc_cbsp_write_bss(payload_len := 42, expect_blocks := 3); + f_tc_cbsp_write_bss(payload_len := 60, expect_blocks := 3); + f_tc_cbsp_write_bss(payload_len := 61, expect_blocks := 4); + f_tc_cbsp_write_bss(payload_len := 77, expect_blocks := 4); + f_tc_cbsp_write_bss(payload_len := 82, expect_blocks := 4); } /* Write to single BTS supporting CBCH: success */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3cace19f9e5adc8ebab13ef2328a36dc150b2b31 Gerrit-Change-Number: 19439 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:51:22 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 23:51:22 +0000 Subject: Change in osmo-bsc[master]: fix CBSP server: actually open the srv_link References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19441 ) Change subject: fix CBSP server: actually open the srv_link ...................................................................... fix CBSP server: actually open the srv_link Change-Id: Ic688573e179381f7798055b647200e508f1bc37f --- M src/osmo-bsc/cbsp_link.c 1 file changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/41/19441/1 diff --git a/src/osmo-bsc/cbsp_link.c b/src/osmo-bsc/cbsp_link.c index 91217ad..d93bd1a 100644 --- a/src/osmo-bsc/cbsp_link.c +++ b/src/osmo-bsc/cbsp_link.c @@ -239,13 +239,20 @@ if (cbc->config.listen_port != -1) { LOGP(DCBS, LOGL_NOTICE, "Starting CBSP Server (bound to %s:%u)\n", cbc->config.listen_hostname, cbc->config.listen_port); - if (!cbc->server.srv) { + if (!cbc->server.link) { + LOGP(DCBS, LOGL_NOTICE, "Creating CBSP Server\n"); cbc->server.link = osmo_stream_srv_link_create(cbc); osmo_stream_srv_link_set_data(cbc->server.link, cbc); osmo_stream_srv_link_set_accept_cb(cbc->server.link, cbsp_srv_link_accept_cb); + + osmo_stream_srv_link_set_addr(cbc->server.link, cbc->config.listen_hostname); + osmo_stream_srv_link_set_port(cbc->server.link, cbc->config.listen_port); + + if (osmo_stream_srv_link_open(cbc->server.link) < 0) { + LOGP(DCBS, LOGL_ERROR, "Cannot open CBSP Server link on %s:%u\n", + cbc->config.listen_hostname, cbc->config.listen_port); + } } - osmo_stream_srv_link_set_addr(cbc->server.link, cbc->config.listen_hostname); - osmo_stream_srv_link_set_port(cbc->server.link, cbc->config.listen_port); } return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic688573e179381f7798055b647200e508f1bc37f Gerrit-Change-Number: 19441 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:57:36 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 23:57:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: f_page2rsl: fix nr of blocks calculation In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19436 to look at the new patch set (#2). Change subject: bsc CBSP: f_page2rsl: fix nr of blocks calculation ...................................................................... bsc CBSP: f_page2rsl: fix nr of blocks calculation When dividing the payload by 22, the initial 6 header octets must also be taken into account. And, the last_block value indicates 4 as 0, which is not encoded correctly before this patch. Add a separate f_cbsp_block_count_enc() to fix the calculation. Change-Id: I06cc144bd92e94d461dac3f56a738da8e055b73a --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 31 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/36/19436/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I06cc144bd92e94d461dac3f56a738da8e055b73a Gerrit-Change-Number: 19436 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:57:36 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 23:57:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: allow passing guard_timeout to BSC_Tests.f_init() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19437 to look at the new patch set (#2). Change subject: bsc CBSP: allow passing guard_timeout to BSC_Tests.f_init() ...................................................................... bsc CBSP: allow passing guard_timeout to BSC_Tests.f_init() An upcoming patch adds a test series (of various payload lengths) to TC_cbsp_write_bss(), which then needs a bit longer than 30 seconds to run through those. That test will pass a longer guard_timeout. Change-Id: I54e1b3994074f4d0caf5b201588fce0ec41dda89 --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/19437/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I54e1b3994074f4d0caf5b201588fce0ec41dda89 Gerrit-Change-Number: 19437 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:57:36 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 23:57:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: f_gen_page(): allow passing explicit payload len In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19438 to look at the new patch set (#2). Change subject: bsc CBSP: f_gen_page(): allow passing explicit payload len ...................................................................... bsc CBSP: f_gen_page(): allow passing explicit payload len Keep the default of using a random payload length, but also allow picking one specifically. TC_cbsp_write_bss() will use this in a subsequent patch. Change-Id: I259da42cbcbfdfe930aabb45c9de8a2b67c69629 --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/19438/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I259da42cbcbfdfe930aabb45c9de8a2b67c69629 Gerrit-Change-Number: 19438 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:57:36 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 23:57:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: TC_cbsp_write_bss: run a fixed series of payload lengths In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19439 to look at the new patch set (#2). Change subject: bsc CBSP: TC_cbsp_write_bss: run a fixed series of payload lengths ...................................................................... bsc CBSP: TC_cbsp_write_bss: run a fixed series of payload lengths Recently fixed errors in the last_block counting as well as encoding ask for a proper test coverage of various lengths, which also verifies the expected blocks count explicitly. Implement this in TC_cbsp_write_bss(): Run f_tc_cbsp_write_bss() multiple times with differing fixed payload lengths, at all block count transitions, plus some arbitrary lengths in-between. Before this patch, TC_cbsp_write_bss() would pick a different random payload length for every test run, which, until recently, then sporadically hit last_block value errors. That's not good for reproducability. Change-Id: I3cace19f9e5adc8ebab13ef2328a36dc150b2b31 --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 33 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/39/19439/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3cace19f9e5adc8ebab13ef2328a36dc150b2b31 Gerrit-Change-Number: 19439 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Jul 28 23:57:36 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 28 Jul 2020 23:57:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: cosmetic: rename f_cbsp_init_tail() to f_expect_cbsp_restart() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19440 to look at the new patch set (#2). Change subject: bsc CBSP: cosmetic: rename f_cbsp_init_tail() to f_expect_cbsp_restart() ...................................................................... bsc CBSP: cosmetic: rename f_cbsp_init_tail() to f_expect_cbsp_restart() It might be part of initialization, but what this function does is expect to receive a CBSP RESTART, period. Change-Id: Ieffe70cf43eb79b798d93717bbce294ee809f0e2 --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/19440/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieffe70cf43eb79b798d93717bbce294ee809f0e2 Gerrit-Change-Number: 19440 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 07:24:53 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 07:24:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: drop unused vars 'pages' In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19430 ) Change subject: bsc CBSP: drop unused vars 'pages' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I252fed22cccfc77a4f9cfdd2a0e3070ceeefc547 Gerrit-Change-Number: 19430 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 29 Jul 2020 07:24:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 07:26:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 07:26:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: add numerous mtc.stop after fail verdicts In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19431 ) Change subject: bsc CBSP: add numerous mtc.stop after fail verdicts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8314c53037948fae51028119c81ea247baed44ec Gerrit-Change-Number: 19431 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 29 Jul 2020 07:26:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 07:27:08 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 07:27:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: add log context for CBSP port errors In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19432 ) Change subject: bsc CBSP: add log context for CBSP port errors ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifd90e84ee65d0cb03eefc7ae1da2605650daf7ac Gerrit-Change-Number: 19432 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 29 Jul 2020 07:27:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 07:28:43 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 07:28:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: log expected response in f_cbsp_write In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19433 ) Change subject: bsc CBSP: log expected response in f_cbsp_write ...................................................................... Patch Set 1: Code-Review+1 In general, the same can be achieved by adding 'TTCN_MATCHING' to the 'ConsoleMask'. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I844717b0f665496a842764b3b915ba64249cd617 Gerrit-Change-Number: 19433 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 29 Jul 2020 07:28:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 07:29:31 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 07:29:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19434 ) Change subject: bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iac46ee2cc5bc0978d5f5baa550baf493a7c56b1b Gerrit-Change-Number: 19434 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 29 Jul 2020 07:29:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 07:29:56 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 07:29:56 +0000 Subject: Change in docker-playground[master]: bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19428 ) Change subject: bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idbcc703ace7012fb395f0eef3e445df28b368d74 Gerrit-Change-Number: 19428 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 29 Jul 2020 07:29:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 07:30:42 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 07:30:42 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: exit early on full disk In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19429 ) Change subject: jenkins-common.sh: exit early on full disk ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6540797c8e0ee3e7b09d4a80592d5e270e7d9adc Gerrit-Change-Number: 19429 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 29 Jul 2020 07:30:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 07:32:03 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 07:32:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: f_page2rsl: fix nr of blocks calculation In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19436 ) Change subject: bsc CBSP: f_page2rsl: fix nr of blocks calculation ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I06cc144bd92e94d461dac3f56a738da8e055b73a Gerrit-Change-Number: 19436 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 29 Jul 2020 07:32:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 07:32:21 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 07:32:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: allow passing guard_timeout to BSC_Tests.f_init() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19437 ) Change subject: bsc CBSP: allow passing guard_timeout to BSC_Tests.f_init() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I54e1b3994074f4d0caf5b201588fce0ec41dda89 Gerrit-Change-Number: 19437 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 29 Jul 2020 07:32:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 07:32:41 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 07:32:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: f_gen_page(): allow passing explicit payload len In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19438 ) Change subject: bsc CBSP: f_gen_page(): allow passing explicit payload len ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I259da42cbcbfdfe930aabb45c9de8a2b67c69629 Gerrit-Change-Number: 19438 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 29 Jul 2020 07:32:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 07:34:05 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 07:34:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: cosmetic: rename f_cbsp_init_tail() to f_expect_cbsp_restart() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19440 ) Change subject: bsc CBSP: cosmetic: rename f_cbsp_init_tail() to f_expect_cbsp_restart() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieffe70cf43eb79b798d93717bbce294ee809f0e2 Gerrit-Change-Number: 19440 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 29 Jul 2020 07:34:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 09:12:30 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 09:12:30 +0000 Subject: Change in osmo-sgsn[master]: Send a BVC-RESET to all persistent Gb interfaces at start-up In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 ) Change subject: Send a BVC-RESET to all persistent Gb interfaces at start-up ...................................................................... Patch Set 4: Code-Review+2 (1 comment) > Patch Set 4: > > The SGSN could react on S_NS_UNBLOCK signal and check if the NSVC is persistant. We should ensure we don't reset a running BSVC. The S_NS_UNBLOCK is only used on Frame Relay or on non-spec-compliant "IPA style" Gb/IP. Spec-compliant Gb/IP doesn't use the NS-RESET/BLOCK/UNBLOCK procedures, so this event is never received. I am very much inclined to merge this patch as it fixes an annoying deadlock occurring in the real world at a customer installation. https://gerrit.osmocom.org/c/osmo-sgsn/+/19027/4/src/sgsn/sgsn_main.c File src/sgsn/sgsn_main.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/19027/4/src/sgsn/sgsn_main.c at 215 PS4, Line 215: nsvc->state |= NSE_S_ALIVE; > we shouldn't sent messages over dead nsvc's The problem is that with the specific BSS I'm talking to, the only way to make the link active again is to send a BVC-RESET. Basically it's stuck in an indefinite loop of: Jul 29 11:00:08 osmo-cn osmo-sgsn[1409]: <0010> gprs_bssgp.c:1099 NSEI=1000/BVCI=100 Rejecting PDU type BVC-UNBLOCK for unknown BVCI Jul 29 11:00:08 osmo-cn osmo-sgsn[1409]: <0010> gprs_bssgp_util.c:237 BSSGP BVCI=100 Tx STATUS, cause=Unknown BVCI The BSS is ignoring that STATUS and the only way to recover after a SGSN restart is to send the BVC-RESET. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Gerrit-Change-Number: 19027 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 09:12:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: lynxis lazus Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 11:42:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jul 2020 11:42:10 +0000 Subject: Change in libosmocore[master]: osmo_sock_init2: improve support for AF_UNSPEC In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19140 ) Change subject: osmo_sock_init2: improve support for AF_UNSPEC ...................................................................... Patch Set 7: (1 comment) If I'm wrong please if possible improve that comment. https://gerrit.osmocom.org/c/libosmocore/+/19140/7/src/socket.c File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/19140/7/src/socket.c at 386 PS7, Line 386: /* When called with AF_UNSPEC, family will set to IPv4 or IPv6 */ I think I don't get this comment + if clause. IIUC ig family=AF_UNSPEC is passed, no result in rp will match AF_UNSPEC; because all will be either AF_INET or AF_INET6. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I397c633931fd00d4f083955a3c49a40fb002d766 Gerrit-Change-Number: 19140 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 11:42:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 11:45:20 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jul 2020 11:45:20 +0000 Subject: Change in libosmocore[master]: vty: Allow using hex and octal representations in cmd numeric ranges In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19422 ) Change subject: vty: Allow using hex and octal representations in cmd numeric ranges ...................................................................... Patch Set 1: > Patch Set 1: > > is this really an advantage? As we don't store the 'base', any write/save would store something in decimal that the user specified in hex. It stores in the format that the _write() function is written in which is fine. This way one can always maintain the same format, be it hexadecimal or decimal, while still allowing the numeric value to be passed in other ways. I am using this to define <0x00-0xffffffffff> cpu-affinity masks, to store them that way upon show running-config and then to allow to set cpu-affinity-masks also as hex, which is a lot more comfortable. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia2b7fbbf5502c28374c21dbff548232680da27d4 Gerrit-Change-Number: 19422 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 11:45:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 11:46:39 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jul 2020 11:46:39 +0000 Subject: Change in libosmocore[master]: vty: Allow larger strlen parsing numerical range values In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19423 ) Change subject: vty: Allow larger strlen parsing numerical range values ...................................................................... Patch Set 1: > Patch Set 1: > > well, the 64bit mask would only work on a 64bit arch, right? > > Where do we need numeric values that large? to express hex masks, like cpu-affinity mask. This allows for systems with up to 64 cores (we could thing about extending it to 128 if needed). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id053acd6bf5e8fb7c468959f0b78b778f8c5e6c2 Gerrit-Change-Number: 19423 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 11:46:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 11:48:45 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jul 2020 11:48:45 +0000 Subject: Change in osmocom-bb[master]: layer23/mobile: cosmetic: use GSM48_PDISC_TEST from gsm_04_08.h In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19425 ) Change subject: layer23/mobile: cosmetic: use GSM48_PDISC_TEST from gsm_04_08.h ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie1f14b37f6138f5a019a25bdbc8a3531418df6c2 Gerrit-Change-Number: 19425 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 11:48:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 11:50:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jul 2020 11:50:14 +0000 Subject: Change in osmo-msc[master]: gsm_04_14: fix off-by-one error in create_gsm0414_msg() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19426 ) Change subject: gsm_04_14: fix off-by-one error in create_gsm0414_msg() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/19426/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/19426/1//COMMIT_MSG at 10 PS1, Line 10: A consequence of this error is that the MS alwats interprets the always -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia47225b884439dcd43be307e7351994e55fcd50d Gerrit-Change-Number: 19426 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 11:50:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 11:50:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jul 2020 11:50:53 +0000 Subject: Change in osmo-msc[master]: vty: fix vsub reference counting: call vlr_subscr_put() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19427 ) Change subject: vty: fix vsub reference counting: call vlr_subscr_put() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0cefa5b5a0cb712080ba2afd322db329f19608e3 Gerrit-Change-Number: 19427 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 11:50:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 11:54:07 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jul 2020 11:54:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_si_acc_rotate In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 ) Change subject: bsc: Introduce test TC_si_acc_rotate ...................................................................... bsc: Introduce test TC_si_acc_rotate Related: SYS#4911 Change-Id: I18d0243353fce547d126d62c34415628a21cb52b --- M bsc/BSC_Tests.ttcn 1 file changed, 76 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index cc7346f..ac6b356 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1854,6 +1854,81 @@ } } +private function f_acc09_count_allowed(AccessControlClass acc) return uint8_t +{ + var uint8_t count := 0; + for (var integer i := 5; i < 16; i := i + 1) { + if (acc[i] == '0'B) { /* the list marks barred, we count allowed */ + count := count + 1; + } + } + return count; +} + +/* verify ACC rotate feature */ +testcase TC_si_acc_rotate() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + var SystemInformationConfig last_si; + var AccessControlClass acc; + var ASP_RSL_Unitdata rx_rsl_ud; + var uint8_t count; + var integer times_allowed[10] := { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + + f_init(0, guard_timeout := 60.0); + + f_bts_0_cfg(BSCVTY, {"rach access-control-class 5 barred", + "access-control-class-rotate 3", + "access-control-class-rotate-quantum 1"}); + + /* Init and get first sysinfo */ + f_init_bts_and_check_sysinfo(0, expect_si := ?); + + var integer i := 0; + while (i < 20) { + IPA_RSL[0].receive(tr_ASP_RSL_UD((tr_RSL_NO_BCCH_INFO, + tr_RSL_BCCH_INFO, + tr_RSL_NO_SACCH_FILL, + tr_RSL_SACCH_FILL)) + ) -> value rx_rsl_ud; + + f_sysinfo_seen(0, rx_rsl_ud.rsl); + last_si := g_system_information[0]; + if (last_si.si1 == omit) { + continue; + } + + g_system_information[0].si1 := omit; + acc := last_si.si1.rach_control.acc; + count := f_acc09_count_allowed(acc); + log("RSL: GOT SI1 ACC len=", count, ": ", acc); + + if (count != 3) { + log("RSL: EXPECTED SI ACC len=3"); + setverdict(fail, "received SI does not match expectations"); + break; + } + + for (var integer j := 0; j < 10; j := j + 1) { + if (acc[16 - 1 - j] == '0'B) { /* the list marks barred, we count allowed */ + times_allowed[j] := times_allowed[j] + 1; + } + } + + i := i + 1; + } + + for (var integer j := 0; j < 10; j := j + 1) { + log("ACC", j, " allowed ", times_allowed[j], " times" ); + if (j != 5 and times_allowed[j] < 3) { + setverdict(fail, "ACC", j, " ERROR: allowed ", times_allowed[j], " < 1 times"); + } else if (j == 5 and times_allowed[j] > 0) { + setverdict(fail, "ACC", j, " ERROR: allowed ", times_allowed[j], " > 0 times"); + } + } + + f_bts_0_cfg(BSCVTY, {"access-control-class-rotate 10", + "rach access-control-class 5 allowed"}); +} testcase TC_ctrl_msc_connection_status() runs on test_CT { var charstring ctrl_resp; @@ -5829,6 +5904,7 @@ execute( TC_si2quater_42_earfcns() ); execute( TC_si2quater_48_earfcns() ); execute( TC_si2quater_49_earfcns() ); + execute( TC_si_acc_rotate() ); /* RSL DCHAN Channel ACtivation / Deactivation */ execute( TC_chan_act_noreply() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I18d0243353fce547d126d62c34415628a21cb52b Gerrit-Change-Number: 19359 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 11:58:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jul 2020 11:58:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: log expected response in f_cbsp_write In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19433 ) Change subject: bsc CBSP: log expected response in f_cbsp_write ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I844717b0f665496a842764b3b915ba64249cd617 Gerrit-Change-Number: 19433 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 11:58:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 12:01:51 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jul 2020 12:01:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: f_page2rsl: fix nr of blocks calculation In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19436 ) Change subject: bsc CBSP: f_page2rsl: fix nr of blocks calculation ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19436/2/bsc/BSC_Tests_CBSP.ttcn File bsc/BSC_Tests_CBSP.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19436/2/bsc/BSC_Tests_CBSP.ttcn at 307 PS2, Line 307: private function f_page2rsl(CBSP_IE page, uint16_t msg_id, uint16_t ser_no, boolean ext_cbch := false, integer expect_blocks := -1) shouldn't expect_blocks be a template := ?, then use match() in line 322? Otherwise default -1 will always fail afaiu. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I06cc144bd92e94d461dac3f56a738da8e055b73a Gerrit-Change-Number: 19436 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 12:01:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 12:04:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jul 2020 12:04:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: TC_cbsp_write_bss: run a fixed series of payload lengths In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19439 ) Change subject: bsc CBSP: TC_cbsp_write_bss: run a fixed series of payload lengths ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3cace19f9e5adc8ebab13ef2328a36dc150b2b31 Gerrit-Change-Number: 19439 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 12:04:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 12:53:14 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 29 Jul 2020 12:53:14 +0000 Subject: Change in osmo-msc[master]: gsm_04_14: fix off-by-one error in create_gsm0414_msg() In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19426 ) Change subject: gsm_04_14: fix off-by-one error in create_gsm0414_msg() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia47225b884439dcd43be307e7351994e55fcd50d Gerrit-Change-Number: 19426 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 12:53:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 12:53:37 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 29 Jul 2020 12:53:37 +0000 Subject: Change in osmo-msc[master]: vty: fix vsub reference counting: call vlr_subscr_put() In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19427 ) Change subject: vty: fix vsub reference counting: call vlr_subscr_put() ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0cefa5b5a0cb712080ba2afd322db329f19608e3 Gerrit-Change-Number: 19427 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 12:53:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 12:54:42 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 12:54:42 +0000 Subject: Change in osmo-msc[master]: gsm_04_14: fix off-by-one error in create_gsm0414_msg() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19426 ) Change subject: gsm_04_14: fix off-by-one error in create_gsm0414_msg() ...................................................................... gsm_04_14: fix off-by-one error in create_gsm0414_msg() This byte is redundant, and must not be allocated in this function. A consequence of this error is that the MS alwats interprets the "Sub-channel" IE as test loop A regardless of the specified type. Here is an example of malformed Close TCH loop (type C) message: 0f 00 00 04 x. .. .. .. - Skip indicator (see 3GPP TS 24.007) .x .. .. .. - Protocol discriminator (see 3GPP TS 24.007) .. xx .. .. - Message type (CLOSE_TCH_LOOP_CMD) .. .. !! .. - (!) Redundant byte from create_gsm0414_msg() .. .. .. xx - (!) The actual "Sub-channel" IE (loop C, X=0) Change-Id: Ia47225b884439dcd43be307e7351994e55fcd50d --- M src/libmsc/gsm_04_14.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved diff --git a/src/libmsc/gsm_04_14.c b/src/libmsc/gsm_04_14.c index 8116558..03c06fd 100644 --- a/src/libmsc/gsm_04_14.c +++ b/src/libmsc/gsm_04_14.c @@ -43,7 +43,7 @@ struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.14"); struct gsm48_hdr *gh; - gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh) + 1); + gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); gh->proto_discr = GSM48_PDISC_TEST; gh->msg_type = msg_type; return msg; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia47225b884439dcd43be307e7351994e55fcd50d Gerrit-Change-Number: 19426 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 12:54:43 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 12:54:43 +0000 Subject: Change in osmo-msc[master]: vty: fix vsub reference counting: call vlr_subscr_put() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19427 ) Change subject: vty: fix vsub reference counting: call vlr_subscr_put() ...................................................................... vty: fix vsub reference counting: call vlr_subscr_put() Otherwise, each time the 3GPP TS 44.014 MS test commands (TCH loop) are invoked, both subscriber_mstest_{close,open} functions add +1 to the subscriber's reference count, but never revoke it. Change-Id: I0cefa5b5a0cb712080ba2afd322db329f19608e3 --- M src/libmsc/msc_vty.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved; Verified Jenkins Builder: Verified diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index c5e93aa..07a88c2 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -1704,6 +1704,7 @@ gsm0414_tx_close_tch_loop_cmd(msc_a, loop_mode); + vlr_subscr_put(vsub, VSUB_USE_VTY); return CMD_SUCCESS; } @@ -1732,6 +1733,7 @@ gsm0414_tx_open_loop_cmd(msc_a); + vlr_subscr_put(vsub, VSUB_USE_VTY); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0cefa5b5a0cb712080ba2afd322db329f19608e3 Gerrit-Change-Number: 19427 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 13:12:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jul 2020 13:12:14 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC subset rotation In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19303 ) Change subject: Introduce support for ACC subset rotation ...................................................................... Patch Set 9: ping -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I952c9eeae02809c7184078c655574ec817902e06 Gerrit-Change-Number: 19303 Gerrit-PatchSet: 9 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 13:12:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 13:14:37 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 29 Jul 2020 13:14:37 +0000 Subject: Change in osmo-sgsn[master]: Send a BVC-RESET to all persistent Gb interfaces at start-up In-Reply-To: References: Message-ID: lynxis lazus has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 ) Change subject: Send a BVC-RESET to all persistent Gb interfaces at start-up ...................................................................... Removed Code-Review-1 by lynxis lazus -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Gerrit-Change-Number: 19027 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 13:15:08 2020 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 29 Jul 2020 13:15:08 +0000 Subject: Change in osmo-sgsn[master]: Send a BVC-RESET to all persistent Gb interfaces at start-up In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 ) Change subject: Send a BVC-RESET to all persistent Gb interfaces at start-up ...................................................................... Patch Set 4: Code-Review+1 I see -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Gerrit-Change-Number: 19027 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 13:15:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 13:40:23 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 29 Jul 2020 13:40:23 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC subset rotation In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19303 ) Change subject: Introduce support for ACC subset rotation ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I952c9eeae02809c7184078c655574ec817902e06 Gerrit-Change-Number: 19303 Gerrit-PatchSet: 9 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 13:40:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 13:42:08 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 29 Jul 2020 13:42:08 +0000 Subject: Change in osmo-trx[master]: Transceiver: Add several rate_ctr for rx error conditions In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19403 ) Change subject: Transceiver: Add several rate_ctr for rx error conditions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I000f7112e35ac68d3d922444f78468b1ea74cbba Gerrit-Change-Number: 19403 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 13:42:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 13:43:51 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jul 2020 13:43:51 +0000 Subject: Change in osmo-trx[master]: Transceiver: Add several rate_ctr for rx error conditions In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/19403 ) Change subject: Transceiver: Add several rate_ctr for rx error conditions ...................................................................... Transceiver: Add several rate_ctr for rx error conditions Since there's now a rate counter, we can drop log level for those events which can be bursty and hence print lots of output in short periods of time, which may affect performance. This way setting them to INFO it's enough to avoid getting them in stderr unless explicitly configured by the user (for instance to debug stuff), while still allowing a good enough level to be enabled for other targets such as gsmtap. Related: OS#4679 Change-Id: I000f7112e35ac68d3d922444f78468b1ea74cbba --- M CommonLibs/osmo_signal.h M CommonLibs/trx_rate_ctr.cpp M CommonLibs/trx_rate_ctr.h M Transceiver52M/Transceiver.cpp 4 files changed, 33 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved diff --git a/CommonLibs/osmo_signal.h b/CommonLibs/osmo_signal.h index 13646a1..003e7af 100644 --- a/CommonLibs/osmo_signal.h +++ b/CommonLibs/osmo_signal.h @@ -65,4 +65,7 @@ unsigned int tx_trxd_fn_repeated; unsigned int tx_trxd_fn_outoforder; unsigned int tx_trxd_fn_skipped; + unsigned int rx_empty_burst; + unsigned int rx_clipping; + unsigned int rx_no_burst_detected; }; diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp index 1f44404..e902ff1 100644 --- a/CommonLibs/trx_rate_ctr.cpp +++ b/CommonLibs/trx_rate_ctr.cpp @@ -107,6 +107,9 @@ { TRX_CTR_TRX_TRXD_FN_REPEATED, "tx_trxd_fn_repeated" }, { TRX_CTR_TRX_TRXD_FN_OUTOFORDER, "tx_trxd_fn_outoforder" }, { TRX_CTR_TRX_TRXD_FN_SKIPPED, "tx_trxd_fn_skipped" }, + { TRX_CTR_TRX_RX_EMPTY_BURST, "rx_empty_burst" }, + { TRX_CTR_TRX_RX_CLIPPING, "rx_clipping" }, + { TRX_CTR_TRX_RX_NO_BURST_DETECTED, "rx_no_burst_detected" }, { 0, NULL } }; @@ -122,6 +125,9 @@ [TRX_CTR_TRX_TRXD_FN_REPEATED] = { "trx:tx_trxd_fn_repeated", "Number of Tx burts received from TRXD with repeated FN" }, [TRX_CTR_TRX_TRXD_FN_OUTOFORDER] = { "trx:tx_trxd_fn_outoforder","Number of Tx burts received from TRXD with a past FN" }, [TRX_CTR_TRX_TRXD_FN_SKIPPED] = { "trx:tx_trxd_fn_skipped", "Number of Tx burts potentially skipped due to FN jumps" }, + [TRX_CTR_TRX_RX_EMPTY_BURST] = { "trx:rx_empty_burst", "Number of Rx bursts empty" }, + [TRX_CTR_TRX_RX_CLIPPING] = { "trx:rx_clipping", "Number of Rx bursts discarded due to clipping" }, + [TRX_CTR_TRX_RX_NO_BURST_DETECTED] = { "trx:rx_no_burst_detected", "Number of Rx burts discarded due to burst detection error" }, }; static const struct rate_ctr_group_desc trx_chan_ctr_group_desc = { @@ -182,6 +188,12 @@ rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_trxd_fn_outoforder - ctr->current); ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TRXD_FN_SKIPPED]; rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_trxd_fn_skipped - ctr->current); + ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_RX_EMPTY_BURST]; + rate_ctr_add(ctr, trx_ctrs_pending[chan].rx_empty_burst - ctr->current); + ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_RX_CLIPPING]; + rate_ctr_add(ctr, trx_ctrs_pending[chan].rx_clipping - ctr->current); + ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_RX_NO_BURST_DETECTED]; + rate_ctr_add(ctr, trx_ctrs_pending[chan].rx_no_burst_detected - ctr->current); /* Mark as done */ trx_ctrs_pending[chan].chan = PENDING_CHAN_NONE; } diff --git a/CommonLibs/trx_rate_ctr.h b/CommonLibs/trx_rate_ctr.h index c4c05ef..72125c2 100644 --- a/CommonLibs/trx_rate_ctr.h +++ b/CommonLibs/trx_rate_ctr.h @@ -15,6 +15,9 @@ TRX_CTR_TRX_TRXD_FN_REPEATED, TRX_CTR_TRX_TRXD_FN_OUTOFORDER, TRX_CTR_TRX_TRXD_FN_SKIPPED, + TRX_CTR_TRX_RX_EMPTY_BURST, + TRX_CTR_TRX_RX_CLIPPING, + TRX_CTR_TRX_RX_NO_BURST_DETECTED, }; struct ctr_threshold { diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index c92a61b..c3ef377 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -638,6 +638,7 @@ GSM::Time burstTime; SoftVector *rxBurst; TransceiverState *state = &mStates[chan]; + bool ctr_changed = false; /* Blocking FIFO read */ radioVector *radio_burst = mReceiveFIFO[chan]->read(); @@ -687,7 +688,9 @@ } if (max_i < 0) { - LOGCHAN(chan, DTRXDUL, FATAL) << "Received empty burst"; + LOGCHAN(chan, DTRXDUL, INFO) << "Received empty burst"; + state->ctrs.rx_empty_burst++; + ctr_changed = true; goto ret_idle; } @@ -713,10 +716,15 @@ /* Detect normal or RACH bursts */ rc = detectAnyBurst(*burst, mTSC, BURST_THRESH, mSPSRx, type, max_toa, &ebp); if (rc <= 0) { - if (rc == -SIGERR_CLIP) - LOGCHAN(chan, DTRXDUL, NOTICE) << "Clipping detected on received RACH or Normal Burst"; - else if (rc != SIGERR_NONE) - LOGCHAN(chan, DTRXDUL, NOTICE) << "Unhandled RACH or Normal Burst detection error"; + if (rc == -SIGERR_CLIP) { + LOGCHAN(chan, DTRXDUL, INFO) << "Clipping detected on received RACH or Normal Burst"; + state->ctrs.rx_clipping++; + ctr_changed = true; + } else if (rc != SIGERR_NONE) { + LOGCHAN(chan, DTRXDUL, INFO) << "Unhandled RACH or Normal Burst detection error"; + state->ctrs.rx_no_burst_detected++; + ctr_changed = true; + } goto ret_idle; } @@ -743,6 +751,8 @@ return 0; ret_idle: + if (ctr_changed) + dispatch_trx_rate_ctr_change(state, chan); bi->idle = true; delete radio_burst; return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I000f7112e35ac68d3d922444f78468b1ea74cbba Gerrit-Change-Number: 19403 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 13:49:22 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 29 Jul 2020 13:49:22 +0000 Subject: Change in libosmocore[master]: vty: Don't match negative values on purely positive ranges In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19424 ) Change subject: vty: Don't match negative values on purely positive ranges ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia95f6314a2dd3f94d21fc219cf69bb8d39b8e7f0 Gerrit-Change-Number: 19424 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 13:49:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 14:04:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jul 2020 14:04:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Introduce test TC_si_acc_ramp_rotate In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378 to look at the new patch set (#2). Change subject: Introduce test TC_si_acc_ramp_rotate ...................................................................... Introduce test TC_si_acc_ramp_rotate Change-Id: I29acf4f117ccea53028c780cc9feb1da1fc16739 --- M bsc/BSC_Tests.ttcn 1 file changed, 91 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/19378/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I29acf4f117ccea53028c780cc9feb1da1fc16739 Gerrit-Change-Number: 19378 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 15:07:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 15:07:10 +0000 Subject: Change in osmo-sgsn[master]: Send a BVC-RESET to all persistent Gb interfaces at start-up In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 ) Change subject: Send a BVC-RESET to all persistent Gb interfaces at start-up ...................................................................... Send a BVC-RESET to all persistent Gb interfaces at start-up 3GPP TS 48.018 Section 8.4: > After any failure affecting the NSE, the party (BSS or SGSN) where > the failure resided shall reset the signalling BVC. After sending or > receiving a BVC-RESET PDU for the signalling BVC, the BSS shall stop all > traffic and initiate the BVC-RESET procedure for all BVCs corresponding > to PTP functional entities of the underlying network service entity. The > BSS must complete the BVC-RESET procedure for signalling BVC before > starting PTP BVC-RESET procedures. TODO: We should not just trigger a single outbound BVC-RESET message, but we should re-transmit them until we get a response. This would likely entail adding FSMs to libosmogb, which we will leave for a later point - it's anticipated that the NS + BSSGP code is undergoing quite some changes in the coming months anyway, so leave it for then. Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Closes: OS#4629 Depends: libosmocore.git I353adc1aa72377f7d4b3336d2ff47791fb73d62c --- M src/sgsn/sgsn_main.c 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved lynxis lazus: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c index 3b18b05..5b53815 100644 --- a/src/sgsn/sgsn_main.c +++ b/src/sgsn/sgsn_main.c @@ -42,6 +42,7 @@ #include #include +#include #include #include @@ -199,6 +200,23 @@ #endif } +static void bvc_reset_persistent_nsvcs(void) +{ + /* Send BVC-RESET on all persistent NSVCs */ + struct gprs_nsvc *nsvc; + + llist_for_each_entry(nsvc, &sgsn_nsi->gprs_nsvcs, list) { + struct bssgp_bvc_ctx bctx = { + .nsei = nsvc->nsei, + }; + if (!nsvc->persistent) + continue; + /* if it is not marked ALIVE, we cannot send any data over it. */ + nsvc->state |= NSE_S_ALIVE; + bssgp_tx_bvc_reset2(&bctx, BVCI_SIGNALLING, BSSGP_CAUSE_EQUIP_FAIL, false); + } +} + static struct vty_app_info vty_info = { .name = "OsmoSGSN", .version = PACKAGE_VERSION, @@ -522,6 +540,8 @@ ranap_iu_init(tall_sgsn_ctx, DRANAP, "OsmoSGSN-IuPS", sccp, gsm0408_gprs_rcvmsg_iu, sgsn_ranap_iu_event); #endif + bvc_reset_persistent_nsvcs(); + if (daemonize) { rc = osmo_daemonize(); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Gerrit-Change-Number: 19027 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 16:19:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jul 2020 16:19:46 +0000 Subject: Change in libosmocore[master]: WIP: vty: Introduce support to set cpu-affinity and scheduler policy References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19442 ) Change subject: WIP: vty: Introduce support to set cpu-affinity and scheduler policy ...................................................................... WIP: vty: Introduce support to set cpu-affinity and scheduler policy Process willing to support this kind of configuration through VTY simply need to call "osmo_sched_vty_init(tall_ctx);" during startup to register the commands. For multithreaded processes, new threads willing to get their cpu-affinity mask according to VTY config should call osmo_sched_vty_apply_localthread() (potentially after setting the thread name through pthread_setname_np()). Related: SYS#4986 Change-Id: If76a4bd2cc7b3c7adf5d84790a944d78be70e10a --- M include/Makefile.am M include/osmocom/vty/command.h A include/osmocom/vty/sched_vty.h M src/vty/Makefile.am A src/vty/sched_vty.c 5 files changed, 600 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/19442/1 diff --git a/include/Makefile.am b/include/Makefile.am index 7af7e01..097f34d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -164,6 +164,7 @@ osmocom/vty/vector.h \ osmocom/vty/vty.h \ osmocom/vty/ports.h \ + osmocom/vty/sched_vty.h \ osmocom/vty/tdef_vty.h \ osmocom/ctrl/control_vty.h endif diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h index 29206ce..338400f 100644 --- a/include/osmocom/vty/command.h +++ b/include/osmocom/vty/command.h @@ -97,6 +97,7 @@ L_CS7_SCCPADDR_NODE, /*!< SS7 SCCP Address */ L_CS7_SCCPADDR_GT_NODE, /*!< SS7 SCCP Global Title */ + L_SCHED_NODE, /*!< CPU Sched related options node */ /* * When adding new nodes to the libosmocore project, these nodes can be * used to avoid ABI changes for unrelated projects. diff --git a/include/osmocom/vty/sched_vty.h b/include/osmocom/vty/sched_vty.h new file mode 100644 index 0000000..6de2914 --- /dev/null +++ b/include/osmocom/vty/sched_vty.h @@ -0,0 +1,37 @@ +/*! \file sched_vty.h + * API to CPU / Threading / Scheduler properties from VTY configuration. + */ +/* (C) 2020 by sysmocom - s.f.m.c. GmbH + * + * Author: Pau Espin Pedrol + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * SPDX-License-Identifier: GPL-2.0+ + */ +#pragma once + +#include + +/*! \defgroup sched_VTY Configuration + * @{ + * \file sched_vty.h + */ + +void osmo_sched_vty_init(void *tall_ctx); +int osmo_sched_vty_apply_localthread(void); + +/*! @} */ diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index 35350cc..5527449 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -12,7 +12,7 @@ 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 \ - tdef_vty.c + sched_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/sched_vty.c b/src/vty/sched_vty.c new file mode 100644 index 0000000..54d7f2a --- /dev/null +++ b/src/vty/sched_vty.c @@ -0,0 +1,560 @@ +/*! \file sched_vty.c + * Implementation to CPU / Threading / Scheduler properties from VTY configuration. + */ +/* (C) 2020 by sysmocom - s.f.m.c. GmbH + * + * Author: Pau Espin Pedrol + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * SPDX-License-Identifier: GPLv2+ + */ + +#define _GNU_SOURCE + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +/*! \addtogroup Tdef_VTY + * + * CPU Scheduling related VTY API. + * + * @{ + * \file sched_vty.c + */ + +enum sched_vty_thread_id { + SCHED_VTY_THREAD_SELF, + SCHED_VTY_THREAD_ALL, + SCHED_VTY_THREAD_ID, + SCHED_VTY_THREAD_NAME, + SCHED_VTY_THREAD_UNKNOWN, +}; + +struct cpu_affinity_it { + struct llist_head entry; + enum sched_vty_thread_id tid_type; + char bufname[64]; + unsigned long mask; + bool delay; +}; + +struct sched_vty_opts { + void *tall_ctx; + int sched_rr_prio; + struct llist_head cpu_affinity_li; + pthread_mutex_t cpu_affinity_li_mutex; +}; + + +static struct sched_vty_opts *sched_vty_opts; + +static struct cmd_node sched_node = { + L_SCHED_NODE, + "%s(config-sched)# ", + 1, +}; + +static bool proc_tid_exists(pid_t tid) +{ + DIR *proc_dir; + struct dirent *entry; + char dirname[100]; + int tid_it; + bool found = false; + + snprintf(dirname, sizeof(dirname), "/proc/%ld/task", (long int)getpid()); + proc_dir = opendir(dirname); + if (!proc_dir) + return false; /*FIXME; print error */ + + while ((entry = readdir(proc_dir))) + { + if(entry->d_name[0] == '.') + continue; + tid_it = atoi(entry->d_name); + if (tid_it == tid) { + found = true; + break; + } + } + + closedir(proc_dir); + return found; +} + +static bool proc_name_exists(const char *name, pid_t *res_pid) +{ + DIR *proc_dir; + struct dirent *entry; + char path[100]; + char buf[17]; /* 15 + \n + \0 */ + int tid_it; + int fd; + pid_t mypid = getpid(); + bool found = false; + int rc; + + *res_pid = 0; + + snprintf(path, sizeof(path), "/proc/%ld/task", (long int)mypid); + proc_dir = opendir(path); + if (!proc_dir) + return false; + + while ((entry = readdir(proc_dir))) + { + if(entry->d_name[0] == '.') + continue; + + tid_it = atoi(entry->d_name); + snprintf(path, sizeof(path), "/proc/%ld/task/%ld/comm", (long int)mypid, (long int) tid_it); + if ((fd = open(path, O_RDONLY)) == -1) + continue; + rc = read(fd, buf, sizeof(buf)); + if (rc >= 0) { + /* Last char contain a '\n', get rid of it */ + buf[rc-1] = '\0'; + buf[rc] = '\0'; + if (strcmp(name, buf) == 0) { + *res_pid = tid_it; + found = true; + } + } + close(fd); + + if (found) + break; + } + + closedir(proc_dir); + return found; +} + +static enum sched_vty_thread_id procname2pid(pid_t *res_pid, const char *str, bool applynow) +{ + size_t i, len; + char *end; + bool is_pid = true; + + if (strcmp(str, "all") == 0) { + *res_pid = 0; + return SCHED_VTY_THREAD_ALL; + } + + if (strcmp(str, "self") == 0) { + *res_pid = 0; + return SCHED_VTY_THREAD_SELF; + } + + len = strlen(str); + for (i = 0; i < len; i++) { + if (!isdigit(str[i])) { + is_pid = false; + break; + } + } + if (is_pid) { + errno = 0; + *res_pid = strtoul(str, &end, 0); + if ((errno == ERANGE && *res_pid == ULONG_MAX) || (errno && !*res_pid) || + str == end) { + return SCHED_VTY_THREAD_UNKNOWN; + } + if (!applynow || proc_tid_exists(*res_pid)) + return SCHED_VTY_THREAD_ID; + else + return SCHED_VTY_THREAD_UNKNOWN; + } + + if (len > 15) { + /* Thread names only allow up to 15+1 null chars, see man pthread_setname_np */ + return SCHED_VTY_THREAD_UNKNOWN; + } + + if (applynow) { + if (proc_name_exists(str, res_pid)) + return SCHED_VTY_THREAD_NAME; + else + return SCHED_VTY_THREAD_UNKNOWN; + } else { + /* assume a thread will be named after it */ + *res_pid = 0; + return SCHED_VTY_THREAD_NAME; + } +} + +int my_sched_setaffinity(enum sched_vty_thread_id tid_type, pid_t pid, unsigned long mask) +{ + DIR *proc_dir; + struct dirent *entry; + char dirname[100]; + int tid_it; + int rc = 0; + unsigned long mask_tmp; + cpu_set_t *cpuset; + size_t cpuset_size; + unsigned int cpu_i = 0; + + cpuset = CPU_ALLOC(64); + cpuset_size = CPU_ALLOC_SIZE(64); + CPU_ZERO_S(cpuset_size, cpuset); + mask_tmp = mask; + while (mask_tmp) { + if (mask_tmp & 0x01) + CPU_SET_S(cpu_i, cpuset_size, cpuset); + mask_tmp >>= 1; + cpu_i++; + } + + if (tid_type != SCHED_VTY_THREAD_ALL) { + LOGP(DLGLOBAL, LOGL_NOTICE, "Setting CPU affinity mask for tid %lu to: 0x%lx\n", + (unsigned long) pid, mask); + + rc = sched_setaffinity(pid, sizeof(cpu_set_t), cpuset); + CPU_FREE(cpuset); + return rc; + } + + snprintf(dirname, sizeof(dirname), "/proc/%ld/task", (long int)getpid()); + proc_dir = opendir(dirname); + if (!proc_dir) { + CPU_FREE(cpuset); + return -EINVAL; + } + + while ((entry = readdir(proc_dir))) + { + if(entry->d_name[0] == '.') + continue; + tid_it = atoi(entry->d_name); + LOGP(DLGLOBAL, LOGL_NOTICE, "Setting CPU affinity mask for tid %lu to: 0x%lx\n", + (unsigned long) tid_it, mask); + + rc = sched_setaffinity(tid_it, sizeof(cpu_set_t), cpuset); + if (rc == -1) + break; + } + + closedir(proc_dir); + CPU_FREE(cpuset); + return rc; + +} + +DEFUN(cfg_sched_cpu_affinity, cfg_sched_cpu_affinity_cmd, + "cpu-affinity (self|all|<0-4294967295>|THREADNAME) <0x00-0xffffffffffffffff> [delay]", /* Allow up to 64 CPUs */ + "Set Target thread to apply the CPU affinty mask\n" + "Set CPU affinity mask of the thread\n" + "CPU affinity mask\n" + "If set, delay applying the affinity mask now and let the app handle it at a later point\n") +{ + unsigned long mask; + const char* str_who = argv[0]; + const char *str_mask = argv[1]; + bool applynow = (argc != 3); + char *end; + int rc; + pid_t pid; + enum sched_vty_thread_id tid_type; + struct cpu_affinity_it *it, *it_next; + + tid_type = procname2pid(&pid, str_who, applynow); + if (tid_type == SCHED_VTY_THREAD_UNKNOWN) { + vty_out(vty, "%% Failed parsing target thread %s%s", + str_who, VTY_NEWLINE); + return CMD_WARNING; + } + + if (tid_type == SCHED_VTY_THREAD_ID && !applynow) { + vty_out(vty, "%% It makes no sense to delay applying cpu-affinity on tid %lu%s", + (unsigned long)pid, VTY_NEWLINE); + return CMD_WARNING; + } + if (tid_type == SCHED_VTY_THREAD_ALL && !applynow) { + vty_out(vty, "%% It makes no sense to delay applying cpu-affinity on all threads%s", + VTY_NEWLINE); + return CMD_WARNING; + } + + errno = 0; + mask = strtoul(str_mask, &end, 0); + if ((errno == ERANGE && mask == ULONG_MAX) || (errno && !mask) || + str_mask == end) { + vty_out(vty, "%% Failed parsing CPU Affinity Mask %s%s", + str_mask, VTY_NEWLINE); + return CMD_WARNING; + } + + if (applynow) { + rc = my_sched_setaffinity(tid_type, pid, mask); + if (rc == -1) { + vty_out(vty, "%% Failed setting sched CPU Affinity Mask 0x%lx: %s%s", + mask, strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + } + + /* Keep history of cmds applied to be able to rewrite config. If PID was passed + directly it makes no sense to store it since PIDs are temporary */ + if (tid_type == SCHED_VTY_THREAD_SELF || + tid_type == SCHED_VTY_THREAD_ALL || + tid_type == SCHED_VTY_THREAD_NAME) { + pthread_mutex_lock(&sched_vty_opts->cpu_affinity_li_mutex); + + /* Drop previous entries matching, since they will be overwritten */ + llist_for_each_entry_safe(it, it_next, &sched_vty_opts->cpu_affinity_li, entry) { + if (strcmp(it->bufname, str_who) == 0) { + llist_del(&it->entry); + talloc_free(it); + break; + } + } + it = talloc_zero(sched_vty_opts->tall_ctx, struct cpu_affinity_it); + OSMO_STRLCPY_ARRAY(it->bufname, str_who); + it->tid_type = tid_type; + it->mask = mask; + it->delay = !applynow; + llist_add_tail(&it->entry, &sched_vty_opts->cpu_affinity_li); + + pthread_mutex_unlock(&sched_vty_opts->cpu_affinity_li_mutex); + } + + return CMD_SUCCESS; +} + +static int set_sched_rr(unsigned int prio) +{ + struct sched_param param; + int rc; + memset(¶m, 0, sizeof(param)); + param.sched_priority = prio; + LOGP(DLGLOBAL, LOGL_NOTICE, "Setting SCHED_RR priority %d\n", param.sched_priority); + rc = sched_setscheduler(getpid(), SCHED_RR, ¶m); + if (rc == -1) { + LOGP(DLGLOBAL, LOGL_FATAL, "Setting SCHED_RR priority %d failed: %s\n", + param.sched_priority, strerror(errno)); + return -1; + } + return 0; +} + +DEFUN(cfg_sched_policy, cfg_sched_policy_cmd, + "policy rr <1-32>", + "Set the scheduling policy to use for the process\n" + "Use the SCHED_RR real-time scheduling algorithm\n" + "Use the SCHED_RR real-time priority\n" + "Real time priority\n") +{ + sched_vty_opts->sched_rr_prio = atoi(argv[0]); + + if (set_sched_rr(sched_vty_opts->sched_rr_prio) < 0) { + vty_out(vty, "%% Failed setting SCHED_RR priority %d%s", + sched_vty_opts->sched_rr_prio, VTY_NEWLINE); + return CMD_WARNING; + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_sched, + cfg_sched_cmd, + "sched", "Configure CPU Scheduler related settings") +{ + vty->index = NULL; + vty->node = L_SCHED_NODE; + + return CMD_SUCCESS; +} + +DEFUN(show_sched_threads, show_sched_threads_cmd, + "show sched threads", + SHOW_STR + "Show Sched section information\n" + "Show information about running threads)\n") +{ + DIR *proc_dir; + struct dirent *entry; + char path[100]; + char buf[16]; + int tid_it; + int fd; + pid_t mypid = getpid(); + int rc; + uint64_t mask; + cpu_set_t *cpuset; + unsigned int cpu_i; + + vty_out(vty, "Thread list for PID %lu:%s", (unsigned long) mypid, VTY_NEWLINE); + + snprintf(path, sizeof(path), "/proc/%ld/task", (long int)mypid); + proc_dir = opendir(path); + if (!proc_dir) { + vty_out(vty, "%% Failed opening dir%s%s", buf, VTY_NEWLINE); + return CMD_WARNING; + } + + while ((entry = readdir(proc_dir))) + { + if(entry->d_name[0] == '.') + continue; + + tid_it = atoi(entry->d_name); + snprintf(path, sizeof(path), "/proc/%ld/task/%ld/comm", (long int)mypid, (long int) tid_it); + if ((fd = open(path, O_RDONLY)) != -1) { + rc = read(fd, buf, sizeof(buf)); + if (rc >= 0) { + /* Last char contain a '\n', get rid of it */ + buf[rc-1] = '\0'; + } + close(fd); + } else { + buf[0] = '\0'; + } + + mask = 0; + cpuset = CPU_ALLOC(64); + CPU_ZERO_S(CPU_ALLOC_SIZE(64), cpuset); + if (sched_getaffinity(tid_it, CPU_ALLOC_SIZE(64), cpuset) == 0) { + for (cpu_i = 0; cpu_i < 64; cpu_i++) { + if (CPU_ISSET(cpu_i, cpuset)) + mask |= (1 << cpu_i); + } + } + CPU_FREE(cpuset); + + vty_out(vty, " TID: %lu, NAME: '%s', cpu-affinity: 0x%" PRIx64 "%s", (unsigned long) tid_it, buf, mask, VTY_NEWLINE); + } + + closedir(proc_dir); + return CMD_SUCCESS; +} + +static int config_write_sched(struct vty *vty) +{ + struct cpu_affinity_it *it; + + /* Only add the node if there's something to write under it */ + if (sched_vty_opts->sched_rr_prio || !llist_empty(&sched_vty_opts->cpu_affinity_li)) + vty_out(vty, "sched%s", VTY_NEWLINE); + + if (sched_vty_opts->sched_rr_prio) + vty_out(vty, " policy rr %d%s", sched_vty_opts->sched_rr_prio, VTY_NEWLINE); + + llist_for_each_entry(it, &sched_vty_opts->cpu_affinity_li, entry) { + vty_out(vty, " cpu-affinity %s 0x%lx%s%s", it->bufname, it->mask, + it->delay ? " delay" : "", VTY_NEWLINE); + } + + return CMD_SUCCESS; +} + +/*! Initialize sched VTY nodes + * \param[in] vty VTY context for vty_out() of error messages. + * \param[in] tdefs Array of timer definitions to look up T timer. + * \param[in] T_str Argument string. It is not validated, expected to be checked by VTY input. + * \return 0 on success, non-zero on error. + */ +int osmo_sched_vty_init(void *tall_ctx) +{ + OSMO_ASSERT(!sched_vty_opts); /* assert only called once */ + + sched_vty_opts = talloc_zero(tall_ctx, struct sched_vty_opts); + sched_vty_opts->tall_ctx = tall_ctx; + INIT_LLIST_HEAD(&sched_vty_opts->cpu_affinity_li); + pthread_mutex_init(&sched_vty_opts->cpu_affinity_li_mutex, NULL); + + install_element(CONFIG_NODE, &cfg_sched_cmd); + install_node(&sched_node, config_write_sched); + + install_element(L_SCHED_NODE, &cfg_sched_policy_cmd); + install_element(L_SCHED_NODE, &cfg_sched_cpu_affinity_cmd); + + install_element_ve(&show_sched_threads_cmd); + return 0; +} + +/*! Apply cpu-affinity on calling thread based on VTY configuration + * \return 0 on success, non-zero on error. + */ +int osmo_sched_vty_apply_localthread(void) +{ + struct cpu_affinity_it *it; + char name[17]; /* 15 + \n + \0 */ + bool has_name = false; + bool mask_found = false; + unsigned long mask; + int rc; + + /* Assert subsystem was inited and structs are preset */ + OSMO_ASSERT(sched_vty_opts); + + if (pthread_getname_np(pthread_self(), name, sizeof(name)) == 0) + has_name = true; + + /* Get latest matching mask for the thread */ + pthread_mutex_lock(&sched_vty_opts->cpu_affinity_li_mutex); + llist_for_each_entry(it, &sched_vty_opts->cpu_affinity_li, entry) { + switch (it->tid_type) { + case SCHED_VTY_THREAD_SELF: + continue; /* self to the VTY thread, not us */ + case SCHED_VTY_THREAD_ALL: + mask_found = true; + mask = it->mask; + break; + case SCHED_VTY_THREAD_NAME: + if (!has_name) + continue; + if (strcmp(name, it->bufname) != 0) + continue; + mask_found = true; + mask = it->mask; + break; + default: + OSMO_ASSERT(0); + } + } + pthread_mutex_unlock(&sched_vty_opts->cpu_affinity_li_mutex); + + if (!mask_found) + return 0; + + rc = my_sched_setaffinity(SCHED_VTY_THREAD_SELF, 0, mask); + if (rc == -1) + LOGP(DLGLOBAL, LOGL_FATAL, "Setting cpu-affinity mask 0x%lx failed: %s\n", + mask, strerror(errno)); + return rc; +} + +/*! @} */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If76a4bd2cc7b3c7adf5d84790a944d78be70e10a Gerrit-Change-Number: 19442 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 16:20:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jul 2020 16:20:06 +0000 Subject: Change in libosmocore[master]: vty: Introduce support to set cpu-affinity and scheduler policy In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmocore/+/19442 ) Change subject: vty: Introduce support to set cpu-affinity and scheduler policy ...................................................................... vty: Introduce support to set cpu-affinity and scheduler policy Process willing to support this kind of configuration through VTY simply need to call "osmo_sched_vty_init(tall_ctx);" during startup to register the commands. For multithreaded processes, new threads willing to get their cpu-affinity mask according to VTY config should call osmo_sched_vty_apply_localthread() (potentially after setting the thread name through pthread_setname_np()). Related: SYS#4986 Change-Id: If76a4bd2cc7b3c7adf5d84790a944d78be70e10a --- M include/Makefile.am M include/osmocom/vty/command.h A include/osmocom/vty/sched_vty.h M src/vty/Makefile.am A src/vty/sched_vty.c 5 files changed, 600 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/19442/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If76a4bd2cc7b3c7adf5d84790a944d78be70e10a Gerrit-Change-Number: 19442 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 16:23:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jul 2020 16:23:03 +0000 Subject: Change in libosmocore[master]: vty: Introduce support to set cpu-affinity and scheduler policy In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/c/libosmocore/+/19442 ) Change subject: vty: Introduce support to set cpu-affinity and scheduler policy ...................................................................... vty: Introduce support to set cpu-affinity and scheduler policy Process willing to support this kind of configuration through VTY simply need to call "osmo_sched_vty_init(tall_ctx);" during startup to register the commands. For multithreaded processes, new threads willing to get their cpu-affinity mask according to VTY config should call osmo_sched_vty_apply_localthread() (potentially after setting the thread name through pthread_setname_np()). Related: SYS#4986 Change-Id: If76a4bd2cc7b3c7adf5d84790a944d78be70e10a --- M include/Makefile.am M include/osmocom/vty/command.h A include/osmocom/vty/sched_vty.h M src/vty/Makefile.am A src/vty/sched_vty.c 5 files changed, 598 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/19442/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If76a4bd2cc7b3c7adf5d84790a944d78be70e10a Gerrit-Change-Number: 19442 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 17:03:29 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jul 2020 17:03:29 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters: Introduce vty_sched.adoc chapter References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19443 ) Change subject: chapters: Introduce vty_sched.adoc chapter ...................................................................... chapters: Introduce vty_sched.adoc chapter Documents new features added in libosmocore.git Change-Id If76a4bd2cc7b3c7adf5d84790a944d78be70e10a. This file will be imported in user manuals of programs using the mentioned libosmovty features. Related: SYS#4986 Change-Id: Icd75769ef630c3fa985fc5e2154d5521689cdd3c --- A common/chapters/vty_sched.adoc 1 file changed, 117 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/43/19443/1 diff --git a/common/chapters/vty_sched.adoc b/common/chapters/vty_sched.adoc new file mode 100644 index 0000000..3824950 --- /dev/null +++ b/common/chapters/vty_sched.adoc @@ -0,0 +1,117 @@ +[[vty_sched]] +== VTY Process and Thread management + +Most Osmocom programs provide, some support to tune some system +settings related to the running process, its threads, its scheduling policies, +etc. + +All of these settings can be configured through the VTY, either during startup +by means of usual config files or through direct human interaction at the telnet +VTY interface while the process is running. + +[[vty_sched_policy]] +=== Scheduling Policy + +The scheduler to use as well as some of its properties (such as realtime +priority) can be configured at any time for the entire process. This sort of +functionality is useful in order to increase priority for processes running +time-constrained procedures, such as those acting on the Um interface, like +_osmo-trx_ or _osmo-bts_, where use of this feature is highly recommended. + +.Example: Set process to use RR scheduler +---- +sched + policy rr 1 <1> +---- +<1> Configure process to use _SCHED_RR_ policy with real time priority 1 + +[[vty_sched_cpu_affinity_mask]] +=== CPU-Affinity Mask + +Most operating systems allow for some sort of configuration on restricting the +amount of CPUs a given process or thread can run on. The procedure is sometimes +called as _cpu-pinning_ since it allows to keep different processes pinned on a +subset of CPUs to make sure the scheduler won't run two CPU-hungry processes on +the same CPU. + +The set of CPUs where each thread is allowed to run on is expressed by means of +a bitmask in hexadecimal representation, where the right most bit relates to +CPU 0, and the Nth most significant bit relates to CPU _N-1_. Setting the bit +means the process is allowed to run on that CPU, while clearing it means the +process is forbidden to run on that CPU. + +Hence, for instance a cpu-affinity mask of _0x00_ means the thread is not +allowed on any CPU, which will cause the thread to stall until a new value is +applied. A mask of _0x01_ means the thread is only allowed to run on the 1st CPU +(CPU 0). A mask of _0xff00_ means CPUs 8-15 are allowed, while 0-7 are not. + +For single-threaded processes (mot of Osmocom are), it is usually enough to set +this line in VTY config file as follows: +---- +sched + cpu-affinity self 0x01 <1> +---- +<1> Allow main thread (the one managing the VTY) only on CPU 0 + +Or otherwise: +---- +sched + cpu-affinity all 0x01 <1> +---- +<1> Allow all threads only on CPU 0 + + +For multi-threaded processes, it may be desired to run some threads on a subset +of CPUs while another subset may run on another one. In order to identify +threads, one can either use the TID of the thread (each thread has its own PID +in Linux), or its specific Thread Name in case it has been set by the +application. + +The related information on all threads available in the process can be listed +through VTY. This allows identifying quickly the different threads, its current +cpu-affinity mask, etc. + +.Example: Get osmo-trx Thread list information from VTY +---- +OsmoTRX> show sched threads +Thread list for PID 338609: + TID: 338609, NAME: 'osmo-trx-uhd', cpu-affinity: 0x3 + TID: 338610, NAME: 'osmo-trx-uhd', cpu-affinity: 0x3 + TID: 338611, NAME: 'osmo-trx-uhd', cpu-affinity: 0x3 + TID: 338629, NAME: 'osmo-trx-uhd', cpu-affinity: 0x3 + TID: 338630, NAME: 'osmo-trx-uhd', cpu-affinity: 0x3 + TID: 338631, NAME: 'osmo-trx-uhd', cpu-affinity: 0x3 + TID: 338634, NAME: 'UHDAsyncEvent', cpu-affinity: 0x3 + TID: 338635, NAME: 'TxLower', cpu-affinity: 0x3 + TID: 338636, NAME: 'RxLower', cpu-affinity: 0x3 + TID: 338637, NAME: 'RxUpper0', cpu-affinity: 0x3 + TID: 338638, NAME: 'TxUpper0', cpu-affinity: 0x3 + TID: 338639, NAME: 'RxUpper1', cpu-affinity: 0x3 + TID: 338640, NAME: 'TxUpper1', cpu-affinity: 0x3 +---- + +At runtime, one can change the cpu-affinity mask for a given thread identifying +it by either TID or name: + +.Example: Set CPU-affinity from VTY telnet interface +---- +OsmoTRX> cpu-affinity TxLower 0x02 <1> +OsmoTRX> cpu-affinity TxLower 0x03 <2> +---- +<1> Allow thread named _TxLower_ (_338635_) only on CPU 1 +<2> Allow with TID _338636_ (_RxLower_) only on CPU 0 and 1 + +Since thread names are set dynamically by the process during startup or at a +later point after creating the thread itself, One may need to specify in the +config file that the mask must be applied by the thread itself once being +configured rather than trying to apply it immediately. To specify so, the +_delay_ keyword is using when configuring in the VTY. If the _delay_ keyword is +not used, the VTY will reprot and error and fail at startup when trying to apply +a cpu-affinity mask for a yet-to-be-created thread. + +.Example: Set CPU-affinity from VTY config file +---- +sched + cpu-affinity TxLower 0x01 delay <1> +---- +<1> Allow thread named _TxLower_ (_338635_) only on CPU 1. It will be applied by the thread itself when created. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Icd75769ef630c3fa985fc5e2154d5521689cdd3c Gerrit-Change-Number: 19443 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 17:11:23 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jul 2020 17:11:23 +0000 Subject: Change in osmo-bts[master]: common: Support setting rt prio through new libosmovty sched VTY cmds References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/19444 ) Change subject: common: Support setting rt prio through new libosmovty sched VTY cmds ...................................................................... common: Support setting rt prio through new libosmovty sched VTY cmds We gain other features from libosmovty for free, like configuring cpu-affinity of the only thread in the process. Depends: libosmocore.git Change-Id If76a4bd2cc7b3c7adf5d84790a944d78be70e10a Depends: osmo-gsm-masnuals.git Change-Id Icd75769ef630c3fa985fc5e2154d5521689cdd3c Related: SYS#4986 Change-Id: Ice46e406b84fa11afcc7ba31e521e7677df73cf3 --- M TODO-RELEASE M doc/manuals/osmobts-usermanual.adoc M src/common/main.c 3 files changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/44/19444/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 1dd5e79..df3a695 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1 +1,2 @@ -* update libosmocore dependency to > 1.3.x for lapdm_channel_init3() +* update libosmocore dependency to > 1.3.x for lapdm_channel_init3(), osmo_sched_vty_init() +* update osmo-gsm-manuals dependency to > 0.3.0 for vty_sched.adoc include. diff --git a/doc/manuals/osmobts-usermanual.adoc b/doc/manuals/osmobts-usermanual.adoc index 55087b2..2c1d1b5 100644 --- a/doc/manuals/osmobts-usermanual.adoc +++ b/doc/manuals/osmobts-usermanual.adoc @@ -30,6 +30,8 @@ include::{srcdir}/chapters/architecture.adoc[] +include::./common/chapters/vty_sched.adoc[] + include::./common/chapters/trx_if.adoc[] include::./common/chapters/control_if.adoc[] diff --git a/src/common/main.c b/src/common/main.c index 6d8088c..6681174 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -74,7 +75,7 @@ " -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" - " -r --realtime PRIO Use SCHED_RR with the specified priority\n" + " -r --realtime PRIO Use SCHED_RR with the specified priority (deprecated, use VTY instead)\n" " -i --gsmtap-ip The destination IP used for GSMTAP.\n" ); bts_model_print_help(); @@ -145,6 +146,8 @@ break; case 'r': rt_prio = atoi(optarg); + fprintf(stderr, "Parameter -r is deprecated, use VTY sched " + "node setting 'policy rr %d' instead\n", rt_prio); break; case 'i': gsmtap_ip = optarg; @@ -238,6 +241,7 @@ osmo_stats_init(tall_bts_ctx); vty_init(&bts_vty_info); ctrl_vty_init(tall_bts_ctx); + osmo_sched_vty_init(tall_bts_ctx); rate_ctr_init(tall_bts_ctx); handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19444 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ice46e406b84fa11afcc7ba31e521e7677df73cf3 Gerrit-Change-Number: 19444 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 17:11:33 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 29 Jul 2020 17:11:33 +0000 Subject: Change in osmo-trx[master]: Use new libosmovty sched config features References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/19445 ) Change subject: Use new libosmovty sched config features ...................................................................... Use new libosmovty sched config features Using the new libosmovty features allow for: * Setting different cpu-affinity masks for each thread in the process, both at startup through .cfg file as well as changing it at runtime. * Unified VTy interface to change the scheduling policy of the process inherited by all osmocom processes enabling the feature. Depends: libosmocore.git Change-Id If76a4bd2cc7b3c7adf5d84790a944d78be70e10a Depends: osmo-gsm-masnuals.git Change-Id Icd75769ef630c3fa985fc5e2154d5521689cdd3c Related: SYS#4986 Change-Id: I3798603779b88ea37da03033cf7737a6e4751d6e --- M CommonLibs/trx_vty.c A TODO-RELEASE M Transceiver52M/Transceiver.cpp M Transceiver52M/device/uhd/UHDDevice.cpp M Transceiver52M/osmo-trx.cpp M Transceiver52M/radioInterface.cpp M doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg M doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg M doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg M doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg M doc/manuals/osmotrx-usermanual.adoc 11 files changed, 32 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/45/19445/1 diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index e37ecaf..1cf4f5a 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -291,7 +291,7 @@ return CMD_SUCCESS; } -DEFUN(cfg_rt_prio, cfg_rt_prio_cmd, +DEFUN_DEPRECATED(cfg_rt_prio, cfg_rt_prio_cmd, "rt-prio <1-32>", "Set the SCHED_RR real-time priority\n" "Real time priority\n") @@ -299,6 +299,8 @@ struct trx_ctx *trx = trx_from_vty(vty); trx->cfg.sched_rr = atoi(argv[0]); + vty_out (vty, "%% 'rt-prio %u' is deprecated, use 'policy rr %u' under 'sched' node instead%s", + trx->cfg.sched_rr, trx->cfg.sched_rr, VTY_NEWLINE); return CMD_SUCCESS; } diff --git a/TODO-RELEASE b/TODO-RELEASE new file mode 100644 index 0000000..9ddafc2 --- /dev/null +++ b/TODO-RELEASE @@ -0,0 +1,2 @@ +* update libosmocore dependency to > 1.3.x for osmo_sched_vty_init(), osmo_sched_vty_apply_localthread() +* update osmo-gsm-manuals dependency to > 0.3.0 for vty_sched.adoc include. diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index c3ef377..61d17ac 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -37,6 +37,7 @@ #include #include #include +#include } #ifdef HAVE_CONFIG_H @@ -1273,6 +1274,7 @@ snprintf(thread_name, 16, "RxUpper%zu", num); set_selfthread_name(thread_name); + OSMO_ASSERT(osmo_sched_vty_apply_localthread() == 0); while (1) { if (!trx->driveReceiveFIFO(num)) { @@ -1288,6 +1290,7 @@ void *RxLowerLoopAdapter(Transceiver *transceiver) { set_selfthread_name("RxLower"); + OSMO_ASSERT(osmo_sched_vty_apply_localthread() == 0); while (1) { if (!transceiver->driveReceiveRadio()) { @@ -1303,6 +1306,7 @@ void *TxLowerLoopAdapter(Transceiver *transceiver) { set_selfthread_name("TxLower"); + OSMO_ASSERT(osmo_sched_vty_apply_localthread() == 0); while (1) { transceiver->driveTxFIFO(); @@ -1321,6 +1325,7 @@ snprintf(thread_name, 16, "TxUpper%zu", num); set_selfthread_name(thread_name); + OSMO_ASSERT(osmo_sched_vty_apply_localthread() == 0); while (1) { if (!trx->driveTxPriorityQueue(num)) { diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 854ed2e..23feac2 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -34,7 +34,9 @@ #endif extern "C" { +#include #include +#include } #ifdef USE_UHD_3_11 @@ -150,6 +152,7 @@ void *async_event_loop(uhd_device *dev) { set_selfthread_name("UHDAsyncEvent"); + OSMO_ASSERT(osmo_sched_vty_apply_localthread() == 0); while (1) { dev->recv_async_msg(); diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 9fcbda5..9a391db 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -55,6 +55,7 @@ #include #include #include +#include #include "convolve.h" #include "convert.h" @@ -435,7 +436,9 @@ int rc; memset(¶m, 0, sizeof(param)); param.sched_priority = prio; - LOG(INFO) << "Setting SCHED_RR priority " << param.sched_priority; + LOG(INFO) << "Setting SCHED_RR priority " << param.sched_priority + << ". This setting is DEPRECATED, please use 'policy rr " << param.sched_priority + << "' under the 'sched' VTY node instead."; rc = sched_setscheduler(getpid(), SCHED_RR, ¶m); if (rc != 0) { LOG(ERROR) << "Config: Setting SCHED_RR failed"; @@ -589,6 +592,7 @@ vty_init(&g_vty_info); logging_vty_add_cmds(); ctrl_vty_init(tall_trx_ctx); + osmo_sched_vty_init(tall_trx_ctx); trx_vty_init(g_trx_ctx); osmo_talloc_vty_add_cmds(); diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index adc2ee7..f0fdc3f 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -27,6 +27,9 @@ #include extern "C" { +#include +#include + #include "convert.h" } @@ -171,6 +174,7 @@ void *AlignRadioServiceLoopAdapter(RadioInterface *radioInterface) { set_selfthread_name("AlignRadio"); + OSMO_ASSERT(osmo_sched_vty_apply_localthread() == 0); while (1) { sleep(60); radioInterface->alignRadio(); diff --git a/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg index 6d787f6..e9929bb 100644 --- a/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg +++ b/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg @@ -9,13 +9,14 @@ line vty no login ! +sched + policy rr 18 trx bind-ip 127.0.0.1 remote-ip 127.0.0.1 egprs disable tx-sps 4 rx-sps 4 - rt-prio 18 chan 0 tx-path BAND1 rx-path LNAW diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg index 6d787f6..e9929bb 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg @@ -9,13 +9,14 @@ line vty no login ! +sched + policy rr 18 trx bind-ip 127.0.0.1 remote-ip 127.0.0.1 egprs disable tx-sps 4 rx-sps 4 - rt-prio 18 chan 0 tx-path BAND1 rx-path LNAW diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg index 2e45da9..d91f370 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg @@ -9,6 +9,8 @@ line vty no login ! +sched + policy rr 18 trx bind-ip 127.0.0.1 remote-ip 127.0.0.1 @@ -17,6 +19,5 @@ tx-sps 4 rx-sps 4 rssi-offset 38 - rt-prio 18 chan 0 chan 1 diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg index 1ecaec2..7fb781d 100644 --- a/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg +++ b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg @@ -9,6 +9,8 @@ line vty no login ! +sched + policy rr 18 trx bind-ip 127.0.0.1 remote-ip 127.0.0.1 @@ -19,6 +21,4 @@ tx-sps 4 rx-sps 4 clock-ref external - rt-prio 18 chan 0 - diff --git a/doc/manuals/osmotrx-usermanual.adoc b/doc/manuals/osmotrx-usermanual.adoc index a17a899..aa9407b 100644 --- a/doc/manuals/osmotrx-usermanual.adoc +++ b/doc/manuals/osmotrx-usermanual.adoc @@ -31,6 +31,8 @@ include::{srcdir}/chapters/code-architecture.adoc[] +include::./common/chapters/vty_sched.adoc[] + include::./common/chapters/trx_if.adoc[] include::./common/chapters/port_numbers.adoc[] -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3798603779b88ea37da03033cf7737a6e4751d6e Gerrit-Change-Number: 19445 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 18:12:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 18:12:25 +0000 Subject: Change in osmo-iuh[master]: Provide more context when logging "Error in ANY_fromType_aper" References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/19446 ) Change subject: Provide more context when logging "Error in ANY_fromType_aper" ...................................................................... Provide more context when logging "Error in ANY_fromType_aper" Let's add the type name whose encoding failed to give us some kind of a clue what's happening in those situations. Change-Id: I802677ba7164a4d3382d4bc00f5e1c7ab7067d89 --- M src/ranap_common.c M src/rua_common.c M src/sabp_common.c 3 files changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/46/19446/1 diff --git a/src/ranap_common.c b/src/ranap_common.c index 46203e0..4ada7ff 100644 --- a/src/ranap_common.c +++ b/src/ranap_common.c @@ -331,7 +331,7 @@ pdu.choice.initiatingMessage.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.initiatingMessage.value, td, sptr); if (rc < 0) { - LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -358,7 +358,7 @@ pdu.choice.successfulOutcome.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr); if (rc < 0) { - LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -385,7 +385,7 @@ pdu.choice.unsuccessfulOutcome.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.unsuccessfulOutcome.value, td, sptr); if (rc < 0) { - LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -412,7 +412,7 @@ pdu.choice.outcome.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.outcome.value, td, sptr); if (rc < 0) { - LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -440,7 +440,7 @@ rc = ANY_fromType_aper(&buff->value, type, sptr); if (rc < 0) { - LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", type->name); FREEMEM(buff); return NULL; } @@ -474,14 +474,14 @@ rc = ANY_fromType_aper(&buff->firstValue, type1, sptr1); if (rc < 0) { - LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", type1->name); FREEMEM(buff); return NULL; } rc = ANY_fromType_aper(&buff->secondValue, type2, sptr2); if (rc < 0) { - LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", type2->name); ASN_STRUCT_FREE(asn_DEF_RANAP_ProtocolIE_FieldPair, buff); return NULL; } diff --git a/src/rua_common.c b/src/rua_common.c index 3c9d773..77ac591 100644 --- a/src/rua_common.c +++ b/src/rua_common.c @@ -140,7 +140,7 @@ pdu.choice.initiatingMessage.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.initiatingMessage.value, td, sptr); if (rc < 0) { - LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -163,7 +163,7 @@ pdu.choice.successfulOutcome.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr); if (rc < 0) { - LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -186,7 +186,7 @@ pdu.choice.unsuccessfulOutcome.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.unsuccessfulOutcome.value, td, sptr); if (rc < 0) { - LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -211,7 +211,7 @@ rc = ANY_fromType_aper(&buff->value, type, sptr); if (rc < 0) { - LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", type->name); FREEMEM(buff); return NULL; } diff --git a/src/sabp_common.c b/src/sabp_common.c index cdb0e32..7aee4b7 100644 --- a/src/sabp_common.c +++ b/src/sabp_common.c @@ -114,7 +114,7 @@ pdu.choice.initiatingMessage.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.initiatingMessage.value, td, sptr); if (rc < 0) { - LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -141,7 +141,7 @@ pdu.choice.successfulOutcome.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr); if (rc < 0) { - LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -168,7 +168,7 @@ pdu.choice.unsuccessfulOutcome.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.unsuccessfulOutcome.value, td, sptr); if (rc < 0) { - LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -195,7 +195,7 @@ rc = ANY_fromType_aper(&buff->value, type, sptr); if (rc < 0) { - LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", type->name); FREEMEM(buff); return NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/19446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I802677ba7164a4d3382d4bc00f5e1c7ab7067d89 Gerrit-Change-Number: 19446 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 19:28:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 19:28:19 +0000 Subject: Change in libosmo-sccp[master]: SCOC: log message type that was received for unknown local reference References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19447 ) Change subject: SCOC: log message type that was received for unknown local reference ...................................................................... SCOC: log message type that was received for unknown local reference A message like DLSCCP <0011> sccp_scoc.c:1653 Cannot find connection for local reference 1154 is not incredibly useful, as you don't even know what type of SCCP/SUA message had been received. Change-Id: I18af9d7e9ea4877b13bf98a980b0ba97c5ed6599 --- M src/sccp_scoc.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/47/19447/1 diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 015850e..1ce08f8 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -1649,8 +1649,8 @@ conn_id = xua_msg_get_u32(xua, SUA_IEI_DEST_REF); conn = conn_find_by_id(inst, conn_id); if (!conn) { - LOGP(DLSCCP, LOGL_NOTICE, "Cannot find connection for " - "local reference %u\n", conn_id); + LOGP(DLSCCP, LOGL_NOTICE, "Received %s: Cannot find connection for " + "local reference %u\n", xua_hdr_dump(xua, &xua_dialect_sua), conn_id); sccp_scoc_rx_unass_local_ref(inst, xua); return; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I18af9d7e9ea4877b13bf98a980b0ba97c5ed6599 Gerrit-Change-Number: 19447 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 19:51:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 19:51:38 +0000 Subject: Change in osmo-iuh[master]: Provide more context when logging "Error in ANY_fromType_aper" In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/19446 ) Change subject: Provide more context when logging "Error in ANY_fromType_aper" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/19446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I802677ba7164a4d3382d4bc00f5e1c7ab7067d89 Gerrit-Change-Number: 19446 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 19:51:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 19:51:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 19:51:40 +0000 Subject: Change in osmo-iuh[master]: Provide more context when logging "Error in ANY_fromType_aper" In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/19446 ) Change subject: Provide more context when logging "Error in ANY_fromType_aper" ...................................................................... Provide more context when logging "Error in ANY_fromType_aper" Let's add the type name whose encoding failed to give us some kind of a clue what's happening in those situations. Change-Id: I802677ba7164a4d3382d4bc00f5e1c7ab7067d89 --- M src/ranap_common.c M src/rua_common.c M src/sabp_common.c 3 files changed, 15 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/ranap_common.c b/src/ranap_common.c index 46203e0..4ada7ff 100644 --- a/src/ranap_common.c +++ b/src/ranap_common.c @@ -331,7 +331,7 @@ pdu.choice.initiatingMessage.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.initiatingMessage.value, td, sptr); if (rc < 0) { - LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -358,7 +358,7 @@ pdu.choice.successfulOutcome.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr); if (rc < 0) { - LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -385,7 +385,7 @@ pdu.choice.unsuccessfulOutcome.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.unsuccessfulOutcome.value, td, sptr); if (rc < 0) { - LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -412,7 +412,7 @@ pdu.choice.outcome.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.outcome.value, td, sptr); if (rc < 0) { - LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -440,7 +440,7 @@ rc = ANY_fromType_aper(&buff->value, type, sptr); if (rc < 0) { - LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", type->name); FREEMEM(buff); return NULL; } @@ -474,14 +474,14 @@ rc = ANY_fromType_aper(&buff->firstValue, type1, sptr1); if (rc < 0) { - LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", type1->name); FREEMEM(buff); return NULL; } rc = ANY_fromType_aper(&buff->secondValue, type2, sptr2); if (rc < 0) { - LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRANAP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", type2->name); ASN_STRUCT_FREE(asn_DEF_RANAP_ProtocolIE_FieldPair, buff); return NULL; } diff --git a/src/rua_common.c b/src/rua_common.c index 3c9d773..77ac591 100644 --- a/src/rua_common.c +++ b/src/rua_common.c @@ -140,7 +140,7 @@ pdu.choice.initiatingMessage.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.initiatingMessage.value, td, sptr); if (rc < 0) { - LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -163,7 +163,7 @@ pdu.choice.successfulOutcome.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr); if (rc < 0) { - LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -186,7 +186,7 @@ pdu.choice.unsuccessfulOutcome.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.unsuccessfulOutcome.value, td, sptr); if (rc < 0) { - LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -211,7 +211,7 @@ rc = ANY_fromType_aper(&buff->value, type, sptr); if (rc < 0) { - LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DRUA, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", type->name); FREEMEM(buff); return NULL; } diff --git a/src/sabp_common.c b/src/sabp_common.c index cdb0e32..7aee4b7 100644 --- a/src/sabp_common.c +++ b/src/sabp_common.c @@ -114,7 +114,7 @@ pdu.choice.initiatingMessage.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.initiatingMessage.value, td, sptr); if (rc < 0) { - LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -141,7 +141,7 @@ pdu.choice.successfulOutcome.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr); if (rc < 0) { - LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -168,7 +168,7 @@ pdu.choice.unsuccessfulOutcome.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.unsuccessfulOutcome.value, td, sptr); if (rc < 0) { - LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", td->name); return NULL; } @@ -195,7 +195,7 @@ rc = ANY_fromType_aper(&buff->value, type, sptr); if (rc < 0) { - LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DSABP, LOGL_ERROR, "Error in ANY_fromType_aper (%s)\n", type->name); FREEMEM(buff); return NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/19446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I802677ba7164a4d3382d4bc00f5e1c7ab7067d89 Gerrit-Change-Number: 19446 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 19:53:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 19:53:19 +0000 Subject: Change in libosmocore[master]: vty: Allow larger strlen parsing numerical range values In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19423 ) Change subject: vty: Allow larger strlen parsing numerical range values ...................................................................... Patch Set 2: > Patch Set 1: > > > Patch Set 1: > > > > well, the 64bit mask would only work on a 64bit arch, right? > > > > Where do we need numeric values that large? > > to express hex masks, like cpu-affinity mask. This allows for systems with up to 64 cores (we could thing about extending it to 128 if needed). I would argue in favor of explicitly adding single CPU numbers to a set with one "add" per VTY line/command. Systems with 256 logical cores are not unheard of, 64 certainly isn't going to cut it even with hardware available to day. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id053acd6bf5e8fb7c468959f0b78b778f8c5e6c2 Gerrit-Change-Number: 19423 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 19:53:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 19:55:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 19:55:17 +0000 Subject: Change in libosmocore[master]: vty: Allow using hex and octal representations in cmd numeric ranges In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19422 ) Change subject: vty: Allow using hex and octal representations in cmd numeric ranges ...................................................................... Patch Set 2: Code-Review-1 > I am using this to define <0x00-0xffffffffff> cpu-affinity masks, to store them that way upon show running-config and then to allow to set cpu-affinity-masks also as hex, which is a lot more comfortable. I'm sorry, but I really don't like hex numeric ranges in the VTY syntax. It is a strong deviation of anything I've seen in Cisco, and also particularly from the quagga/zebra VTY that we inherit. If nobody else of the reviewers has any issues, I am happy to defer to the majority. I'd prefer not to touch the VTY numeric range code and work without hex-masks but by specifying indivudal CPU IDs or CPU ID ranges, ... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia2b7fbbf5502c28374c21dbff548232680da27d4 Gerrit-Change-Number: 19422 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 19:55:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 19:55:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 19:55:22 +0000 Subject: Change in libosmocore[master]: vty: Allow larger strlen parsing numerical range values In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19423 ) Change subject: vty: Allow larger strlen parsing numerical range values ...................................................................... Patch Set 2: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id053acd6bf5e8fb7c468959f0b78b778f8c5e6c2 Gerrit-Change-Number: 19423 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 19:55:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:00:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:00:56 +0000 Subject: Change in libosmocore[master]: vty: Introduce support to set cpu-affinity and scheduler policy In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19442 ) Change subject: vty: Introduce support to set cpu-affinity and scheduler policy ...................................................................... Patch Set 3: Code-Review-1 (10 comments) https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c File src/vty/sched_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 89 PS3, Line 89: static bool proc_tid_exists(pid_t tid) one-line comment would be useful https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 103 PS3, Line 103: { inconsistent syntax. Other clauese have opening braces at end of line, this one doesn't. And if is a function below https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 117 PS3, Line 117: static bool proc_name_exists(const char *name, pid_t *res_pid) one-line summary https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 121 PS3, Line 121: char path[100]; why not PATH_MAX? https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 138 PS3, Line 138: if(entry->d_name[0] == '.') if... https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 147 PS3, Line 147: Last char contain a '\n', get rid of it */ : buf[rc-1] = '\0'; don't blindly assume what you read has a certain structure; test for it! https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 149 PS3, Line 149: buf buffer overflow: rc may be sizeof(buf) and you're writing beyond the end of the buffer here. https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 165 PS3, Line 165: static enum sched_vty_thread_id procname2pid(pid_t *res_pid, const char *str, bool applynow) one-line summary https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 218 PS3, Line 218: int my_sched_setaffinity(enum sched_vty_thread_id tid_type, pid_t pid, unsigned long mask) one lne summary https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 230 PS3, Line 230: cpuset = CPU_ALLOC(64); blind assumption of 64 cores -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If76a4bd2cc7b3c7adf5d84790a944d78be70e10a Gerrit-Change-Number: 19442 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 20:00:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:01:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:01:19 +0000 Subject: Change in libosmo-sccp[master]: SCOC: log message type that was received for unknown local reference In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19447 ) Change subject: SCOC: log message type that was received for unknown local reference ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I18af9d7e9ea4877b13bf98a980b0ba97c5ed6599 Gerrit-Change-Number: 19447 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 20:01:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:01:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:01:21 +0000 Subject: Change in libosmo-sccp[master]: SCOC: log message type that was received for unknown local reference In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19447 ) Change subject: SCOC: log message type that was received for unknown local reference ...................................................................... SCOC: log message type that was received for unknown local reference A message like DLSCCP <0011> sccp_scoc.c:1653 Cannot find connection for local reference 1154 is not incredibly useful, as you don't even know what type of SCCP/SUA message had been received. Change-Id: I18af9d7e9ea4877b13bf98a980b0ba97c5ed6599 --- M src/sccp_scoc.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 015850e..1ce08f8 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -1649,8 +1649,8 @@ conn_id = xua_msg_get_u32(xua, SUA_IEI_DEST_REF); conn = conn_find_by_id(inst, conn_id); if (!conn) { - LOGP(DLSCCP, LOGL_NOTICE, "Cannot find connection for " - "local reference %u\n", conn_id); + LOGP(DLSCCP, LOGL_NOTICE, "Received %s: Cannot find connection for " + "local reference %u\n", xua_hdr_dump(xua, &xua_dialect_sua), conn_id); sccp_scoc_rx_unass_local_ref(inst, xua); return; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I18af9d7e9ea4877b13bf98a980b0ba97c5ed6599 Gerrit-Change-Number: 19447 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:01:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:01:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: drop unused vars 'pages' In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19430 ) Change subject: bsc CBSP: drop unused vars 'pages' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I252fed22cccfc77a4f9cfdd2a0e3070ceeefc547 Gerrit-Change-Number: 19430 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 20:01:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:02:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:02:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: add numerous mtc.stop after fail verdicts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19431 ) Change subject: bsc CBSP: add numerous mtc.stop after fail verdicts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8314c53037948fae51028119c81ea247baed44ec Gerrit-Change-Number: 19431 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 20:02:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:02:28 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:02:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: add log context for CBSP port errors In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19432 ) Change subject: bsc CBSP: add log context for CBSP port errors ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifd90e84ee65d0cb03eefc7ae1da2605650daf7ac Gerrit-Change-Number: 19432 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 20:02:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:03:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:03:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: log expected response in f_cbsp_write In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19433 ) Change subject: bsc CBSP: log expected response in f_cbsp_write ...................................................................... Patch Set 1: doesnt the MATCH log category print that kind of information? I would generally prefer us not to add hand-written log statements if the same can be achieved by changing the TITAN logger configuriation for this component to include matching information. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I844717b0f665496a842764b3b915ba64249cd617 Gerrit-Change-Number: 19433 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 20:03:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:03:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:03:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: drop unused vars 'pages' In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19430 ) Change subject: bsc CBSP: drop unused vars 'pages' ...................................................................... bsc CBSP: drop unused vars 'pages' Change-Id: I252fed22cccfc77a4f9cfdd2a0e3070ceeefc547 --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index 94167ce..56e522a 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -197,7 +197,6 @@ template CBSP_FailureListItems fail_list := omit) runs on cbsp_test_CT { var template (value) CBSP_PDU tx; var template CBSP_PDU rx; - var CBSP_IEs pages := {f_gen_page()}; tx := ts_CBSP_WRITE_CBS(msg_id, ser_no, cell_list, channel_ind, category, rep_period, num_bcast_req, dcs, content); @@ -227,7 +226,6 @@ template CBSP_FailureListItems fail_list := omit) runs on cbsp_test_CT { var template (value) CBSP_PDU tx; var template CBSP_PDU rx; - var CBSP_IEs pages := {f_gen_page()}; tx := ts_CBSP_REPLACE_CBS(msg_id, new_ser_no, old_ser_no, cell_list, channel_ind, category, rep_period, num_bcast_req, dcs, content); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I252fed22cccfc77a4f9cfdd2a0e3070ceeefc547 Gerrit-Change-Number: 19430 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:03:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:03:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: add numerous mtc.stop after fail verdicts In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19431 ) Change subject: bsc CBSP: add numerous mtc.stop after fail verdicts ...................................................................... bsc CBSP: add numerous mtc.stop after fail verdicts I found that I had to wait 30 seconds after a failure verdict. Change-Id: I8314c53037948fae51028119c81ea247baed44ec --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index 56e522a..acd0b99 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -120,6 +120,7 @@ } [] T.timeout { setverdict(fail, "Timeout waiting for incoming connection to CBSP Port"); + mtc.stop; } } f_cbsp_init_tail(); @@ -183,6 +184,7 @@ } [] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], ?)) { setverdict(fail, "Received unexpected CBSP"); + mtc.stop; } } } @@ -212,6 +214,7 @@ } [] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], ?)) { setverdict(fail, "Received unexpected CBSP"); + mtc.stop; } } } @@ -243,6 +246,7 @@ } [] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], ?)) { setverdict(fail, "Received unexpected CBSP"); + mtc.stop; } } } @@ -270,6 +274,7 @@ } [] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], ?)) { setverdict(fail, "Received unexpected CBSP"); + mtc.stop; } } } @@ -573,10 +578,12 @@ } [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(?,?))) { setverdict(fail, "Received unexpected OSMO_ETWS_CMD"); + mtc.stop; } [] IPA_RSL[0].receive { repeat; } [] T.timeout { setverdict(fail, "Timeout waiting for RSL_OSMO_ETWS_CMD"); + mtc.stop; } } } @@ -602,10 +609,12 @@ } [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(?,?))) { setverdict(fail, "Received unexpected OSMO_ETWS_CMD"); + mtc.stop; } [] IPA_RSL[0].receive { repeat; } [] T.timeout { setverdict(fail, "Timeout waiting for RSL_OSMO_ETWS_CMD (enable)"); + mtc.stop; } } @@ -617,10 +626,12 @@ } [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(?,?))) { setverdict(fail, "Received unexpected OSMO_ETWS_CMD"); + mtc.stop; } [] IPA_RSL[0].receive { repeat; } [] T.timeout { setverdict(fail, "Timeout waiting for RSL_OSMO_ETWS_CMD (disable)"); + mtc.stop; } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8314c53037948fae51028119c81ea247baed44ec Gerrit-Change-Number: 19431 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:03:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:03:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: add log context for CBSP port errors In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19432 ) Change subject: bsc CBSP: add log context for CBSP port errors ...................................................................... bsc CBSP: add log context for CBSP port errors Change-Id: Ifd90e84ee65d0cb03eefc7ae1da2605650daf7ac --- M library/CBSP_Adapter.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/CBSP_Adapter.ttcn b/library/CBSP_Adapter.ttcn index 8dbee6a..fe399aa 100644 --- a/library/CBSP_Adapter.ttcn +++ b/library/CBSP_Adapter.ttcn @@ -44,7 +44,8 @@ res := CBSP_CodecPort_CtrlFunct.f_IPL4_connect(CBSP[idx], remote_host, remote_port, local_host, local_port, 0, { tcp :={} }); if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect to CBSP port, check your configuration"); + setverdict(fail, "Could not connect to CBSP port, check your configuration ", + "{remote ", remote_host, ":", remote_port, " local ", local_host, ":", local_port, "}"); mtc.stop; } g_cbsp_conn_id[idx] := res.connId; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifd90e84ee65d0cb03eefc7ae1da2605650daf7ac Gerrit-Change-Number: 19432 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:03:52 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 20:03:52 +0000 Subject: Change in libosmo-sccp[master]: SCOC: log message type that was received for unknown local reference In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19447 ) Change subject: SCOC: log message type that was received for unknown local reference ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I18af9d7e9ea4877b13bf98a980b0ba97c5ed6599 Gerrit-Change-Number: 19447 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 20:03:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:05:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:05:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19434 ) Change subject: bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH ...................................................................... Patch Set 1: Code-Review-1 Unless I'm missing something, this will likely break a variety of resource exhaustion tests that have assumptions on the number of available SDCCH. Has this patch been tested gainst the full site of BSC_Tests.ttcn without any regressions? Feel free to remove -1 if it does. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iac46ee2cc5bc0978d5f5baa550baf493a7c56b1b Gerrit-Change-Number: 19434 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 20:05:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:06:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:06:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: allow passing guard_timeout to BSC_Tests.f_init() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19437 ) Change subject: bsc CBSP: allow passing guard_timeout to BSC_Tests.f_init() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I54e1b3994074f4d0caf5b201588fce0ec41dda89 Gerrit-Change-Number: 19437 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 20:06:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:06:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:06:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: f_gen_page(): allow passing explicit payload len In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19438 ) Change subject: bsc CBSP: f_gen_page(): allow passing explicit payload len ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I259da42cbcbfdfe930aabb45c9de8a2b67c69629 Gerrit-Change-Number: 19438 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 20:06:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:07:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:07:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: TC_cbsp_write_bss: run a fixed series of payload lengths In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19439 ) Change subject: bsc CBSP: TC_cbsp_write_bss: run a fixed series of payload lengths ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3cace19f9e5adc8ebab13ef2328a36dc150b2b31 Gerrit-Change-Number: 19439 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 20:07:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:07:27 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:07:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: cosmetic: rename f_cbsp_init_tail() to f_expect_cbsp_restart() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19440 ) Change subject: bsc CBSP: cosmetic: rename f_cbsp_init_tail() to f_expect_cbsp_restart() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieffe70cf43eb79b798d93717bbce294ee809f0e2 Gerrit-Change-Number: 19440 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 20:07:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:07:32 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 20:07:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19434 ) Change subject: bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH ...................................................................... Patch Set 1: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iac46ee2cc5bc0978d5f5baa550baf493a7c56b1b Gerrit-Change-Number: 19434 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 20:07:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:07:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:07:43 +0000 Subject: Change in osmo-bsc[master]: fix CBSP server: actually open the srv_link In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19441 ) Change subject: fix CBSP server: actually open the srv_link ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic688573e179381f7798055b647200e508f1bc37f Gerrit-Change-Number: 19441 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 20:07:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:08:17 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:08:17 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC subset rotation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19303 ) Change subject: Introduce support for ACC subset rotation ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I952c9eeae02809c7184078c655574ec817902e06 Gerrit-Change-Number: 19303 Gerrit-PatchSet: 9 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 20:08:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:09:42 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:09:42 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC ramping during whole BTS life cycle In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19376 ) Change subject: Introduce support for ACC ramping during whole BTS life cycle ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id17f947c92cdfc0eb9541a9bf066338169caaeb5 Gerrit-Change-Number: 19376 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 20:09:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:09:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:09:47 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC subset rotation In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19303 ) Change subject: Introduce support for ACC subset rotation ...................................................................... Introduce support for ACC subset rotation See updated documentation section in manuals/chapters/bts.adoc regarding an explanation on how the system works. Related: SYS#4911 Change-Id: I952c9eeae02809c7184078c655574ec817902e06 --- M configure.ac M doc/manuals/chapters/bts.adoc M include/osmocom/bsc/acc.h M include/osmocom/bsc/bts.h M src/osmo-bsc/acc.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/osmo-bsc/system_information.c M tests/Makefile.am A tests/acc/Makefile.am A tests/acc/acc_test.c A tests/acc/acc_test.ok M tests/gsm0408/gsm0408_test.c M tests/testsuite.at 14 files changed, 1,610 insertions(+), 117 deletions(-) Approvals: laforge: Looks good to me, approved Hoernchen: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index d25925b..4a58079 100644 --- a/configure.ac +++ b/configure.ac @@ -241,6 +241,7 @@ src/utils/Makefile tests/Makefile tests/atlocal + tests/acc/Makefile tests/gsm0408/Makefile tests/bsc/Makefile tests/codec_pref/Makefile diff --git a/doc/manuals/chapters/bts.adoc b/doc/manuals/chapters/bts.adoc index 94e89a4..6e7a308 100644 --- a/doc/manuals/chapters/bts.adoc +++ b/doc/manuals/chapters/bts.adoc @@ -416,17 +416,28 @@ in order to minimize the delay when a RACH request or response gets lost the MS should not wait too long before retransmitting. -==== Load Management +==== Access Control Class Load Management -Every SIM card is member of one of the ten regular ACCs (0-9). Access to the -BTS can be restricted to SIMs that are members of certain ACCs. +Every SIM card is member of one of the ten regular ACCs (0-9). Access to the BTS +can be restricted to SIMs that are members of certain ACCs. -Since the ACCs are distributed uniformly across all SIMs allowing only ACCs -0-4 to connect to the BTS should reduce its load by 50%. +Furthermore, high priority users (such as PLMN staff, public or emergency +services, etc.) may be members of one or more ACCs from 11-15. + +Since the ACCs 0-9 are distributed uniformly across all SIMs, for instance +allowing only ACCs 0-4 to connect to the BTS should reduce its load by 50% at +the expense of not serving 50% of the subscribers. The default is to allow all ACCs to connect. -.Example: Restrict access to the BTS by ACC +OsmoBSC supports several levels of ACC management to allow or restrict access +either permanently or temporarily on each BTS. + +The first level of management consists of an access list to flag specific ACCs +as permanently barred (the list can be updated at any time through VTY as seen +below). As indicated above, the default is to allow all ACCs (0-15). + +.Example: Restrict permanent access to the BTS by ACC ---- network bts 0 @@ -436,12 +447,33 @@ <1> Disallow SIMs with access-class 1 from connecting to the BTS <2> Permit SIMs with access-class 9 to connect to the BTS. +On really crowded areas, a BTS may struggle to service all mobile stations +willing to use it, and which may end up in collapse. In this kind of scenarios +it is a good idea to temporarily further restrict the amount of allowed ACCs +(hence restrict the amount of subscribers allowed to reach the BTS). +However, doing so on a permanent basis would be unfair to subscribers from +barred ACCs. Hence, OsmoBSC can be configured to temporarily generate ACC +subsets of the permanent set presented above, and rotate them over time to allow +fair access to all subscribers. This feature is only aimed at ACCs 0-9, +since ACCs 11-15 are considered high priority and hence are always configured +based on permanent list policy. -Smaller cells with lots of subscribers can be overwhelmed with traffic after -the network is turned on. This is especially true in areas with little to no -reception from other networks. To manage the load OsmoBSC has an option to -enable one Access Class at a time so initial access to the network is -distributed across a longer time. +.Example: Configure rotative access to the BTS +---- +network + bts 0 + access-control-rotate 3 <1> + access-control-rotate-quantum 20 <2> +---- +<1> Only allow up to 3 concurrent allowed ACCs from the permanent list +<2> Rotate the generated permanent list subsets every 20 seconds in a fair fashion + +Furthermore, cells with large number of subscribers and limited overlapping +coverage may become overwhelmed with traffic after the cell starts brodacasting. +This is especially true in areas with little to no reception from other +networks. To manage the load, OsmoBSC has an option to further restrict the +rotating ACC subset during startup and slowly increment it over time and taking +current load into account. .Example: Ramp up access to the BTS after startup ---- @@ -456,6 +488,29 @@ <3> At each step enable one more ACC +Here a full example of all the mechanisms combined can be found: + +.Example: Full ACC Load Management config setup +---- +bts 0 + rach access-control-class 5 barred <1> + rach access-control-class 6 barred + rach access-control-class 7 barred + rach access-control-class 8 barred + rach access-control-class 9 barred + access-control-class-rotate 3 <2> + access-control-class-rotate-quantum 20 <3> + access-control-class-ramping <4> + access-control-class-ramping-step-size 1 <5> + access-control-class-ramping-step-interval dynamic <6> +---- +<1> ACCs 5-9 are administratively barred, ie they will never be used until somebody manually enables them in VTY config +<2> Allow access through temporary subsets of len=3 from ACC set 0-4: (0,1,2) -> (1,2,3) -> (2,3,4) -> (3,4,0), etc. +<3> Each subset iteration will happen every 20 seconds +<4> During startup since ramping is enabled, it will further restrict the rotate subset size parameter (len=3) +<5> The rotate subset size parameter will be increased one ACC slot at a time: len=0 -> len=1 -> len=2 -> len=3 +<6> The time until the subset size is further increased will be calculated based on current channel load + ==== RACH Parameter Configuration The following parameters allow control over how the MS can access the random diff --git a/include/osmocom/bsc/acc.h b/include/osmocom/bsc/acc.h index 31fc74f..bd75f95 100644 --- a/include/osmocom/bsc/acc.h +++ b/include/osmocom/bsc/acc.h @@ -27,6 +27,40 @@ #include #include +#define ACC_MGR_QUANTUM_DEFAULT 20 /* 20 seconds */ + +/* Manage rotating subset of allowed Access Class as per configuration */ +struct acc_mgr { + struct gsm_bts *bts; /*!< backpointer to BTS using this ACC manager */ + /* Administrative Maximum Number of ACC 0-9 to be allowed at the same time. + Configurable through VTY cmd "access-control-class-roundrobin", + defaults to all allowed (10) */ + uint8_t len_allowed_adm; + /* Further limiting the number of ACC to use. It may be lower due + to ramping, based for instance on channel or system load. */ + uint8_t len_allowed_ramp; + + /* Time until next subset is generated */ + uint32_t rotation_time_sec; + struct osmo_timer_list rotate_timer; + + /* Bitmask containing subset of allowed ACC 0-9 on current rotation iteration */ + uint16_t allowed_subset_mask; + /* Number of bits (ACC) set in allowed_subset_mask: 0->min(len_allowed_ramp, len_allowed_adm) */ + uint8_t allowed_subset_mask_count; + /* Number of ACC 0-9 allowed as per adminsitrative (permanent) config. */ + uint8_t allowed_permanent_count; +}; + +void acc_mgr_init(struct acc_mgr *acc_mgr, struct gsm_bts *bts); +uint8_t acc_mgr_get_len_allowed_adm(struct acc_mgr *acc_mgr); +uint8_t acc_mgr_get_len_allowed_ramp(struct acc_mgr *acc_mgr); +void acc_mgr_set_len_allowed_adm(struct acc_mgr *acc_mgr, uint8_t len_allowed_adm); +void acc_mgr_set_len_allowed_ramp(struct acc_mgr *acc_mgr, uint8_t len_allowed_ramp); +void acc_mgr_set_rotation_time(struct acc_mgr *acc_mgr, uint32_t rotation_time_sec); +void acc_mgr_perm_subset_changed(struct acc_mgr *acc_mgr, struct gsm48_rach_control *rach_control); +void acc_mgr_apply_acc(struct acc_mgr *acc_mgr, struct gsm48_rach_control *rach_control); + /*! * Access control class (ACC) ramping is used to slowly make the cell available to * an increasing number of MS. This avoids overload at startup time in cases where @@ -50,17 +84,6 @@ bool acc_ramping_enabled; /*!< whether ACC ramping is enabled */ /*! - * Bitmask which keeps track of access control classes that are currently denied - * access. The function acc_ramp_apply() uses this mask to modulate bits from - * octets 2 and 3 in RACH Control Parameters (see 3GPP 44.018 10.5.2.29). - * Ramping is only concerned with ACCs 0-9. While any of the bits 0-9 is set, - * the corresponding ACC is barred. - * ACCs 11-15 should always be allowed, and ACC 10 denies emergency calls for - * all ACCs from 0-9 inclusive; these ACCs are ignored in this implementation. - */ - uint16_t barred_accs; - - /*! * This controls the maximum number of ACCs to allow per ramping step (1 - 10). * The compile-time default value is ACC_RAMP_STEP_SIZE_DEFAULT. * This value can be changed by VTY configuration. @@ -126,33 +149,6 @@ return !(acc_ramp->step_interval_is_fixed); } -/*! - * Return bitmasks which correspond to access control classes that are currently - * denied access. Ramping is only concerned with those bits which control access - * for ACCs 0-9, and any of the other bits will always be set to zero in these masks, i.e. - * it is safe to OR these bitmasks with the corresponding fields in struct gsm48_rach_control. - * \param[in] acc_ramp Pointer to acc_ramp structure. - */ -static inline uint8_t acc_ramp_get_barred_t2(struct acc_ramp *acc_ramp) -{ - return ((acc_ramp->barred_accs >> 8) & 0x03); -}; -static inline uint8_t acc_ramp_get_barred_t3(struct acc_ramp *acc_ramp) -{ - return (acc_ramp->barred_accs & 0xff); -} - -/*! - * Potentially mark certain Access Control Classes (ACCs) as barred in accordance to ACC ramping. - * \param[in] rach_control RACH control parameters in which barred ACCs will be configured. - * \param[in] acc_ramp Pointer to acc_ramp structure. - */ -static inline void acc_ramp_apply(struct gsm48_rach_control *rach_control, struct acc_ramp *acc_ramp) -{ - rach_control->t2 |= acc_ramp_get_barred_t2(acc_ramp); - rach_control->t3 |= acc_ramp_get_barred_t3(acc_ramp); -} - void acc_ramp_init(struct acc_ramp *acc_ramp, struct gsm_bts *bts); int acc_ramp_set_step_size(struct acc_ramp *acc_ramp, unsigned int step_size); int acc_ramp_set_step_interval(struct acc_ramp *acc_ramp, unsigned int step_interval); diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 730dee9..16053a3 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -449,6 +449,7 @@ uint32_t si_mode_static; /* access control class ramping */ + struct acc_mgr acc_mgr; struct acc_ramp acc_ramp; /* exclude the BTS from the global RF Lock handling */ diff --git a/src/osmo-bsc/acc.c b/src/osmo-bsc/acc.c index a1941e4..b25f2fd 100644 --- a/src/osmo-bsc/acc.c +++ b/src/osmo-bsc/acc.c @@ -1,4 +1,4 @@ -/* (C) 2018 by sysmocom s.f.m.c. GmbH +/* (C) 2018-2020 by sysmocom s.f.m.c. GmbH * * Author: Stefan Sperling * @@ -20,6 +20,8 @@ */ #include +#include +#include #include #include @@ -43,42 +45,319 @@ return (bts->si_common.rach_control.t3 & (1 << (acc))); } -static void allow_one_acc(struct acc_ramp *acc_ramp, unsigned int acc) +/*! + * Return bitmasks which correspond to access control classes that are currently + * denied access. Ramping is only concerned with those bits which control access + * for ACCs 0-9, and any of the other bits will always be set to zero in these masks, i.e. + * it is safe to OR these bitmasks with the corresponding fields in struct gsm48_rach_control. + * \param[in] acc_mgr Pointer to acc_mgr structure. + */ +static inline uint8_t acc_mgr_get_barred_t2(struct acc_mgr *acc_mgr) { - OSMO_ASSERT(acc <= 9); - if (acc_ramp->barred_accs & (1 << acc)) - LOG_BTS(acc_ramp->bts, DRSL, LOGL_NOTICE, - "ACC RAMP: allowing Access Control Class %u\n", acc); - acc_ramp->barred_accs &= ~(1 << acc); + return ((~acc_mgr->allowed_subset_mask) >> 8) & 0x03; +}; +static inline uint8_t acc_mgr_get_barred_t3(struct acc_mgr *acc_mgr) +{ + return (~acc_mgr->allowed_subset_mask) & 0xff; } -static void barr_one_acc(struct acc_ramp *acc_ramp, unsigned int acc) +static uint8_t acc_mgr_subset_len(struct acc_mgr *acc_mgr) { - OSMO_ASSERT(acc <= 9); - if ((acc_ramp->barred_accs & (1 << acc)) == 0) - LOG_BTS(acc_ramp->bts, DRSL, LOGL_NOTICE, - "ACC RAMP: barring Access Control Class %u\n", acc); - acc_ramp->barred_accs |= (1 << acc); + return OSMO_MIN(acc_mgr->len_allowed_ramp, acc_mgr->len_allowed_adm); } -static void barr_all_accs(struct acc_ramp *acc_ramp) +static void acc_mgr_enable_rotation_cond(struct acc_mgr *acc_mgr) { - unsigned int acc; - for (acc = 0; acc < 10; acc++) { - if (!acc_is_permanently_barred(acc_ramp->bts, acc)) - barr_one_acc(acc_ramp, acc); + if (acc_mgr->allowed_permanent_count && acc_mgr->allowed_subset_mask_count && + acc_mgr->allowed_permanent_count != acc_mgr->allowed_subset_mask_count) { + if (!osmo_timer_pending(&acc_mgr->rotate_timer)) + osmo_timer_schedule(&acc_mgr->rotate_timer, acc_mgr->rotation_time_sec, 0); + } else { + /* No rotation needed, disable rotation timer */ + if (osmo_timer_pending(&acc_mgr->rotate_timer)) + osmo_timer_del(&acc_mgr->rotate_timer); } } -static void allow_all_accs(struct acc_ramp *acc_ramp) +static void acc_mgr_gen_subset(struct acc_mgr *acc_mgr, bool update_si) { - unsigned int acc; + uint8_t acc; + + acc_mgr->allowed_subset_mask = 0; /* clean mask */ + acc_mgr->allowed_subset_mask_count = 0; + acc_mgr->allowed_permanent_count = 0; + for (acc = 0; acc < 10; acc++) { - if (!acc_is_permanently_barred(acc_ramp->bts, acc)) - allow_one_acc(acc_ramp, acc); + if (acc_is_permanently_barred(acc_mgr->bts, acc)) + continue; + acc_mgr->allowed_permanent_count++; + if (acc_mgr->allowed_subset_mask_count < acc_mgr_subset_len(acc_mgr)) { + acc_mgr->allowed_subset_mask |= (1 << acc); + acc_mgr->allowed_subset_mask_count++; + } + } + + acc_mgr_enable_rotation_cond(acc_mgr); + + LOG_BTS(acc_mgr->bts, DRSL, LOGL_INFO, + "ACC: New ACC allowed subset 0x%03" PRIx16 " (active_len=%" PRIu8 + ", ramp_len=%" PRIu8 ", adm_len=%" PRIu8 ", perm_len=%" PRIu8 ", rotation=%s)\n", + acc_mgr->allowed_subset_mask, acc_mgr->allowed_subset_mask_count, + acc_mgr->len_allowed_ramp, acc_mgr->len_allowed_adm, + acc_mgr->allowed_permanent_count, + osmo_timer_pending(&(acc_mgr)->rotate_timer) ? "on" : "off"); + + /* Trigger SI data update, acc_mgr_apply_acc will bew called */ + if (update_si) + gsm_bts_set_system_infos(acc_mgr->bts); +} + +static uint8_t get_highest_allowed_acc(uint16_t mask) +{ + for (int i = 9; i >= 0; i--) { + if (mask & (1 << i)) + return i; + } + OSMO_ASSERT(0); + return 0; +} + +static uint8_t get_lowest_allowed_acc(uint16_t mask) +{ + for (int i = 0; i < 10; i++) { + if (mask & (1 << i)) + return i; + } + OSMO_ASSERT(0); + return 0; +} + +#define LOG_ACC_CHG(acc_mgr, level, old_mask, verb_str) \ + LOG_BTS((acc_mgr)->bts, DRSL, level, \ + "ACC: %s ACC allowed active subset 0x%03" PRIx16 " -> 0x%03" PRIx16 \ + " (active_len=%" PRIu8 ", ramp_len=%" PRIu8 ", adm_len=%" PRIu8 \ + ", perm_len=%" PRIu8 ", rotation=%s)\n", \ + verb_str, old_mask, (acc_mgr)->allowed_subset_mask, \ + (acc_mgr)->allowed_subset_mask_count, \ + (acc_mgr)->len_allowed_ramp, (acc_mgr)->len_allowed_adm, \ + (acc_mgr)->allowed_permanent_count, \ + osmo_timer_pending(&(acc_mgr)->rotate_timer) ? "on" : "off") + +/* Call when either adm_len or ramp_len changed (and values have been updated) */ +static void acc_mgr_subset_length_changed(struct acc_mgr *acc_mgr) +{ + uint16_t old_mask = acc_mgr->allowed_subset_mask; + uint8_t curr_len = acc_mgr->allowed_subset_mask_count; + uint8_t new_len = acc_mgr_subset_len(acc_mgr); + int8_t diff = new_len - curr_len; + uint8_t i; + + if (curr_len == new_len) + return; + + if (new_len == 0) { + acc_mgr->allowed_subset_mask = 0; + acc_mgr->allowed_subset_mask_count = 0; + acc_mgr_enable_rotation_cond(acc_mgr); + LOG_ACC_CHG(acc_mgr, LOGL_INFO, old_mask, "update"); + gsm_bts_set_system_infos(acc_mgr->bts); + return; + } + + if (curr_len == 0) { + acc_mgr_gen_subset(acc_mgr, true); + return; + } + + /* Try to add new ACCs to the set starting from highest one (since we rotate rolling up) */ + if (diff > 0) { /* curr_len < new_len */ + uint8_t highest = get_highest_allowed_acc(acc_mgr->allowed_subset_mask); + /* It's fine skipping highest in the loop since it's known to be already set: */ + for (i = (highest + 1) % 10; i != highest; i = (i + 1) % 10) { + if (acc_is_permanently_barred(acc_mgr->bts, i)) + continue; + if (acc_mgr->allowed_subset_mask & (1 << i)) + continue; /* already in set */ + acc_mgr->allowed_subset_mask |= (1 << i); + acc_mgr->allowed_subset_mask_count++; + diff--; + if (diff == 0) + break; + } + } else { /* curr_len > new_len, try removing from lowest one. */ + uint8_t lowest = get_lowest_allowed_acc(acc_mgr->allowed_subset_mask); + i = lowest; + do { + if ((acc_mgr->allowed_subset_mask & (1 << i))) { + acc_mgr->allowed_subset_mask &= ~(1 << i); + acc_mgr->allowed_subset_mask_count--; + diff++; + if (diff == 0) + break; + } + i = (i + 1) % 10; + } while(i != lowest); + } + + acc_mgr_enable_rotation_cond(acc_mgr); + LOG_ACC_CHG(acc_mgr, LOGL_INFO, old_mask, "update"); + + /* if we updated the set, notify about it */ + if (curr_len != acc_mgr->allowed_subset_mask_count) + gsm_bts_set_system_infos(acc_mgr->bts); + +} + +/* Eg: (2,3,4) -> first=2; last=4. (3,7,8) -> first=3, last=8; (8,9,2) -> first=8, last=2 */ +void get_subset_limits(struct acc_mgr *acc_mgr, uint8_t *first, uint8_t *last) +{ + uint8_t lowest = get_lowest_allowed_acc(acc_mgr->allowed_subset_mask); + uint8_t highest = get_highest_allowed_acc(acc_mgr->allowed_subset_mask); + /* check if there's unselected ACCs between lowest and highest, that + * means subset is wrapping around, eg: (8,9,1) + * Assumption: The permanent set is bigger than the current selected subset */ + bool is_wrapped = false; + uint8_t i = (lowest + 1) % 10; + do { + if (!acc_is_permanently_barred(acc_mgr->bts, i) && + !(acc_mgr->allowed_subset_mask & (1 << i))) { + is_wrapped = true; + break; + } + i = (i + 1 ) % 10; + } while (i != (highest + 1) % 10); + + if (is_wrapped) { + *first = highest; + *last = lowest; + } else { + *first = lowest; + *last = highest; + } +} +static void do_acc_rotate_step(void *data) +{ + struct acc_mgr *acc_mgr = data; + uint8_t i; + uint8_t first, last; + uint16_t old_mask = acc_mgr->allowed_subset_mask; + + /* Assumption: The size of the subset didn't change, that's handled by + * acc_mgr_subset_length_changed() + */ + + /* Assumption: Rotation timer has been disabled if no ACC is allowed */ + OSMO_ASSERT(acc_mgr->allowed_subset_mask_count != 0); + + /* One ACC is rotated at a time: Drop first ACC and add next from last ACC */ + get_subset_limits(acc_mgr, &first, &last); + + acc_mgr->allowed_subset_mask &= ~(1 << first); + i = (last + 1) % 10; + do { + if (!acc_is_permanently_barred(acc_mgr->bts, i) && + !(acc_mgr->allowed_subset_mask & (1 << i))) { + /* found first one which can be allowed, do it and be done */ + acc_mgr->allowed_subset_mask |= (1 << i); + break; + } + i = (i + 1 ) % 10; + } while (i != (last + 1) % 10); + + osmo_timer_schedule(&acc_mgr->rotate_timer, acc_mgr->rotation_time_sec, 0); + + if (old_mask != acc_mgr->allowed_subset_mask) { + LOG_ACC_CHG(acc_mgr, LOGL_INFO, old_mask, "rotate"); + gsm_bts_set_system_infos(acc_mgr->bts); } } +void acc_mgr_init(struct acc_mgr *acc_mgr, struct gsm_bts *bts) +{ + acc_mgr->bts = bts; + acc_mgr->len_allowed_adm = 10; /* Allow all by default */ + acc_mgr->len_allowed_ramp = 10; + acc_mgr->rotation_time_sec = ACC_MGR_QUANTUM_DEFAULT; + osmo_timer_setup(&acc_mgr->rotate_timer, do_acc_rotate_step, acc_mgr); + /* FIXME: Don't update SI yet, avoid crash due to bts->model being NULL */ + acc_mgr_gen_subset(acc_mgr, false); +} + +uint8_t acc_mgr_get_len_allowed_adm(struct acc_mgr *acc_mgr) +{ + return acc_mgr->len_allowed_adm; +} + +uint8_t acc_mgr_get_len_allowed_ramp(struct acc_mgr *acc_mgr) +{ + return acc_mgr->len_allowed_ramp; +} + +void acc_mgr_set_len_allowed_adm(struct acc_mgr *acc_mgr, uint8_t len_allowed_adm) +{ + uint8_t old_len; + + OSMO_ASSERT(len_allowed_adm <= 10); + + if (acc_mgr->len_allowed_adm == len_allowed_adm) + return; + + LOG_BTS(acc_mgr->bts, DRSL, LOGL_DEBUG, + "ACC: administrative rotate subset size set to %" PRIu8 "\n", len_allowed_adm); + + old_len = acc_mgr_subset_len(acc_mgr); + acc_mgr->len_allowed_adm = len_allowed_adm; + if (old_len != acc_mgr_subset_len(acc_mgr)) + acc_mgr_subset_length_changed(acc_mgr); +} +void acc_mgr_set_len_allowed_ramp(struct acc_mgr *acc_mgr, uint8_t len_allowed_ramp) +{ + uint8_t old_len; + + OSMO_ASSERT(len_allowed_ramp <= 10); + + if (acc_mgr->len_allowed_ramp == len_allowed_ramp) + return; + + LOG_BTS(acc_mgr->bts, DRSL, LOGL_DEBUG, + "ACC: ramping rotate subset size set to %" PRIu8 "\n", len_allowed_ramp); + + old_len = acc_mgr_subset_len(acc_mgr); + acc_mgr->len_allowed_ramp = len_allowed_ramp; + if (old_len != acc_mgr_subset_len(acc_mgr)) + acc_mgr_subset_length_changed(acc_mgr); +} + +void acc_mgr_set_rotation_time(struct acc_mgr *acc_mgr, uint32_t rotation_time_sec) +{ + LOG_BTS(acc_mgr->bts, DRSL, LOGL_DEBUG, + "ACC: rotate subset time set to %" PRIu32 " seconds\n", rotation_time_sec); + acc_mgr->rotation_time_sec = rotation_time_sec; +} + +void acc_mgr_perm_subset_changed(struct acc_mgr *acc_mgr, struct gsm48_rach_control *rach_control) +{ + /* Even if amount is the same, the allowed/barred ones may have changed, + * so let's retrigger generation of an entire subset rather than + * rotating it */ + acc_mgr_gen_subset(acc_mgr, true); +} + +/*! + * Potentially mark certain Access Control Classes (ACCs) as barred in accordance to ACC policy. + * \param[in] acc_mgr Pointer to acc_mgr structure. + * \param[in] rach_control RACH control parameters in which barred ACCs will be configured. + */ +void acc_mgr_apply_acc(struct acc_mgr *acc_mgr, struct gsm48_rach_control *rach_control) +{ + rach_control->t2 |= acc_mgr_get_barred_t2(acc_mgr); + rach_control->t3 |= acc_mgr_get_barred_t3(acc_mgr); +} + + +////////////////////////// +// acc_ramp +////////////////////////// static unsigned int get_next_step_interval(struct acc_ramp *acc_ramp) { struct gsm_bts *bts = acc_ramp->bts; @@ -104,42 +383,14 @@ static void do_acc_ramping_step(void *data) { struct acc_ramp *acc_ramp = data; - int i; + struct acc_mgr *acc_mgr = &acc_ramp->bts->acc_mgr; + uint8_t old_len = acc_mgr_get_len_allowed_ramp(acc_mgr); + uint8_t new_len = OSMO_MIN(10, old_len + acc_ramp->step_size); - /* Shortcut in case we only do one ramping step. */ - if (acc_ramp->step_size == ACC_RAMP_STEP_SIZE_MAX) { - allow_all_accs(acc_ramp); - gsm_bts_set_system_infos(acc_ramp->bts); - return; - } - - /* Allow 'step_size' ACCs, starting from ACC0. ACC9 will be allowed last. */ - for (i = 0; i < acc_ramp->step_size; i++) { - int idx = ffs(acc_ramp_get_barred_t3(acc_ramp)); - if (idx > 0) { - /* One of ACC0-ACC7 is still bared. */ - unsigned int acc = idx - 1; - if (!acc_is_permanently_barred(acc_ramp->bts, acc)) - allow_one_acc(acc_ramp, acc); - } else { - idx = ffs(acc_ramp_get_barred_t2(acc_ramp)); - if (idx == 1 || idx == 2) { - /* ACC8 or ACC9 is still barred. */ - unsigned int acc = idx - 1 + 8; - if (!acc_is_permanently_barred(acc_ramp->bts, acc)) - allow_one_acc(acc_ramp, acc); - } else { - /* All ACCs are now allowed. */ - break; - } - } - } - - gsm_bts_set_system_infos(acc_ramp->bts); + acc_mgr_set_len_allowed_ramp(acc_mgr, new_len); /* If we have not allowed all ACCs yet, schedule another ramping step. */ - if (acc_ramp_get_barred_t2(acc_ramp) != 0x00 || - acc_ramp_get_barred_t3(acc_ramp) != 0x00) + if (new_len != 10) osmo_timer_schedule(&acc_ramp->step_timer, get_next_step_interval(acc_ramp), 0); } @@ -279,7 +530,6 @@ acc_ramp->step_size = ACC_RAMP_STEP_SIZE_DEFAULT; acc_ramp->step_interval_sec = ACC_RAMP_STEP_INTERVAL_MIN; acc_ramp->step_interval_is_fixed = false; - allow_all_accs(acc_ramp); osmo_timer_setup(&acc_ramp->step_timer, do_acc_ramping_step, acc_ramp); osmo_signal_register_handler(SS_NM, acc_ramp_nm_sig_cb, acc_ramp); } @@ -344,7 +594,7 @@ if (acc_ramp_is_enabled(acc_ramp)) { /* Set all available ACCs to barred and start ramping up. */ - barr_all_accs(acc_ramp); + acc_mgr_set_len_allowed_ramp(&acc_ramp->bts->acc_mgr, 0); do_acc_ramping_step(acc_ramp); } } @@ -358,5 +608,5 @@ if (osmo_timer_pending(&acc_ramp->step_timer)) osmo_timer_del(&acc_ramp->step_timer); - allow_all_accs(acc_ramp); + acc_mgr_set_len_allowed_ramp(&acc_ramp->bts->acc_mgr, 10); } diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 9cc7673..0be4e6d 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -404,6 +404,8 @@ VTY_NEWLINE); vty_out(vty, " Cell Reselection Hysteresis: %u dBm%s", bts->si_common.cell_sel_par.cell_resel_hyst*2, VTY_NEWLINE); + vty_out(vty, " Access Control Class rotation allow mask: 0x%" PRIx16 "%s", + bts->acc_mgr.allowed_subset_mask, VTY_NEWLINE); vty_out(vty, " Access Control Class ramping: %senabled%s", acc_ramp_is_enabled(&bts->acc_ramp) ? "" : "not ", VTY_NEWLINE); if (acc_ramp_is_enabled(&bts->acc_ramp)) { @@ -948,6 +950,10 @@ for (i = 0; i < 8; i++) if ((i != 2) && (bts->si_common.rach_control.t2 & (0x1 << i))) vty_out(vty, " rach access-control-class %d barred%s", i+8, VTY_NEWLINE); + if (bts->acc_mgr.len_allowed_adm < 10) + vty_out(vty, " access-control-class-rotate %" PRIu8 "%s", bts->acc_mgr.len_allowed_adm, VTY_NEWLINE); + if (bts->acc_mgr.rotation_time_sec != ACC_MGR_QUANTUM_DEFAULT) + vty_out(vty, " access-control-class-rotate-quantum %" PRIu32 "%s", bts->acc_mgr.rotation_time_sec, VTY_NEWLINE); vty_out(vty, " %saccess-control-class-ramping%s", acc_ramp_is_enabled(&bts->acc_ramp) ? "" : "no ", VTY_NEWLINE); if (!acc_ramp_step_interval_is_dynamic(&bts->acc_ramp)) { vty_out(vty, " access-control-class-ramping-step-interval %u%s", @@ -2745,6 +2751,9 @@ else bts->si_common.rach_control.t2 |= (0x1 << (control_class - 8)); + if (control_class < 10) + acc_mgr_perm_subset_changed(&bts->acc_mgr, &bts->si_common.rach_control); + return CMD_SUCCESS; } @@ -3640,6 +3649,30 @@ return CMD_SUCCESS; } +DEFUN(cfg_bts_acc_rotate, + cfg_bts_acc_rotate_cmd, + "access-control-class-rotate <0-10>", + "Enable Access Control Class allowed subset rotation\n" + "Size of the rotating allowed ACC 0-9 subset (default=10, no subset)\n") +{ + struct gsm_bts *bts = vty->index; + int len_allowed_adm = atoi(argv[0]); + acc_mgr_set_len_allowed_adm(&bts->acc_mgr, len_allowed_adm); + return CMD_SUCCESS; +} + +DEFUN(cfg_bts_acc_rotate_quantum, + cfg_bts_acc_rotate_quantum_cmd, + "access-control-class-rotate-quantum <1-65535>", + "Time between rotation of ACC 0-9 generated subsets\n" + "Time in seconds (default=" OSMO_STRINGIFY_VAL(ACC_MGR_QUANTUM_DEFAULT) ")\n") +{ + struct gsm_bts *bts = vty->index; + uint32_t rotation_time_sec = (uint32_t)atoi(argv[0]); + acc_mgr_set_rotation_time(&bts->acc_mgr, rotation_time_sec); + return CMD_SUCCESS; +} + DEFUN(cfg_bts_acc_ramping, cfg_bts_acc_ramping_cmd, "access-control-class-ramping", @@ -6493,6 +6526,8 @@ install_element(BTS_NODE, &cfg_bts_amr_hr_hyst3_cmd); install_element(BTS_NODE, &cfg_bts_amr_hr_start_mode_cmd); install_element(BTS_NODE, &cfg_bts_pcu_sock_cmd); + install_element(BTS_NODE, &cfg_bts_acc_rotate_cmd); + install_element(BTS_NODE, &cfg_bts_acc_rotate_quantum_cmd); install_element(BTS_NODE, &cfg_bts_acc_ramping_cmd); install_element(BTS_NODE, &cfg_bts_no_acc_ramping_cmd); install_element(BTS_NODE, &cfg_bts_acc_ramping_step_interval_cmd); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 7794024..4318b7e 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -387,6 +387,7 @@ bts_init_cbch_state(&bts->cbch_basic, bts); bts_init_cbch_state(&bts->cbch_extended, bts); + acc_mgr_init(&bts->acc_mgr, bts); acc_ramp_init(&bts->acc_ramp, bts); return bts; diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index fe78e8e..7011127 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -723,8 +723,7 @@ list_arfcn(si1->cell_channel_description, 0xce, "Serving cell:"); si1->rach_control = bts->si_common.rach_control; - if (acc_ramp_is_enabled(&bts->acc_ramp)) - acc_ramp_apply(&si1->rach_control, &bts->acc_ramp); + acc_mgr_apply_acc(&bts->acc_mgr, &si1->rach_control); /* * SI1 Rest Octets (10.5.2.32), contains NCH position and band @@ -755,8 +754,7 @@ si2->ncc_permitted = bts->si_common.ncc_permitted; si2->rach_control = bts->si_common.rach_control; - if (acc_ramp_is_enabled(&bts->acc_ramp)) - acc_ramp_apply(&si2->rach_control, &bts->acc_ramp); + acc_mgr_apply_acc(&bts->acc_mgr, &si2->rach_control); return sizeof(*si2); } @@ -790,8 +788,7 @@ bts->si_valid &= ~(1 << SYSINFO_TYPE_2bis); si2b->rach_control = bts->si_common.rach_control; - if (acc_ramp_is_enabled(&bts->acc_ramp)) - acc_ramp_apply(&si2b->rach_control, &bts->acc_ramp); + acc_mgr_apply_acc(&bts->acc_mgr, &si2b->rach_control); /* SI2bis Rest Octets as per 3GPP TS 44.018 ?10.5.2.33 */ rc = rest_octets_si2bis(si2b->rest_octets); @@ -912,8 +909,7 @@ si3->cell_options = bts->si_common.cell_options; si3->cell_sel_par = bts->si_common.cell_sel_par; si3->rach_control = bts->si_common.rach_control; - if (acc_ramp_is_enabled(&bts->acc_ramp)) - acc_ramp_apply(&si3->rach_control, &bts->acc_ramp); + acc_mgr_apply_acc(&bts->acc_mgr, &si3->rach_control); /* allow/disallow DTXu */ gsm48_set_dtx(&si3->cell_options, bts->dtxu, bts->dtxu, true); @@ -962,8 +958,7 @@ gsm48_generate_lai2(&si4->lai, bts_lai(bts)); si4->cell_sel_par = bts->si_common.cell_sel_par; si4->rach_control = bts->si_common.rach_control; - if (acc_ramp_is_enabled(&bts->acc_ramp)) - acc_ramp_apply(&si4->rach_control, &bts->acc_ramp); + acc_mgr_apply_acc(&bts->acc_mgr, &si4->rach_control); /* Optional: CBCH Channel Description + CBCH Mobile Allocation */ cbch_lchan = gsm_bts_get_cbch(bts); diff --git a/tests/Makefile.am b/tests/Makefile.am index 9f2e0e0..07de847 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,5 @@ SUBDIRS = \ + acc \ bsc \ codec_pref \ gsm0408 \ diff --git a/tests/acc/Makefile.am b/tests/acc/Makefile.am new file mode 100644 index 0000000..4726ddc --- /dev/null +++ b/tests/acc/Makefile.am @@ -0,0 +1,37 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + -ggdb3 \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(NULL) + +EXTRA_DIST = \ + acc_test.ok \ + $(NULL) + +noinst_PROGRAMS = \ + acc_test \ + $(NULL) + +acc_test_SOURCES = \ + acc_test.c \ + $(NULL) + +acc_test_LDADD = \ + $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ + $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ + $(top_builddir)/src/osmo-bsc/gsm_data.o \ + $(top_builddir)/src/osmo-bsc/net_init.o \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOABIS_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) diff --git a/tests/acc/acc_test.c b/tests/acc/acc_test.c new file mode 100644 index 0000000..54f3de1 --- /dev/null +++ b/tests/acc/acc_test.c @@ -0,0 +1,493 @@ +/* + * (C) 2020 by sysmocom s.f.m.c. GmbH + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU 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 + +static void clock_debug(char* str) +{ + struct timespec ts; + struct timeval tv; + osmo_clock_gettime(CLOCK_MONOTONIC, &ts); + osmo_gettimeofday(&tv, NULL); + fprintf(stderr, "sys={%lu.%06lu}: %s\n", + tv.tv_sec, tv.tv_usec, str); +} + +#define bts_init(net) _bts_init(net, __func__) +static inline struct gsm_bts *_bts_init(struct gsm_network *net, const char *msg) +{ + struct gsm_bts *bts = gsm_bts_alloc(net, 0); + if (!bts) { + fprintf(stderr, "BTS allocation failure in %s()\n", msg); + exit(1); + } + fprintf(stderr, "BTS allocation OK in %s()\n", msg); + + bts->network = net; + + return bts; +} + +#define bts_del(bts) _bts_del(bts, __func__) +static inline void _bts_del(struct gsm_bts *bts, const char *msg) +{ + osmo_stat_item_group_free(bts->bts_statg); + rate_ctr_group_free(bts->bts_ctrs); + if (osmo_timer_pending(&bts->acc_mgr.rotate_timer)) + osmo_timer_del(&bts->acc_mgr.rotate_timer); + /* no need to llist_del(&bts->list), we never registered the bts there. */ + talloc_free(bts); + fprintf(stderr, "BTS deallocated OK in %s()\n", msg); +} + +static void do_allowed_len_adm_loop(struct acc_mgr *acc_mgr, uint8_t jump) +{ + int i; + fprintf(stderr, "%s(%" PRIu8 ")\n", __func__, jump); + /* Test decreasing the administrative (VTY) max subset size */ + for (i = 10; i >= 0; i -= jump) { + acc_mgr_set_len_allowed_adm(acc_mgr, i); + } + if (i != 0) + acc_mgr_set_len_allowed_adm(acc_mgr, 0); + /* Test increasing the administrative (VTY) max subset size */ + for (i = 0; i <= 10; i += jump) { + acc_mgr_set_len_allowed_adm(acc_mgr, i); + } + if (i != 10) + acc_mgr_set_len_allowed_adm(acc_mgr, 10); +} + +static void do_allowed_len_ramp_loop(struct acc_mgr *acc_mgr, uint8_t jump) +{ + int i; + fprintf(stderr, "%s(%" PRIu8 ")\n", __func__, jump); + /* Test decreasing the administrative (VTY) max subset size */ + for (i = 10; i >= 0; i -= jump) { + acc_mgr_set_len_allowed_ramp(acc_mgr, i); + } + if (i != 0) + acc_mgr_set_len_allowed_ramp(acc_mgr, 0); + /* Test increasing the administrative (VTY) max subset size */ + for (i = 0; i <= 10; i += jump) { + acc_mgr_set_len_allowed_ramp(acc_mgr, i); + } + if (i != 10) + acc_mgr_set_len_allowed_ramp(acc_mgr, 10); +} + +static void test_acc_mgr_no_ramp(struct gsm_network *net) +{ + fprintf(stderr, "===%s===\n", __func__); + struct gsm_bts *bts = bts_init(net); + struct acc_mgr *acc_mgr = &bts->acc_mgr; + + /* Validate are all allowed by default after allocation: */ + OSMO_ASSERT(acc_mgr_get_len_allowed_adm(acc_mgr) == 10); + OSMO_ASSERT(acc_mgr_get_len_allowed_ramp(acc_mgr) == 10); + OSMO_ASSERT(acc_mgr->rotation_time_sec == ACC_MGR_QUANTUM_DEFAULT); + OSMO_ASSERT(acc_mgr->allowed_subset_mask == 0x3ff); + OSMO_ASSERT(acc_mgr->allowed_subset_mask_count == 10); + OSMO_ASSERT(acc_mgr->allowed_permanent_count == 10); + + + do_allowed_len_adm_loop(acc_mgr, 1); + do_allowed_len_adm_loop(acc_mgr, 4); + + /* Now permantenly barr some ACC */ + fprintf(stderr, "*** Barring some ACCs ***\n"); + bts->si_common.rach_control.t2 |= 0x02; + bts->si_common.rach_control.t3 |= 0xa5; + acc_mgr_perm_subset_changed(acc_mgr, &bts->si_common.rach_control); + + do_allowed_len_adm_loop(acc_mgr, 1); + do_allowed_len_adm_loop(acc_mgr, 4); + + fprintf(stderr, "*** Barring ALL ACCs ***\n"); + bts->si_common.rach_control.t2 |= 0x03; + bts->si_common.rach_control.t3 |= 0xff; + acc_mgr_perm_subset_changed(acc_mgr, &bts->si_common.rach_control); + + fprintf(stderr, "*** Barring zero ACCs ***\n"); + bts->si_common.rach_control.t2 = 0xfc; + bts->si_common.rach_control.t3 = 0x00; + acc_mgr_perm_subset_changed(acc_mgr, &bts->si_common.rach_control); + + bts_del(bts); +} + +static void test_acc_mgr_manual_ramp(struct gsm_network *net) +{ + fprintf(stderr, "===%s===\n", __func__); + struct gsm_bts *bts = bts_init(net); + struct acc_mgr *acc_mgr = &bts->acc_mgr; + + /* Validate are all allowed by default after allocation: */ + OSMO_ASSERT(acc_mgr_get_len_allowed_adm(acc_mgr) == 10); + OSMO_ASSERT(acc_mgr_get_len_allowed_ramp(acc_mgr) == 10); + OSMO_ASSERT(acc_mgr->rotation_time_sec == ACC_MGR_QUANTUM_DEFAULT); + OSMO_ASSERT(acc_mgr->allowed_subset_mask == 0x3ff); + OSMO_ASSERT(acc_mgr->allowed_subset_mask_count == 10); + OSMO_ASSERT(acc_mgr->allowed_permanent_count == 10); + + do_allowed_len_ramp_loop(acc_mgr, 1); + do_allowed_len_ramp_loop(acc_mgr, 4); + + /* Now permantenly barr some ACC */ + fprintf(stderr, "*** Barring some ACCs ***\n"); + bts->si_common.rach_control.t2 |= 0x01; + bts->si_common.rach_control.t3 |= 0xb3; + acc_mgr_perm_subset_changed(acc_mgr, &bts->si_common.rach_control); + + do_allowed_len_ramp_loop(acc_mgr, 1); + do_allowed_len_ramp_loop(acc_mgr, 4); + + fprintf(stderr, "*** Barring ALL ACCs ***\n"); + bts->si_common.rach_control.t2 |= 0x03; + bts->si_common.rach_control.t3 |= 0xff; + acc_mgr_perm_subset_changed(acc_mgr, &bts->si_common.rach_control); + do_allowed_len_ramp_loop(acc_mgr, 1); + do_allowed_len_ramp_loop(acc_mgr, 4); + + fprintf(stderr, "*** Barring zero ACCs ***\n"); + bts->si_common.rach_control.t2 = 0xfc; + bts->si_common.rach_control.t3 = 0x00; + acc_mgr_perm_subset_changed(acc_mgr, &bts->si_common.rach_control); + do_allowed_len_ramp_loop(acc_mgr, 1); + do_allowed_len_ramp_loop(acc_mgr, 4); + + fprintf(stderr, "*** Barring some ACCs + adm len 4 ***\n"); + acc_mgr_set_len_allowed_adm(acc_mgr, 4); + bts->si_common.rach_control.t2 = 0xfd; + bts->si_common.rach_control.t3 = 0xb3; + acc_mgr_perm_subset_changed(acc_mgr, &bts->si_common.rach_control); + do_allowed_len_ramp_loop(acc_mgr, 1); + do_allowed_len_ramp_loop(acc_mgr, 4); + + bts_del(bts); +} + +static void test_acc_mgr_rotate(struct gsm_network *net) +{ + fprintf(stderr, "===%s===\n", __func__); + int i; + struct gsm_bts *bts = bts_init(net); + struct acc_mgr *acc_mgr = &bts->acc_mgr; + + osmo_gettimeofday_override_time = (struct timeval) {0, 0}; + + /* Validate are all allowed by default after allocation: */ + OSMO_ASSERT(acc_mgr_get_len_allowed_adm(acc_mgr) == 10); + OSMO_ASSERT(acc_mgr_get_len_allowed_ramp(acc_mgr) == 10); + OSMO_ASSERT(acc_mgr->rotation_time_sec == ACC_MGR_QUANTUM_DEFAULT); + OSMO_ASSERT(acc_mgr->allowed_subset_mask == 0x3ff); + OSMO_ASSERT(acc_mgr->allowed_subset_mask_count == 10); + OSMO_ASSERT(acc_mgr->allowed_permanent_count == 10); + + /* Test that rotation won't go over permanently barred ACC*/ + fprintf(stderr, "*** Barring one ACC ***\n"); + bts->si_common.rach_control.t2 |= 0x02; + acc_mgr_perm_subset_changed(acc_mgr, &bts->si_common.rach_control); + + + acc_mgr_set_rotation_time(acc_mgr, 2); + acc_mgr_set_len_allowed_adm(acc_mgr, 4); + + for (i = 0; i < 20; i++) { + osmo_gettimeofday_override_time.tv_sec += 2; + clock_debug("select()"); + osmo_select_main(0); + } + + bts_del(bts); +} + +static void test_acc_ramp_fixed(struct gsm_network *net) +{ + fprintf(stderr, "===%s===\n", __func__); + int i; + struct gsm_bts *bts = bts_init(net); + struct acc_mgr *acc_mgr = &bts->acc_mgr; + struct acc_ramp *acc_ramp = &bts->acc_ramp; + + /* Validate are all allowed by default after allocation: */ + OSMO_ASSERT(acc_ramp_is_enabled(acc_ramp) == false); + OSMO_ASSERT(acc_ramp_get_step_size(acc_ramp) == ACC_RAMP_STEP_SIZE_DEFAULT); + OSMO_ASSERT(acc_ramp_get_step_interval(acc_ramp) == ACC_RAMP_STEP_INTERVAL_MIN); + OSMO_ASSERT(acc_ramp_step_interval_is_dynamic(acc_ramp) == true); + + /* Set super high rotation time so it doesn't interfer here: */ + acc_mgr_set_rotation_time(acc_mgr, 5000); + + //acc_ramp_set_step_interval_dynamic(acc_ramp); + OSMO_ASSERT(acc_ramp_set_step_interval(acc_ramp, 1) == -ERANGE); + OSMO_ASSERT(acc_ramp_set_step_interval(acc_ramp, 50) == 0); + acc_ramp_set_step_size(acc_ramp, 1); + acc_ramp_set_enabled(acc_ramp, true); + + osmo_gettimeofday_override_time = (struct timeval) {0, 0}; + acc_ramp_trigger(acc_ramp); + + for (i = 0; i < 9; i++) { + osmo_gettimeofday_override_time.tv_sec += 50; + clock_debug("select()"); + osmo_select_main(0); + } + + bts_del(bts); +} + +static void test_acc_ramp_fixed2(struct gsm_network *net) +{ + fprintf(stderr, "===%s===\n", __func__); + int i; + struct gsm_bts *bts = bts_init(net); + struct acc_mgr *acc_mgr = &bts->acc_mgr; + struct acc_ramp *acc_ramp = &bts->acc_ramp; + + /* Validate are all allowed by default after allocation: */ + OSMO_ASSERT(acc_ramp_is_enabled(acc_ramp) == false); + OSMO_ASSERT(acc_ramp_get_step_size(acc_ramp) == ACC_RAMP_STEP_SIZE_DEFAULT); + OSMO_ASSERT(acc_ramp_get_step_interval(acc_ramp) == ACC_RAMP_STEP_INTERVAL_MIN); + OSMO_ASSERT(acc_ramp_step_interval_is_dynamic(acc_ramp) == true); + + /* Set super high rotation time so it doesn't interfer here: */ + acc_mgr_set_rotation_time(acc_mgr, 5000); + /* Set adm len to test that ramping won't go over it */ + acc_mgr_set_len_allowed_adm(acc_mgr, 7); + + acc_ramp_set_step_size(acc_ramp, 3); + acc_ramp_set_enabled(acc_ramp, true); + + osmo_gettimeofday_override_time = (struct timeval) {0, 0}; + acc_ramp_trigger(acc_ramp); + + for (i = 0; i < 3; i++) { + osmo_gettimeofday_override_time.tv_sec += ACC_RAMP_STEP_INTERVAL_MIN; + clock_debug("select()"); + osmo_select_main(0); + } + + bts_del(bts); +} + +static void test_acc_ramp_fixed3(struct gsm_network *net) +{ + fprintf(stderr, "===%s===\n", __func__); + int i; + struct gsm_bts *bts = bts_init(net); + struct acc_mgr *acc_mgr = &bts->acc_mgr; + struct acc_ramp *acc_ramp = &bts->acc_ramp; + + /* Validate are all allowed by default after allocation: */ + OSMO_ASSERT(acc_ramp_is_enabled(acc_ramp) == false); + OSMO_ASSERT(acc_ramp_get_step_size(acc_ramp) == ACC_RAMP_STEP_SIZE_DEFAULT); + OSMO_ASSERT(acc_ramp_get_step_interval(acc_ramp) == ACC_RAMP_STEP_INTERVAL_MIN); + OSMO_ASSERT(acc_ramp_step_interval_is_dynamic(acc_ramp) == true); + + /* Set super high rotation time so it doesn't interfer here: */ + acc_mgr_set_rotation_time(acc_mgr, 5000); + /* Test that ramping won't go over permanently barred ACC*/ + fprintf(stderr, "*** Barring some ACCs ***\n"); + bts->si_common.rach_control.t2 |= 0x02; + bts->si_common.rach_control.t3 |= 0xa5; + acc_mgr_perm_subset_changed(acc_mgr, &bts->si_common.rach_control); + + acc_ramp_set_step_size(acc_ramp, 1); + acc_ramp_set_enabled(acc_ramp, true); + + osmo_gettimeofday_override_time = (struct timeval) {0, 0}; + acc_ramp_trigger(acc_ramp); + + for (i = 0; i < 9; i++) { + osmo_gettimeofday_override_time.tv_sec += ACC_RAMP_STEP_INTERVAL_MIN; + clock_debug("select()"); + osmo_select_main(0); + } + + bts_del(bts); +} + +static void test_acc_ramp_dynamic(struct gsm_network *net) +{ + fprintf(stderr, "===%s===\n", __func__); + char buf[128]; + unsigned int step_sec; + struct gsm_bts *bts = bts_init(net); + struct acc_mgr *acc_mgr = &bts->acc_mgr; + struct acc_ramp *acc_ramp = &bts->acc_ramp; + + /* Validate are all allowed by default after allocation: */ + OSMO_ASSERT(acc_ramp_is_enabled(acc_ramp) == false); + OSMO_ASSERT(acc_ramp_get_step_size(acc_ramp) == ACC_RAMP_STEP_SIZE_DEFAULT); + OSMO_ASSERT(acc_ramp_get_step_interval(acc_ramp) == ACC_RAMP_STEP_INTERVAL_MIN); + OSMO_ASSERT(acc_ramp_step_interval_is_dynamic(acc_ramp) == true); + + /* Set super high rotation time so it doesn't interfer here: */ + acc_mgr_set_rotation_time(acc_mgr, 5000); + + acc_ramp_set_step_interval_dynamic(acc_ramp); + acc_ramp_set_step_size(acc_ramp, 1); + acc_ramp_set_enabled(acc_ramp, true); + + bts->chan_load_avg = 0; /*set 70% channel load */ + + osmo_gettimeofday_override_time = (struct timeval) {0, 0}; + acc_ramp_trigger(acc_ramp); + + while (osmo_timer_pending(&acc_ramp->step_timer)) { + bts->chan_load_avg += 10; + step_sec = ((bts->chan_load_avg * ACC_RAMP_STEP_INTERVAL_MAX) / 100); + osmo_gettimeofday_override_time.tv_sec += step_sec; + snprintf(buf, sizeof(buf), "select(): load=%" PRIu8 " -> step_sec=%u", + bts->chan_load_avg, step_sec); + clock_debug(buf); + osmo_select_main(0); + } + + bts_del(bts); +} + +static void test_acc_ramp_fixed_rotate(struct gsm_network *net) +{ + fprintf(stderr, "===%s===\n", __func__); + struct gsm_bts *bts = bts_init(net); + struct acc_mgr *acc_mgr = &bts->acc_mgr; + struct acc_ramp *acc_ramp = &bts->acc_ramp; + + /* Validate are all allowed by default after allocation: */ + OSMO_ASSERT(acc_ramp_is_enabled(acc_ramp) == false); + OSMO_ASSERT(acc_ramp_get_step_size(acc_ramp) == ACC_RAMP_STEP_SIZE_DEFAULT); + OSMO_ASSERT(acc_ramp_get_step_interval(acc_ramp) == ACC_RAMP_STEP_INTERVAL_MIN); + OSMO_ASSERT(acc_ramp_step_interval_is_dynamic(acc_ramp) == true); + + OSMO_ASSERT(acc_ramp_set_step_interval(acc_ramp, 250) == 0); + acc_mgr_set_rotation_time(acc_mgr, 100); + /* Test that ramping + rotation won't go over permanently barred ACC*/ + fprintf(stderr, "*** Barring one ACC ***\n"); + bts->si_common.rach_control.t2 |= 0x02; + acc_mgr_perm_subset_changed(acc_mgr, &bts->si_common.rach_control); + + acc_ramp_set_step_size(acc_ramp, 1); + acc_ramp_set_enabled(acc_ramp, true); + + osmo_gettimeofday_override_time = (struct timeval) {0, 0}; + acc_ramp_trigger(acc_ramp); + + while (true) { + if (osmo_timer_pending(&acc_mgr->rotate_timer)) { + if ((osmo_gettimeofday_override_time.tv_sec + 50) % 250 == 0) + osmo_gettimeofday_override_time.tv_sec += 50; + else + osmo_gettimeofday_override_time.tv_sec += 100; + } else if (osmo_timer_pending(&acc_ramp->step_timer)) { + osmo_gettimeofday_override_time.tv_sec -= osmo_gettimeofday_override_time.tv_sec % 250; + osmo_gettimeofday_override_time.tv_sec += 250; + } else { + /* Once ramping is done, adm level is big enough and hence + * rotation is not needed and will be disabled. We are then done + */ + break; + } + clock_debug("select()"); + osmo_select_main(0); + } + + bts_del(bts); +} + +static const struct log_info_cat log_categories[] = { + [DRSL] = { + .name = "DRSL", + .description = "A-bis Radio Signalling Link (RSL)", + .enabled = 1, .loglevel = LOGL_NOTICE, + }, +}; + +static const struct log_info log_info = { + .cat = log_categories, + .num_cat = ARRAY_SIZE(log_categories), +}; + +int main(int argc, char **argv) +{ + struct gsm_network *net; + + osmo_gettimeofday_override = true; + osmo_gettimeofday_override_time = (struct timeval) {0, 0}; + + tall_bsc_ctx = talloc_named_const(NULL, 0, "gsm0408_test"); + osmo_init_logging2(tall_bsc_ctx, &log_info); + log_set_log_level(osmo_stderr_target, LOGL_INFO); + log_set_print_category_hex(osmo_stderr_target, false); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_set_use_color(osmo_stderr_target, 0); + + net = gsm_network_init(tall_bsc_ctx); + if (!net) { + fprintf(stderr, "Network init failure.\n"); + return EXIT_FAILURE; + } + + test_acc_mgr_no_ramp(net); + test_acc_mgr_manual_ramp(net); + test_acc_mgr_rotate(net); + test_acc_ramp_fixed(net); + test_acc_ramp_fixed2(net); + test_acc_ramp_fixed3(net); + test_acc_ramp_dynamic(net); + test_acc_ramp_fixed_rotate(net); + + return EXIT_SUCCESS; +} + +/* Whenever ACC code changes the set of barred ACCs, gsm_bts_set_system_infos() + * is called which ends up calling pcu_info_update */ +void pcu_info_update(struct gsm_bts *bts) { + struct gsm48_rach_control rach_control = {0}; + + acc_mgr_apply_acc(&bts->acc_mgr, &rach_control); + fprintf(stderr, "%s(): t2=0x%02" PRIx8 " t3=0x%02" PRIx8 "\n", + __func__, rach_control.t2, rach_control.t3); +} + + +struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) { + OSMO_ASSERT(0); +} + +bool on_gsm_ts_init(struct gsm_bts_trx_ts *ts) { return true; } +void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} +int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } +int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) +{ return 0; } +int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/tests/acc/acc_test.ok b/tests/acc/acc_test.ok new file mode 100644 index 0000000..f377651 --- /dev/null +++ b/tests/acc/acc_test.ok @@ -0,0 +1,620 @@ +===test_acc_mgr_no_ramp=== +(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +BTS allocation OK in test_acc_mgr_no_ramp() +do_allowed_len_adm_loop(1) +(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3fe (active_len=9, ramp_len=10, adm_len=9, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x01 +(bts=0) ACC: update ACC allowed active subset 0x3fe -> 0x3fc (active_len=8, ramp_len=10, adm_len=8, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x03 +(bts=0) ACC: update ACC allowed active subset 0x3fc -> 0x3f8 (active_len=7, ramp_len=10, adm_len=7, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x07 +(bts=0) ACC: update ACC allowed active subset 0x3f8 -> 0x3f0 (active_len=6, ramp_len=10, adm_len=6, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x0f +(bts=0) ACC: update ACC allowed active subset 0x3f0 -> 0x3e0 (active_len=5, ramp_len=10, adm_len=5, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x1f +(bts=0) ACC: update ACC allowed active subset 0x3e0 -> 0x3c0 (active_len=4, ramp_len=10, adm_len=4, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x3f +(bts=0) ACC: update ACC allowed active subset 0x3c0 -> 0x380 (active_len=3, ramp_len=10, adm_len=3, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x7f +(bts=0) ACC: update ACC allowed active subset 0x380 -> 0x300 (active_len=2, ramp_len=10, adm_len=2, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0xff +(bts=0) ACC: update ACC allowed active subset 0x300 -> 0x200 (active_len=1, ramp_len=10, adm_len=1, perm_len=10, rotation=on) +pcu_info_update(): t2=0x01 t3=0xff +(bts=0) ACC: update ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=10, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=10, adm_len=1, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfe +(bts=0) ACC: update ACC allowed active subset 0x001 -> 0x003 (active_len=2, ramp_len=10, adm_len=2, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfc +(bts=0) ACC: update ACC allowed active subset 0x003 -> 0x007 (active_len=3, ramp_len=10, adm_len=3, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf8 +(bts=0) ACC: update ACC allowed active subset 0x007 -> 0x00f (active_len=4, ramp_len=10, adm_len=4, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf0 +(bts=0) ACC: update ACC allowed active subset 0x00f -> 0x01f (active_len=5, ramp_len=10, adm_len=5, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe0 +(bts=0) ACC: update ACC allowed active subset 0x01f -> 0x03f (active_len=6, ramp_len=10, adm_len=6, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xc0 +(bts=0) ACC: update ACC allowed active subset 0x03f -> 0x07f (active_len=7, ramp_len=10, adm_len=7, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0x80 +(bts=0) ACC: update ACC allowed active subset 0x07f -> 0x0ff (active_len=8, ramp_len=10, adm_len=8, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0x00 +(bts=0) ACC: update ACC allowed active subset 0x0ff -> 0x1ff (active_len=9, ramp_len=10, adm_len=9, perm_len=10, rotation=on) +pcu_info_update(): t2=0x02 t3=0x00 +(bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +pcu_info_update(): t2=0x00 t3=0x00 +do_allowed_len_adm_loop(4) +(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3f0 (active_len=6, ramp_len=10, adm_len=6, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x0f +(bts=0) ACC: update ACC allowed active subset 0x3f0 -> 0x300 (active_len=2, ramp_len=10, adm_len=2, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0xff +(bts=0) ACC: update ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=10, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x00f (active_len=4, ramp_len=10, adm_len=4, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf0 +(bts=0) ACC: update ACC allowed active subset 0x00f -> 0x0ff (active_len=8, ramp_len=10, adm_len=8, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0x00 +(bts=0) ACC: update ACC allowed active subset 0x0ff -> 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +pcu_info_update(): t2=0x00 t3=0x00 +*** Barring some ACCs *** +(bts=0) ACC: New ACC allowed subset 0x15a (active_len=5, ramp_len=10, adm_len=10, perm_len=5, rotation=off) +pcu_info_update(): t2=0x02 t3=0xa5 +do_allowed_len_adm_loop(1) +(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=10, adm_len=9, perm_len=5, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=10, adm_len=8, perm_len=5, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=10, adm_len=7, perm_len=5, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=10, adm_len=6, perm_len=5, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x158 (active_len=4, ramp_len=10, adm_len=4, perm_len=5, rotation=on) +pcu_info_update(): t2=0x02 t3=0xa7 +(bts=0) ACC: update ACC allowed active subset 0x158 -> 0x150 (active_len=3, ramp_len=10, adm_len=3, perm_len=5, rotation=on) +pcu_info_update(): t2=0x02 t3=0xaf +(bts=0) ACC: update ACC allowed active subset 0x150 -> 0x140 (active_len=2, ramp_len=10, adm_len=2, perm_len=5, rotation=on) +pcu_info_update(): t2=0x02 t3=0xbf +(bts=0) ACC: update ACC allowed active subset 0x140 -> 0x100 (active_len=1, ramp_len=10, adm_len=1, perm_len=5, rotation=on) +pcu_info_update(): t2=0x02 t3=0xff +(bts=0) ACC: update ACC allowed active subset 0x100 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=5, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x002 (active_len=1, ramp_len=10, adm_len=1, perm_len=5, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfd +(bts=0) ACC: update ACC allowed active subset 0x002 -> 0x00a (active_len=2, ramp_len=10, adm_len=2, perm_len=5, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf5 +(bts=0) ACC: update ACC allowed active subset 0x00a -> 0x01a (active_len=3, ramp_len=10, adm_len=3, perm_len=5, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe5 +(bts=0) ACC: update ACC allowed active subset 0x01a -> 0x05a (active_len=4, ramp_len=10, adm_len=4, perm_len=5, rotation=on) +pcu_info_update(): t2=0x03 t3=0xa5 +(bts=0) ACC: update ACC allowed active subset 0x05a -> 0x15a (active_len=5, ramp_len=10, adm_len=5, perm_len=5, rotation=off) +pcu_info_update(): t2=0x02 t3=0xa5 +(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=10, adm_len=6, perm_len=5, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=10, adm_len=7, perm_len=5, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=10, adm_len=8, perm_len=5, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=10, adm_len=9, perm_len=5, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=10, adm_len=10, perm_len=5, rotation=off) +do_allowed_len_adm_loop(4) +(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=10, adm_len=6, perm_len=5, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x140 (active_len=2, ramp_len=10, adm_len=2, perm_len=5, rotation=on) +pcu_info_update(): t2=0x02 t3=0xbf +(bts=0) ACC: update ACC allowed active subset 0x140 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=5, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x05a (active_len=4, ramp_len=10, adm_len=4, perm_len=5, rotation=on) +pcu_info_update(): t2=0x03 t3=0xa5 +(bts=0) ACC: update ACC allowed active subset 0x05a -> 0x15a (active_len=5, ramp_len=10, adm_len=8, perm_len=5, rotation=off) +pcu_info_update(): t2=0x02 t3=0xa5 +(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=10, adm_len=10, perm_len=5, rotation=off) +*** Barring ALL ACCs *** +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=10, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +*** Barring zero ACCs *** +(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +pcu_info_update(): t2=0x00 t3=0x00 +BTS deallocated OK in test_acc_mgr_no_ramp() +===test_acc_mgr_manual_ramp=== +(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +BTS allocation OK in test_acc_mgr_manual_ramp() +do_allowed_len_ramp_loop(1) +(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3fe (active_len=9, ramp_len=9, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x01 +(bts=0) ACC: update ACC allowed active subset 0x3fe -> 0x3fc (active_len=8, ramp_len=8, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x03 +(bts=0) ACC: update ACC allowed active subset 0x3fc -> 0x3f8 (active_len=7, ramp_len=7, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x07 +(bts=0) ACC: update ACC allowed active subset 0x3f8 -> 0x3f0 (active_len=6, ramp_len=6, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x0f +(bts=0) ACC: update ACC allowed active subset 0x3f0 -> 0x3e0 (active_len=5, ramp_len=5, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x1f +(bts=0) ACC: update ACC allowed active subset 0x3e0 -> 0x3c0 (active_len=4, ramp_len=4, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x3f +(bts=0) ACC: update ACC allowed active subset 0x3c0 -> 0x380 (active_len=3, ramp_len=3, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x7f +(bts=0) ACC: update ACC allowed active subset 0x380 -> 0x300 (active_len=2, ramp_len=2, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0xff +(bts=0) ACC: update ACC allowed active subset 0x300 -> 0x200 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x01 t3=0xff +(bts=0) ACC: update ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfe +(bts=0) ACC: update ACC allowed active subset 0x001 -> 0x003 (active_len=2, ramp_len=2, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfc +(bts=0) ACC: update ACC allowed active subset 0x003 -> 0x007 (active_len=3, ramp_len=3, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf8 +(bts=0) ACC: update ACC allowed active subset 0x007 -> 0x00f (active_len=4, ramp_len=4, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf0 +(bts=0) ACC: update ACC allowed active subset 0x00f -> 0x01f (active_len=5, ramp_len=5, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe0 +(bts=0) ACC: update ACC allowed active subset 0x01f -> 0x03f (active_len=6, ramp_len=6, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xc0 +(bts=0) ACC: update ACC allowed active subset 0x03f -> 0x07f (active_len=7, ramp_len=7, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0x80 +(bts=0) ACC: update ACC allowed active subset 0x07f -> 0x0ff (active_len=8, ramp_len=8, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0x00 +(bts=0) ACC: update ACC allowed active subset 0x0ff -> 0x1ff (active_len=9, ramp_len=9, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x02 t3=0x00 +(bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +pcu_info_update(): t2=0x00 t3=0x00 +do_allowed_len_ramp_loop(4) +(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3f0 (active_len=6, ramp_len=6, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x0f +(bts=0) ACC: update ACC allowed active subset 0x3f0 -> 0x300 (active_len=2, ramp_len=2, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0xff +(bts=0) ACC: update ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x00f (active_len=4, ramp_len=4, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf0 +(bts=0) ACC: update ACC allowed active subset 0x00f -> 0x0ff (active_len=8, ramp_len=8, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0x00 +(bts=0) ACC: update ACC allowed active subset 0x0ff -> 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +pcu_info_update(): t2=0x00 t3=0x00 +*** Barring some ACCs *** +(bts=0) ACC: New ACC allowed subset 0x24c (active_len=4, ramp_len=10, adm_len=10, perm_len=4, rotation=off) +pcu_info_update(): t2=0x01 t3=0xb3 +do_allowed_len_ramp_loop(1) +(bts=0) ACC: update ACC allowed active subset 0x24c -> 0x24c (active_len=4, ramp_len=9, adm_len=10, perm_len=4, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x24c -> 0x24c (active_len=4, ramp_len=8, adm_len=10, perm_len=4, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x24c -> 0x24c (active_len=4, ramp_len=7, adm_len=10, perm_len=4, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x24c -> 0x24c (active_len=4, ramp_len=6, adm_len=10, perm_len=4, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x24c -> 0x24c (active_len=4, ramp_len=5, adm_len=10, perm_len=4, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x24c -> 0x248 (active_len=3, ramp_len=3, adm_len=10, perm_len=4, rotation=on) +pcu_info_update(): t2=0x01 t3=0xb7 +(bts=0) ACC: update ACC allowed active subset 0x248 -> 0x240 (active_len=2, ramp_len=2, adm_len=10, perm_len=4, rotation=on) +pcu_info_update(): t2=0x01 t3=0xbf +(bts=0) ACC: update ACC allowed active subset 0x240 -> 0x200 (active_len=1, ramp_len=1, adm_len=10, perm_len=4, rotation=on) +pcu_info_update(): t2=0x01 t3=0xff +(bts=0) ACC: update ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=4, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x004 (active_len=1, ramp_len=1, adm_len=10, perm_len=4, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfb +(bts=0) ACC: update ACC allowed active subset 0x004 -> 0x00c (active_len=2, ramp_len=2, adm_len=10, perm_len=4, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf3 +(bts=0) ACC: update ACC allowed active subset 0x00c -> 0x04c (active_len=3, ramp_len=3, adm_len=10, perm_len=4, rotation=on) +pcu_info_update(): t2=0x03 t3=0xb3 +(bts=0) ACC: update ACC allowed active subset 0x04c -> 0x24c (active_len=4, ramp_len=4, adm_len=10, perm_len=4, rotation=off) +pcu_info_update(): t2=0x01 t3=0xb3 +(bts=0) ACC: update ACC allowed active subset 0x24c -> 0x24c (active_len=4, ramp_len=5, adm_len=10, perm_len=4, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x24c -> 0x24c (active_len=4, ramp_len=6, adm_len=10, perm_len=4, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x24c -> 0x24c (active_len=4, ramp_len=7, adm_len=10, perm_len=4, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x24c -> 0x24c (active_len=4, ramp_len=8, adm_len=10, perm_len=4, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x24c -> 0x24c (active_len=4, ramp_len=9, adm_len=10, perm_len=4, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x24c -> 0x24c (active_len=4, ramp_len=10, adm_len=10, perm_len=4, rotation=off) +do_allowed_len_ramp_loop(4) +(bts=0) ACC: update ACC allowed active subset 0x24c -> 0x24c (active_len=4, ramp_len=6, adm_len=10, perm_len=4, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x24c -> 0x240 (active_len=2, ramp_len=2, adm_len=10, perm_len=4, rotation=on) +pcu_info_update(): t2=0x01 t3=0xbf +(bts=0) ACC: update ACC allowed active subset 0x240 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=4, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x24c (active_len=4, ramp_len=4, adm_len=10, perm_len=4, rotation=off) +pcu_info_update(): t2=0x01 t3=0xb3 +(bts=0) ACC: update ACC allowed active subset 0x24c -> 0x24c (active_len=4, ramp_len=8, adm_len=10, perm_len=4, rotation=off) +(bts=0) ACC: update ACC allowed active subset 0x24c -> 0x24c (active_len=4, ramp_len=10, adm_len=10, perm_len=4, rotation=off) +*** Barring ALL ACCs *** +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=10, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +do_allowed_len_ramp_loop(1) +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=9, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=8, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=7, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=6, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=5, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=4, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=3, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=2, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=1, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=1, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=2, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=3, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=4, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=5, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=6, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=7, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=8, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=9, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=10, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +do_allowed_len_ramp_loop(4) +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=6, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=2, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=4, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=8, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x000 (active_len=0, ramp_len=10, adm_len=10, perm_len=0, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +*** Barring zero ACCs *** +(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +pcu_info_update(): t2=0x00 t3=0x00 +do_allowed_len_ramp_loop(1) +(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3fe (active_len=9, ramp_len=9, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x01 +(bts=0) ACC: update ACC allowed active subset 0x3fe -> 0x3fc (active_len=8, ramp_len=8, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x03 +(bts=0) ACC: update ACC allowed active subset 0x3fc -> 0x3f8 (active_len=7, ramp_len=7, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x07 +(bts=0) ACC: update ACC allowed active subset 0x3f8 -> 0x3f0 (active_len=6, ramp_len=6, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x0f +(bts=0) ACC: update ACC allowed active subset 0x3f0 -> 0x3e0 (active_len=5, ramp_len=5, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x1f +(bts=0) ACC: update ACC allowed active subset 0x3e0 -> 0x3c0 (active_len=4, ramp_len=4, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x3f +(bts=0) ACC: update ACC allowed active subset 0x3c0 -> 0x380 (active_len=3, ramp_len=3, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x7f +(bts=0) ACC: update ACC allowed active subset 0x380 -> 0x300 (active_len=2, ramp_len=2, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0xff +(bts=0) ACC: update ACC allowed active subset 0x300 -> 0x200 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x01 t3=0xff +(bts=0) ACC: update ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfe +(bts=0) ACC: update ACC allowed active subset 0x001 -> 0x003 (active_len=2, ramp_len=2, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfc +(bts=0) ACC: update ACC allowed active subset 0x003 -> 0x007 (active_len=3, ramp_len=3, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf8 +(bts=0) ACC: update ACC allowed active subset 0x007 -> 0x00f (active_len=4, ramp_len=4, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf0 +(bts=0) ACC: update ACC allowed active subset 0x00f -> 0x01f (active_len=5, ramp_len=5, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe0 +(bts=0) ACC: update ACC allowed active subset 0x01f -> 0x03f (active_len=6, ramp_len=6, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xc0 +(bts=0) ACC: update ACC allowed active subset 0x03f -> 0x07f (active_len=7, ramp_len=7, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0x80 +(bts=0) ACC: update ACC allowed active subset 0x07f -> 0x0ff (active_len=8, ramp_len=8, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0x00 +(bts=0) ACC: update ACC allowed active subset 0x0ff -> 0x1ff (active_len=9, ramp_len=9, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x02 t3=0x00 +(bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +pcu_info_update(): t2=0x00 t3=0x00 +do_allowed_len_ramp_loop(4) +(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3f0 (active_len=6, ramp_len=6, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x0f +(bts=0) ACC: update ACC allowed active subset 0x3f0 -> 0x300 (active_len=2, ramp_len=2, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0xff +(bts=0) ACC: update ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x00f (active_len=4, ramp_len=4, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf0 +(bts=0) ACC: update ACC allowed active subset 0x00f -> 0x0ff (active_len=8, ramp_len=8, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0x00 +(bts=0) ACC: update ACC allowed active subset 0x0ff -> 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +pcu_info_update(): t2=0x00 t3=0x00 +*** Barring some ACCs + adm len 4 *** +(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3c0 (active_len=4, ramp_len=10, adm_len=4, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x3f +(bts=0) ACC: New ACC allowed subset 0x24c (active_len=4, ramp_len=10, adm_len=4, perm_len=4, rotation=off) +pcu_info_update(): t2=0x01 t3=0xb3 +do_allowed_len_ramp_loop(1) +(bts=0) ACC: update ACC allowed active subset 0x24c -> 0x248 (active_len=3, ramp_len=3, adm_len=4, perm_len=4, rotation=on) +pcu_info_update(): t2=0x01 t3=0xb7 +(bts=0) ACC: update ACC allowed active subset 0x248 -> 0x240 (active_len=2, ramp_len=2, adm_len=4, perm_len=4, rotation=on) +pcu_info_update(): t2=0x01 t3=0xbf +(bts=0) ACC: update ACC allowed active subset 0x240 -> 0x200 (active_len=1, ramp_len=1, adm_len=4, perm_len=4, rotation=on) +pcu_info_update(): t2=0x01 t3=0xff +(bts=0) ACC: update ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=4, perm_len=4, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x004 (active_len=1, ramp_len=1, adm_len=4, perm_len=4, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfb +(bts=0) ACC: update ACC allowed active subset 0x004 -> 0x00c (active_len=2, ramp_len=2, adm_len=4, perm_len=4, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf3 +(bts=0) ACC: update ACC allowed active subset 0x00c -> 0x04c (active_len=3, ramp_len=3, adm_len=4, perm_len=4, rotation=on) +pcu_info_update(): t2=0x03 t3=0xb3 +(bts=0) ACC: update ACC allowed active subset 0x04c -> 0x24c (active_len=4, ramp_len=4, adm_len=4, perm_len=4, rotation=off) +pcu_info_update(): t2=0x01 t3=0xb3 +do_allowed_len_ramp_loop(4) +(bts=0) ACC: update ACC allowed active subset 0x24c -> 0x240 (active_len=2, ramp_len=2, adm_len=4, perm_len=4, rotation=on) +pcu_info_update(): t2=0x01 t3=0xbf +(bts=0) ACC: update ACC allowed active subset 0x240 -> 0x000 (active_len=0, ramp_len=0, adm_len=4, perm_len=4, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x24c (active_len=4, ramp_len=4, adm_len=4, perm_len=4, rotation=off) +pcu_info_update(): t2=0x01 t3=0xb3 +BTS deallocated OK in test_acc_mgr_manual_ramp() +===test_acc_mgr_rotate=== +(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +BTS allocation OK in test_acc_mgr_rotate() +*** Barring one ACC *** +(bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) +pcu_info_update(): t2=0x02 t3=0x00 +(bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x1e0 (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x1f +sys={2.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x1e0 -> 0x1c1 (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x3e +sys={4.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x1c1 -> 0x0c3 (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x3c +sys={6.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x0c3 -> 0x047 (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xb8 +sys={8.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x047 -> 0x00f (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf0 +sys={10.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x00f -> 0x01e (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe1 +sys={12.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x01e -> 0x03c (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xc3 +sys={14.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x03c -> 0x078 (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x87 +sys={16.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x078 -> 0x0f0 (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x0f +sys={18.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x0f0 -> 0x1e0 (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x1f +sys={20.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x1e0 -> 0x1c1 (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x3e +sys={22.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x1c1 -> 0x0c3 (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x3c +sys={24.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x0c3 -> 0x047 (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xb8 +sys={26.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x047 -> 0x00f (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf0 +sys={28.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x00f -> 0x01e (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe1 +sys={30.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x01e -> 0x03c (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xc3 +sys={32.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x03c -> 0x078 (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x87 +sys={34.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x078 -> 0x0f0 (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x0f +sys={36.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x0f0 -> 0x1e0 (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x1f +sys={38.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x1e0 -> 0x1c1 (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x3e +sys={40.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x1c1 -> 0x0c3 (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x3c +BTS deallocated OK in test_acc_mgr_rotate() +===test_acc_ramp_fixed=== +(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +BTS allocation OK in test_acc_ramp_fixed() +(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfe +sys={50.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x001 -> 0x003 (active_len=2, ramp_len=2, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfc +sys={100.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x003 -> 0x007 (active_len=3, ramp_len=3, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf8 +sys={150.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x007 -> 0x00f (active_len=4, ramp_len=4, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf0 +sys={200.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x00f -> 0x01f (active_len=5, ramp_len=5, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe0 +sys={250.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x01f -> 0x03f (active_len=6, ramp_len=6, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xc0 +sys={300.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x03f -> 0x07f (active_len=7, ramp_len=7, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0x80 +sys={350.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x07f -> 0x0ff (active_len=8, ramp_len=8, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0x00 +sys={400.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x0ff -> 0x1ff (active_len=9, ramp_len=9, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x02 t3=0x00 +sys={450.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +pcu_info_update(): t2=0x00 t3=0x00 +BTS deallocated OK in test_acc_ramp_fixed() +===test_acc_ramp_fixed2=== +(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +BTS allocation OK in test_acc_ramp_fixed2() +(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3f8 (active_len=7, ramp_len=10, adm_len=7, perm_len=10, rotation=on) +pcu_info_update(): t2=0x00 t3=0x07 +(bts=0) ACC: update ACC allowed active subset 0x3f8 -> 0x000 (active_len=0, ramp_len=0, adm_len=7, perm_len=10, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x007 (active_len=3, ramp_len=3, adm_len=7, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf8 +sys={30.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x007 -> 0x03f (active_len=6, ramp_len=6, adm_len=7, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xc0 +sys={60.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x03f -> 0x07f (active_len=7, ramp_len=9, adm_len=7, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0x80 +sys={90.000000}: select() +BTS deallocated OK in test_acc_ramp_fixed2() +===test_acc_ramp_fixed3=== +(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +BTS allocation OK in test_acc_ramp_fixed3() +*** Barring some ACCs *** +(bts=0) ACC: New ACC allowed subset 0x15a (active_len=5, ramp_len=10, adm_len=10, perm_len=5, rotation=off) +pcu_info_update(): t2=0x02 t3=0xa5 +(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=5, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x002 (active_len=1, ramp_len=1, adm_len=10, perm_len=5, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfd +sys={30.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x002 -> 0x00a (active_len=2, ramp_len=2, adm_len=10, perm_len=5, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf5 +sys={60.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x00a -> 0x01a (active_len=3, ramp_len=3, adm_len=10, perm_len=5, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe5 +sys={90.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x01a -> 0x05a (active_len=4, ramp_len=4, adm_len=10, perm_len=5, rotation=on) +pcu_info_update(): t2=0x03 t3=0xa5 +sys={120.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x05a -> 0x15a (active_len=5, ramp_len=5, adm_len=10, perm_len=5, rotation=off) +pcu_info_update(): t2=0x02 t3=0xa5 +sys={150.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=6, adm_len=10, perm_len=5, rotation=off) +sys={180.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=7, adm_len=10, perm_len=5, rotation=off) +sys={210.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=8, adm_len=10, perm_len=5, rotation=off) +sys={240.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=9, adm_len=10, perm_len=5, rotation=off) +sys={270.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=10, adm_len=10, perm_len=5, rotation=off) +BTS deallocated OK in test_acc_ramp_fixed3() +===test_acc_ramp_dynamic=== +(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +BTS allocation OK in test_acc_ramp_dynamic() +(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfe +sys={60.000000}: select(): load=10 -> step_sec=60 +(bts=0) ACC: update ACC allowed active subset 0x001 -> 0x003 (active_len=2, ramp_len=2, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfc +sys={180.000000}: select(): load=20 -> step_sec=120 +(bts=0) ACC: update ACC allowed active subset 0x003 -> 0x007 (active_len=3, ramp_len=3, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf8 +sys={360.000000}: select(): load=30 -> step_sec=180 +(bts=0) ACC: update ACC allowed active subset 0x007 -> 0x00f (active_len=4, ramp_len=4, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf0 +sys={600.000000}: select(): load=40 -> step_sec=240 +(bts=0) ACC: update ACC allowed active subset 0x00f -> 0x01f (active_len=5, ramp_len=5, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe0 +sys={900.000000}: select(): load=50 -> step_sec=300 +(bts=0) ACC: update ACC allowed active subset 0x01f -> 0x03f (active_len=6, ramp_len=6, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0xc0 +sys={1260.000000}: select(): load=60 -> step_sec=360 +(bts=0) ACC: update ACC allowed active subset 0x03f -> 0x07f (active_len=7, ramp_len=7, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0x80 +sys={1680.000000}: select(): load=70 -> step_sec=420 +(bts=0) ACC: update ACC allowed active subset 0x07f -> 0x0ff (active_len=8, ramp_len=8, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x03 t3=0x00 +sys={2160.000000}: select(): load=80 -> step_sec=480 +(bts=0) ACC: update ACC allowed active subset 0x0ff -> 0x1ff (active_len=9, ramp_len=9, adm_len=10, perm_len=10, rotation=on) +pcu_info_update(): t2=0x02 t3=0x00 +sys={2700.000000}: select(): load=90 -> step_sec=540 +(bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +pcu_info_update(): t2=0x00 t3=0x00 +BTS deallocated OK in test_acc_ramp_dynamic() +===test_acc_ramp_fixed_rotate=== +(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +BTS allocation OK in test_acc_ramp_fixed_rotate() +*** Barring one ACC *** +(bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) +pcu_info_update(): t2=0x02 t3=0x00 +(bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=9, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfe +sys={100.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x001 -> 0x002 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfd +sys={200.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x002 -> 0x004 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfb +sys={250.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x004 -> 0x00c (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf3 +sys={350.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x00c -> 0x018 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe7 +sys={450.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x018 -> 0x030 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xcf +sys={500.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x030 -> 0x070 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x8f +sys={600.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x070 -> 0x0e0 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x1f +sys={700.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x0e0 -> 0x1c0 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x3f +sys={750.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x1c0 -> 0x1c1 (active_len=4, ramp_len=4, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x3e +sys={850.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x1c1 -> 0x0c3 (active_len=4, ramp_len=4, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x3c +sys={950.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x0c3 -> 0x047 (active_len=4, ramp_len=4, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xb8 +sys={1000.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x047 -> 0x0c7 (active_len=5, ramp_len=5, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x38 +sys={1100.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x0c7 -> 0x04f (active_len=5, ramp_len=5, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xb0 +sys={1200.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x04f -> 0x01f (active_len=5, ramp_len=5, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe0 +sys={1250.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x01f -> 0x03f (active_len=6, ramp_len=6, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xc0 +sys={1350.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x03f -> 0x07e (active_len=6, ramp_len=6, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x81 +sys={1450.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x07e -> 0x0fc (active_len=6, ramp_len=6, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x03 +sys={1500.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x0fc -> 0x1fc (active_len=7, ramp_len=7, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x03 +sys={1600.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x1fc -> 0x1f9 (active_len=7, ramp_len=7, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x06 +sys={1700.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x1f9 -> 0x0fb (active_len=7, ramp_len=7, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x04 +sys={1750.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x0fb -> 0x1fb (active_len=8, ramp_len=8, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x04 +sys={1850.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x1fb -> 0x0ff (active_len=8, ramp_len=8, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x00 +sys={1950.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x0ff -> 0x1fe (active_len=8, ramp_len=8, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x01 +sys={2000.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x1fe -> 0x1ff (active_len=9, ramp_len=9, adm_len=10, perm_len=9, rotation=off) +pcu_info_update(): t2=0x02 t3=0x00 +sys={2250.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) +BTS deallocated OK in test_acc_ramp_fixed_rotate() diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index e53b83a..35531f8 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -140,6 +140,8 @@ { osmo_stat_item_group_free(bts->bts_statg); rate_ctr_group_free(bts->bts_ctrs); + if (osmo_timer_pending(&bts->acc_mgr.rotate_timer)) + osmo_timer_del(&bts->acc_mgr.rotate_timer); /* no need to llist_del(&bts->list), we never registered the bts there. */ talloc_free(bts); printf("BTS deallocated OK in %s()\n", msg); diff --git a/tests/testsuite.at b/tests/testsuite.at index 1a190dd..1c43249 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -20,6 +20,12 @@ AT_CHECK([$abs_top_builddir/tests/abis/abis_test], [], [expout], [ignore]) AT_CLEANUP +AT_SETUP([acc]) +AT_KEYWORDS([acc]) +cat $abs_srcdir/acc/acc_test.ok > experr +AT_CHECK([$abs_top_builddir/tests/acc/acc_test], [], [ignore], [experr]) +AT_CLEANUP + AT_SETUP([bsc]) AT_KEYWORDS([bsc]) cat $abs_srcdir/bsc/bsc_test.ok > expout -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I952c9eeae02809c7184078c655574ec817902e06 Gerrit-Change-Number: 19303 Gerrit-PatchSet: 10 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:10:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:10:15 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: exit early on full disk In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19429 ) Change subject: jenkins-common.sh: exit early on full disk ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6540797c8e0ee3e7b09d4a80592d5e270e7d9adc Gerrit-Change-Number: 19429 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 20:10:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:10:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:10:56 +0000 Subject: Change in docker-playground[master]: bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19428 ) Change subject: bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH ...................................................................... Patch Set 1: Code-Review-1 see my related comment on the corresponding change in osmo-ttcn3-hacks.git -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idbcc703ace7012fb395f0eef3e445df28b368d74 Gerrit-Change-Number: 19428 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 20:10:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:11:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:11:37 +0000 Subject: Change in osmocom-bb[master]: layer23/mobile: cosmetic: use GSM48_PDISC_TEST from gsm_04_08.h In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19425 ) Change subject: layer23/mobile: cosmetic: use GSM48_PDISC_TEST from gsm_04_08.h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie1f14b37f6138f5a019a25bdbc8a3531418df6c2 Gerrit-Change-Number: 19425 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 20:11:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:11:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:11:40 +0000 Subject: Change in osmocom-bb[master]: layer23/mobile: cosmetic: use GSM48_PDISC_TEST from gsm_04_08.h In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19425 ) Change subject: layer23/mobile: cosmetic: use GSM48_PDISC_TEST from gsm_04_08.h ...................................................................... layer23/mobile: cosmetic: use GSM48_PDISC_TEST from gsm_04_08.h Change-Id: Ie1f14b37f6138f5a019a25bdbc8a3531418df6c2 --- M src/host/layer23/src/mobile/gsm48_mm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index d3b042c..52c6fe9 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -4076,7 +4076,7 @@ msgb_free(msg); return rc; - case 0x0f: /* test TS 04.14 */ + case GSM48_PDISC_TEST: /* test TS 04.14 */ LOGP(DMM, LOGL_NOTICE, "Test protocol 0x%02x according to " "TS 04.14 is not supported.\n", pdisc); goto status; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie1f14b37f6138f5a019a25bdbc8a3531418df6c2 Gerrit-Change-Number: 19425 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:12:43 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:12:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Introduce test TC_si_acc_ramp_rotate In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378 ) Change subject: Introduce test TC_si_acc_ramp_rotate ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I29acf4f117ccea53028c780cc9feb1da1fc16739 Gerrit-Change-Number: 19378 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 20:12:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:14:01 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:14:01 +0000 Subject: Change in osmo-msc[master]: Send "BSSMAP CommonID" to tell BSC about the IMSI In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/18949 ) Change subject: Send "BSSMAP CommonID" to tell BSC about the IMSI ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/18949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2552736477663adb250c55728093500e8ae83ebb Gerrit-Change-Number: 18949 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 29 Jul 2020 20:14:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:14:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:14:15 +0000 Subject: Change in osmo-msc[master]: Send "BSSMAP CommonID" to tell BSC about the IMSI In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/18949 to look at the new patch set (#4). Change subject: Send "BSSMAP CommonID" to tell BSC about the IMSI ...................................................................... Send "BSSMAP CommonID" to tell BSC about the IMSI We're already sending the RANAP CommonID message to the RNC, let's do the same using BSSMAP CommonId towards the BSC. This way the BSC knows about the IMSI of the served subscriber, which is very useful for logging/debugging. Change-Id: I2552736477663adb250c55728093500e8ae83ebb Closes: OS#2969 Depends: libosmocore.git I353adc1aa72377f7d4b3336d2ff47791fb73d62c --- M src/libmsc/ran_msg_a.c M src/libvlr/vlr_access_req_fsm.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_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 14 files changed, 195 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/49/18949/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/18949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2552736477663adb250c55728093500e8ae83ebb Gerrit-Change-Number: 18949 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:16:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 29 Jul 2020 20:16:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: test RR Channel Release EARFCNs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 ) Change subject: bsc: test RR Channel Release EARFCNs ...................................................................... Patch Set 3: (4 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/3/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/3/bsc/BSC_Tests.ttcn at 1463 PS3, Line 1463: ispresent > I think you should use istemplatekind(csfb_expect_cells, "omit") here. Ack https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/3/bsc/BSC_Tests.ttcn at 1472 PS3, Line 1472: > ws Ack https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/3/bsc/BSC_Tests.ttcn at 1774 PS3, Line 1774: ispresent > Same here. Ack https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216/3/bsc/BSC_Tests.ttcn at 1794 PS3, Line 1794: > ws Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I882c5e1f70bcc4833fc837a95c900ce291919cc5 Gerrit-Change-Number: 19216 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 29 Jul 2020 20:16:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:16:19 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 20:16:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Introduce test TC_si_acc_ramp_rotate In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378 ) Change subject: Introduce test TC_si_acc_ramp_rotate ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378/2/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378/2/bsc/BSC_Tests.ttcn at 1876 PS2, Line 1876: tr_ASP_RSL_UD Ok, so you're waiting for SI Type 1 here? Do you need other SI types? If not, just use a proper template here - tr_RSL_BCCH_INFO(RSL_SYSTEM_INFO_1) - instead of checking for SI1 manually. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I29acf4f117ccea53028c780cc9feb1da1fc16739 Gerrit-Change-Number: 19378 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 20:16:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:33:44 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 29 Jul 2020 20:33:44 +0000 Subject: Change in libosmocore[master]: i460_mux: correctly reset subchannels In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19381 to look at the new patch set (#2). Change subject: i460_mux: correctly reset subchannels ...................................................................... i460_mux: correctly reset subchannels When a subchannel is deleted or created the initalization mainly consists of a memset over the wohle subchannel struct a message buffer initailization. However, when we delete a subchannel we also must take of the resetting of the related struct. Currently this is done with a memest. Unfortunately this creates not only a memory leak (there might be still items in the multiplexer tx queue) but also it makes the application crash when the message buffer is used the next time since the llist_head of the tx queue looses its initialization. Lets fix the memory leak problem and the message buffer problem and put the reset functionality in a single place. Change-Id: I937a9d4db95f44a860cd2c5dbb660dc1970b9a49 --- M src/gsm/i460_mux.c 1 file changed, 29 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/81/19381/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I937a9d4db95f44a860cd2c5dbb660dc1970b9a49 Gerrit-Change-Number: 19381 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:33:45 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 29 Jul 2020 20:33:45 +0000 Subject: Change in libosmocore[master]: gsm_08_58: add missing RSL error cause codeds References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19448 ) Change subject: gsm_08_58: add missing RSL error cause codeds ...................................................................... gsm_08_58: add missing RSL error cause codeds The define constants for the cause codes "BTS not equipped", "remote transcoder failure" and "notification overflow" are missing. Lets add them including value strings. Change-Id: Ic3e936da00bd256bae03867887851f1a4e30e218 --- M include/osmocom/gsm/protocol/gsm_08_58.h M src/gsm/rsl.c 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/48/19448/1 diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h index da55a8d..cd13a7d 100644 --- a/include/osmocom/gsm/protocol/gsm_08_58.h +++ b/include/osmocom/gsm/protocol/gsm_08_58.h @@ -542,6 +542,9 @@ #define RSL_ERR_CCCH_OVERLOAD 0x23 #define RSL_ERR_ACCH_OVERLOAD 0x24 #define RSL_ERR_PROCESSOR_OVERLOAD 0x25 +#define RSL_ERR_BTS_NOT_EQUIPPED 0x27 +#define RSL_ERR_REMOTE_TRANSC_FAIL 0x28 +#define RSL_ERR_NOTIFICATION_OVERFL 0x29 #define RSL_ERR_RES_UNAVAIL 0x2f /* service or option not available */ #define RSL_ERR_TRANSC_UNAVAIL 0x30 diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c index 5534aa2..91b114b 100644 --- a/src/gsm/rsl.c +++ b/src/gsm/rsl.c @@ -295,6 +295,9 @@ { RSL_ERR_CCCH_OVERLOAD, "CCCH Overload" }, { RSL_ERR_ACCH_OVERLOAD, "ACCH Overload" }, { RSL_ERR_PROCESSOR_OVERLOAD, "Processor Overload" }, + { RSL_ERR_BTS_NOT_EQUIPPED, "BTS not equipped" }, + { RSL_ERR_REMOTE_TRANSC_FAIL, "remote transcoder failure" }, + { RSL_ERR_NOTIFICATION_OVERFL, "notification overflow" }, { RSL_ERR_RES_UNAVAIL, "Resource not available, unspecified" }, { RSL_ERR_TRANSC_UNAVAIL, "Transcoding not available" }, { RSL_ERR_SERV_OPT_UNAVAIL, "Service or Option not available" }, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic3e936da00bd256bae03867887851f1a4e30e218 Gerrit-Change-Number: 19448 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 20:34:14 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 29 Jul 2020 20:34:14 +0000 Subject: Change in libosmocore[master]: i460_mux: correctly reset subchannels In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19381 ) Change subject: i460_mux: correctly reset subchannels ...................................................................... Patch Set 2: (1 comment) (send messages) https://gerrit.osmocom.org/c/libosmocore/+/19381/1/src/gsm/i460_mux.c File src/gsm/i460_mux.c: https://gerrit.osmocom.org/c/libosmocore/+/19381/1/src/gsm/i460_mux.c at 361 PS1, Line 361: schan->rate = OSMO_I460_RATE_NONE; > to be honest, in indsight, I don't even understand why we memset the entire sub-channel here. [?] the alloc_bitbuf() is not a problem, schan->demux.out_bitbuf is freed, so there is no leak here. However, the tx_queue is indeed problematic. Also line 348 introduces a crash on the next use of the subchannel when the alloc_bitbuf() has failed in the last call. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I937a9d4db95f44a860cd2c5dbb660dc1970b9a49 Gerrit-Change-Number: 19381 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 20:34:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 21:05:38 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 21:05:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/PCUIF_Types: version 10: add frequency hopping parameters In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19323 ) Change subject: library/PCUIF_Types: version 10: add frequency hopping parameters ...................................................................... Patch Set 6: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idf11bc4ba3ff0b00b32f2beab8fd020c67119d05 Gerrit-Change-Number: 19323 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 21:05:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 21:25:45 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 21:25:45 +0000 Subject: Change in libosmocore[master]: vty: Allow using hex and octal representations in cmd numeric ranges In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19422 ) Change subject: vty: Allow using hex and octal representations in cmd numeric ranges ...................................................................... Patch Set 2: I am fine adding this feature, but I don't think it's a 'must-have' for libosmovty. Are there other (than the task you're working on) potential use cases? If we finally decide to merge it, there definitely must be the unit test coverage. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia2b7fbbf5502c28374c21dbff548232680da27d4 Gerrit-Change-Number: 19422 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 29 Jul 2020 21:25:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 22:02:03 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 22:02:03 +0000 Subject: Change in libosmocore[master]: vty: Introduce support to set cpu-affinity and scheduler policy In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19442 ) Change subject: vty: Introduce support to set cpu-affinity and scheduler policy ...................................................................... Patch Set 3: Code-Review-1 (11 comments) https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c File src/vty/sched_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 279 PS3, Line 279: "Set CPU affinity mask of the thread\n" This description only applies to 'self', while the rest ('all', 'THREADNAME', '<0-4294967295>') is not documented. Each '(x|y|z)' entry needs a separate doc-string. Please make sure to add the VTY node tests (see tdef/tdef_vty_test_dynamic.vty, for example). https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 315 PS3, Line 315: parsing Maybe s/parsing/to parse/? https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 323 PS3, Line 323: setting Same here. https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 361 PS3, Line 361: memset(¶m, 0, sizeof(param)); : param.sched_priority = prio; Cosmetic: could be ... param = { .prio = 0 }; https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 377 PS3, Line 377: Use Set? https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 378 PS3, Line 378: Real time priority Something also looks wrong here: you have three patterns in "policy rr <1-32>", but there are four help messages? https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 430 PS3, Line 430: if( coding style https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 434 PS3, Line 434: (long int)mypid, (long int) tid_it) cosmetic: inconsistent spacing https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 452 PS3, Line 452: (1 << cpu_i); UBSan usually warns that this needs to be explicitly casted to typeof(mask), because AFAIU by default (1 << x) is an integer of the platform specific size. https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 484 PS3, Line 484: vty Doxygen: 'vty' (no such parameter) vs 'tall_ctx' https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 487 PS3, Line 487: int void? You always return 0 anyway... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If76a4bd2cc7b3c7adf5d84790a944d78be70e10a Gerrit-Change-Number: 19442 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 29 Jul 2020 22:02:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 22:09:08 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 22:09:08 +0000 Subject: Change in libosmocore[master]: i460_mux: correctly reset subchannels In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19381 ) Change subject: i460_mux: correctly reset subchannels ...................................................................... Patch Set 2: Code-Review+1 Good catch! -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I937a9d4db95f44a860cd2c5dbb660dc1970b9a49 Gerrit-Change-Number: 19381 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Jul 2020 22:09:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Jul 29 22:13:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 29 Jul 2020 22:13:07 +0000 Subject: Change in libosmocore[master]: gsm_08_58: add missing RSL error cause codeds In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19448 ) Change subject: gsm_08_58: add missing RSL error cause codeds ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19448/1/src/gsm/rsl.c File src/gsm/rsl.c: https://gerrit.osmocom.org/c/libosmocore/+/19448/1/src/gsm/rsl.c at 299 PS1, Line 299: remote Consistency: the first letter(s) should be capitalized, like in the other strings around. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic3e936da00bd256bae03867887851f1a4e30e218 Gerrit-Change-Number: 19448 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 29 Jul 2020 22:13:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Jul 29 23:16:40 2020 From: admin at opensuse.org (OBS Notification) Date: Wed, 29 Jul 2020 23:16:40 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f22035e617f4_2bd02ac693dbc6101241282@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 513s] dh_gencontrol [ 513s] dpkg-gencontrol: warning: package osmo-bsc-doc: substitution variable ${misc:Package} used, but is not defined [ 513s] dh_md5sums [ 513s] dh_builddeb [ 513s] dpkg-deb: building package 'osmo-bsc' in '../osmo-bsc_1.6.0.198.3e2e8_amd64.deb'. [ 513s] dpkg-deb: building package 'osmo-bsc-dbg' in '../osmo-bsc-dbg_1.6.0.198.3e2e8_amd64.deb'. [ 513s] dpkg-deb: building package 'osmo-bsc-ipaccess-utils' in '../osmo-bsc-ipaccess-utils_1.6.0.198.3e2e8_amd64.deb'. [ 513s] dpkg-deb: building package 'osmo-bsc-bs11-utils' in '../osmo-bsc-bs11-utils_1.6.0.198.3e2e8_amd64.deb'. [ 513s] dpkg-deb: building package 'abisip-find' in '../abisip-find_1.6.0.198.3e2e8_amd64.deb'. [ 513s] dpkg-deb: building package 'osmo-bsc-doc' in '../osmo-bsc-doc_1.6.0.198.3e2e8_all.deb'. [ 513s] dpkg-deb: building package 'osmo-bsc-meas-utils' in '../osmo-bsc-meas-utils_1.6.0.198.3e2e8_amd64.deb'. [ 514s] dpkg-genbuildinfo [ 515s] dpkg-genchanges >../osmo-bsc_1.6.0.198.3e2e8_amd64.changes [ 515s] dpkg-genchanges: warning: substitution variable ${misc:Package} used, but is not defined [ 515s] dpkg-genchanges: info: including full source code in upload [ 515s] dpkg-source --after-build . [ 515s] dpkg-buildpackage: info: full upload; Debian-native package (full source is included) [ 515s] ln: failed to create hard link '///usr/src/packages/DEBS/osmo-bsc_1.6.0.198.3e2e8.dsc': File exists [ 515s] ln: failed to create hard link '///usr/src/packages/DEBS/osmo-bsc_1.6.0.198.3e2e8.tar.xz': File exists [ 515s] Warning: mkbaselibs missing in build root, skipping baselibs [ 515s] ... saving statistics [ 515s] ... saving built packages [29316s] qemu-system-x86_64: terminating on signal 15 from pid 18382 () Job seems to be stuck here, killed. (after 28800 seconds of inactivity) [29316s] ### VM INTERACTION END ### [29316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [29316s] or the build host has a kernel or hardware problem... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jul 30 06:39:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 06:39:00 +0000 Subject: Change in osmo-bsc[master]: Add example config files for Ericsson DUG20 based BTS References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19449 ) Change subject: Add example config files for Ericsson DUG20 based BTS ...................................................................... Add example config files for Ericsson DUG20 based BTS The files have been used successfully in the past weeks to bring up a variety of different combinations of Ericsson DUG20 + RUS. Change-Id: I046f786d68f7cd3fd21693142bd1315bf40696f5 --- A doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus01-4trx.cfg A doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-4trx.cfg A doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-8trx.cfg 3 files changed, 797 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/49/19449/1 diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus01-4trx.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus01-4trx.cfg new file mode 100644 index 0000000..68837ca --- /dev/null +++ b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus01-4trx.cfg @@ -0,0 +1,211 @@ +! +! OpenBSC (0.9.11.308-62d46) configuration saved from vty +!! +password foo +! +line vty + no login +! +log stderr + logging level lmi info + logging level linp info + logging level nm debug + logging level rsl debug + logging level llapd notice +network + network country code 901 + mobile network code 70 + neci 0 + paging any use tch 0 + handover 0 + handover window rxlev averaging 10 + handover window rxqual averaging 1 + handover window rxlev neighbor averaging 10 + handover power budget interval 6 + handover power budget hysteresis 3 + handover maximum distance 9999 + timer t3101 10 + timer t3105 40 + timer t3109 4 + timer t3113 60 + bts 0 + type rbs2000 + band GSM900 + om2000 version-limit oml gen 12 rev 10 + cell_identity 0 + location_area_code 1 + training_sequence_code 7 + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + channel allocator descending + rach tx integer 9 + rach max transmission 7 + oml e1 line 0 timeslot 1 sub-slot full + oml e1 tei 62 + neighbor-list mode automatic + gprs mode none + is-connection-list add 4 512 12 + is-connection-list add 16 524 12 + is-connection-list add 28 536 12 + is-connection-list add 40 548 12 + trx 0 + rf_locked 0 + arfcn 123 + nominal power 42 + max_power_red 12 + rsl e1 line 0 timeslot 1 sub-slot full + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + e1 line 0 timeslot 1 sub-slot full + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 3 + trx 1 + rf_locked 0 + arfcn 121 + nominal power 42 + max_power_red 12 + rsl e1 line 0 timeslot 4 sub-slot full + rsl e1 tei 1 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 3 + trx 2 + rf_locked 0 + arfcn 119 + nominal power 42 + max_power_red 12 + rsl e1 line 0 timeslot 7 sub-slot full + rsl e1 tei 2 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 3 + trx 3 + rf_locked 0 + arfcn 119 + nominal power 42 + max_power_red 12 + rsl e1 line 0 timeslot 10 sub-slot full + rsl e1 tei 3 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 3 +e1_input + e1_line 0 driver dahdi + e1_line 0 port 3 diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-4trx.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-4trx.cfg new file mode 100644 index 0000000..ae0b7db --- /dev/null +++ b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-4trx.cfg @@ -0,0 +1,215 @@ +! +! OpenBSC (0.9.11.308-62d46) configuration saved from vty +!! +password foo +! +line vty + no login +! +log stderr + logging level lmi info + logging level linp info + logging level nm debug + logging level rsl debug + logging level llapd notice +network + network country code 901 + mobile network code 70 + neci 0 + paging any use tch 0 + handover 0 + handover window rxlev averaging 10 + handover window rxqual averaging 1 + handover window rxlev neighbor averaging 10 + handover power budget interval 6 + handover power budget hysteresis 3 + handover maximum distance 9999 + timer t3101 10 + timer t3105 40 + timer t3109 4 + timer t3113 60 + bts 0 + type rbs2000 + band GSM900 + om2000 version-limit oml gen 12 rev 10 + cell_identity 0 + location_area_code 1 + training_sequence_code 7 + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + channel allocator descending + rach tx integer 9 + rach max transmission 7 + oml e1 line 0 timeslot 1 sub-slot full + oml e1 tei 62 + neighbor-list mode automatic + gprs mode none + is-connection-list add 4 512 12 + is-connection-list add 16 524 12 + is-connection-list add 28 536 12 + is-connection-list add 40 548 12 + is-connection-list add 52 560 12 + is-connection-list add 64 572 12 + is-connection-list add 76 640 12 + is-connection-list add 88 652 12 + trx 0 + rf_locked 0 + arfcn 123 + nominal power 44 + max_power_red 0 + rsl e1 line 0 timeslot 1 sub-slot full + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + e1 line 0 timeslot 1 sub-slot full + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 3 + trx 1 + rf_locked 0 + arfcn 121 + nominal power 44 + max_power_red 0 + rsl e1 line 0 timeslot 4 sub-slot full + rsl e1 tei 1 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 3 + trx 2 + rf_locked 0 + arfcn 119 + nominal power 44 + max_power_red 0 + rsl e1 line 0 timeslot 7 sub-slot full + rsl e1 tei 2 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 3 + trx 3 + rf_locked 0 + arfcn 119 + nominal power 44 + max_power_red 0 + rsl e1 line 0 timeslot 10 sub-slot full + rsl e1 tei 3 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 3 +e1_input + e1_line 0 driver dahdi + e1_line 0 port 3 diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-8trx.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-8trx.cfg new file mode 100644 index 0000000..ff0b277 --- /dev/null +++ b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-8trx.cfg @@ -0,0 +1,371 @@ +! +! OpenBSC (0.9.11.308-62d46) configuration saved from vty +!! +password foo +! +line vty + no login +! +log stderr + logging level lmi info + logging level linp info + logging level nm debug + logging level rsl debug + logging level llapd notice +network + network country code 901 + mobile network code 70 + neci 0 + paging any use tch 0 + handover 0 + handover window rxlev averaging 10 + handover window rxqual averaging 1 + handover window rxlev neighbor averaging 10 + handover power budget interval 6 + handover power budget hysteresis 3 + handover maximum distance 9999 + timer t3101 10 + timer t3105 40 + timer t3109 4 + timer t3113 60 + bts 0 + type rbs2000 + band GSM900 + om2000 version-limit oml gen 12 rev 10 + cell_identity 0 + location_area_code 1 + training_sequence_code 7 + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + channel allocator descending + rach tx integer 9 + rach max transmission 7 + oml e1 line 0 timeslot 1 sub-slot full + oml e1 tei 62 + neighbor-list mode automatic + gprs mode none + is-connection-list add 4 512 12 + is-connection-list add 16 524 12 + is-connection-list add 28 536 12 + is-connection-list add 40 548 12 + is-connection-list add 52 560 12 + is-connection-list add 64 572 12 + is-connection-list add 76 640 12 + is-connection-list add 88 652 12 + trx 0 + rf_locked 0 + arfcn 123 + nominal power 40 + max_power_red 10 + rsl e1 line 0 timeslot 1 sub-slot full + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + e1 line 0 timeslot 1 sub-slot full + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 3 + trx 1 + rf_locked 0 + arfcn 121 + nominal power 40 + max_power_red 10 + rsl e1 line 0 timeslot 4 sub-slot full + rsl e1 tei 1 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 3 + trx 2 + rf_locked 0 + arfcn 119 + nominal power 40 + max_power_red 10 + rsl e1 line 0 timeslot 7 sub-slot full + rsl e1 tei 2 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 3 + trx 3 + rf_locked 0 + arfcn 119 + nominal power 40 + max_power_red 10 + rsl e1 line 0 timeslot 10 sub-slot full + rsl e1 tei 3 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 3 + trx 4 + rf_locked 0 + arfcn 117 + nominal power 40 + max_power_red 10 + rsl e1 line 0 timeslot 13 sub-slot full + rsl e1 tei 4 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 14 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 14 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 14 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 14 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 15 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 15 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 15 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 15 sub-slot 3 + trx 5 + rf_locked 0 + arfcn 115 + nominal power 40 + max_power_red 10 + rsl e1 line 0 timeslot 16 sub-slot full + rsl e1 tei 5 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 17 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 17 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 17 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 17 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 18 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 18 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 18 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 18 sub-slot 3 + trx 6 + rf_locked 0 + arfcn 113 + nominal power 40 + max_power_red 10 + rsl e1 line 0 timeslot 19 sub-slot full + rsl e1 tei 6 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 20 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 20 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 20 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 20 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 21 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 21 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 21 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 21 sub-slot 3 + trx 7 + rf_locked 0 + arfcn 113 + nominal power 40 + max_power_red 10 + rsl e1 line 0 timeslot 22 sub-slot full + rsl e1 tei 7 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 23 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 23 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 23 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 23 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 24 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 24 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 24 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 24 sub-slot 3 +e1_input + e1_line 0 driver dahdi + e1_line 0 port 3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I046f786d68f7cd3fd21693142bd1315bf40696f5 Gerrit-Change-Number: 19449 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 07:16:54 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 07:16:54 +0000 Subject: Change in osmo-ci[master]: remove limesuite/build-for-debian10.patch References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/19450 ) Change subject: remove limesuite/build-for-debian10.patch ...................................................................... remove limesuite/build-for-debian10.patch As of yesterday (upstream commit fdfe3d340506a7de4f41d74296e1f32a906700f2), LimeSuite upstream finally builds without patches on Debian 10 Change-Id: Ibbed53f57ac750f39ea20ac73c28c4773c244a6f --- D obs-patches/limesuite/build-for-debian10.patch 1 file changed, 0 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/50/19450/1 diff --git a/obs-patches/limesuite/build-for-debian10.patch b/obs-patches/limesuite/build-for-debian10.patch deleted file mode 100644 index 2387b08..0000000 --- a/obs-patches/limesuite/build-for-debian10.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/debian/control b/debian/control -index c25b7c97..375ab95b 100644 ---- a/debian/control -+++ b/debian/control -@@ -6,7 +6,7 @@ Build-Depends: - debhelper (>= 9.0.0), - cmake (>= 3.1.3), - libusb-1.0-0-dev, -- libwxgtk3.0-dev, -+ libwxgtk3.0-gtk3-dev, - libsoapysdr-dev, - freeglut3-dev, - libfltk1.3-dev, -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/19450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibbed53f57ac750f39ea20ac73c28c4773c244a6f Gerrit-Change-Number: 19450 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 07:17:32 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 07:17:32 +0000 Subject: Change in osmo-ci[master]: remove limesuite/build-for-debian10.patch In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/19450 ) Change subject: remove limesuite/build-for-debian10.patch ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/19450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibbed53f57ac750f39ea20ac73c28c4773c244a6f Gerrit-Change-Number: 19450 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 07:17:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 07:17:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 07:17:35 +0000 Subject: Change in osmo-ci[master]: remove limesuite/build-for-debian10.patch In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/19450 ) Change subject: remove limesuite/build-for-debian10.patch ...................................................................... remove limesuite/build-for-debian10.patch As of yesterday (upstream commit fdfe3d340506a7de4f41d74296e1f32a906700f2), LimeSuite upstream finally builds without patches on Debian 10 Change-Id: Ibbed53f57ac750f39ea20ac73c28c4773c244a6f --- D obs-patches/limesuite/build-for-debian10.patch 1 file changed, 0 insertions(+), 13 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/obs-patches/limesuite/build-for-debian10.patch b/obs-patches/limesuite/build-for-debian10.patch deleted file mode 100644 index 2387b08..0000000 --- a/obs-patches/limesuite/build-for-debian10.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/debian/control b/debian/control -index c25b7c97..375ab95b 100644 ---- a/debian/control -+++ b/debian/control -@@ -6,7 +6,7 @@ Build-Depends: - debhelper (>= 9.0.0), - cmake (>= 3.1.3), - libusb-1.0-0-dev, -- libwxgtk3.0-dev, -+ libwxgtk3.0-gtk3-dev, - libsoapysdr-dev, - freeglut3-dev, - libfltk1.3-dev, -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/19450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibbed53f57ac750f39ea20ac73c28c4773c244a6f Gerrit-Change-Number: 19450 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 07:30:38 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 07:30:38 +0000 Subject: Change in osmo-ci[master]: obs-nightly: Remove limesuite-debian10 package altogether References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/19451 ) Change subject: obs-nightly: Remove limesuite-debian10 package altogether ...................................................................... obs-nightly: Remove limesuite-debian10 package altogether 20.07 builds unmodified on debian10 Change-Id: I24f95efe55e3c88c07e3f313a11d706d6947b4ab --- M scripts/osmocom-nightly-packages.sh 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/51/19451/1 diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 29e8275..ea0dcd4 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -241,11 +241,9 @@ cd "$REPO" osmo_obs_checkout_copy debian8 osmo-gsm-manuals osmo_obs_checkout_copy debian8 osmo-trx - osmo_obs_checkout_copy debian10 limesuite build osmocom-$FEED build limesuite no_commit --git-upstream-tree="$(get_last_tag limesuite)" - build limesuite-debian10 no_commit --git-upstream-tree="$(get_last_tag limesuite)" build osmo-gsm-manuals build osmo-gsm-manuals-debian8 build libosmocore -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/19451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I24f95efe55e3c88c07e3f313a11d706d6947b4ab Gerrit-Change-Number: 19451 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 07:32:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 07:32:00 +0000 Subject: Change in osmo-ci[master]: obs-nightly: Remove limesuite-debian10 package altogether In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/19451 ) Change subject: obs-nightly: Remove limesuite-debian10 package altogether ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/19451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I24f95efe55e3c88c07e3f313a11d706d6947b4ab Gerrit-Change-Number: 19451 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 07:32:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 07:32:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 07:32:03 +0000 Subject: Change in osmo-ci[master]: obs-nightly: Remove limesuite-debian10 package altogether In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/19451 ) Change subject: obs-nightly: Remove limesuite-debian10 package altogether ...................................................................... obs-nightly: Remove limesuite-debian10 package altogether 20.07 builds unmodified on debian10 Change-Id: I24f95efe55e3c88c07e3f313a11d706d6947b4ab --- M scripts/osmocom-nightly-packages.sh 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 29e8275..ea0dcd4 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -241,11 +241,9 @@ cd "$REPO" osmo_obs_checkout_copy debian8 osmo-gsm-manuals osmo_obs_checkout_copy debian8 osmo-trx - osmo_obs_checkout_copy debian10 limesuite build osmocom-$FEED build limesuite no_commit --git-upstream-tree="$(get_last_tag limesuite)" - build limesuite-debian10 no_commit --git-upstream-tree="$(get_last_tag limesuite)" build osmo-gsm-manuals build osmo-gsm-manuals-debian8 build libosmocore -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/19451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I24f95efe55e3c88c07e3f313a11d706d6947b4ab Gerrit-Change-Number: 19451 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 07:33:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 07:33:14 +0000 Subject: Change in libosmocore[master]: gsm_08_58: add missing RSL error cause codeds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19448 ) Change subject: gsm_08_58: add missing RSL error cause codeds ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic3e936da00bd256bae03867887851f1a4e30e218 Gerrit-Change-Number: 19448 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 07:33:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 07:36:11 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 07:36:11 +0000 Subject: Change in libosmocore[master]: i460_mux: correctly reset subchannels In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19381 ) Change subject: i460_mux: correctly reset subchannels ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19381/2/src/gsm/i460_mux.c File src/gsm/i460_mux.c: https://gerrit.osmocom.org/c/libosmocore/+/19381/2/src/gsm/i460_mux.c at 323 PS2, Line 323: llist_for_each_entry_safe(tx_msg, tx_msg_tmp, &schan->mux.tx_queue, list) { the for-loop (and the related variable declarations above) could be replaced with a single call to "msgb_queue_free(&schan->mux.tx_queue)" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I937a9d4db95f44a860cd2c5dbb660dc1970b9a49 Gerrit-Change-Number: 19381 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jul 2020 07:36:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jul 30 07:41:52 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 07:41:52 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5f2279d97d728_2bd02ac693dbc610129463a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/xUbuntu_18.04/i586 Package network:osmocom:nightly/limesuite failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 143s] dh_compress -O--buildsystem=cmake -O--parallel [ 143s] dh_fixperms -O--buildsystem=cmake -O--parallel [ 143s] dh_missing -O--buildsystem=cmake -O--parallel [ 143s] dh_strip -O--buildsystem=cmake -O--parallel [ 145s] dh_makeshlibs -O--buildsystem=cmake -O--parallel [ 145s] dh_shlibdeps -O--buildsystem=cmake -O--parallel [ 146s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') [ 146s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/soapysdr0.7-module-lms7/usr/lib/i386-linux-gnu/SoapySDR/modules0.6/libLMS7Support.so (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') [ 146s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') [ 146s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeSuiteGUI (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') [ 146s] dpkg-shlibdeps: error: cannot continue due to the error above [ 146s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 146s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 146s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/soapysdr0.7-module-lms7.substvars debian/soapysdr0.7-module-lms7/usr/lib/i386-linux-gnu/SoapySDR/modules0.6/libLMS7Support.so returned exit code 2 [ 147s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 147s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 147s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 147s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeUtil debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeSuiteGUI returned exit code 2 [ 147s] dh_shlibdeps: Aborting due to earlier error [ 147s] debian/rules:28: recipe for target 'binary' failed [ 147s] make: *** [binary] Error 2 [ 147s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 147s] ### VM INTERACTION START ### [ 151s] [ 144.790449] sysrq: SysRq : Power Off [ 151s] [ 144.795123] reboot: Power down [ 151s] ### VM INTERACTION END ### [ 151s] [ 151s] goat05 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 07:41:36 UTC 2020. [ 151s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 07:42:26 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 07:42:26 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5f2279f95731e_2bd02ac693dbc6101295077@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/xUbuntu_16.04/i586 Package network:osmocom:nightly/limesuite failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 171s] LINE: -- Lime Microsystems Wed, 29 Jul 2020 09:30:00 +0300 [ 171s] dh_installchangelogs Changelog.txt [ 171s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 171s] dh_lintian -O--buildsystem=cmake -O--parallel [ 171s] dh_perl -O--buildsystem=cmake -O--parallel [ 171s] dh_link -O--buildsystem=cmake -O--parallel [ 171s] dh_strip_nondeterminism -O--buildsystem=cmake -O--parallel [ 171s] dh_compress -O--buildsystem=cmake -O--parallel [ 172s] dh_fixperms -O--buildsystem=cmake -O--parallel [ 172s] dh_strip -O--buildsystem=cmake -O--parallel [ 172s] dh_makeshlibs -O--buildsystem=cmake -O--parallel [ 173s] dh_shlibdeps -O--buildsystem=cmake -O--parallel [ 173s] dpkg-shlibdeps: error: couldn't find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeSuiteGUI (ELF format: 'elf32-i386'; RPATH: '') [ 175s] dpkg-shlibdeps: error: couldn't find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf32-i386'; RPATH: '') [ 176s] dpkg-shlibdeps: error: couldn't find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf32-i386'; RPATH: '') [ 176s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 176s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 176s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 176s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeUtil debian/limesuite/usr/bin/LimeSuiteGUI returned exit code 2 [ 176s] debian/rules:28: recipe for target 'binary' failed [ 176s] make: *** [binary] Error 2 [ 176s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 176s] ### VM INTERACTION START ### [ 179s] [ 171.286317] sysrq: SysRq : Power Off [ 179s] [ 171.293556] reboot: Power down [ 179s] ### VM INTERACTION END ### [ 179s] [ 179s] lamb26 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 07:42:13 UTC 2020. [ 179s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 07:43:01 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 07:43:01 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5f227a13b8b43_2bd02ac693dbc610129527d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/xUbuntu_18.10/i586 Package network:osmocom:nightly/limesuite failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 212s] dh_strip_nondeterminism -O--buildsystem=cmake -O--parallel [ 213s] dh_compress -O--buildsystem=cmake -O--parallel [ 213s] dh_fixperms -O--buildsystem=cmake -O--parallel [ 213s] dh_missing -O--buildsystem=cmake -O--parallel [ 213s] dh_strip -O--buildsystem=cmake -O--parallel [ 216s] dh_makeshlibs -O--buildsystem=cmake -O--parallel [ 216s] dh_shlibdeps -O--buildsystem=cmake -O--parallel [ 216s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/soapysdr0.7-module-lms7/usr/lib/i386-linux-gnu/SoapySDR/modules0.6/libLMS7Support.so (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') [ 216s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeSuiteGUI (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') [ 217s] dpkg-shlibdeps: error: cannot continue due to the error above [ 217s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 217s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 217s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/soapysdr0.7-module-lms7.substvars debian/soapysdr0.7-module-lms7/usr/lib/i386-linux-gnu/SoapySDR/modules0.6/libLMS7Support.so returned exit code 2 [ 219s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') [ 219s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') [ 219s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 219s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 219s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 219s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeUtil debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeQuickTest returned exit code 2 [ 219s] dh_shlibdeps: Aborting due to earlier error [ 219s] make: *** [debian/rules:28: binary] Error 2 [ 219s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 219s] ### VM INTERACTION START ### [ 222s] [ 215.038447] sysrq: SysRq : Power Off [ 222s] [ 215.041857] reboot: Power down [ 222s] ### VM INTERACTION END ### [ 222s] [ 222s] sheep87 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 07:42:44 UTC 2020. [ 222s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 07:43:01 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 07:43:01 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5f227a147e365_2bd02ac693dbc6101295437@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/limesuite failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 216s] dh_strip_nondeterminism -O--buildsystem=cmake -O--parallel [ 216s] dh_compress -O--buildsystem=cmake -O--parallel [ 216s] dh_fixperms -O--buildsystem=cmake -O--parallel [ 216s] dh_missing -O--buildsystem=cmake -O--parallel [ 216s] dh_strip -O--buildsystem=cmake -O--parallel [ 220s] dh_makeshlibs -O--buildsystem=cmake -O--parallel [ 220s] dh_shlibdeps -O--buildsystem=cmake -O--parallel [ 221s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/soapysdr0.7-module-lms7/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.6/libLMS7Support.so (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 221s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeSuiteGUI (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 222s] dpkg-shlibdeps: error: cannot continue due to the error above [ 222s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 222s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 222s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/soapysdr0.7-module-lms7.substvars debian/soapysdr0.7-module-lms7/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.6/libLMS7Support.so returned exit code 2 [ 224s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 224s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 224s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 224s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 224s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 224s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeUtil debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeQuickTest returned exit code 2 [ 224s] dh_shlibdeps: Aborting due to earlier error [ 224s] make: *** [debian/rules:28: binary] Error 2 [ 224s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 224s] ### VM INTERACTION START ### [ 228s] [ 217.925496] sysrq: SysRq : Power Off [ 228s] [ 217.929937] reboot: Power down [ 228s] ### VM INTERACTION END ### [ 228s] [ 228s] lamb59 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 07:42:57 UTC 2020. [ 228s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 07:43:01 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 07:43:01 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5f227a142fcf1_2bd02ac693dbc61012953ad@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/Debian_9.0/i586 Package network:osmocom:nightly/limesuite failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 206s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeSuiteGUI (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') [ 209s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') [ 209s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libSM.so.6 (it uses none of the library's symbols) [ 209s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libXext.so.6 (it uses none of the library's symbols) [ 209s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_images.so.1.3 (it uses none of the library's symbols) [ 209s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_gl.so.1.3 (it uses none of the library's symbols) [ 209s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libICE.so.6 (it uses none of the library's symbols) [ 209s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_forms.so.1.3 (it uses none of the library's symbols) [ 209s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_html-3.0.so.0 (it uses none of the library's symbols) [ 209s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_richtext-3.0.so.0 (it uses none of the library's symbols) [ 209s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_baseu_xml-3.0.so.0 (it uses none of the library's symbols) [ 209s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libX11.so.6 (it uses none of the library's symbols) [ 209s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_aui-3.0.so.0 (it uses none of the library's symbols) [ 209s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_xrc-3.0.so.0 (it uses none of the library's symbols) [ 209s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeUtil were not linked against libusb-1.0.so.0 (they use none of the library's symbols) [ 209s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 209s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 209s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 209s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeUtil returned exit code 2 [ 209s] debian/rules:28: recipe for target 'binary' failed [ 209s] make: *** [binary] Error 2 [ 209s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 209s] ### VM INTERACTION START ### [ 212s] [ 203.159852] sysrq: SysRq : Power Off [ 212s] [ 203.167693] reboot: Power down [ 212s] ### VM INTERACTION END ### [ 212s] [ 212s] lamb27 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 07:42:54 UTC 2020. [ 212s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 07:43:18 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 07:43:18 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5f227a333f7df_2bd02ac693dbc61012955f0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/limesuite failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 220s] dh_strip_nondeterminism -O--buildsystem=cmake -O--parallel [ 220s] dh_compress -O--buildsystem=cmake -O--parallel [ 220s] dh_fixperms -O--buildsystem=cmake -O--parallel [ 220s] dh_missing -O--buildsystem=cmake -O--parallel [ 221s] dh_strip -O--buildsystem=cmake -O--parallel [ 224s] dh_makeshlibs -O--buildsystem=cmake -O--parallel [ 224s] dh_shlibdeps -O--buildsystem=cmake -O--parallel [ 225s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/soapysdr0.7-module-lms7/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.6/libLMS7Support.so (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 225s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeSuiteGUI (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 226s] dpkg-shlibdeps: error: cannot continue due to the error above [ 226s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 226s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 226s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/soapysdr0.7-module-lms7.substvars debian/soapysdr0.7-module-lms7/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.6/libLMS7Support.so returned exit code 2 [ 228s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 228s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 228s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 228s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 228s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 228s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeUtil returned exit code 2 [ 228s] dh_shlibdeps: Aborting due to earlier error [ 228s] make: *** [debian/rules:28: binary] Error 2 [ 228s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 228s] ### VM INTERACTION START ### [ 232s] [ 221.520265] sysrq: SysRq : Power Off [ 232s] [ 221.525174] reboot: Power down [ 232s] ### VM INTERACTION END ### [ 232s] [ 232s] lamb07 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 07:43:13 UTC 2020. [ 232s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 07:43:52 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 07:43:52 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5f227a5098720_2bd02ac693dbc61012960c3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/limesuite failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 205s] dh_compress -O--buildsystem=cmake -O--parallel [ 205s] dh_fixperms -O--buildsystem=cmake -O--parallel [ 206s] dh_missing -O--buildsystem=cmake -O--parallel [ 206s] dh_strip -O--buildsystem=cmake -O--parallel [ 209s] dh_makeshlibs -O--buildsystem=cmake -O--parallel [ 209s] dh_shlibdeps -O--buildsystem=cmake -O--parallel [ 209s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/soapysdr0.7-module-lms7/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.6/libLMS7Support.so (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 209s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeSuiteGUI (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 210s] dpkg-shlibdeps: error: cannot continue due to the error above [ 210s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 210s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 210s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/soapysdr0.7-module-lms7.substvars debian/soapysdr0.7-module-lms7/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.6/libLMS7Support.so returned exit code 2 [ 212s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 212s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 213s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 213s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 213s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 213s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeUtil debian/limesuite/usr/bin/LimeQuickTest returned exit code 2 [ 213s] dh_shlibdeps: Aborting due to earlier error [ 213s] debian/rules:28: recipe for target 'binary' failed [ 213s] make: *** [binary] Error 2 [ 213s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 213s] ### VM INTERACTION START ### [ 216s] [ 206.006531] sysrq: SysRq : Power Off [ 216s] [ 206.013226] reboot: Power down [ 216s] ### VM INTERACTION END ### [ 216s] [ 216s] lamb58 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 07:43:47 UTC 2020. [ 216s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 07:43:52 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 07:43:52 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5f227a5122df_2bd02ac693dbc610129619d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/limesuite failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 249s] dh_strip_nondeterminism -O--buildsystem=cmake -O--parallel [ 249s] dh_compress -O--buildsystem=cmake -O--parallel [ 249s] dh_fixperms -O--buildsystem=cmake -O--parallel [ 250s] dh_missing -O--buildsystem=cmake -O--parallel [ 250s] dh_strip -O--buildsystem=cmake -O--parallel [ 254s] dh_makeshlibs -O--buildsystem=cmake -O--parallel [ 254s] dh_shlibdeps -O--buildsystem=cmake -O--parallel [ 255s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/soapysdr0.7-module-lms7/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.6/libLMS7Support.so (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 255s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 256s] dpkg-shlibdeps: error: cannot continue due to the error above [ 256s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 256s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 256s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/soapysdr0.7-module-lms7.substvars debian/soapysdr0.7-module-lms7/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.6/libLMS7Support.so returned exit code 2 [ 256s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 256s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeSuiteGUI (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 258s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 258s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 258s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 258s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeUtil debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeSuiteGUI returned exit code 2 [ 258s] dh_shlibdeps: Aborting due to earlier error [ 258s] make: *** [debian/rules:28: binary] Error 255 [ 258s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 259s] ### VM INTERACTION START ### [ 262s] [ 251.265659] sysrq: SysRq : Power Off [ 262s] [ 251.272240] reboot: Power down [ 262s] ### VM INTERACTION END ### [ 262s] [ 262s] lamb60 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 07:43:36 UTC 2020. [ 262s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 07:45:01 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 07:45:01 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in Debian_10/i586 In-Reply-To: References: Message-ID: <5f227a8ba5fb3_2bd02ac693dbc6101296771@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/Debian_10/i586 Package network:osmocom:nightly/limesuite failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 268s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') [ 268s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') [ 269s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libXext.so.6 (it uses none of the library's symbols) [ 269s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libX11.so.6 (it uses none of the library's symbols) [ 269s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_gl.so.1.3 (it uses none of the library's symbols) [ 269s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_richtext-3.0.so.0 (it uses none of the library's symbols) [ 269s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libSM.so.6 (it uses none of the library's symbols) [ 269s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_aui-3.0.so.0 (it uses none of the library's symbols) [ 269s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_baseu_xml-3.0.so.0 (it uses none of the library's symbols) [ 269s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_images.so.1.3 (it uses none of the library's symbols) [ 269s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_html-3.0.so.0 (it uses none of the library's symbols) [ 269s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeUtil debian/limesuite/usr/bin/LimeQuickTest were not linked against libusb-1.0.so.0 (they use none of the library's symbols) [ 269s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libICE.so.6 (it uses none of the library's symbols) [ 269s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_forms.so.1.3 (it uses none of the library's symbols) [ 269s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_xrc-3.0.so.0 (it uses none of the library's symbols) [ 269s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 269s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 269s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 269s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeUtil returned exit code 2 [ 269s] dh_shlibdeps: Aborting due to earlier error [ 269s] make: *** [debian/rules:28: binary] Error 2 [ 269s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 269s] ### VM INTERACTION START ### [ 272s] [ 261.573866] sysrq: SysRq : Power Off [ 272s] [ 261.581105] reboot: Power down [ 272s] ### VM INTERACTION END ### [ 272s] [ 272s] lamb68 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 07:44:57 UTC 2020. [ 272s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 07:45:52 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 07:45:52 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in Debian_10/aarch64 In-Reply-To: References: Message-ID: <5f227ac9a1c8a_2bd02ac693dbc61012970a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/Debian_10/aarch64 Package network:osmocom:nightly/limesuite failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 374s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf64-littleaarch64' abi: '020100b700000000'; RPATH: '') [ 375s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf64-littleaarch64' abi: '020100b700000000'; RPATH: '') [ 375s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_xrc-3.0.so.0 (it uses none of the library's symbols) [ 375s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_richtext-3.0.so.0 (it uses none of the library's symbols) [ 375s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_images.so.1.3 (it uses none of the library's symbols) [ 375s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libX11.so.6 (it uses none of the library's symbols) [ 375s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libICE.so.6 (it uses none of the library's symbols) [ 375s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_html-3.0.so.0 (it uses none of the library's symbols) [ 375s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libXext.so.6 (it uses none of the library's symbols) [ 375s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_aui-3.0.so.0 (it uses none of the library's symbols) [ 375s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeUtil were not linked against libusb-1.0.so.0 (they use none of the library's symbols) [ 375s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libSM.so.6 (it uses none of the library's symbols) [ 375s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_forms.so.1.3 (it uses none of the library's symbols) [ 375s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_baseu_xml-3.0.so.0 (it uses none of the library's symbols) [ 375s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_gl.so.1.3 (it uses none of the library's symbols) [ 375s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 375s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 375s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 375s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeUtil debian/limesuite/usr/bin/LimeQuickTest returned exit code 2 [ 375s] dh_shlibdeps: Aborting due to earlier error [ 375s] make: *** [debian/rules:28: binary] Error 2 [ 375s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 375s] ### VM INTERACTION START ### [ 379s] [ 362.443079] sysrq: Power Off [ 379s] [ 362.444821] reboot: Power down [ 379s] ### VM INTERACTION END ### [ 379s] [ 379s] obs-arm-9 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 07:45:36 UTC 2020. [ 379s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 07:47:02 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 07:47:02 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5f227b0627d5b_2bd02ac693dbc61012972dd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/limesuite failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 158s] LINE: -- Lime Microsystems Wed, 29 Jul 2020 09:30:00 +0300 [ 158s] dh_installchangelogs Changelog.txt [ 158s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 158s] dh_lintian -O--buildsystem=cmake -O--parallel [ 158s] dh_perl -O--buildsystem=cmake -O--parallel [ 158s] dh_link -O--buildsystem=cmake -O--parallel [ 159s] dh_strip_nondeterminism -O--buildsystem=cmake -O--parallel [ 159s] dh_compress -O--buildsystem=cmake -O--parallel [ 159s] dh_fixperms -O--buildsystem=cmake -O--parallel [ 159s] dh_strip -O--buildsystem=cmake -O--parallel [ 160s] dh_makeshlibs -O--buildsystem=cmake -O--parallel [ 160s] dh_shlibdeps -O--buildsystem=cmake -O--parallel [ 160s] dpkg-shlibdeps: error: couldn't find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf64-x86-64'; RPATH: '') [ 161s] dpkg-shlibdeps: error: couldn't find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeSuiteGUI (ELF format: 'elf64-x86-64'; RPATH: '') [ 163s] dpkg-shlibdeps: error: couldn't find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf64-x86-64'; RPATH: '') [ 163s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 163s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 163s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 163s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeUtil debian/limesuite/usr/bin/LimeQuickTest returned exit code 2 [ 163s] debian/rules:28: recipe for target 'binary' failed [ 163s] make: *** [binary] Error 2 [ 163s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 163s] ### VM INTERACTION START ### [ 167s] [ 157.386502] sysrq: SysRq : Power Off [ 167s] [ 157.392790] reboot: Power down [ 167s] ### VM INTERACTION END ### [ 167s] [ 167s] lamb01 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 07:46:57 UTC 2020. [ 167s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 07:48:26 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 07:48:26 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5f227b6046bc7_2bd02ac693dbc61012974d4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/Debian_9.0/x86_64 Package network:osmocom:nightly/limesuite failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 190s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 191s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 191s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_aui-3.0.so.0 (it uses none of the library's symbols) [ 191s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libICE.so.6 (it uses none of the library's symbols) [ 191s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_forms.so.1.3 (it uses none of the library's symbols) [ 191s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeUtil were not linked against libusb-1.0.so.0 (they use none of the library's symbols) [ 191s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libXext.so.6 (it uses none of the library's symbols) [ 191s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_baseu_xml-3.0.so.0 (it uses none of the library's symbols) [ 191s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_images.so.1.3 (it uses none of the library's symbols) [ 191s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_richtext-3.0.so.0 (it uses none of the library's symbols) [ 191s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libSM.so.6 (it uses none of the library's symbols) [ 191s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_html-3.0.so.0 (it uses none of the library's symbols) [ 191s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_xrc-3.0.so.0 (it uses none of the library's symbols) [ 191s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_gl.so.1.3 (it uses none of the library's symbols) [ 191s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libX11.so.6 (it uses none of the library's symbols) [ 191s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 191s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 191s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 191s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeUtil returned exit code 2 [ 191s] debian/rules:28: recipe for target 'binary' failed [ 191s] make: *** [binary] Error 2 [ 191s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 191s] ### VM INTERACTION START ### [ 194s] [ 184.319289] sysrq: SysRq : Power Off [ 194s] [ 184.326883] reboot: Power down [ 194s] ### VM INTERACTION END ### [ 194s] [ 194s] lamb25 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 07:48:16 UTC 2020. [ 194s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 07:48:44 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 07:48:44 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f227b60b5cd8_2bd02ac693dbc61012975bd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/Debian_Unstable/x86_64 Package network:osmocom:nightly/limesuite failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 227s] dh_strip: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 229s] dh_makeshlibs -O--buildsystem=cmake -O--parallel [ 229s] dh_makeshlibs: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 229s] dh_shlibdeps -O--buildsystem=cmake -O--parallel [ 229s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 229s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 229s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 229s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/soapysdr0.7-module-lms7/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.7/libLMS7Support.so (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 229s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 230s] dpkg-shlibdeps: error: cannot continue due to the error above [ 230s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 230s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 230s] dh_shlibdeps: error: dpkg-shlibdeps -Tdebian/soapysdr0.7-module-lms7.substvars debian/soapysdr0.7-module-lms7/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.7/libLMS7Support.so returned exit code 2 [ 230s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 230s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeSuiteGUI (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 232s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 232s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 232s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 232s] dh_shlibdeps: error: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeUtil returned exit code 2 [ 232s] dh_shlibdeps: error: Aborting due to earlier error [ 232s] make: *** [debian/rules:28: binary] Error 25 [ 232s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 232s] ### VM INTERACTION START ### [ 233s] Powering off. [ 233s] [ 224.647876] reboot: Power down [ 233s] ### VM INTERACTION END ### [ 233s] [ 233s] build76 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 07:48:26 UTC 2020. [ 233s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 07:49:18 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 07:49:18 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f227b9ae5e1f_2bd02ac693dbc61012978e4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/Debian_10/x86_64 Package network:osmocom:nightly/limesuite failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 224s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 226s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeSuiteGUI (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 228s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_xrc-3.0.so.0 (it uses none of the library's symbols) [ 228s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_html-3.0.so.0 (it uses none of the library's symbols) [ 228s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libICE.so.6 (it uses none of the library's symbols) [ 228s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_baseu_xml-3.0.so.0 (it uses none of the library's symbols) [ 228s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libX11.so.6 (it uses none of the library's symbols) [ 228s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_richtext-3.0.so.0 (it uses none of the library's symbols) [ 228s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_forms.so.1.3 (it uses none of the library's symbols) [ 228s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_aui-3.0.so.0 (it uses none of the library's symbols) [ 228s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeUtil debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeSuiteGUI were not linked against libusb-1.0.so.0 (they use none of the library's symbols) [ 228s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_gl.so.1.3 (it uses none of the library's symbols) [ 228s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_images.so.1.3 (it uses none of the library's symbols) [ 228s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libSM.so.6 (it uses none of the library's symbols) [ 228s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libXext.so.6 (it uses none of the library's symbols) [ 228s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 228s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 228s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 229s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeUtil debian/limesuite/usr/bin/LimeQuickTest returned exit code 2 [ 229s] dh_shlibdeps: Aborting due to earlier error [ 229s] make: *** [debian/rules:28: binary] Error 2 [ 229s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 229s] ### VM INTERACTION START ### [ 232s] [ 220.261400] sysrq: SysRq : Power Off [ 232s] [ 220.270545] reboot: Power down [ 232s] ### VM INTERACTION END ### [ 232s] [ 232s] lamb01 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 07:49:13 UTC 2020. [ 232s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 07:49:35 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 07:49:35 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f227b9b9aa26_2bd02ac693dbc6101297969@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/Debian_Testing/x86_64 Package network:osmocom:nightly/limesuite failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 261s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 261s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 261s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 261s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 261s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 261s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 261s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 261s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/soapysdr0.7-module-lms7/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.7/libLMS7Support.so (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 261s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeSuiteGUI (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 262s] dpkg-shlibdeps: error: cannot continue due to the error above [ 262s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 262s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 262s] dh_shlibdeps: error: dpkg-shlibdeps -Tdebian/soapysdr0.7-module-lms7.substvars debian/soapysdr0.7-module-lms7/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.7/libLMS7Support.so returned exit code 2 [ 264s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 265s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 265s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 265s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 265s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 265s] dh_shlibdeps: error: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeUtil debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeQuickTest returned exit code 2 [ 265s] dh_shlibdeps: error: Aborting due to earlier error [ 265s] make: *** [debian/rules:28: binary] Error 25 [ 265s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 265s] ### VM INTERACTION START ### [ 266s] Powering off. [ 266s] [ 253.568182] reboot: Power down [ 266s] ### VM INTERACTION END ### [ 266s] [ 266s] lamb71 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 07:49:27 UTC 2020. [ 266s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 07:51:01 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 07:51:01 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5f227bf2ae2aa_2bd02ac693dbc610129802a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/Debian_9.0/aarch64 Package network:osmocom:nightly/limesuite failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 647s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf64-littleaarch64' abi: '020100b700000000'; RPATH: '') [ 648s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf64-littleaarch64' abi: '020100b700000000'; RPATH: '') [ 649s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_aui-3.0.so.0 (it uses none of the library's symbols) [ 649s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeUtil were not linked against libusb-1.0.so.0 (they use none of the library's symbols) [ 649s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libSM.so.6 (it uses none of the library's symbols) [ 649s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_gl.so.1.3 (it uses none of the library's symbols) [ 649s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libICE.so.6 (it uses none of the library's symbols) [ 649s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_baseu_xml-3.0.so.0 (it uses none of the library's symbols) [ 649s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_html-3.0.so.0 (it uses none of the library's symbols) [ 649s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_images.so.1.3 (it uses none of the library's symbols) [ 649s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libXext.so.6 (it uses none of the library's symbols) [ 649s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_forms.so.1.3 (it uses none of the library's symbols) [ 649s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_richtext-3.0.so.0 (it uses none of the library's symbols) [ 649s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libX11.so.6 (it uses none of the library's symbols) [ 649s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_xrc-3.0.so.0 (it uses none of the library's symbols) [ 649s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 649s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 649s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 649s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeUtil debian/limesuite/usr/bin/LimeSuiteGUI returned exit code 2 [ 649s] debian/rules:28: recipe for target 'binary' failed [ 649s] make: *** [binary] Error 2 [ 649s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 649s] ### VM INTERACTION START ### [ 653s] [ 615.430364] sysrq: Power Off [ 653s] [ 615.434433] reboot: Power down [ 653s] ### VM INTERACTION END ### [ 653s] [ 653s] obs-arm-1 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 07:50:44 UTC 2020. [ 653s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 07:55:46 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 07:55:46 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5f227d2727bb8_67502ac3bb5765f897689@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_8.0/i586 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 160s] ^ [ 160s] acc.c:117:2: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code [ 160s] acc.c: In function 'get_lowest_allowed_acc': [ 160s] acc.c:127:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 160s] for (int i = 0; i < 10; i++) { [ 160s] ^ [ 160s] Makefile:617: recipe for target 'acc.o' failed [ 160s] make[4]: *** [acc.o] Error 1 [ 160s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 160s] Makefile:393: recipe for target 'all-recursive' failed [ 160s] make[3]: *** [all-recursive] Error 1 [ 160s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 160s] Makefile:443: recipe for target 'all-recursive' failed [ 160s] make[2]: *** [all-recursive] Error 1 [ 160s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 160s] Makefile:374: recipe for target 'all' failed [ 160s] make[1]: *** [all] Error 2 [ 160s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 160s] dh_auto_build: make -j1 returned exit code 2 [ 160s] debian/rules:45: recipe for target 'build' failed [ 160s] make: *** [build] Error 2 [ 160s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 160s] ### VM INTERACTION START ### [ 161s] Powering off. [ 161s] [ 152.039844] reboot: Power down [ 161s] ### VM INTERACTION END ### [ 161s] [ 161s] lamb05 failed "build osmo-bsc_1.6.0.199.deaa.dsc" at Thu Jul 30 07:55:32 UTC 2020. [ 161s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jul 30 08:40:39 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 30 Jul 2020 08:40:39 +0000 Subject: Change in libosmocore[master]: i460_mux: correctly reset subchannels In-Reply-To: References: Message-ID: Hello fixeria, pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19381 to look at the new patch set (#3). Change subject: i460_mux: correctly reset subchannels ...................................................................... i460_mux: correctly reset subchannels When a subchannel is deleted or created the initalization mainly consists of a memset over the wohle subchannel struct a message buffer initailization. However, when we delete a subchannel we also must take of the resetting of the related struct. Currently this is done with a memest. Unfortunately this creates not only a memory leak (there might be still items in the multiplexer tx queue) but also it makes the application crash when the message buffer is used the next time since the llist_head of the tx queue looses its initialization. Lets fix the memory leak problem and the message buffer problem and put the reset functionality in a single place. Change-Id: I937a9d4db95f44a860cd2c5dbb660dc1970b9a49 --- M src/gsm/i460_mux.c 1 file changed, 23 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/81/19381/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I937a9d4db95f44a860cd2c5dbb660dc1970b9a49 Gerrit-Change-Number: 19381 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 08:45:07 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 30 Jul 2020 08:45:07 +0000 Subject: Change in libosmocore[master]: i460_mux: correctly reset subchannels In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19381 ) Change subject: i460_mux: correctly reset subchannels ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I937a9d4db95f44a860cd2c5dbb660dc1970b9a49 Gerrit-Change-Number: 19381 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jul 2020 08:45:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 08:55:01 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 30 Jul 2020 08:55:01 +0000 Subject: Change in libosmocore[master]: gsm_08_58: add missing RSL error cause codes In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19448 to look at the new patch set (#3). Change subject: gsm_08_58: add missing RSL error cause codes ...................................................................... gsm_08_58: add missing RSL error cause codes The define constants for the cause codes "BTS not equipped", "remote transcoder failure" and "notification overflow" are missing. Lets add them including value strings. Change-Id: Ic3e936da00bd256bae03867887851f1a4e30e218 --- M include/osmocom/gsm/protocol/gsm_08_58.h M src/gsm/rsl.c 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/48/19448/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic3e936da00bd256bae03867887851f1a4e30e218 Gerrit-Change-Number: 19448 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 08:55:59 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 08:55:59 +0000 Subject: Change in osmo-ci[master]: nightly-packages: Hard-code LimeSuite to 20.01.0 as 20.07.0 is broken References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/19452 ) Change subject: nightly-packages: Hard-code LimeSuite to 20.01.0 as 20.07.0 is broken ...................................................................... nightly-packages: Hard-code LimeSuite to 20.01.0 as 20.07.0 is broken See https://github.com/myriadrf/LimeSuite/issues/313 Change-Id: Ib70418f0b8a4c6aafa3098b6fa3e240f89112b59 --- M scripts/osmocom-nightly-packages.sh 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/52/19452/1 diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index ea0dcd4..aa93172 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -179,7 +179,9 @@ checkout_limesuite() { cd "$REPO" git clone https://github.com/myriadrf/LimeSuite limesuite - TAG="$(get_last_tag limesuite)" + # temp workaround, see https://github.com/myriadrf/LimeSuite/issues/313 + #TAG="$(get_last_tag limesuite)" + TAG="v20.01.0" cd limesuite git checkout "$TAG" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/19452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib70418f0b8a4c6aafa3098b6fa3e240f89112b59 Gerrit-Change-Number: 19452 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jul 30 08:56:50 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 08:56:50 +0000 Subject: Build failure of network:osmocom:nightly/binutils-arm-osmo-eabi in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f228b5e43403_67502ac3bb5765f8123098@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/binutils-arm-osmo-eabi/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/binutils-arm-osmo-eabi failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly binutils-arm-osmo-eabi Last lines of build log: [ 167s] ./bfd.h:5851:3: note: in expansion of macro '_bfd_nodynamic_canonicalize_dynamic_reloc' [ 167s] 5851 | NAME##_canonicalize_dynamic_reloc [ 167s] | ^~~~ [ 167s] ../../bfd/ihex.c:994:3: note: in expansion of macro 'BFD_JUMP_TABLE_DYNAMIC' [ 167s] 994 | BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), [ 167s] | ^~~~~~~~~~~~~~~~~~~~~~ [ 167s] cc1: all warnings being treated as errors [ 167s] make[5]: *** [Makefile:1517: srec.lo] Error 1 [ 167s] cc1: all warnings being treated as errors [ 167s] make[5]: *** [Makefile:1517: ihex.lo] Error 1 [ 167s] make[5]: Leaving directory '/usr/src/packages/BUILD/build/bfd' [ 167s] make[4]: *** [Makefile:1555: all-recursive] Error 1 [ 167s] make[4]: Leaving directory '/usr/src/packages/BUILD/build/bfd' [ 167s] make[3]: *** [Makefile:1066: all] Error 2 [ 167s] make[3]: Leaving directory '/usr/src/packages/BUILD/build/bfd' [ 167s] make[2]: *** [Makefile:3331: all-bfd] Error 2 [ 167s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 167s] make[1]: *** [Makefile:850: all] Error 2 [ 167s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 167s] dh_auto_build: error: cd build && make -j8 returned exit code 2 [ 167s] make: *** [debian/rules:43: build] Error 25 [ 167s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 167s] ### VM INTERACTION START ### [ 170s] [ 160.542737] sysrq: SysRq : Power Off [ 170s] [ 160.547688] reboot: Power down [ 170s] ### VM INTERACTION END ### [ 170s] [ 170s] lamb17 failed "build binutils-arm-osmo-eabi_2.21.1a.dsc" at Thu Jul 30 08:56:49 UTC 2020. [ 170s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 08:59:41 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 08:59:41 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5f228c14f288d_67502ac3bb5765f812378e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 97s] ^ [ 97s] acc.c:117:2: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code [ 97s] acc.c: In function 'get_lowest_allowed_acc': [ 97s] acc.c:127:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 97s] for (int i = 0; i < 10; i++) { [ 97s] ^ [ 97s] Makefile:617: recipe for target 'acc.o' failed [ 97s] make[4]: *** [acc.o] Error 1 [ 97s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 97s] Makefile:393: recipe for target 'all-recursive' failed [ 97s] make[3]: *** [all-recursive] Error 1 [ 97s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 97s] Makefile:443: recipe for target 'all-recursive' failed [ 97s] make[2]: *** [all-recursive] Error 1 [ 97s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 97s] Makefile:374: recipe for target 'all' failed [ 97s] make[1]: *** [all] Error 2 [ 97s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 97s] dh_auto_build: make -j1 returned exit code 2 [ 97s] debian/rules:45: recipe for target 'build' failed [ 97s] make: *** [build] Error 2 [ 97s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 97s] ### VM INTERACTION START ### [ 98s] Powering off. [ 98s] [ 92.858568] reboot: Power down [ 98s] ### VM INTERACTION END ### [ 98s] [ 98s] goat05 failed "build osmo-bsc_1.6.0.199.deaa.dsc" at Thu Jul 30 08:59:27 UTC 2020. [ 98s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 09:01:24 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 09:01:24 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f228c78a0a18_67502ac3bb5765f8124482@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/limesuite failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 384s] dh_strip_nondeterminism -O--buildsystem=cmake -O--parallel [ 385s] dh_compress -O--buildsystem=cmake -O--parallel [ 385s] dh_fixperms -O--buildsystem=cmake -O--parallel [ 386s] dh_missing -O--buildsystem=cmake -O--parallel [ 386s] dh_strip -O--buildsystem=cmake -O--parallel [ 392s] dh_makeshlibs -O--buildsystem=cmake -O--parallel [ 392s] dh_shlibdeps -O--buildsystem=cmake -O--parallel [ 393s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/soapysdr0.7-module-lms7/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.7/libLMS7Support.so (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 393s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 395s] dpkg-shlibdeps: error: cannot continue due to the error above [ 395s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 395s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 395s] dh_shlibdeps: error: dpkg-shlibdeps -Tdebian/soapysdr0.7-module-lms7.substvars debian/soapysdr0.7-module-lms7/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.7/libLMS7Support.so returned exit code 2 [ 395s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeSuiteGUI (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 398s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 398s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 398s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 398s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 398s] dh_shlibdeps: error: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeUtil debian/limesuite/usr/bin/LimeSuiteGUI returned exit code 2 [ 398s] dh_shlibdeps: error: Aborting due to earlier error [ 398s] make: *** [debian/rules:28: binary] Error 25 [ 398s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 398s] ### VM INTERACTION START ### [ 400s] Powering off. [ 400s] [ 386.169298] reboot: Power down [ 400s] ### VM INTERACTION END ### [ 400s] [ 400s] lamb51 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 09:01:08 UTC 2020. [ 400s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jul 30 09:07:46 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 30 Jul 2020 09:07:46 +0000 Subject: Change in osmocom-bb[master]: layer23/mobile: fix wrong message type in gsm48_rr_tx_rr_status() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19453 ) Change subject: layer23/mobile: fix wrong message type in gsm48_rr_tx_rr_status() ...................................................................... layer23/mobile: fix wrong message type in gsm48_rr_tx_rr_status() Change-Id: I57c6a4e1e725da52c50e2a28e56627a3f3827c62 --- M src/host/layer23/src/mobile/gsm48_rr.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/53/19453/1 diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index fdc9916..74b94c4 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -894,7 +894,7 @@ st = (struct gsm48_rr_status *) msgb_put(nmsg, sizeof(*st)); gh->proto_discr = GSM48_PDISC_RR; - gh->msg_type = GSM48_MT_RR_CIPH_M_COMPL; + gh->msg_type = GSM48_MT_RR_STATUS; /* rr cause */ st->rr_cause = cause; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I57c6a4e1e725da52c50e2a28e56627a3f3827c62 Gerrit-Change-Number: 19453 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 09:07:56 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 09:07:56 +0000 Subject: Change in osmo-ci[master]: nightly-packages: Hard-code LimeSuite to 20.01.0 as 20.07.0 is broken In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ci/+/19452 ) Change subject: nightly-packages: Hard-code LimeSuite to 20.01.0 as 20.07.0 is broken ...................................................................... nightly-packages: Hard-code LimeSuite to 20.01.0 as 20.07.0 is broken See https://github.com/myriadrf/LimeSuite/issues/313 This also reverts the previous commits that removed the work-around for building LimeSuite on Debian10, as that one is still required for v20.01.0 (and not for v20.07.0). Change-Id: Ib70418f0b8a4c6aafa3098b6fa3e240f89112b59 --- A obs-patches/limesuite/build-for-debian10.patch M scripts/osmocom-latest-packages.sh M scripts/osmocom-nightly-packages.sh 3 files changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/52/19452/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/19452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib70418f0b8a4c6aafa3098b6fa3e240f89112b59 Gerrit-Change-Number: 19452 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jul 30 09:15:08 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 09:15:08 +0000 Subject: Build failure of network:osmocom:nightly/limesuite-debian10 in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f228fb696aff_67502ac3bb5765f812867f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite-debian10/Debian_Unstable/x86_64 Package network:osmocom:nightly/limesuite-debian10 failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly limesuite-debian10 Last lines of build log: [ 208s] dh_makeshlibs -O--buildsystem=cmake -O--parallel [ 208s] dh_makeshlibs: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 208s] dh_shlibdeps -O--buildsystem=cmake -O--parallel [ 208s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 208s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 208s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 208s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 209s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 209s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/soapysdr0.7-module-lms7/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.7/libLMS7Support.so (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 209s] dpkg-shlibdeps: error: cannot continue due to the error above [ 209s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 209s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 209s] dh_shlibdeps: error: dpkg-shlibdeps -Tdebian/soapysdr0.7-module-lms7.substvars debian/soapysdr0.7-module-lms7/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.7/libLMS7Support.so returned exit code 2 [ 210s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 210s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeSuiteGUI (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 211s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 211s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 211s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 212s] dh_shlibdeps: error: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeUtil returned exit code 2 [ 212s] dh_shlibdeps: error: Aborting due to earlier error [ 212s] make: *** [debian/rules:28: binary] Error 25 [ 212s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 212s] ### VM INTERACTION START ### [ 213s] Powering off. [ 213s] [ 201.119584] reboot: Power down [ 213s] ### VM INTERACTION END ### [ 213s] [ 213s] sheep88 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 09:14:56 UTC 2020. [ 213s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 09:17:07 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 09:17:07 +0000 Subject: Build failure of network:osmocom:nightly/limesuite-debian10 in Debian_10/i586 In-Reply-To: References: Message-ID: <5f22902ed9d4c_67502ac3bb5765f81296da@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite-debian10/Debian_10/i586 Package network:osmocom:nightly/limesuite-debian10 failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly limesuite-debian10 Last lines of build log: [ 325s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') [ 325s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeSuiteGUI (ELF format: 'elf32-i386' abi: '0101000300000000'; RPATH: '') [ 328s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libX11.so.6 (it uses none of the library's symbols) [ 328s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_xrc-3.0.so.0 (it uses none of the library's symbols) [ 328s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_gl.so.1.3 (it uses none of the library's symbols) [ 328s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libSM.so.6 (it uses none of the library's symbols) [ 328s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_html-3.0.so.0 (it uses none of the library's symbols) [ 328s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_baseu_xml-3.0.so.0 (it uses none of the library's symbols) [ 328s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libICE.so.6 (it uses none of the library's symbols) [ 328s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libXext.so.6 (it uses none of the library's symbols) [ 328s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_aui-3.0.so.0 (it uses none of the library's symbols) [ 328s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_richtext-3.0.so.0 (it uses none of the library's symbols) [ 328s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_images.so.1.3 (it uses none of the library's symbols) [ 328s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeUtil debian/limesuite/usr/bin/LimeSuiteGUI were not linked against libusb-1.0.so.0 (they use none of the library's symbols) [ 328s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_forms.so.1.3 (it uses none of the library's symbols) [ 328s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 328s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 328s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 328s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeUtil debian/limesuite/usr/bin/LimeSuiteGUI returned exit code 2 [ 328s] dh_shlibdeps: Aborting due to earlier error [ 328s] make: *** [debian/rules:28: binary] Error 2 [ 328s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 328s] ### VM INTERACTION START ### [ 332s] [ 319.129483] sysrq: SysRq : Power Off [ 332s] [ 319.138190] reboot: Power down [ 332s] ### VM INTERACTION END ### [ 332s] [ 332s] lamb17 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 09:16:51 UTC 2020. [ 332s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 09:17:24 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 09:17:24 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f22902fb4b78_67502ac3bb5765f812974d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 521s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_board_qmod.o:(.rodata.cst4+0x0): warning: undefined reference to `__stack_chk_guard' [ 521s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_board_qmod.o:(.rodata.cst4+0x4): warning: undefined reference to `__stack_chk_guard' [ 521s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_board_qmod.o: in function `board_override_enter_dfu': [ 521s] ./firmware/libboard/qmod/source/board_qmod.c:408: warning: undefined reference to `__stack_chk_fail' [ 521s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_main.o:(.rodata.cst4+0x0): warning: undefined reference to `__stack_chk_guard' [ 521s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_main.o: in function `USBDFU_handle_dnload': [ 521s] ./firmware/apps/dfu/main.c:150: warning: undefined reference to `__stack_chk_fail' [ 521s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_dfu_desc.o:(.rodata.cst4+0x0): warning: undefined reference to `__stack_chk_guard' [ 521s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_dfu_desc.o: in function `set_usb_serial_str': [ 521s] ./firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:211: warning: undefined reference to `__stack_chk_fail' [ 521s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_dfu_driver.o:(.rodata.cst4+0x0): warning: undefined reference to `__stack_chk_guard' [ 521s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_dfu_driver.o: in function `handle_getstate': [ 521s] ./firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 521s] collect2: error: ld returned 1 exit status [ 521s] % [ 521s] make[2]: *** [Makefile:234: flash] Error 1 [ 521s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 521s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 521s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 521s] dh_auto_build: error: make -j1 returned exit code 2 [ 521s] make: *** [debian/rules:16: build] Error 25 [ 521s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 521s] ### VM INTERACTION START ### [ 524s] [ 510.292889] sysrq: SysRq : Power Off [ 524s] [ 510.323464] reboot: Power down [ 524s] ### VM INTERACTION END ### [ 524s] [ 524s] lamb07 failed "build simtrace2_0.7.0.60.859f.dsc" at Thu Jul 30 09:17:23 UTC 2020. [ 524s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 09:19:07 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 09:19:07 +0000 Subject: Build failure of network:osmocom:nightly/limesuite-debian10 in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5f2290a2bd7ca_67502ac3bb5765f813036e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite-debian10/Debian_10/x86_64 Package network:osmocom:nightly/limesuite-debian10 failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly limesuite-debian10 Last lines of build log: [ 413s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 414s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 414s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_images.so.1.3 (it uses none of the library's symbols) [ 414s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeUtil were not linked against libusb-1.0.so.0 (they use none of the library's symbols) [ 414s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_aui-3.0.so.0 (it uses none of the library's symbols) [ 414s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_gl.so.1.3 (it uses none of the library's symbols) [ 414s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libSM.so.6 (it uses none of the library's symbols) [ 414s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_xrc-3.0.so.0 (it uses none of the library's symbols) [ 414s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_richtext-3.0.so.0 (it uses none of the library's symbols) [ 414s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libX11.so.6 (it uses none of the library's symbols) [ 414s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libXext.so.6 (it uses none of the library's symbols) [ 414s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_html-3.0.so.0 (it uses none of the library's symbols) [ 414s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libICE.so.6 (it uses none of the library's symbols) [ 414s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_baseu_xml-3.0.so.0 (it uses none of the library's symbols) [ 414s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_forms.so.1.3 (it uses none of the library's symbols) [ 414s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 414s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 414s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 414s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeUtil returned exit code 2 [ 414s] dh_shlibdeps: Aborting due to earlier error [ 414s] make: *** [debian/rules:28: binary] Error 2 [ 414s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 414s] ### VM INTERACTION START ### [ 418s] [ 405.984732] sysrq: SysRq : Power Off [ 418s] [ 405.992205] reboot: Power down [ 418s] ### VM INTERACTION END ### [ 418s] [ 418s] lamb57 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 09:18:57 UTC 2020. [ 418s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 09:20:34 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 09:20:34 +0000 Subject: Build failure of network:osmocom:nightly/limesuite-debian10 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5f2290fe36022_67502ac3bb5765f8130774@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite-debian10/Debian_Testing/x86_64 Package network:osmocom:nightly/limesuite-debian10 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly limesuite-debian10 Last lines of build log: [ 513s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 513s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 513s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 513s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 513s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 513s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 513s] dh_shlibdeps: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 513s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/soapysdr0.7-module-lms7/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.7/libLMS7Support.so (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 513s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 515s] dpkg-shlibdeps: error: cannot continue due to the error above [ 515s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 515s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 515s] dh_shlibdeps: error: dpkg-shlibdeps -Tdebian/soapysdr0.7-module-lms7.substvars debian/soapysdr0.7-module-lms7/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.7/libLMS7Support.so returned exit code 2 [ 515s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeSuiteGUI (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 518s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf64-x86-64' abi: '0201003e00000000'; RPATH: '') [ 519s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 519s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 519s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 519s] dh_shlibdeps: error: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeUtil returned exit code 2 [ 519s] dh_shlibdeps: error: Aborting due to earlier error [ 519s] make: *** [debian/rules:28: binary] Error 25 [ 519s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 519s] ### VM INTERACTION START ### [ 520s] Powering off. [ 520s] [ 496.919363] reboot: Power down [ 520s] ### VM INTERACTION END ### [ 520s] [ 520s] lamb04 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 09:20:29 UTC 2020. [ 520s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 09:20:34 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 09:20:34 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f2290fee8f0b_67502ac3bb5765f81308f5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/xUbuntu_20.04/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 338s] #define PACKAGE_URL "" [ 338s] #define PACKAGE "osmo-mgw" [ 338s] #define VERSION "1.7.0" [ 338s] #define STDC_HEADERS 1 [ 338s] #define HAVE_SYS_TYPES_H 1 [ 338s] #define HAVE_SYS_STAT_H 1 [ 338s] #define HAVE_STDLIB_H 1 [ 338s] #define HAVE_STRING_H 1 [ 338s] #define HAVE_MEMORY_H 1 [ 338s] #define HAVE_STRINGS_H 1 [ 338s] #define HAVE_INTTYPES_H 1 [ 338s] #define HAVE_STDINT_H 1 [ 338s] #define HAVE_UNISTD_H 1 [ 338s] #define HAVE_DLFCN_H 1 [ 338s] #define LT_OBJDIR ".libs/" [ 338s] [ 338s] configure: exit 1 [ 338s] dh_auto_configure: error: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 338s] make[1]: *** [debian/rules:33: override_dh_auto_configure] Error 25 [ 338s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 338s] make: *** [debian/rules:17: build] Error 2 [ 338s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 338s] ### VM INTERACTION START ### [ 342s] [ 328.336155] sysrq: SysRq : Power Off [ 342s] [ 328.341507] reboot: Power down [ 342s] ### VM INTERACTION END ### [ 342s] [ 342s] lamb18 failed "build osmo-mgw_1.7.0.dsc" at Thu Jul 30 09:20:21 UTC 2020. [ 342s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 09:21:43 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 09:21:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-uecups in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f22913a64723_67502ac3bb5765f8130914@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-uecups/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/osmo-uecups failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-uecups Last lines of build log: [ 757s] #define PACKAGE_URL "" [ 757s] #define PACKAGE "osmo-uecups" [ 757s] #define VERSION "0.1.3.1-8362" [ 757s] #define STDC_HEADERS 1 [ 757s] #define HAVE_SYS_TYPES_H 1 [ 757s] #define HAVE_SYS_STAT_H 1 [ 757s] #define HAVE_STDLIB_H 1 [ 757s] #define HAVE_STRING_H 1 [ 757s] #define HAVE_MEMORY_H 1 [ 757s] #define HAVE_STRINGS_H 1 [ 757s] #define HAVE_INTTYPES_H 1 [ 757s] #define HAVE_STDINT_H 1 [ 757s] #define HAVE_UNISTD_H 1 [ 757s] #define HAVE_DLFCN_H 1 [ 757s] #define LT_OBJDIR ".libs/" [ 757s] [ 757s] configure: exit 1 [ 757s] dh_auto_configure: error: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 757s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 25 [ 757s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 757s] make: *** [debian/rules:45: build] Error 2 [ 757s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 757s] ### VM INTERACTION START ### [ 760s] [ 743.331134] sysrq: SysRq : Power Off [ 760s] [ 743.352265] reboot: Power down [ 760s] ### VM INTERACTION END ### [ 760s] [ 760s] lamb25 failed "build osmo-uecups_0.1.3.1.8362.dsc" at Thu Jul 30 09:21:26 UTC 2020. [ 760s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 09:21:43 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 09:21:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f22913b2ab31_67502ac3bb5765f8131139@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 767s] #define PACKAGE_URL "" [ 767s] #define PACKAGE "osmo-mgw" [ 767s] #define VERSION "1.7.0.66-51b4" [ 767s] #define STDC_HEADERS 1 [ 767s] #define HAVE_SYS_TYPES_H 1 [ 767s] #define HAVE_SYS_STAT_H 1 [ 767s] #define HAVE_STDLIB_H 1 [ 767s] #define HAVE_STRING_H 1 [ 767s] #define HAVE_MEMORY_H 1 [ 767s] #define HAVE_STRINGS_H 1 [ 767s] #define HAVE_INTTYPES_H 1 [ 767s] #define HAVE_STDINT_H 1 [ 767s] #define HAVE_UNISTD_H 1 [ 767s] #define HAVE_DLFCN_H 1 [ 767s] #define LT_OBJDIR ".libs/" [ 767s] [ 767s] configure: exit 1 [ 767s] dh_auto_configure: error: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 767s] make[1]: *** [debian/rules:33: override_dh_auto_configure] Error 25 [ 767s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 767s] make: *** [debian/rules:17: build] Error 2 [ 767s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 767s] ### VM INTERACTION START ### [ 770s] [ 755.863185] sysrq: SysRq : Power Off [ 770s] [ 755.871169] reboot: Power down [ 771s] ### VM INTERACTION END ### [ 771s] [ 771s] lamb53 failed "build osmo-mgw_1.7.0.66.51b4.dsc" at Thu Jul 30 09:21:29 UTC 2020. [ 771s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 09:39:24 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 09:39:24 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f22955673bc3_67502ac3bb5765f81364d3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 168s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_board_qmod.o:(.rodata.cst4+0x0): warning: undefined reference to `__stack_chk_guard' [ 168s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_board_qmod.o:(.rodata.cst4+0x4): warning: undefined reference to `__stack_chk_guard' [ 168s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_board_qmod.o: in function `board_override_enter_dfu': [ 168s] ./firmware/libboard/qmod/source/board_qmod.c:408: warning: undefined reference to `__stack_chk_fail' [ 168s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_main.o:(.rodata.cst4+0x0): warning: undefined reference to `__stack_chk_guard' [ 168s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_main.o: in function `USBDFU_handle_dnload': [ 168s] ./firmware/apps/dfu/main.c:150: warning: undefined reference to `__stack_chk_fail' [ 168s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_dfu_desc.o:(.rodata.cst4+0x0): warning: undefined reference to `__stack_chk_guard' [ 168s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_dfu_desc.o: in function `set_usb_serial_str': [ 168s] ./firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:211: warning: undefined reference to `__stack_chk_fail' [ 168s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_dfu_driver.o:(.rodata.cst4+0x0): warning: undefined reference to `__stack_chk_guard' [ 168s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_dfu_driver.o: in function `handle_getstate': [ 168s] ./firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 168s] collect2: error: ld returned 1 exit status [ 168s] % [ 168s] make[2]: *** [Makefile:234: flash] Error 1 [ 168s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 168s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 168s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 168s] dh_auto_build: error: make -j1 returned exit code 2 [ 168s] make: *** [debian/rules:16: build] Error 25 [ 168s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 169s] ### VM INTERACTION START ### [ 172s] [ 159.674517] sysrq: SysRq : Power Off [ 172s] [ 159.680540] reboot: Power down [ 172s] ### VM INTERACTION END ### [ 172s] [ 172s] lamb59 failed "build simtrace2_0.7.0.60.859f.dsc" at Thu Jul 30 09:39:11 UTC 2020. [ 172s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jul 30 09:47:02 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 30 Jul 2020 09:47:02 +0000 Subject: Change in osmocom-bb[master]: layer23/mobile: fix a memory leak (msgb) in gsm48_rr_data_ind() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19454 ) Change subject: layer23/mobile: fix a memory leak (msgb) in gsm48_rr_data_ind() ...................................................................... layer23/mobile: fix a memory leak (msgb) in gsm48_rr_data_ind() Change-Id: I55dcccf5b7d27d012908759954182eaec434d26b --- M src/host/layer23/src/mobile/gsm48_rr.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/54/19454/1 diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 74b94c4..0449ee3 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -4633,8 +4633,10 @@ uint8_t skip_ind = (gh->proto_discr & 0xf0) >> 4; /* ignore if skip indicator is not B'0000' */ - if (skip_ind) + if (skip_ind) { + msgb_free(msg); return 0; + } switch(gh->msg_type) { case GSM48_MT_RR_ADD_ASS: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I55dcccf5b7d27d012908759954182eaec434d26b Gerrit-Change-Number: 19454 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jul 30 09:47:45 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 09:47:45 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5f229755489a8_67502ac3bb5765f81393eb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_8.0/i586 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 164s] ^ [ 164s] acc.c:117:2: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code [ 164s] acc.c: In function 'get_lowest_allowed_acc': [ 164s] acc.c:127:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 164s] for (int i = 0; i < 10; i++) { [ 164s] ^ [ 164s] Makefile:617: recipe for target 'acc.o' failed [ 164s] make[4]: *** [acc.o] Error 1 [ 164s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 164s] Makefile:393: recipe for target 'all-recursive' failed [ 164s] make[3]: *** [all-recursive] Error 1 [ 164s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 164s] Makefile:443: recipe for target 'all-recursive' failed [ 164s] make[2]: *** [all-recursive] Error 1 [ 164s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 164s] Makefile:374: recipe for target 'all' failed [ 165s] make[1]: *** [all] Error 2 [ 165s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 165s] dh_auto_build: make -j1 returned exit code 2 [ 165s] debian/rules:45: recipe for target 'build' failed [ 165s] make: *** [build] Error 2 [ 165s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 165s] ### VM INTERACTION START ### [ 166s] Powering off. [ 166s] [ 156.056396] reboot: Power down [ 166s] ### VM INTERACTION END ### [ 166s] [ 166s] lamb24 failed "build osmo-bsc_1.6.0.199.deaa.dsc" at Thu Jul 30 09:47:40 UTC 2020. [ 166s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jul 30 10:35:05 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 10:35:05 +0000 Subject: Change in osmo-ci[master]: nightly-packages: Hard-code LimeSuite to 20.01.0 as 20.07.0 is broken In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/19452 ) Change subject: nightly-packages: Hard-code LimeSuite to 20.01.0 as 20.07.0 is broken ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/19452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib70418f0b8a4c6aafa3098b6fa3e240f89112b59 Gerrit-Change-Number: 19452 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 10:35:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 10:35:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 10:35:07 +0000 Subject: Change in osmo-ci[master]: nightly-packages: Hard-code LimeSuite to 20.01.0 as 20.07.0 is broken In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/19452 ) Change subject: nightly-packages: Hard-code LimeSuite to 20.01.0 as 20.07.0 is broken ...................................................................... nightly-packages: Hard-code LimeSuite to 20.01.0 as 20.07.0 is broken See https://github.com/myriadrf/LimeSuite/issues/313 This also reverts the previous commits that removed the work-around for building LimeSuite on Debian10, as that one is still required for v20.01.0 (and not for v20.07.0). Change-Id: Ib70418f0b8a4c6aafa3098b6fa3e240f89112b59 --- A obs-patches/limesuite/build-for-debian10.patch M scripts/osmocom-latest-packages.sh M scripts/osmocom-nightly-packages.sh 3 files changed, 28 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/obs-patches/limesuite/build-for-debian10.patch b/obs-patches/limesuite/build-for-debian10.patch new file mode 100644 index 0000000..2387b08 --- /dev/null +++ b/obs-patches/limesuite/build-for-debian10.patch @@ -0,0 +1,13 @@ +diff --git a/debian/control b/debian/control +index c25b7c97..375ab95b 100644 +--- a/debian/control ++++ b/debian/control +@@ -6,7 +6,7 @@ Build-Depends: + debhelper (>= 9.0.0), + cmake (>= 3.1.3), + libusb-1.0-0-dev, +- libwxgtk3.0-dev, ++ libwxgtk3.0-gtk3-dev, + libsoapysdr-dev, + freeglut3-dev, + libfltk1.3-dev, diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 212bb4c..219ae6d 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -30,6 +30,11 @@ get_last_tag() { project="$1" + if [ "$project" = "limesuite" ]; then + # temp workaround, see https://github.com/myriadrf/LimeSuite/issues/313 + echo "v20.01.0" + return + fi if [ "$project" = "limesuite" ] || [ "$project" = "open5gs" ]; then ver_regexp="^v[0-9]*.[0-9]*.[0-9]*$" else diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index ea0dcd4..876c70c 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -51,6 +51,11 @@ get_last_tag() { project="$1" if [ "$project" = "limesuite" ]; then + # temp workaround, see https://github.com/myriadrf/LimeSuite/issues/313 + echo "v20.01.0" + return + fi + if [ "$project" = "limesuite" ]; then ver_regexp="^v[0-9]*.[0-9]*.[0-9]*$" else ver_regexp="^[0-9]*.[0-9]*.[0-9]*$" @@ -179,7 +184,9 @@ checkout_limesuite() { cd "$REPO" git clone https://github.com/myriadrf/LimeSuite limesuite - TAG="$(get_last_tag limesuite)" + # temp workaround, see https://github.com/myriadrf/LimeSuite/issues/313 + #TAG="$(get_last_tag limesuite)" + TAG="v20.01.0" cd limesuite git checkout "$TAG" } @@ -241,9 +248,11 @@ cd "$REPO" osmo_obs_checkout_copy debian8 osmo-gsm-manuals osmo_obs_checkout_copy debian8 osmo-trx + osmo_obs_checkout_copy debian10 limesuite build osmocom-$FEED build limesuite no_commit --git-upstream-tree="$(get_last_tag limesuite)" + build limesuite-debian10 no_commit --git-upstream-tree="$(get_last_tag limesuite)" build osmo-gsm-manuals build osmo-gsm-manuals-debian8 build libosmocore -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/19452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib70418f0b8a4c6aafa3098b6fa3e240f89112b59 Gerrit-Change-Number: 19452 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 10:35:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 10:35:22 +0000 Subject: Change in osmocom-bb[master]: layer23/mobile: fix wrong message type in gsm48_rr_tx_rr_status() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19453 ) Change subject: layer23/mobile: fix wrong message type in gsm48_rr_tx_rr_status() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I57c6a4e1e725da52c50e2a28e56627a3f3827c62 Gerrit-Change-Number: 19453 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 10:35:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 10:35:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 10:35:34 +0000 Subject: Change in osmocom-bb[master]: layer23/mobile: fix a memory leak (msgb) in gsm48_rr_data_ind() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19454 ) Change subject: layer23/mobile: fix a memory leak (msgb) in gsm48_rr_data_ind() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I55dcccf5b7d27d012908759954182eaec434d26b Gerrit-Change-Number: 19454 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 10:35:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 10:35:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 10:35:37 +0000 Subject: Change in osmocom-bb[master]: layer23/mobile: fix wrong message type in gsm48_rr_tx_rr_status() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19453 ) Change subject: layer23/mobile: fix wrong message type in gsm48_rr_tx_rr_status() ...................................................................... layer23/mobile: fix wrong message type in gsm48_rr_tx_rr_status() Change-Id: I57c6a4e1e725da52c50e2a28e56627a3f3827c62 --- M src/host/layer23/src/mobile/gsm48_rr.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index fdc9916..74b94c4 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -894,7 +894,7 @@ st = (struct gsm48_rr_status *) msgb_put(nmsg, sizeof(*st)); gh->proto_discr = GSM48_PDISC_RR; - gh->msg_type = GSM48_MT_RR_CIPH_M_COMPL; + gh->msg_type = GSM48_MT_RR_STATUS; /* rr cause */ st->rr_cause = cause; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I57c6a4e1e725da52c50e2a28e56627a3f3827c62 Gerrit-Change-Number: 19453 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 10:35:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 10:35:37 +0000 Subject: Change in osmocom-bb[master]: layer23/mobile: fix a memory leak (msgb) in gsm48_rr_data_ind() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19454 ) Change subject: layer23/mobile: fix a memory leak (msgb) in gsm48_rr_data_ind() ...................................................................... layer23/mobile: fix a memory leak (msgb) in gsm48_rr_data_ind() Change-Id: I55dcccf5b7d27d012908759954182eaec434d26b --- M src/host/layer23/src/mobile/gsm48_rr.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 74b94c4..0449ee3 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -4633,8 +4633,10 @@ uint8_t skip_ind = (gh->proto_discr & 0xf0) >> 4; /* ignore if skip indicator is not B'0000' */ - if (skip_ind) + if (skip_ind) { + msgb_free(msg); return 0; + } switch(gh->msg_type) { case GSM48_MT_RR_ADD_ASS: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I55dcccf5b7d27d012908759954182eaec434d26b Gerrit-Change-Number: 19454 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jul 30 10:54:51 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 10:54:51 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f22a70b20871_67502ac3bb5765f8161558@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 207s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_board_qmod.o:(.rodata.cst4+0x0): warning: undefined reference to `__stack_chk_guard' [ 207s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_board_qmod.o:(.rodata.cst4+0x4): warning: undefined reference to `__stack_chk_guard' [ 207s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_board_qmod.o: in function `board_override_enter_dfu': [ 207s] ./firmware/libboard/qmod/source/board_qmod.c:408: warning: undefined reference to `__stack_chk_fail' [ 207s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_main.o:(.rodata.cst4+0x0): warning: undefined reference to `__stack_chk_guard' [ 207s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_main.o: in function `USBDFU_handle_dnload': [ 207s] ./firmware/apps/dfu/main.c:150: warning: undefined reference to `__stack_chk_fail' [ 207s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_dfu_desc.o:(.rodata.cst4+0x0): warning: undefined reference to `__stack_chk_guard' [ 207s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_dfu_desc.o: in function `set_usb_serial_str': [ 207s] ./firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:211: warning: undefined reference to `__stack_chk_fail' [ 207s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_dfu_driver.o:(.rodata.cst4+0x0): warning: undefined reference to `__stack_chk_guard' [ 207s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_dfu_driver.o: in function `handle_getstate': [ 207s] ./firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 207s] collect2: error: ld returned 1 exit status [ 207s] % [ 207s] make[2]: *** [Makefile:234: flash] Error 1 [ 207s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 207s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 207s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 207s] dh_auto_build: error: make -j1 returned exit code 2 [ 207s] make: *** [debian/rules:16: build] Error 25 [ 207s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 207s] ### VM INTERACTION START ### [ 211s] [ 200.246602] sysrq: SysRq : Power Off [ 211s] [ 200.271817] reboot: Power down [ 211s] ### VM INTERACTION END ### [ 211s] [ 211s] lamb04 failed "build simtrace2_0.7.0.60.859f.dsc" at Thu Jul 30 10:54:38 UTC 2020. [ 211s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 11:02:51 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 11:02:51 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5f22a8f1d5c8b_67502ac3bb5765f81629c0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_8.0/i586 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 194s] ^ [ 194s] acc.c:117:2: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code [ 194s] acc.c: In function 'get_lowest_allowed_acc': [ 194s] acc.c:127:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 194s] for (int i = 0; i < 10; i++) { [ 194s] ^ [ 194s] Makefile:617: recipe for target 'acc.o' failed [ 194s] make[4]: *** [acc.o] Error 1 [ 194s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 194s] Makefile:393: recipe for target 'all-recursive' failed [ 194s] make[3]: *** [all-recursive] Error 1 [ 194s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 194s] Makefile:443: recipe for target 'all-recursive' failed [ 194s] make[2]: *** [all-recursive] Error 1 [ 194s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 194s] Makefile:374: recipe for target 'all' failed [ 194s] make[1]: *** [all] Error 2 [ 194s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 194s] dh_auto_build: make -j1 returned exit code 2 [ 194s] debian/rules:45: recipe for target 'build' failed [ 194s] make: *** [build] Error 2 [ 194s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 194s] ### VM INTERACTION START ### [ 196s] Powering off. [ 196s] [ 179.987906] reboot: Power down [ 196s] ### VM INTERACTION END ### [ 196s] [ 196s] cloud119 failed "build osmo-bsc_1.6.0.199.deaa.dsc" at Thu Jul 30 11:02:46 UTC 2020. [ 196s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jul 30 11:20:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 11:20:08 +0000 Subject: Change in osmo-bsc[master]: acc.c: Don't use C99 constructs, this breaks builds on Debian 8 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19455 ) Change subject: acc.c: Don't use C99 constructs, this breaks builds on Debian 8 ...................................................................... acc.c: Don't use C99 constructs, this breaks builds on Debian 8 [ 160s] acc.c: In function 'get_highest_allowed_acc': [ 160s] acc.c:117:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 160s] for (int i = 9; i >= 0; i--) { [ 160s] ^ [ 160s] acc.c:117:2: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code [ 160s] acc.c: In function 'get_lowest_allowed_acc': [ 160s] acc.c:127:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 160s] for (int i = 0; i < 10; i++) { [ 160s] ^ [ 160s] Makefile:617: recipe for target 'acc.o' failed Change-Id: I03722854634b2d6d6f1abac7c7553762b5fc6890 --- M src/osmo-bsc/acc.c 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/55/19455/1 diff --git a/src/osmo-bsc/acc.c b/src/osmo-bsc/acc.c index b25f2fd..72b4591 100644 --- a/src/osmo-bsc/acc.c +++ b/src/osmo-bsc/acc.c @@ -114,7 +114,9 @@ static uint8_t get_highest_allowed_acc(uint16_t mask) { - for (int i = 9; i >= 0; i--) { + int i; + + for (i = 9; i >= 0; i--) { if (mask & (1 << i)) return i; } @@ -124,7 +126,9 @@ static uint8_t get_lowest_allowed_acc(uint16_t mask) { - for (int i = 0; i < 10; i++) { + int i; + + for (i = 0; i < 10; i++) { if (mask & (1 << i)) return i; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I03722854634b2d6d6f1abac7c7553762b5fc6890 Gerrit-Change-Number: 19455 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 11:21:09 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 11:21:09 +0000 Subject: Change in libosmocore[master]: gsm_08_58: add missing RSL error cause codes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19448 ) Change subject: gsm_08_58: add missing RSL error cause codes ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic3e936da00bd256bae03867887851f1a4e30e218 Gerrit-Change-Number: 19448 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 11:21:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 11:21:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 11:21:41 +0000 Subject: Change in libosmocore[master]: i460_mux: correctly reset subchannels In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19381 ) Change subject: i460_mux: correctly reset subchannels ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I937a9d4db95f44a860cd2c5dbb660dc1970b9a49 Gerrit-Change-Number: 19381 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jul 2020 11:21:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 11:21:47 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 11:21:47 +0000 Subject: Change in libosmocore[master]: i460_mux: correctly reset subchannels In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19381 ) Change subject: i460_mux: correctly reset subchannels ...................................................................... i460_mux: correctly reset subchannels When a subchannel is deleted or created the initalization mainly consists of a memset over the wohle subchannel struct a message buffer initailization. However, when we delete a subchannel we also must take of the resetting of the related struct. Currently this is done with a memest. Unfortunately this creates not only a memory leak (there might be still items in the multiplexer tx queue) but also it makes the application crash when the message buffer is used the next time since the llist_head of the tx queue looses its initialization. Lets fix the memory leak problem and the message buffer problem and put the reset functionality in a single place. Change-Id: I937a9d4db95f44a860cd2c5dbb660dc1970b9a49 --- M src/gsm/i460_mux.c 1 file changed, 23 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/gsm/i460_mux.c b/src/gsm/i460_mux.c index 3fb63ec..50cb56e 100644 --- a/src/gsm/i460_mux.c +++ b/src/gsm/i460_mux.c @@ -306,6 +306,26 @@ return -1; } +/* reset subchannel struct into a defined state */ +static void subchan_reset(struct osmo_i460_subchan *schan, bool first_time) +{ + /* Before we zero out the subchannel struct, we must be sure that the + * tx_queue is cleared and all dynamically allocated memory is freed. + * However, on an uninitalized subchannel struct we can not be sure + * that the pointers are valid. If the subchannel is reset the first + * time the caller must set first_time to true. */ + if (!first_time) { + if (schan->demux.out_bitbuf) + talloc_free(schan->demux.out_bitbuf); + msgb_queue_free(&schan->mux.tx_queue); + } + + /* Reset subchannel to a defined state */ + memset(schan, 0, sizeof(*schan)); + schan->rate = OSMO_I460_RATE_NONE; + INIT_LLIST_HEAD(&schan->mux.tx_queue); +} + /*! initialize an I.460 timeslot */ void osmo_i460_ts_init(struct osmo_i460_timeslot *ts) { @@ -313,10 +333,7 @@ for (i = 0; i < ARRAY_SIZE(ts->schan); i++) { struct osmo_i460_subchan *schan = &ts->schan[i]; - - memset(schan, 0, sizeof(*schan)); - schan->rate = OSMO_I460_RATE_NONE; - INIT_LLIST_HEAD(&schan->mux.tx_queue); + subchan_reset(schan, true); } } @@ -345,7 +362,7 @@ schan->demux.user_data = chd->demux.user_data; rc = alloc_bitbuf(ctx, schan, chd->demux.num_bits); if (rc < 0) { - memset(schan, 0, sizeof(*schan)); + subchan_reset(schan, false); return NULL; } @@ -356,8 +373,7 @@ /* remove a su-channel from the multiplex */ void osmo_i460_subchan_del(struct osmo_i460_subchan *schan) { - talloc_free(schan->demux.out_bitbuf); - memset(schan, 0, sizeof(*schan)); + subchan_reset(schan, false); } /*! @} */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I937a9d4db95f44a860cd2c5dbb660dc1970b9a49 Gerrit-Change-Number: 19381 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 11:22:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 11:22:53 +0000 Subject: Change in libosmocore[master]: gsm_08_58: add missing RSL error cause codes In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#4) to the change originally created by dexter. ( https://gerrit.osmocom.org/c/libosmocore/+/19448 ) Change subject: gsm_08_58: add missing RSL error cause codes ...................................................................... gsm_08_58: add missing RSL error cause codes The define constants for the cause codes "BTS not equipped", "remote transcoder failure" and "notification overflow" are missing. Lets add them including value strings. Change-Id: Ic3e936da00bd256bae03867887851f1a4e30e218 --- M include/osmocom/gsm/protocol/gsm_08_58.h M src/gsm/rsl.c 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/48/19448/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic3e936da00bd256bae03867887851f1a4e30e218 Gerrit-Change-Number: 19448 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 11:22:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 11:22:58 +0000 Subject: Change in libosmocore[master]: gsm_08_58: add missing RSL error cause codes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19448 ) Change subject: gsm_08_58: add missing RSL error cause codes ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic3e936da00bd256bae03867887851f1a4e30e218 Gerrit-Change-Number: 19448 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 11:22:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 11:23:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 11:23:06 +0000 Subject: Change in osmo-bsc[master]: fix CBSP server: actually open the srv_link In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19441 ) Change subject: fix CBSP server: actually open the srv_link ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic688573e179381f7798055b647200e508f1bc37f Gerrit-Change-Number: 19441 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jul 2020 11:23:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 11:25:13 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 11:25:13 +0000 Subject: Change in osmo-msc[master]: Send "BSSMAP CommonID" to tell BSC about the IMSI In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/18949 ) Change subject: Send "BSSMAP CommonID" to tell BSC about the IMSI ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/18949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2552736477663adb250c55728093500e8ae83ebb Gerrit-Change-Number: 18949 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jul 2020 11:25:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 11:27:08 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 11:27:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Introduce test TC_si_acc_ramp_rotate In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378 ) Change subject: Introduce test TC_si_acc_ramp_rotate ...................................................................... Patch Set 2: Code-Review+2 (1 comment) +1+1=+2 https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378/2/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378/2/bsc/BSC_Tests.ttcn at 1876 PS2, Line 1876: tr_ASP_RSL_UD > Ok, so you're waiting for SI Type 1 here? Do you need other SI types? If not, just use a proper temp [?] I'd need to have other receive lines then anyway to drop the other ones. Right now I'm only checking S1 to avoid adding abunch of extra lines to check different types and access ACC for each of them, but if needed in the future this was it can easily be extended to other SI too. I'm simply reusing existing infra. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I29acf4f117ccea53028c780cc9feb1da1fc16739 Gerrit-Change-Number: 19378 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jul 2020 11:27:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 11:27:10 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 11:27:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Introduce test TC_si_acc_ramp_rotate In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378 ) Change subject: Introduce test TC_si_acc_ramp_rotate ...................................................................... Introduce test TC_si_acc_ramp_rotate Change-Id: I29acf4f117ccea53028c780cc9feb1da1fc16739 --- M bsc/BSC_Tests.ttcn 1 file changed, 91 insertions(+), 20 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index ac6b356..5bd0e4f 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1865,12 +1865,37 @@ return count; } +private function f_recv_next_si1(integer rsl_idx := 0) runs on test_CT return SystemInformationType1 +{ + var ASP_RSL_Unitdata rx_rsl_ud; + var SystemInformationType1 last_si1; + + timer T := 30.0; + T.start; + alt { + [] IPA_RSL[rsl_idx].receive(tr_ASP_RSL_UD((tr_RSL_NO_BCCH_INFO, + tr_RSL_BCCH_INFO, + tr_RSL_NO_SACCH_FILL, + tr_RSL_SACCH_FILL)) + ) -> value rx_rsl_ud { + f_sysinfo_seen(rsl_idx, rx_rsl_ud.rsl); + if (g_system_information[rsl_idx].si1 == omit) { + repeat; + } + last_si1 := g_system_information[rsl_idx].si1; + g_system_information[rsl_idx].si1 := omit; + T.stop; + } + [] T.timeout { setverdict(fail, "Timeout receiving next SI1"); } + } + return last_si1; +} + /* verify ACC rotate feature */ testcase TC_si_acc_rotate() runs on test_CT { var template SystemInformationConfig sic := SystemInformationConfig_default; - var SystemInformationConfig last_si; + var SystemInformationType1 last_si1; var AccessControlClass acc; - var ASP_RSL_Unitdata rx_rsl_ud; var uint8_t count; var integer times_allowed[10] := { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -1883,22 +1908,9 @@ /* Init and get first sysinfo */ f_init_bts_and_check_sysinfo(0, expect_si := ?); - var integer i := 0; - while (i < 20) { - IPA_RSL[0].receive(tr_ASP_RSL_UD((tr_RSL_NO_BCCH_INFO, - tr_RSL_BCCH_INFO, - tr_RSL_NO_SACCH_FILL, - tr_RSL_SACCH_FILL)) - ) -> value rx_rsl_ud; - - f_sysinfo_seen(0, rx_rsl_ud.rsl); - last_si := g_system_information[0]; - if (last_si.si1 == omit) { - continue; - } - - g_system_information[0].si1 := omit; - acc := last_si.si1.rach_control.acc; + for (var integer i:= 0; i < 20; i := i + 1) { + last_si1 := f_recv_next_si1(0); + acc := last_si1.rach_control.acc; count := f_acc09_count_allowed(acc); log("RSL: GOT SI1 ACC len=", count, ": ", acc); @@ -1913,8 +1925,6 @@ times_allowed[j] := times_allowed[j] + 1; } } - - i := i + 1; } for (var integer j := 0; j < 10; j := j + 1) { @@ -1930,6 +1940,66 @@ "rach access-control-class 5 allowed"}); } +/* verify ACC startup ramp+rotate feature */ +testcase TC_si_acc_ramp_rotate() runs on test_CT { + var template SystemInformationConfig sic := SystemInformationConfig_default; + var SystemInformationType1 last_si1; + var AccessControlClass acc; + var ASP_RSL_Unitdata rx_rsl_ud; + var uint8_t count; + var uint8_t prev_count; + var integer times_allowed[10] := { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + + f_init(0, guard_timeout := 80.0); + + f_bts_0_cfg(BSCVTY, {"rach access-control-class 4 barred", + "access-control-class-rotate 0", + "access-control-class-rotate-quantum 1", + "access-control-class-ramping", + "access-control-class-ramping-step-interval 5", + "access-control-class-ramping-step-size 5"}); + + /* Init and get first sysinfo */ + f_init_bts_and_check_sysinfo(0, expect_si := ?); + last_si1 := g_system_information[0].si1; + acc := last_si1.rach_control.acc; + count := f_acc09_count_allowed(acc); + /* Adm subset size was set to 0 above, so wait until all ACC are barred */ + while (count > 0) { + last_si1 := f_recv_next_si1(0); + acc := last_si1.rach_control.acc; + count := f_acc09_count_allowed(acc); + log("RSL: wait len()=0: GOT SI1 ACC len=", count, ": ", acc); + } + + /* Increase adm subset size, we should see ramping start up */ + f_bts_0_cfg(BSCVTY, {"access-control-class-rotate 10"}); + prev_count := 0; + while (true) { + last_si1 := f_recv_next_si1(0); + acc := last_si1.rach_control.acc; + count := f_acc09_count_allowed(acc); + log("RSL: GOT SI1 ACC len=", count, ": ", acc); + + if (prev_count > count) { + setverdict(fail, "ACC allowed count dropped while expecting grow: ", prev_count, " -> ", count); + break; + } + + if (count == 9) { + break; /* Maximum reached (10 - 1 perm barred), done here */ + } + + prev_count := count; + } + + setverdict(pass); + + f_bts_0_cfg(BSCVTY, {"access-control-class-rotate 10", + "rach access-control-class 4 allowed", + "no access-control-class-ramping"}); +} + testcase TC_ctrl_msc_connection_status() runs on test_CT { var charstring ctrl_resp; @@ -5905,6 +5975,7 @@ execute( TC_si2quater_48_earfcns() ); execute( TC_si2quater_49_earfcns() ); execute( TC_si_acc_rotate() ); + execute (TC_si_acc_ramp_rotate() ); /* RSL DCHAN Channel ACtivation / Deactivation */ execute( TC_chan_act_noreply() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I29acf4f117ccea53028c780cc9feb1da1fc16739 Gerrit-Change-Number: 19378 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 11:29:26 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 11:29:26 +0000 Subject: Change in osmo-bsc[master]: Add example config files for Ericsson DUG20 based BTS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19449 ) Change subject: Add example config files for Ericsson DUG20 based BTS ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I046f786d68f7cd3fd21693142bd1315bf40696f5 Gerrit-Change-Number: 19449 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jul 2020 11:29:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 11:29:57 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 11:29:57 +0000 Subject: Change in osmo-bsc[master]: acc.c: Don't use C99 constructs, this breaks builds on Debian 8 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19455 ) Change subject: acc.c: Don't use C99 constructs, this breaks builds on Debian 8 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I03722854634b2d6d6f1abac7c7553762b5fc6890 Gerrit-Change-Number: 19455 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Assignee: pespin Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 30 Jul 2020 11:29:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 11:30:15 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 11:30:15 +0000 Subject: Change in osmo-bsc[master]: acc.c: Don't use C99 constructs, this breaks builds on Debian 8 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19455 ) Change subject: acc.c: Don't use C99 constructs, this breaks builds on Debian 8 ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I03722854634b2d6d6f1abac7c7553762b5fc6890 Gerrit-Change-Number: 19455 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jul 2020 11:30:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 11:32:55 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 11:32:55 +0000 Subject: Change in osmo-bsc[master]: Add example config files for Ericsson DUG20 based BTS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19449 ) Change subject: Add example config files for Ericsson DUG20 based BTS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I046f786d68f7cd3fd21693142bd1315bf40696f5 Gerrit-Change-Number: 19449 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jul 2020 11:32:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 11:32:58 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 11:32:58 +0000 Subject: Change in osmo-bsc[master]: Add example config files for Ericsson DUG20 based BTS In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19449 ) Change subject: Add example config files for Ericsson DUG20 based BTS ...................................................................... Add example config files for Ericsson DUG20 based BTS The files have been used successfully in the past weeks to bring up a variety of different combinations of Ericsson DUG20 + RUS. Change-Id: I046f786d68f7cd3fd21693142bd1315bf40696f5 --- A doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus01-4trx.cfg A doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-4trx.cfg A doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-8trx.cfg 3 files changed, 797 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus01-4trx.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus01-4trx.cfg new file mode 100644 index 0000000..68837ca --- /dev/null +++ b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus01-4trx.cfg @@ -0,0 +1,211 @@ +! +! OpenBSC (0.9.11.308-62d46) configuration saved from vty +!! +password foo +! +line vty + no login +! +log stderr + logging level lmi info + logging level linp info + logging level nm debug + logging level rsl debug + logging level llapd notice +network + network country code 901 + mobile network code 70 + neci 0 + paging any use tch 0 + handover 0 + handover window rxlev averaging 10 + handover window rxqual averaging 1 + handover window rxlev neighbor averaging 10 + handover power budget interval 6 + handover power budget hysteresis 3 + handover maximum distance 9999 + timer t3101 10 + timer t3105 40 + timer t3109 4 + timer t3113 60 + bts 0 + type rbs2000 + band GSM900 + om2000 version-limit oml gen 12 rev 10 + cell_identity 0 + location_area_code 1 + training_sequence_code 7 + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + channel allocator descending + rach tx integer 9 + rach max transmission 7 + oml e1 line 0 timeslot 1 sub-slot full + oml e1 tei 62 + neighbor-list mode automatic + gprs mode none + is-connection-list add 4 512 12 + is-connection-list add 16 524 12 + is-connection-list add 28 536 12 + is-connection-list add 40 548 12 + trx 0 + rf_locked 0 + arfcn 123 + nominal power 42 + max_power_red 12 + rsl e1 line 0 timeslot 1 sub-slot full + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + e1 line 0 timeslot 1 sub-slot full + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 3 + trx 1 + rf_locked 0 + arfcn 121 + nominal power 42 + max_power_red 12 + rsl e1 line 0 timeslot 4 sub-slot full + rsl e1 tei 1 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 3 + trx 2 + rf_locked 0 + arfcn 119 + nominal power 42 + max_power_red 12 + rsl e1 line 0 timeslot 7 sub-slot full + rsl e1 tei 2 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 3 + trx 3 + rf_locked 0 + arfcn 119 + nominal power 42 + max_power_red 12 + rsl e1 line 0 timeslot 10 sub-slot full + rsl e1 tei 3 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 3 +e1_input + e1_line 0 driver dahdi + e1_line 0 port 3 diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-4trx.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-4trx.cfg new file mode 100644 index 0000000..ae0b7db --- /dev/null +++ b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-4trx.cfg @@ -0,0 +1,215 @@ +! +! OpenBSC (0.9.11.308-62d46) configuration saved from vty +!! +password foo +! +line vty + no login +! +log stderr + logging level lmi info + logging level linp info + logging level nm debug + logging level rsl debug + logging level llapd notice +network + network country code 901 + mobile network code 70 + neci 0 + paging any use tch 0 + handover 0 + handover window rxlev averaging 10 + handover window rxqual averaging 1 + handover window rxlev neighbor averaging 10 + handover power budget interval 6 + handover power budget hysteresis 3 + handover maximum distance 9999 + timer t3101 10 + timer t3105 40 + timer t3109 4 + timer t3113 60 + bts 0 + type rbs2000 + band GSM900 + om2000 version-limit oml gen 12 rev 10 + cell_identity 0 + location_area_code 1 + training_sequence_code 7 + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + channel allocator descending + rach tx integer 9 + rach max transmission 7 + oml e1 line 0 timeslot 1 sub-slot full + oml e1 tei 62 + neighbor-list mode automatic + gprs mode none + is-connection-list add 4 512 12 + is-connection-list add 16 524 12 + is-connection-list add 28 536 12 + is-connection-list add 40 548 12 + is-connection-list add 52 560 12 + is-connection-list add 64 572 12 + is-connection-list add 76 640 12 + is-connection-list add 88 652 12 + trx 0 + rf_locked 0 + arfcn 123 + nominal power 44 + max_power_red 0 + rsl e1 line 0 timeslot 1 sub-slot full + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + e1 line 0 timeslot 1 sub-slot full + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 3 + trx 1 + rf_locked 0 + arfcn 121 + nominal power 44 + max_power_red 0 + rsl e1 line 0 timeslot 4 sub-slot full + rsl e1 tei 1 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 3 + trx 2 + rf_locked 0 + arfcn 119 + nominal power 44 + max_power_red 0 + rsl e1 line 0 timeslot 7 sub-slot full + rsl e1 tei 2 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 3 + trx 3 + rf_locked 0 + arfcn 119 + nominal power 44 + max_power_red 0 + rsl e1 line 0 timeslot 10 sub-slot full + rsl e1 tei 3 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 3 +e1_input + e1_line 0 driver dahdi + e1_line 0 port 3 diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-8trx.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-8trx.cfg new file mode 100644 index 0000000..ff0b277 --- /dev/null +++ b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-8trx.cfg @@ -0,0 +1,371 @@ +! +! OpenBSC (0.9.11.308-62d46) configuration saved from vty +!! +password foo +! +line vty + no login +! +log stderr + logging level lmi info + logging level linp info + logging level nm debug + logging level rsl debug + logging level llapd notice +network + network country code 901 + mobile network code 70 + neci 0 + paging any use tch 0 + handover 0 + handover window rxlev averaging 10 + handover window rxqual averaging 1 + handover window rxlev neighbor averaging 10 + handover power budget interval 6 + handover power budget hysteresis 3 + handover maximum distance 9999 + timer t3101 10 + timer t3105 40 + timer t3109 4 + timer t3113 60 + bts 0 + type rbs2000 + band GSM900 + om2000 version-limit oml gen 12 rev 10 + cell_identity 0 + location_area_code 1 + training_sequence_code 7 + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + channel allocator descending + rach tx integer 9 + rach max transmission 7 + oml e1 line 0 timeslot 1 sub-slot full + oml e1 tei 62 + neighbor-list mode automatic + gprs mode none + is-connection-list add 4 512 12 + is-connection-list add 16 524 12 + is-connection-list add 28 536 12 + is-connection-list add 40 548 12 + is-connection-list add 52 560 12 + is-connection-list add 64 572 12 + is-connection-list add 76 640 12 + is-connection-list add 88 652 12 + trx 0 + rf_locked 0 + arfcn 123 + nominal power 40 + max_power_red 10 + rsl e1 line 0 timeslot 1 sub-slot full + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + e1 line 0 timeslot 1 sub-slot full + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 3 sub-slot 3 + trx 1 + rf_locked 0 + arfcn 121 + nominal power 40 + max_power_red 10 + rsl e1 line 0 timeslot 4 sub-slot full + rsl e1 tei 1 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 5 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 6 sub-slot 3 + trx 2 + rf_locked 0 + arfcn 119 + nominal power 40 + max_power_red 10 + rsl e1 line 0 timeslot 7 sub-slot full + rsl e1 tei 2 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 8 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 9 sub-slot 3 + trx 3 + rf_locked 0 + arfcn 119 + nominal power 40 + max_power_red 10 + rsl e1 line 0 timeslot 10 sub-slot full + rsl e1 tei 3 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 11 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 12 sub-slot 3 + trx 4 + rf_locked 0 + arfcn 117 + nominal power 40 + max_power_red 10 + rsl e1 line 0 timeslot 13 sub-slot full + rsl e1 tei 4 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 14 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 14 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 14 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 14 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 15 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 15 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 15 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 15 sub-slot 3 + trx 5 + rf_locked 0 + arfcn 115 + nominal power 40 + max_power_red 10 + rsl e1 line 0 timeslot 16 sub-slot full + rsl e1 tei 5 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 17 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 17 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 17 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 17 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 18 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 18 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 18 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 18 sub-slot 3 + trx 6 + rf_locked 0 + arfcn 113 + nominal power 40 + max_power_red 10 + rsl e1 line 0 timeslot 19 sub-slot full + rsl e1 tei 6 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 20 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 20 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 20 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 20 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 21 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 21 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 21 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 21 sub-slot 3 + trx 7 + rf_locked 0 + arfcn 113 + nominal power 40 + max_power_red 10 + rsl e1 line 0 timeslot 22 sub-slot full + rsl e1 tei 7 + timeslot 0 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 23 sub-slot 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 23 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 23 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 23 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 24 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 24 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 24 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + e1 line 0 timeslot 24 sub-slot 3 +e1_input + e1_line 0 driver dahdi + e1_line 0 port 3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I046f786d68f7cd3fd21693142bd1315bf40696f5 Gerrit-Change-Number: 19449 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 11:32:59 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 11:32:59 +0000 Subject: Change in osmo-bsc[master]: acc.c: Don't use C99 constructs, this breaks builds on Debian 8 In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19455 ) Change subject: acc.c: Don't use C99 constructs, this breaks builds on Debian 8 ...................................................................... acc.c: Don't use C99 constructs, this breaks builds on Debian 8 [ 160s] acc.c: In function 'get_highest_allowed_acc': [ 160s] acc.c:117:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 160s] for (int i = 9; i >= 0; i--) { [ 160s] ^ [ 160s] acc.c:117:2: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code [ 160s] acc.c: In function 'get_lowest_allowed_acc': [ 160s] acc.c:127:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 160s] for (int i = 0; i < 10; i++) { [ 160s] ^ [ 160s] Makefile:617: recipe for target 'acc.o' failed Change-Id: I03722854634b2d6d6f1abac7c7553762b5fc6890 --- M src/osmo-bsc/acc.c 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved; Verified Jenkins Builder: Verified diff --git a/src/osmo-bsc/acc.c b/src/osmo-bsc/acc.c index b25f2fd..72b4591 100644 --- a/src/osmo-bsc/acc.c +++ b/src/osmo-bsc/acc.c @@ -114,7 +114,9 @@ static uint8_t get_highest_allowed_acc(uint16_t mask) { - for (int i = 9; i >= 0; i--) { + int i; + + for (i = 9; i >= 0; i--) { if (mask & (1 << i)) return i; } @@ -124,7 +126,9 @@ static uint8_t get_lowest_allowed_acc(uint16_t mask) { - for (int i = 0; i < 10; i++) { + int i; + + for (i = 0; i < 10; i++) { if (mask & (1 << i)) return i; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I03722854634b2d6d6f1abac7c7553762b5fc6890 Gerrit-Change-Number: 19455 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jul 30 12:09:33 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 12:09:33 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5f22b89c70897_67502ac3bb5765f817411a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 157s] ^ [ 157s] acc.c:117:2: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code [ 157s] acc.c: In function 'get_lowest_allowed_acc': [ 157s] acc.c:127:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode [ 157s] for (int i = 0; i < 10; i++) { [ 157s] ^ [ 157s] Makefile:617: recipe for target 'acc.o' failed [ 157s] make[4]: *** [acc.o] Error 1 [ 157s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 157s] Makefile:393: recipe for target 'all-recursive' failed [ 157s] make[3]: *** [all-recursive] Error 1 [ 157s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 157s] Makefile:443: recipe for target 'all-recursive' failed [ 157s] make[2]: *** [all-recursive] Error 1 [ 157s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 157s] Makefile:374: recipe for target 'all' failed [ 157s] make[1]: *** [all] Error 2 [ 157s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 157s] dh_auto_build: make -j1 returned exit code 2 [ 157s] debian/rules:45: recipe for target 'build' failed [ 157s] make: *** [build] Error 2 [ 157s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 157s] ### VM INTERACTION START ### [ 158s] Powering off. [ 158s] [ 148.890913] reboot: Power down [ 158s] ### VM INTERACTION END ### [ 158s] [ 158s] lamb06 failed "build osmo-bsc_1.6.0.199.deaa.dsc" at Thu Jul 30 12:09:14 UTC 2020. [ 158s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Jul 30 13:47:15 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 13:47:15 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5f22cf82a5199_67502ac3bb5765f8204541@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/Debian_9.0/armv7l Package network:osmocom:nightly/limesuite failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 702s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeQuickTest (ELF format: 'elf32-littlearm' abi: '0101002800000000'; RPATH: '') [ 704s] dpkg-shlibdeps: error: cannot find library libLimeSuite.so.20.07-1 needed by debian/limesuite/usr/bin/LimeUtil (ELF format: 'elf32-littlearm' abi: '0101002800000000'; RPATH: '') [ 704s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_forms.so.1.3 (it uses none of the library's symbols) [ 704s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_gl.so.1.3 (it uses none of the library's symbols) [ 704s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_baseu_xml-3.0.so.0 (it uses none of the library's symbols) [ 704s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeUtil were not linked against libusb-1.0.so.0 (they use none of the library's symbols) [ 704s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libICE.so.6 (it uses none of the library's symbols) [ 704s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libSM.so.6 (it uses none of the library's symbols) [ 704s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libXext.so.6 (it uses none of the library's symbols) [ 704s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libX11.so.6 (it uses none of the library's symbols) [ 704s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_html-3.0.so.0 (it uses none of the library's symbols) [ 704s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_richtext-3.0.so.0 (it uses none of the library's symbols) [ 704s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeQuickTest was not linked against libfltk_images.so.1.3 (it uses none of the library's symbols) [ 704s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_xrc-3.0.so.0 (it uses none of the library's symbols) [ 704s] dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/limesuite/usr/bin/LimeSuiteGUI was not linked against libwx_gtk2u_aui-3.0.so.0 (it uses none of the library's symbols) [ 704s] dpkg-shlibdeps: error: cannot continue due to the errors listed above [ 704s] Note: libraries are not searched in other binary packages that do not have any shlibs or symbols file. [ 704s] To help dpkg-shlibdeps find private libraries, you might need to use -l. [ 704s] dh_shlibdeps: dpkg-shlibdeps -Tdebian/limesuite.substvars debian/limesuite/usr/bin/LimeSuiteGUI debian/limesuite/usr/bin/LimeQuickTest debian/limesuite/usr/bin/LimeUtil returned exit code 2 [ 704s] debian/rules:28: recipe for target 'binary' failed [ 704s] make: *** [binary] Error 2 [ 704s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 704s] ### VM INTERACTION START ### [ 707s] [ 683.975535] sysrq: SysRq : Power Off [ 707s] [ 683.977613] reboot: Power down [ 707s] ### VM INTERACTION END ### [ 707s] [ 707s] armbuild02 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 13:46:59 UTC 2020. [ 707s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jul 30 14:11:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 14:11:30 +0000 Subject: Change in libosmocore[master]: vty: Don't match negative values on purely positive ranges In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, Hoernchen, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19424 to look at the new patch set (#3). Change subject: vty: Don't match negative values on purely positive ranges ...................................................................... vty: Don't match negative values on purely positive ranges Without this patch, for instance having a range 0-ULONG_MAX would match if someones types value -3, which would be converted to unsigned but that's clearly what is expected here from user point of view. Change-Id: Ia95f6314a2dd3f94d21fc219cf69bb8d39b8e7f0 --- M src/vty/command.c M tests/vty/vty_test.c M tests/vty/vty_test.ok 3 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/19424/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia95f6314a2dd3f94d21fc219cf69bb8d39b8e7f0 Gerrit-Change-Number: 19424 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 14:11:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 14:11:31 +0000 Subject: Change in libosmocore[master]: tests: vty: Extend test to do some numeric range validations References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19456 ) Change subject: tests: vty: Extend test to do some numeric range validations ...................................................................... tests: vty: Extend test to do some numeric range validations As per current status, the numeric tests are expected to fail due to a couple bugs which will be fixed in next commits. Change-Id: Id5b17bd96d7af4ed9a77ebbea0e6be4b0fcbde6c --- M tests/vty/vty_test.c M tests/vty/vty_test.ok 2 files changed, 40 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/56/19456/1 diff --git a/tests/vty/vty_test.c b/tests/vty/vty_test.c index 9627b6d..7146a1d 100644 --- a/tests/vty/vty_test.c +++ b/tests/vty/vty_test.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -438,6 +439,19 @@ return CMD_WARNING; } +DEFUN(cfg_numeric_range, cfg_numeric_range_cmd, +#if ULONG_MAX == 18446744073709551615UL + "numeric-range <0-18446744073709551615>", +#else + "numeric-range <0-4294967295>", +#endif + "testing numeric range\n" + "the numeric range\n") +{ + printf("Called: 'return-success'\n"); + return CMD_SUCCESS; +} + void test_vty_add_cmds() { install_element(CONFIG_NODE, &cfg_ret_warning_cmd); @@ -461,6 +475,8 @@ install_element_ve(&cfg_ambiguous_nr_2_cmd); install_element_ve(&cfg_ambiguous_str_1_cmd); install_element_ve(&cfg_ambiguous_str_2_cmd); + + install_element_ve(&cfg_numeric_range_cmd); } void test_is_cmd_ambiguous() @@ -482,6 +498,21 @@ destroy_test_vty(&test, vty); } +void test_numeric_range() +{ + struct vty *vty; + struct vty_test test; + + printf("Going to test test_numeric_range()\n"); + vty = create_test_vty(&test); + + OSMO_ASSERT(do_vty_command(vty, "numeric-range 0") == CMD_ERR_NO_MATCH); + OSMO_ASSERT(do_vty_command(vty, "numeric-range 40000") == CMD_ERR_NO_MATCH); + OSMO_ASSERT(do_vty_command(vty, "numeric-range -400000") == CMD_ERR_NO_MATCH); + + destroy_test_vty(&test, vty); +} + int main(int argc, char **argv) { struct vty_app_info vty_info = { @@ -535,6 +566,8 @@ test_is_cmd_ambiguous(); + test_numeric_range(); + /* Leak check */ OSMO_ASSERT(talloc_total_blocks(stats_ctx) == 1); diff --git a/tests/vty/vty_test.ok b/tests/vty/vty_test.ok index d2c9611..d81c6c7 100644 --- a/tests/vty/vty_test.ok +++ b/tests/vty/vty_test.ok @@ -311,4 +311,11 @@ Going to execute 'ambiguous_str arg keyword' Called: 'ambiguous_str ARG keyword' Returned: 0, Current node: 1 '%s> ' +Going to test test_numeric_range() +Going to execute 'numeric-range 0' +Returned: 2, Current node: 1 '%s> ' +Going to execute 'numeric-range 40000' +Returned: 2, Current node: 1 '%s> ' +Going to execute 'numeric-range -400000' +Returned: 2, Current node: 1 '%s> ' All tests passed -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id5b17bd96d7af4ed9a77ebbea0e6be4b0fcbde6c Gerrit-Change-Number: 19456 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 14:11:32 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 14:11:32 +0000 Subject: Change in libosmocore[master]: vty: Allow 64 bit values in numeric ranges if system supports it References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19457 ) Change subject: vty: Allow 64 bit values in numeric ranges if system supports it ...................................................................... vty: Allow 64 bit values in numeric ranges if system supports it This fixes commands not being matched due to providing a range with more than 10 digits. The last case (passing -4000 matching 0-ULONG_MAX) shows a different bug which will be fixed in next commit. Change-Id: I0afa0caabffe36083c36b92ba90696ded00bb7be --- M src/vty/command.c M tests/vty/vty_test.c M tests/vty/vty_test.ok 3 files changed, 31 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/57/19457/1 diff --git a/src/vty/command.c b/src/vty/command.c index 9b32d22..16dd07f 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -1262,12 +1263,27 @@ #endif /* HAVE_IPV6 */ -#define DECIMAL_STRLEN_MAX 10 + +#if ULONG_MAX == 18446744073709551615UL +#define DECIMAL_STRLEN_MAX_UNSIGNED 20 +#elif ULONG_MAX == 4294967295UL +#define DECIMAL_STRLEN_MAX_UNSIGNED 10 +#else +#error "ULONG_MAX not defined!" +#endif + +#if LONG_MAX == 9223372036854775807L +#define DECIMAL_STRLEN_MAX_SIGNED 19 +#elif LONG_MAX == 2147483647L +#define DECIMAL_STRLEN_MAX_SIGNED 10 +#else +#error "LONG_MAX not defined!" +#endif static int cmd_range_match(const char *range, const char *str) { char *p; - char buf[DECIMAL_STRLEN_MAX + 1]; + char buf[DECIMAL_STRLEN_MAX_UNSIGNED + 1]; char *endptr = NULL; if (str == NULL) @@ -1284,7 +1300,7 @@ p = strchr(range, '-'); if (p == NULL) return 0; - if (p - range > DECIMAL_STRLEN_MAX) + if (p - range > DECIMAL_STRLEN_MAX_SIGNED) return 0; strncpy(buf, range, p - range); buf[p - range] = '\0'; @@ -1296,7 +1312,7 @@ p = strchr(range, '>'); if (p == NULL) return 0; - if (p - range > DECIMAL_STRLEN_MAX) + if (p - range > DECIMAL_STRLEN_MAX_SIGNED) return 0; strncpy(buf, range, p - range); buf[p - range] = '\0'; @@ -1317,7 +1333,7 @@ p = strchr(range, '-'); if (p == NULL) return 0; - if (p - range > DECIMAL_STRLEN_MAX) + if (p - range > DECIMAL_STRLEN_MAX_UNSIGNED) return 0; strncpy(buf, range, p - range); buf[p - range] = '\0'; @@ -1329,7 +1345,7 @@ p = strchr(range, '>'); if (p == NULL) return 0; - if (p - range > DECIMAL_STRLEN_MAX) + if (p - range > DECIMAL_STRLEN_MAX_UNSIGNED) return 0; strncpy(buf, range, p - range); buf[p - range] = '\0'; diff --git a/tests/vty/vty_test.c b/tests/vty/vty_test.c index 7146a1d..a7aef11 100644 --- a/tests/vty/vty_test.c +++ b/tests/vty/vty_test.c @@ -506,9 +506,9 @@ printf("Going to test test_numeric_range()\n"); vty = create_test_vty(&test); - OSMO_ASSERT(do_vty_command(vty, "numeric-range 0") == CMD_ERR_NO_MATCH); - OSMO_ASSERT(do_vty_command(vty, "numeric-range 40000") == CMD_ERR_NO_MATCH); - OSMO_ASSERT(do_vty_command(vty, "numeric-range -400000") == CMD_ERR_NO_MATCH); + OSMO_ASSERT(do_vty_command(vty, "numeric-range 0") == CMD_SUCCESS); + OSMO_ASSERT(do_vty_command(vty, "numeric-range 40000") == CMD_SUCCESS); + OSMO_ASSERT(do_vty_command(vty, "numeric-range -400000") == CMD_SUCCESS); destroy_test_vty(&test, vty); } diff --git a/tests/vty/vty_test.ok b/tests/vty/vty_test.ok index d81c6c7..bac083d 100644 --- a/tests/vty/vty_test.ok +++ b/tests/vty/vty_test.ok @@ -313,9 +313,12 @@ Returned: 0, Current node: 1 '%s> ' Going to test test_numeric_range() Going to execute 'numeric-range 0' -Returned: 2, Current node: 1 '%s> ' +Called: 'return-success' +Returned: 0, Current node: 1 '%s> ' Going to execute 'numeric-range 40000' -Returned: 2, Current node: 1 '%s> ' +Called: 'return-success' +Returned: 0, Current node: 1 '%s> ' Going to execute 'numeric-range -400000' -Returned: 2, Current node: 1 '%s> ' +Called: 'return-success' +Returned: 0, Current node: 1 '%s> ' All tests passed -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0afa0caabffe36083c36b92ba90696ded00bb7be Gerrit-Change-Number: 19457 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 14:31:27 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 30 Jul 2020 14:31:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: log expected response in f_cbsp_write In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19433 ) Change subject: bsc CBSP: log expected response in f_cbsp_write ...................................................................... Patch Set 1: > Patch Set 1: > > doesnt the MATCH log category print that kind of information? I would generally prefer us not to add hand-written log statements if the same can be achieved by changing the TITAN logger configuriation for this component to include matching information. For me it is super handy to have one specific string to search for in the log output that directly shows me what message is expected at that precise line in the test. I am aware that the matching and mismatching is shown in the logging, but with that alone I find it hard to find the expected message I am looking for... The purpose of this log message is basically served when the problem is fixed, so I'm also fine with not merging it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I844717b0f665496a842764b3b915ba64249cd617 Gerrit-Change-Number: 19433 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 14:31:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 14:41:42 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 14:41:42 +0000 Subject: Change in libosmocore[master]: vty: Introduce support to set cpu-affinity and scheduler policy In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19442 ) Change subject: vty: Introduce support to set cpu-affinity and scheduler policy ...................................................................... Patch Set 3: (2 comments) I'm fine with not using numeric ranges to specify the mask since I understand I'm limited to 64 cpus there, I'll use a variable for that and parse it manually as a string, but I still want to define the cpuset as a hexstring, which is a usual known way of expressing it (see taskset cmd for instance). https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c File src/vty/sched_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 121 PS3, Line 121: char path[100]; > why not PATH_MAX? Because it's clearly not needed, the path length is more or less known (with a few variables like name being 1-15 chars, and TID+PID being 1-20 each aprox. https://gerrit.osmocom.org/c/libosmocore/+/19442/3/src/vty/sched_vty.c at 487 PS3, Line 487: int > void? You always return 0 anyway... Currently only returns only 0, but who knows if extending implementation/commands here in the future would require returning an error. So let's keep it this way to prevent API breakage in the future. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If76a4bd2cc7b3c7adf5d84790a944d78be70e10a Gerrit-Change-Number: 19442 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jul 2020 14:41:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 14:45:49 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 30 Jul 2020 14:45:49 +0000 Subject: Change in osmo-bsc[master]: fix CBSP server: actually open the srv_link In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19441 ) Change subject: fix CBSP server: actually open the srv_link ...................................................................... fix CBSP server: actually open the srv_link Change-Id: Ic688573e179381f7798055b647200e508f1bc37f --- M src/osmo-bsc/cbsp_link.c 1 file changed, 10 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/cbsp_link.c b/src/osmo-bsc/cbsp_link.c index 91217ad..d93bd1a 100644 --- a/src/osmo-bsc/cbsp_link.c +++ b/src/osmo-bsc/cbsp_link.c @@ -239,13 +239,20 @@ if (cbc->config.listen_port != -1) { LOGP(DCBS, LOGL_NOTICE, "Starting CBSP Server (bound to %s:%u)\n", cbc->config.listen_hostname, cbc->config.listen_port); - if (!cbc->server.srv) { + if (!cbc->server.link) { + LOGP(DCBS, LOGL_NOTICE, "Creating CBSP Server\n"); cbc->server.link = osmo_stream_srv_link_create(cbc); osmo_stream_srv_link_set_data(cbc->server.link, cbc); osmo_stream_srv_link_set_accept_cb(cbc->server.link, cbsp_srv_link_accept_cb); + + osmo_stream_srv_link_set_addr(cbc->server.link, cbc->config.listen_hostname); + osmo_stream_srv_link_set_port(cbc->server.link, cbc->config.listen_port); + + if (osmo_stream_srv_link_open(cbc->server.link) < 0) { + LOGP(DCBS, LOGL_ERROR, "Cannot open CBSP Server link on %s:%u\n", + cbc->config.listen_hostname, cbc->config.listen_port); + } } - osmo_stream_srv_link_set_addr(cbc->server.link, cbc->config.listen_hostname); - osmo_stream_srv_link_set_port(cbc->server.link, cbc->config.listen_port); } return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic688573e179381f7798055b647200e508f1bc37f Gerrit-Change-Number: 19441 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jul 30 14:55:34 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 14:55:34 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5f22df84bf10d_67502ac3bb5765f821789d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/Raspbian_10/armv7l Package network:osmocom:nightly/limesuite failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 740s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src && /usr/bin/c++ -DLIMERFE -DLIME_DLL -DWIN32_LEAN_AND_MEAN -DWXUSINGDLL -D_FILE_OFFSET_BITS=64 -D__WXGTK__ -I/usr/src/packages/BUILD/src/lms7002_wxgui -I/usr/src/packages/BUILD/src/LMS_Programing -I/usr/src/packages/BUILD/src/utilities_gui -I/usr/src/packages/BUILD/src/RFSpark -I/usr/src/packages/BUILD/src/FPGAcontrols_wxgui -I/usr/src/packages/BUILD/src/numericSlider -I/usr/src/packages/BUILD/src/fftviewer_wxgui -I/usr/src/packages/BUILD/src/lms7suiteEvents -I/usr/src/packages/BUILD/src/boards_wxgui -I/usr/src/packages/BUILD/src/limeRFE -I/usr/src/packages/BUILD/src -I/usr/src/packages/BUILD/src/API -I/usr/src/packages/BUILD/src/lime -I/usr/src/packages/BUILD/src/GFIR -I/usr/src/packages/BUILD/src/protocols -I/usr/src/packages/BUILD/src/ConnectionRegistry -I/usr/src/packages/BUILD/src/lms7002m_mcu -I/usr/src/packages/BUILD/src/ADF4002 -I/usr/src/packages/BUILD/src/Si5351C -I/usr/src/packages/BUILD/src/lms7002m -I/usr/src/packages/BUILD/src/FPGA_common -I/usr/src/packages/BUILD/external/cpp-feather-ini-parser -I/usr/src/packages/BUILD/external/kissFFT -I/usr/include/libusb-1.0 -I/usr/src/packages/BUILD/src/oglGraph -isystem /usr/lib/arm-linux-gnueabihf/wx/include/gtk2-unicode-3.0 -isystem /usr/include/wx-3.0 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fvisibility-inlines-hidden -pthread -O3 -DNDEBUG -march=native -fvisibility=hidden -std=gnu++11 -o CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_gui.cpp.o -c /usr/src/packages/BUILD/src/limeRFE/limeRFE_gui.cpp [ 740s] [ 80%] Building CXX object src/CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_wxgui.cpp.o [ 740s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src && /usr/bin/c++ -DLIMERFE -DLIME_DLL -DWIN32_LEAN_AND_MEAN -DWXUSINGDLL -D_FILE_OFFSET_BITS=64 -D__WXGTK__ -I/usr/src/packages/BUILD/src/lms7002_wxgui -I/usr/src/packages/BUILD/src/LMS_Programing -I/usr/src/packages/BUILD/src/utilities_gui -I/usr/src/packages/BUILD/src/RFSpark -I/usr/src/packages/BUILD/src/FPGAcontrols_wxgui -I/usr/src/packages/BUILD/src/numericSlider -I/usr/src/packages/BUILD/src/fftviewer_wxgui -I/usr/src/packages/BUILD/src/lms7suiteEvents -I/usr/src/packages/BUILD/src/boards_wxgui -I/usr/src/packages/BUILD/src/limeRFE -I/usr/src/packages/BUILD/src -I/usr/src/packages/BUILD/src/API -I/usr/src/packages/BUILD/src/lime -I/usr/src/packages/BUILD/src/GFIR -I/usr/src/packages/BUILD/src/protocols -I/usr/src/packages/BUILD/src/ConnectionRegistry -I/usr/src/packages/BUILD/src/lms7002m_mcu -I/usr/src/packages/BUILD/src/ADF4002 -I/usr/src/packages/BUILD/src/Si5351C -I/usr/src/packages/BUILD/src/lms7002m -I/usr/src/packages/BUILD/src/FPGA_common -I/usr/src/packages/BUILD/external/cpp-feather-ini-parser -I/usr/src/packages/BUILD/external/kissFFT -I/usr/include/libusb-1.0 -I/usr/src/packages/BUILD/src/oglGraph -isystem /usr/lib/arm-linux-gnueabihf/wx/include/gtk2-unicode-3.0 -isystem /usr/include/wx-3.0 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fvisibility-inlines-hidden -pthread -O3 -DNDEBUG -march=native -fvisibility=hidden -std=gnu++11 -o CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_wxgui.cpp.o -c /usr/src/packages/BUILD/src/limeRFE/limeRFE_wxgui.cpp [ 757s] [ 81%] Building CXX object src/CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_cmd.cpp.o [ 757s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src && /usr/bin/c++ -DLIMERFE -DLIME_DLL -DWIN32_LEAN_AND_MEAN -DWXUSINGDLL -D_FILE_OFFSET_BITS=64 -D__WXGTK__ -I/usr/src/packages/BUILD/src/lms7002_wxgui -I/usr/src/packages/BUILD/src/LMS_Programing -I/usr/src/packages/BUILD/src/utilities_gui -I/usr/src/packages/BUILD/src/RFSpark -I/usr/src/packages/BUILD/src/FPGAcontrols_wxgui -I/usr/src/packages/BUILD/src/numericSlider -I/usr/src/packages/BUILD/src/fftviewer_wxgui -I/usr/src/packages/BUILD/src/lms7suiteEvents -I/usr/src/packages/BUILD/src/boards_wxgui -I/usr/src/packages/BUILD/src/limeRFE -I/usr/src/packages/BUILD/src -I/usr/src/packages/BUILD/src/API -I/usr/src/packages/BUILD/src/lime -I/usr/src/packages/BUILD/src/GFIR -I/usr/src/packages/BUILD/src/protocols -I/usr/src/packages/BUILD/src/ConnectionRegistry -I/usr/src/packages/BUILD/src/lms7002m_mcu -I/usr/src/packages/BUILD/src/ADF4002 -I/usr/src/packages/BUILD/src/Si5351C -I/usr/src/packages/BUILD/src/lms7002m -I/usr/src/packages/BUILD/src/FPGA_common -I/usr/src/packages/BUILD/external/cpp-feather-ini-parser -I/usr/src/packages/BUILD/external/kissFFT -I/usr/include/libusb-1.0 -I/usr/src/packages/BUILD/src/oglGraph -isystem /usr/lib/arm-linux-gnueabihf/wx/include/gtk2-unicode-3.0 -isystem /usr/include/wx-3.0 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fvisibility-inlines-hidden -pthread -O3 -DNDEBUG -march=native -fvisibility=hidden -std=gnu++11 -o CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_cmd.cpp.o -c /usr/src/packages/BUILD/src/limeRFE/limeRFE_cmd.cpp [ 761s] [ 81%] Building CXX object src/CMakeFiles/LimeSuiteGUI.dir/limeRFE/RFE_Device.cpp.o [ 761s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src && /usr/bin/c++ -DLIMERFE -DLIME_DLL -DWIN32_LEAN_AND_MEAN -DWXUSINGDLL -D_FILE_OFFSET_BITS=64 -D__WXGTK__ -I/usr/src/packages/BUILD/src/lms7002_wxgui -I/usr/src/packages/BUILD/src/LMS_Programing -I/usr/src/packages/BUILD/src/utilities_gui -I/usr/src/packages/BUILD/src/RFSpark -I/usr/src/packages/BUILD/src/FPGAcontrols_wxgui -I/usr/src/packages/BUILD/src/numericSlider -I/usr/src/packages/BUILD/src/fftviewer_wxgui -I/usr/src/packages/BUILD/src/lms7suiteEvents -I/usr/src/packages/BUILD/src/boards_wxgui -I/usr/src/packages/BUILD/src/limeRFE -I/usr/src/packages/BUILD/src -I/usr/src/packages/BUILD/src/API -I/usr/src/packages/BUILD/src/lime -I/usr/src/packages/BUILD/src/GFIR -I/usr/src/packages/BUILD/src/protocols -I/usr/src/packages/BUILD/src/ConnectionRegistry -I/usr/src/packages/BUILD/src/lms7002m_mcu -I/usr/src/packages/BUILD/src/ADF4002 -I/usr/src/packages/BUILD/src/Si5351C -I/usr/src/packages/BUILD/src/lms7002m -I/usr/src/packages/BUILD/src/FPGA_common -I/usr/src/packages/BUILD/external/cpp-feather-ini-parser -I/usr/src/packages/BUILD/external/kissFFT -I/usr/include/libusb-1.0 -I/usr/src/packages/BUILD/src/oglGraph -isystem /usr/lib/arm-linux-gnueabihf/wx/include/gtk2-unicode-3.0 -isystem /usr/include/wx-3.0 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fvisibility-inlines-hidden -pthread -O3 -DNDEBUG -march=native -fvisibility=hidden -std=gnu++11 -o CMakeFiles/LimeSuiteGUI.dir/limeRFE/RFE_Device.cpp.o -c /usr/src/packages/BUILD/src/limeRFE/RFE_Device.cpp [ 765s] [ 82%] Linking CXX executable ../bin/LimeSuiteGUI [ 765s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src && /usr/bin/cmake -E cmake_link_script CMakeFiles/LimeSuiteGUI.dir/link.txt --verbose=1 [ 766s] /usr/bin/c++ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fvisibility-inlines-hidden -pthread -O3 -DNDEBUG -Wl,-z,relro -rdynamic CMakeFiles/LimeSuiteGUI.dir/ADF4002/ADF4002_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlXBUF_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlRFE_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlCalibrations_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlTRF_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlCDS_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlLimeLightPAD_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlBIST_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/dlgViewIRAM.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_gui_utilities.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlSX_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlTBB_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_dlgVCOfrequencies.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlRBB_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlLDO_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlAFE_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlGains_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/CoefficientFileParser.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlRxTSP_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_mainPanel.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/dlgViewSFR.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlCLKGEN_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlMCU_BD_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlBIAS_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_dlgGFIR_Coefficients.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlTxTSP_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlR3.cpp.o CMakeFiles/LimeSuiteGUI.dir/LMS_Programing/LMS_Programing_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/dlgConnectionSettings.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/pnlMiniLog.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/pnlAPI.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/SPI_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/dlgFullMessageLog.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/dlgDeviceInfo.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/utilities_gui.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7suiteAppFrame.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/RFSpark_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/Si5351C/Si5351C_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7suiteApp_gui.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7suiteApp.cpp.o CMakeFiles/LimeSuiteGUI.dir/FPGAcontrols_wxgui/FPGAcontrols_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/dlgAbout.cpp.o CMakeFiles/LimeSuiteGUI.dir/numericSlider/numericSlider.cpp.o CMakeFiles/LimeSuiteGUI.dir/fftviewer_wxgui/fftviewer_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/fftviewer_wxgui/fftviewer_frFFTviewer.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7suiteEvents/lms7suiteEvents.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlBoardControls.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlQSpark.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnluLimeSDR.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlUltimateEVB.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlBuffers.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlCoreSDR.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlLimeNetMicro.cpp.o CMakeFiles/LimeSuiteGUI.dir/__/external/kissFFT/kiss_fft.c.o CMakeFiles/LimeSuiteGUI.dir/windowFunction.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlLimeSDR.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlGPIO.cpp.o CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_gui.cpp.o CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_cmd.cpp.o CMakeFiles/LimeSuiteGUI.dir/limeRFE/RFE_Device.cpp.o -o ../bin/LimeSuiteGUI -Wl,-rpath,/usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src: libLimeSuite.so.20.07.0 oglGraph/liboglGraph.a -L/usr/lib/arm-linux-gnueabihf -pthread -lwx_gtk2u_richtext-3.0 -lwx_baseu_xml-3.0 -lwx_gtk2u_html-3.0 -lwx_gtk2u_xrc-3.0 -lwx_gtk2u_adv-3.0 -lwx_gtk2u_aui-3.0 -lwx_gtk2u_core-3.0 -lwx_baseu-3.0 -lwx_gtk2u_gl-3.0 -lusb-1.0 -lGL -lwx_gtk2u_richtext-3.0 -lwx_baseu_xml-3.0 -lwx_gtk2u_html-3.0 -lwx_gtk2u_xrc-3.0 -lwx_gtk2u_adv-3.0 -lwx_gtk2u_aui-3.0 -lwx_gtk2u_core-3.0 -lwx_baseu-3.0 -lwx_gtk2u_gl-3.0 [ 771s] /usr/bin/ld: libLimeSuite.so.20.07.0: undefined reference to `__atomic_store_8' [ 771s] /usr/bin/ld: libLimeSuite.so.20.07.0: undefined reference to `__atomic_load_8' [ 771s] collect2: error: ld returned 1 exit status [ 771s] make[3]: *** [src/CMakeFiles/LimeSuiteGUI.dir/build.make:1005: bin/LimeSuiteGUI] Error 1 [ 771s] make[3]: Leaving directory '/usr/src/packages/BUILD/obj-arm-linux-gnueabihf' [ 771s] make[2]: *** [CMakeFiles/Makefile2:145: src/CMakeFiles/LimeSuiteGUI.dir/all] Error 2 [ 771s] make[2]: Leaving directory '/usr/src/packages/BUILD/obj-arm-linux-gnueabihf' [ 771s] make[1]: *** [Makefile:133: all] Error 2 [ 771s] make[1]: Leaving directory '/usr/src/packages/BUILD/obj-arm-linux-gnueabihf' [ 771s] dh_auto_build: cd obj-arm-linux-gnueabihf && make -j2 returned exit code 2 [ 771s] make: *** [debian/rules:28: binary] Error 2 [ 771s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 771s] ### VM INTERACTION START ### [ 774s] [ 757.098988] sysrq: SysRq : Power Off [ 774s] [ 757.101431] reboot: Power down [ 774s] ### VM INTERACTION END ### [ 774s] [ 774s] armbuild04 failed "build limesuite_20.07.0-1.dsc" at Thu Jul 30 14:55:29 UTC 2020. [ 774s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jul 30 16:48:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 16:48:05 +0000 Subject: Change in libosmocore[master]: vty: Introduce support to set cpu-affinity and scheduler policy In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19442 to look at the new patch set (#4). Change subject: vty: Introduce support to set cpu-affinity and scheduler policy ...................................................................... vty: Introduce support to set cpu-affinity and scheduler policy Process willing to support this kind of configuration through VTY simply need to call "osmo_sched_vty_init(tall_ctx);" during startup to register the commands. For multithreaded processes, new threads willing to get their cpu-affinity mask according to VTY config should call osmo_sched_vty_apply_localthread() (potentially after setting the thread name through pthread_setname_np()). Related: SYS#4986 Change-Id: If76a4bd2cc7b3c7adf5d84790a944d78be70e10a --- M include/Makefile.am M include/osmocom/vty/command.h A include/osmocom/vty/sched_vty.h M src/vty/Makefile.am A src/vty/sched_vty.c 5 files changed, 715 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/19442/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If76a4bd2cc7b3c7adf5d84790a944d78be70e10a Gerrit-Change-Number: 19442 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jul 30 17:04:21 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 17:04:21 +0000 Subject: Build failure of network:osmocom:nightly/limesuite in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5f22fda2569cc_67502ac3bb5765f8239028@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/limesuite/Raspbian_10/armv7l Package network:osmocom:nightly/limesuite failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly limesuite Last lines of build log: [ 796s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src && /usr/bin/c++ -DLIME_DLL -DWIN32_LEAN_AND_MEAN -DWXUSINGDLL -D_FILE_OFFSET_BITS=64 -D__WXGTK__ -I/usr/src/packages/BUILD/src/lms7002_wxgui -I/usr/src/packages/BUILD/src/LMS_Programing -I/usr/src/packages/BUILD/src/utilities_gui -I/usr/src/packages/BUILD/src/RFSpark -I/usr/src/packages/BUILD/src/FPGAcontrols_wxgui -I/usr/src/packages/BUILD/src/numericSlider -I/usr/src/packages/BUILD/src/fftviewer_wxgui -I/usr/src/packages/BUILD/src/lms7suiteEvents -I/usr/src/packages/BUILD/src/boards_wxgui -I/usr/src/packages/BUILD/src/limeRFE -I/usr/src/packages/BUILD/src -I/usr/src/packages/BUILD/src/API -I/usr/src/packages/BUILD/src/lime -I/usr/src/packages/BUILD/src/GFIR -I/usr/src/packages/BUILD/src/protocols -I/usr/src/packages/BUILD/src/ConnectionRegistry -I/usr/src/packages/BUILD/src/lms7002m_mcu -I/usr/src/packages/BUILD/src/ADF4002 -I/usr/src/packages/BUILD/src/Si5351C -I/usr/src/packages/BUILD/src/lms7002m -I/usr/src/packages/BUILD/src/FPGA_common -I/usr/src/packages/BUILD/external/cpp-feather-ini-parser -I/usr/src/packages/BUILD/external/kissFFT -I/usr/include/libusb-1.0 -I/usr/src/packages/BUILD/src/oglGraph -isystem /usr/lib/arm-linux-gnueabihf/wx/include/gtk2-unicode-3.0 -isystem /usr/include/wx-3.0 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fvisibility-inlines-hidden -pthread -O3 -DNDEBUG -march=native -fvisibility=hidden -std=gnu++11 -o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlGPIO.cpp.o -c /usr/src/packages/BUILD/src/boards_wxgui/pnlGPIO.cpp [ 802s] [ 77%] Building CXX object src/CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_gui.cpp.o [ 802s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src && /usr/bin/c++ -DLIME_DLL -DWIN32_LEAN_AND_MEAN -DWXUSINGDLL -D_FILE_OFFSET_BITS=64 -D__WXGTK__ -I/usr/src/packages/BUILD/src/lms7002_wxgui -I/usr/src/packages/BUILD/src/LMS_Programing -I/usr/src/packages/BUILD/src/utilities_gui -I/usr/src/packages/BUILD/src/RFSpark -I/usr/src/packages/BUILD/src/FPGAcontrols_wxgui -I/usr/src/packages/BUILD/src/numericSlider -I/usr/src/packages/BUILD/src/fftviewer_wxgui -I/usr/src/packages/BUILD/src/lms7suiteEvents -I/usr/src/packages/BUILD/src/boards_wxgui -I/usr/src/packages/BUILD/src/limeRFE -I/usr/src/packages/BUILD/src -I/usr/src/packages/BUILD/src/API -I/usr/src/packages/BUILD/src/lime -I/usr/src/packages/BUILD/src/GFIR -I/usr/src/packages/BUILD/src/protocols -I/usr/src/packages/BUILD/src/ConnectionRegistry -I/usr/src/packages/BUILD/src/lms7002m_mcu -I/usr/src/packages/BUILD/src/ADF4002 -I/usr/src/packages/BUILD/src/Si5351C -I/usr/src/packages/BUILD/src/lms7002m -I/usr/src/packages/BUILD/src/FPGA_common -I/usr/src/packages/BUILD/external/cpp-feather-ini-parser -I/usr/src/packages/BUILD/external/kissFFT -I/usr/include/libusb-1.0 -I/usr/src/packages/BUILD/src/oglGraph -isystem /usr/lib/arm-linux-gnueabihf/wx/include/gtk2-unicode-3.0 -isystem /usr/include/wx-3.0 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fvisibility-inlines-hidden -pthread -O3 -DNDEBUG -march=native -fvisibility=hidden -std=gnu++11 -o CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_gui.cpp.o -c /usr/src/packages/BUILD/src/limeRFE/limeRFE_gui.cpp [ 804s] [ 77%] Building CXX object src/CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_wxgui.cpp.o [ 804s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src && /usr/bin/c++ -DLIME_DLL -DWIN32_LEAN_AND_MEAN -DWXUSINGDLL -D_FILE_OFFSET_BITS=64 -D__WXGTK__ -I/usr/src/packages/BUILD/src/lms7002_wxgui -I/usr/src/packages/BUILD/src/LMS_Programing -I/usr/src/packages/BUILD/src/utilities_gui -I/usr/src/packages/BUILD/src/RFSpark -I/usr/src/packages/BUILD/src/FPGAcontrols_wxgui -I/usr/src/packages/BUILD/src/numericSlider -I/usr/src/packages/BUILD/src/fftviewer_wxgui -I/usr/src/packages/BUILD/src/lms7suiteEvents -I/usr/src/packages/BUILD/src/boards_wxgui -I/usr/src/packages/BUILD/src/limeRFE -I/usr/src/packages/BUILD/src -I/usr/src/packages/BUILD/src/API -I/usr/src/packages/BUILD/src/lime -I/usr/src/packages/BUILD/src/GFIR -I/usr/src/packages/BUILD/src/protocols -I/usr/src/packages/BUILD/src/ConnectionRegistry -I/usr/src/packages/BUILD/src/lms7002m_mcu -I/usr/src/packages/BUILD/src/ADF4002 -I/usr/src/packages/BUILD/src/Si5351C -I/usr/src/packages/BUILD/src/lms7002m -I/usr/src/packages/BUILD/src/FPGA_common -I/usr/src/packages/BUILD/external/cpp-feather-ini-parser -I/usr/src/packages/BUILD/external/kissFFT -I/usr/include/libusb-1.0 -I/usr/src/packages/BUILD/src/oglGraph -isystem /usr/lib/arm-linux-gnueabihf/wx/include/gtk2-unicode-3.0 -isystem /usr/include/wx-3.0 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fvisibility-inlines-hidden -pthread -O3 -DNDEBUG -march=native -fvisibility=hidden -std=gnu++11 -o CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_wxgui.cpp.o -c /usr/src/packages/BUILD/src/limeRFE/limeRFE_wxgui.cpp [ 817s] [ 78%] Building CXX object src/CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_cmd.cpp.o [ 817s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src && /usr/bin/c++ -DLIME_DLL -DWIN32_LEAN_AND_MEAN -DWXUSINGDLL -D_FILE_OFFSET_BITS=64 -D__WXGTK__ -I/usr/src/packages/BUILD/src/lms7002_wxgui -I/usr/src/packages/BUILD/src/LMS_Programing -I/usr/src/packages/BUILD/src/utilities_gui -I/usr/src/packages/BUILD/src/RFSpark -I/usr/src/packages/BUILD/src/FPGAcontrols_wxgui -I/usr/src/packages/BUILD/src/numericSlider -I/usr/src/packages/BUILD/src/fftviewer_wxgui -I/usr/src/packages/BUILD/src/lms7suiteEvents -I/usr/src/packages/BUILD/src/boards_wxgui -I/usr/src/packages/BUILD/src/limeRFE -I/usr/src/packages/BUILD/src -I/usr/src/packages/BUILD/src/API -I/usr/src/packages/BUILD/src/lime -I/usr/src/packages/BUILD/src/GFIR -I/usr/src/packages/BUILD/src/protocols -I/usr/src/packages/BUILD/src/ConnectionRegistry -I/usr/src/packages/BUILD/src/lms7002m_mcu -I/usr/src/packages/BUILD/src/ADF4002 -I/usr/src/packages/BUILD/src/Si5351C -I/usr/src/packages/BUILD/src/lms7002m -I/usr/src/packages/BUILD/src/FPGA_common -I/usr/src/packages/BUILD/external/cpp-feather-ini-parser -I/usr/src/packages/BUILD/external/kissFFT -I/usr/include/libusb-1.0 -I/usr/src/packages/BUILD/src/oglGraph -isystem /usr/lib/arm-linux-gnueabihf/wx/include/gtk2-unicode-3.0 -isystem /usr/include/wx-3.0 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fvisibility-inlines-hidden -pthread -O3 -DNDEBUG -march=native -fvisibility=hidden -std=gnu++11 -o CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_cmd.cpp.o -c /usr/src/packages/BUILD/src/limeRFE/limeRFE_cmd.cpp [ 823s] [ 79%] Linking CXX executable ../bin/LimeSuiteGUI [ 823s] cd /usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src && /usr/bin/cmake -E cmake_link_script CMakeFiles/LimeSuiteGUI.dir/link.txt --verbose=1 [ 823s] /usr/bin/c++ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fvisibility-inlines-hidden -pthread -O3 -DNDEBUG -Wl,-z,relro -rdynamic CMakeFiles/LimeSuiteGUI.dir/ADF4002/ADF4002_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlXBUF_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlRFE_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlCalibrations_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlTRF_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlCDS_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlLimeLightPAD_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlBIST_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/dlgViewIRAM.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_gui_utilities.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlSX_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlTBB_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_dlgVCOfrequencies.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlRBB_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlLDO_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlAFE_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlGains_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/CoefficientFileParser.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlRxTSP_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_mainPanel.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/dlgViewSFR.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlCLKGEN_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlMCU_BD_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlBIAS_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_dlgGFIR_Coefficients.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlTxTSP_view.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7002_wxgui/lms7002_pnlR3.cpp.o CMakeFiles/LimeSuiteGUI.dir/LMS_Programing/LMS_Programing_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/dlgConnectionSettings.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/pnlMiniLog.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/pnlAPI.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/SPI_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/dlgFullMessageLog.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/dlgDeviceInfo.cpp.o CMakeFiles/LimeSuiteGUI.dir/utilities_gui/utilities_gui.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7suiteAppFrame.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/RFSpark_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/Si5351C/Si5351C_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7suiteApp_gui.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7suiteApp.cpp.o CMakeFiles/LimeSuiteGUI.dir/FPGAcontrols_wxgui/FPGAcontrols_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/dlgAbout.cpp.o CMakeFiles/LimeSuiteGUI.dir/numericSlider/numericSlider.cpp.o CMakeFiles/LimeSuiteGUI.dir/fftviewer_wxgui/fftviewer_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/fftviewer_wxgui/fftviewer_frFFTviewer.cpp.o CMakeFiles/LimeSuiteGUI.dir/lms7suiteEvents/lms7suiteEvents.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlBoardControls.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlQSpark.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnluLimeSDR.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlUltimateEVB.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlBuffers.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlCoreSDR.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlLimeNetMicro.cpp.o CMakeFiles/LimeSuiteGUI.dir/__/external/kissFFT/kiss_fft.c.o CMakeFiles/LimeSuiteGUI.dir/windowFunction.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlLimeSDR.cpp.o CMakeFiles/LimeSuiteGUI.dir/boards_wxgui/pnlGPIO.cpp.o CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_gui.cpp.o CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_wxgui.cpp.o CMakeFiles/LimeSuiteGUI.dir/limeRFE/limeRFE_cmd.cpp.o -o ../bin/LimeSuiteGUI -Wl,-rpath,/usr/src/packages/BUILD/obj-arm-linux-gnueabihf/src: libLimeSuite.so.20.01.0 oglGraph/liboglGraph.a -L/usr/lib/arm-linux-gnueabihf -pthread -lwx_gtk2u_richtext-3.0 -lwx_baseu_xml-3.0 -lwx_gtk2u_html-3.0 -lwx_gtk2u_xrc-3.0 -lwx_gtk2u_adv-3.0 -lwx_gtk2u_aui-3.0 -lwx_gtk2u_core-3.0 -lwx_baseu-3.0 -lwx_gtk2u_gl-3.0 -lusb-1.0 -lGL -lwx_gtk2u_richtext-3.0 -lwx_baseu_xml-3.0 -lwx_gtk2u_html-3.0 -lwx_gtk2u_xrc-3.0 -lwx_gtk2u_adv-3.0 -lwx_gtk2u_aui-3.0 -lwx_gtk2u_core-3.0 -lwx_baseu-3.0 -lwx_gtk2u_gl-3.0 [ 828s] /usr/bin/ld: libLimeSuite.so.20.01.0: undefined reference to `__atomic_store_8' [ 828s] /usr/bin/ld: libLimeSuite.so.20.01.0: undefined reference to `__atomic_load_8' [ 828s] collect2: error: ld returned 1 exit status [ 828s] make[3]: *** [src/CMakeFiles/LimeSuiteGUI.dir/build.make:990: bin/LimeSuiteGUI] Error 1 [ 828s] make[3]: Leaving directory '/usr/src/packages/BUILD/obj-arm-linux-gnueabihf' [ 828s] make[2]: *** [CMakeFiles/Makefile2:142: src/CMakeFiles/LimeSuiteGUI.dir/all] Error 2 [ 828s] make[2]: Leaving directory '/usr/src/packages/BUILD/obj-arm-linux-gnueabihf' [ 828s] make[1]: *** [Makefile:133: all] Error 2 [ 828s] make[1]: Leaving directory '/usr/src/packages/BUILD/obj-arm-linux-gnueabihf' [ 828s] dh_auto_build: cd obj-arm-linux-gnueabihf && make -j2 returned exit code 2 [ 828s] make: *** [debian/rules:28: binary] Error 2 [ 828s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 828s] ### VM INTERACTION START ### [ 831s] [ 809.848684] sysrq: SysRq : Power Off [ 831s] [ 809.850492] reboot: Power down [ 831s] ### VM INTERACTION END ### [ 831s] [ 831s] armbuild04 failed "build limesuite_20.01.0-1.dsc" at Thu Jul 30 17:04:06 UTC 2020. [ 831s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Jul 30 17:43:48 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 30 Jul 2020 17:43:48 +0000 Subject: Change in osmocom-bb[master]: firmware: add possibility to configure TCH loops in the DSP References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19458 ) Change subject: firmware: add possibility to configure TCH loops in the DSP ...................................................................... firmware: add possibility to configure TCH loops in the DSP Change-Id: Ide7b0527ad64a044977a10da4a82a8ecd1fbd8dc --- M include/l1ctl_proto.h M src/target/firmware/include/layer1/sync.h M src/target/firmware/layer1/l23_api.c M src/target/firmware/layer1/prim_tch.c 4 files changed, 25 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/58/19458/1 diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h index 05d65de..cf41ac7 100644 --- a/include/l1ctl_proto.h +++ b/include/l1ctl_proto.h @@ -149,11 +149,24 @@ uint8_t padding[3]; } __attribute__((packed)); +/* 3GPP TS 44.014, section 5.1 (Calypso specific numbers) */ +enum l1ctl_tch_loop_mode { + L1CTL_TCH_LOOP_OPEN = 0x00, + L1CTL_TCH_LOOP_A = 0x01, + L1CTL_TCH_LOOP_B = 0x02, + L1CTL_TCH_LOOP_C = 0x03, + L1CTL_TCH_LOOP_D = 0x04, + L1CTL_TCH_LOOP_E = 0x05, + L1CTL_TCH_LOOP_F = 0x06, + L1CTL_TCH_LOOP_I = 0x07, +}; + /* TCH mode was changed */ struct l1ctl_tch_mode_conf { uint8_t tch_mode; /* enum tch_mode */ uint8_t audio_mode; - uint8_t padding[2]; + uint8_t tch_loop_mode; /* enum l1ctl_tch_loop_mode */ + uint8_t padding[1]; } __attribute__((packed)); /* data on the CCCH was found. This is following the header */ @@ -231,7 +244,8 @@ #define AUDIO_RX_SPEAKER (1<<2) #define AUDIO_RX_TRAFFIC_IND (1<<3) uint8_t audio_mode; - uint8_t padding[2]; + uint8_t tch_loop_mode; /* enum l1ctl_tch_loop_mode */ + uint8_t padding[1]; } __attribute__((packed)); /* the l1_info_ul header is in front */ diff --git a/src/target/firmware/include/layer1/sync.h b/src/target/firmware/include/layer1/sync.h index 6ed3890..dd93242 100644 --- a/src/target/firmware/include/layer1/sync.h +++ b/src/target/firmware/include/layer1/sync.h @@ -83,6 +83,9 @@ uint8_t tch_sync; uint8_t audio_mode; + /* 3GPP TS 44.014, section 5.1 (Calypso DSP specific numbers) */ + enum l1ctl_tch_loop_mode tch_loop_mode; + /* Transmit queues of pending packets for main DCCH and ACCH */ struct llist_head tx_queue[_NUM_L1S_CHAN]; struct msgb *tx_meas; diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c index d52d8f6..62c21f6 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -352,6 +352,7 @@ dsp_load_ciph_param(0, NULL); l1a_tch_mode_set(GSM48_CMODE_SIGN); audio_set_enabled(GSM48_CMODE_SIGN, 0); + l1s.tch_loop_mode = L1CTL_TCH_LOOP_OPEN; l1s.neigh_pm.n = 0; } @@ -521,6 +522,7 @@ msgb_put(msg, sizeof(*mode_conf)); mode_conf->tch_mode = tch_mode; mode_conf->audio_mode = audio_mode; + mode_conf->tch_loop_mode = l1s.tch_loop_mode; l1_queue_for_l2(msg); } @@ -542,6 +544,7 @@ audio_set_enabled(tch_mode, audio_mode); l1s.tch_sync = 1; /* Needed for audio to work */ + l1s.tch_loop_mode = tch_mode_req->tch_loop_mode; l1ctl_tx_tch_mode_conf(tch_mode, audio_mode); } diff --git a/src/target/firmware/layer1/prim_tch.c b/src/target/firmware/layer1/prim_tch.c index 0254654..40ef8f3 100644 --- a/src/target/firmware/layer1/prim_tch.c +++ b/src/target/firmware/layer1/prim_tch.c @@ -526,7 +526,7 @@ dsp_load_tch_param( &l1s.next_time, tch_mode, tch_f_hn ? TCH_F : TCH_H, tch_sub, - 0, sync, tn + l1s.tch_loop_mode, sync, tn ); dsp_load_rx_task( @@ -585,7 +585,7 @@ dsp_load_tch_param( &l1s.next_time, tch_mode, tch_f_hn ? TCH_F : TCH_H, tch_sub, - 0, 0, tn + l1s.tch_loop_mode, 0, tn ); dsp_load_rx_task(TCHD_DSP_TASK, 0, tsc); /* burst_id unused for TCH */ @@ -791,7 +791,7 @@ dsp_load_tch_param( &l1s.next_time, tch_mode, tch_f_hn ? TCH_F : TCH_H, tch_sub, - 0, 0, tn + l1s.tch_loop_mode, 0, tn ); dsp_load_rx_task( -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ide7b0527ad64a044977a10da4a82a8ecd1fbd8dc Gerrit-Change-Number: 19458 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 17:43:49 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 30 Jul 2020 17:43:49 +0000 Subject: Change in osmocom-bb[master]: layer23/mobile: implement handling of TCH test loop commands References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19459 ) Change subject: layer23/mobile: implement handling of TCH test loop commands ...................................................................... layer23/mobile: implement handling of TCH test loop commands For more information, see 3GPP TS 44.014, sections: - 5.1 "Single-slot TCH loops", and - 8 "Message definitions and contents". This feature has nothing to do with the Mobility Management, so let's handle GSM48_PDISC_TEST messages in the Radio Resources layer implementation (gsm48_mm.c -> gsm48_rr.c). Change-Id: If8efc57c7017aa8ea47b37c472d1bbb1914389ca --- M src/host/layer23/include/osmocom/bb/common/l1ctl.h M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h M src/host/layer23/src/common/l1ctl.c M src/host/layer23/src/mobile/Makefile.am A src/host/layer23/src/mobile/gsm414.c M src/host/layer23/src/mobile/gsm48_mm.c M src/host/layer23/src/mobile/gsm48_rr.c 7 files changed, 239 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/59/19459/1 diff --git a/src/host/layer23/include/osmocom/bb/common/l1ctl.h b/src/host/layer23/include/osmocom/bb/common/l1ctl.h index e4dbded..02ffa34 100644 --- a/src/host/layer23/include/osmocom/bb/common/l1ctl.h +++ b/src/host/layer23/include/osmocom/bb/common/l1ctl.h @@ -49,7 +49,7 @@ /* Transmit TCH_MODE_REQ */ int l1ctl_tx_tch_mode_req(struct osmocom_ms *ms, uint8_t tch_mode, - uint8_t audio_mode); + uint8_t audio_mode, uint8_t tch_loop_mode); /* Transmit ECHO_REQ */ int l1ctl_tx_echo_req(struct osmocom_ms *ms, unsigned int len); diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h index 6996ff3..9b499a6 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h @@ -188,6 +188,9 @@ /* audio flow */ uint8_t audio_mode; + /* 3GPP TS 44.014 TCH test loop mode (L1CTL specific format) */ + uint8_t tch_loop_mode; + /* sapi 3 */ uint8_t sapi3_state; uint8_t sapi3_link_id; diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 54c7452..a0c156f 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -461,7 +461,7 @@ /* Transmit L1CTL_TCH_MODE_REQ */ int l1ctl_tx_tch_mode_req(struct osmocom_ms *ms, uint8_t tch_mode, - uint8_t audio_mode) + uint8_t audio_mode, uint8_t tch_loop_mode) { struct msgb *msg; struct l1ctl_tch_mode_req *req; @@ -475,6 +475,7 @@ req = (struct l1ctl_tch_mode_req *) msgb_put(msg, sizeof(*req)); req->tch_mode = tch_mode; req->audio_mode = audio_mode; + req->loop_mode = tch_loop_mode; return osmo_send_l1(ms, msg); } diff --git a/src/host/layer23/src/mobile/Makefile.am b/src/host/layer23/src/mobile/Makefile.am index 4e80e4e..783ae16 100644 --- a/src/host/layer23/src/mobile/Makefile.am +++ b/src/host/layer23/src/mobile/Makefile.am @@ -4,7 +4,7 @@ noinst_LIBRARIES = libmobile.a libmobile_a_SOURCES = gsm322.c gsm480_ss.c gsm411_sms.c gsm48_cc.c gsm48_mm.c \ - gsm48_rr.c mnccms.c settings.c subscriber.c support.c \ + gsm48_rr.c gsm414.c mnccms.c settings.c subscriber.c support.c \ transaction.c vty_interface.c voice.c mncc_sock.c primitives.c bin_PROGRAMS = mobile diff --git a/src/host/layer23/src/mobile/gsm414.c b/src/host/layer23/src/mobile/gsm414.c new file mode 100644 index 0000000..2f630df --- /dev/null +++ b/src/host/layer23/src/mobile/gsm414.c @@ -0,0 +1,220 @@ +/* + * (C) 2020 by sysmocom - s.f.m.c. GmbH + * Author: Vadim Yanitskiy + * + * 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 + +#include +#include + +#include + +int gsm48_rr_tx_rr_status(struct osmocom_ms *ms, uint8_t cause); +int gsm48_send_rsl(struct osmocom_ms *ms, uint8_t msg_type, + struct msgb *msg, uint8_t link_id); +struct msgb *gsm48_l3_msgb_alloc(void); + +#define loop_mode_name(mode) \ + get_value_string(loop_mode_names, mode) + +static const struct value_string loop_mode_names[] = { + { L1CTL_TCH_LOOP_OPEN, "(OPEN)" }, + { L1CTL_TCH_LOOP_A, "A" }, + { L1CTL_TCH_LOOP_B, "B" }, + { L1CTL_TCH_LOOP_C, "C" }, + { L1CTL_TCH_LOOP_D, "D" }, + { L1CTL_TCH_LOOP_E, "E" }, + { L1CTL_TCH_LOOP_F, "F" }, + { L1CTL_TCH_LOOP_I, "I" }, + { 0, NULL } +}; + +static struct msgb *alloc_gsm414_msg(uint8_t msg_type) +{ + struct gsm48_hdr *ngh; + struct msgb *nmsg; + + nmsg = gsm48_l3_msgb_alloc(); + if (nmsg == NULL) + return NULL; + + ngh = (struct gsm48_hdr *) msgb_put(nmsg, sizeof(*ngh)); + ngh->proto_discr = GSM48_PDISC_TEST; + ngh->msg_type = msg_type; + + return nmsg; +} + +static int handle_close_tch_loop(struct osmocom_ms *ms, const struct msgb *msg) +{ + struct gsm48_rrlayer *rr = &ms->rrlayer; + const struct gsm48_hdr *gh = msgb_l3(msg); + unsigned int msg_len = msgb_l3len(msg); + struct msgb *nmsg; + + /* Make sure that we have an active connection */ + if (rr->state != GSM48_RR_ST_DEDICATED) { + LOGP(DMM, LOGL_NOTICE, "TCH loop requires an active connection\n"); + gsm48_rr_tx_rr_status(ms, GSM48_RR_CAUSE_MSG_TYPE_N_COMPAT); + return -EINVAL; + } + + /* Make sure that the established channel is either TCH/F or TCH/H */ + if ((rr->cd_now.chan_nr & 0xf8) != RSL_CHAN_Bm_ACCHs + && (rr->cd_now.chan_nr & 0xf0) != RSL_CHAN_Lm_ACCHs) { + LOGP(DMM, LOGL_NOTICE, "TCH loop requires a TCH/F or TCH/H connection\n"); + gsm48_rr_tx_rr_status(ms, GSM48_RR_CAUSE_MSG_TYPE_N_COMPAT); + return -EINVAL; + } + + /* Check if a loop is already closed */ + if (rr->tch_loop_mode != L1CTL_TCH_LOOP_OPEN) { + LOGP(DMM, LOGL_NOTICE, "TCH loop has already been closed\n"); + gsm48_rr_tx_rr_status(ms, GSM48_RR_CAUSE_MSG_TYPE_N_COMPAT); + return -EINVAL; + } + + if ((msg_len - sizeof(*gh)) < 1) + return -EINVAL; + + /* Parse type of the TCH test loop, convert to L1CTL format */ + uint8_t gsm414_loop_mode = (gh->data[0] >> 1) & 0x1f; + + /* NOTE: some bits are not specified, so they can be 0 or 1 */ + if (gsm414_loop_mode == GSM414_LOOP_A) + rr->tch_loop_mode = L1CTL_TCH_LOOP_A; + else if (gsm414_loop_mode == GSM414_LOOP_B) + rr->tch_loop_mode = L1CTL_TCH_LOOP_B; + else if ((gsm414_loop_mode & 0x1e) == GSM414_LOOP_C) + rr->tch_loop_mode = L1CTL_TCH_LOOP_C; + else if ((gsm414_loop_mode & 0x1c) == GSM414_LOOP_D) + rr->tch_loop_mode = L1CTL_TCH_LOOP_D; + else if ((gsm414_loop_mode & 0x1c) == GSM414_LOOP_E) + rr->tch_loop_mode = L1CTL_TCH_LOOP_E; + else if ((gsm414_loop_mode & 0x1c) == GSM414_LOOP_F) + rr->tch_loop_mode = L1CTL_TCH_LOOP_F; + else if ((gsm414_loop_mode & 0x1c) == GSM414_LOOP_I) + rr->tch_loop_mode = L1CTL_TCH_LOOP_I; + else { + LOGP(DMM, LOGL_NOTICE, "Unhandled 3GPP TS 44.014 TCH loop " + "mode=0x%02x => rejecting\n", gsm414_loop_mode); + gsm48_rr_tx_rr_status(ms, GSM48_RR_CAUSE_MSG_TYPE_N); + return -ENOTSUP; + } + + LOGP(DMM, LOGL_NOTICE, "(%s) Closing 3GPP TS 44.014 TCH loop mode '%s'\n", + rsl_chan_nr_str(rr->cd_now.chan_nr), loop_mode_name(rr->tch_loop_mode)); + + /* Instruct the L1 to enable received TCH loopback mode + * FIXME: delay applying this mode, so we can send the ACK first */ + l1ctl_tx_tch_mode_req(ms, rr->cd_now.mode, rr->audio_mode, rr->tch_loop_mode); + + /* Craft and send the ACKnowledgement */ + nmsg = alloc_gsm414_msg(GSM414_MT_CLOSE_TCH_LOOP_ACK); + if (nmsg == NULL) + return -ENOMEM; + + return gsm48_send_rsl(ms, RSL_MT_DATA_REQ, nmsg, 0); +} + +static int handle_open_tch_loop(struct osmocom_ms *ms, const struct msgb *msg) +{ + struct gsm48_rrlayer *rr = &ms->rrlayer; + struct msgb *nmsg; + + /* Make sure that we have an active connection */ + if (rr->state != GSM48_RR_ST_DEDICATED) { + LOGP(DMM, LOGL_NOTICE, "TCH loop requires an active connection\n"); + gsm48_rr_tx_rr_status(ms, GSM48_RR_CAUSE_MSG_TYPE_N_COMPAT); + return -EINVAL; + } + + /* Make sure that the established channel is either TCH/F or TCH/H */ + if ((rr->cd_now.chan_nr & 0xf8) != RSL_CHAN_Bm_ACCHs + && (rr->cd_now.chan_nr & 0xf0) != RSL_CHAN_Lm_ACCHs) { + LOGP(DMM, LOGL_NOTICE, "TCH loop requires a TCH/F or TCH/H connection\n"); + gsm48_rr_tx_rr_status(ms, GSM48_RR_CAUSE_MSG_TYPE_N_COMPAT); + return -EINVAL; + } + + /* Check if a loop actually needs to be closed */ + if (rr->tch_loop_mode == L1CTL_TCH_LOOP_OPEN) { + LOGP(DMM, LOGL_NOTICE, "TCH loop has not been closed (already open)\n"); + gsm48_rr_tx_rr_status(ms, GSM48_RR_CAUSE_MSG_TYPE_N_COMPAT); + return -EINVAL; + } + + LOGP(DMM, LOGL_NOTICE, "(%s) Opening 3GPP TS 44.014 TCH loop mode '%s'\n", + rsl_chan_nr_str(rr->cd_now.chan_nr), loop_mode_name(rr->tch_loop_mode)); + + /* Instruct the L1 to disable the TCH loopback mode */ + l1ctl_tx_tch_mode_req(ms, rr->cd_now.mode, rr->audio_mode, L1CTL_TCH_LOOP_OPEN); + + /* Only the loop mode C needs to be ACKnowledged */ + bool needs_ack = rr->tch_loop_mode == L1CTL_TCH_LOOP_C; + rr->tch_loop_mode = L1CTL_TCH_LOOP_OPEN; + if (!needs_ack) + return 0; + + /* Craft and send the ACKnowledgement */ + nmsg = alloc_gsm414_msg(GSM414_MT_OPEN_LOOP_CMD); + if (nmsg == NULL) + return -ENOMEM; + + msgb_put_u8(nmsg, GSM414_OPEN_LOOP_ACK_IE); + + return gsm48_send_rsl(ms, RSL_MT_DATA_REQ, nmsg, 0); +} + +int gsm414_rcv_test(struct osmocom_ms *ms, const struct msgb *msg) +{ + const struct gsm48_hdr *gh = msgb_l3(msg); + + LOGP(DMM, LOGL_INFO, "Received 3GPP TS 44.014 message '%s' (0x%02x)\n", + get_value_string(gsm414_msgt_names, gh->msg_type), gh->msg_type); + + /* TODO: check if the test SIM (special EF.ADM) is inserted */ + switch (gh->msg_type) { + case GSM414_MT_CLOSE_TCH_LOOP_CMD: + return handle_close_tch_loop(ms, msg); + case GSM414_MT_OPEN_LOOP_CMD: + return handle_open_tch_loop(ms, msg); + default: + LOGP(DMM, LOGL_NOTICE, "Unhandled 3GPP TS 44.014 message '%s' (0x%02x)\n", + get_value_string(gsm414_msgt_names, gh->msg_type), gh->msg_type); + gsm48_rr_tx_rr_status(ms, GSM48_RR_CAUSE_MSG_TYPE_N); + return -ENOTSUP; + } +} diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 52c6fe9..49cc2bc 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -4076,14 +4076,9 @@ msgb_free(msg); return rc; - case GSM48_PDISC_TEST: /* test TS 04.14 */ - LOGP(DMM, LOGL_NOTICE, "Test protocol 0x%02x according to " - "TS 04.14 is not supported.\n", pdisc); - goto status; default: LOGP(DMM, LOGL_NOTICE, "Protocol type 0x%02x unsupported.\n", pdisc); -status: msgb_free(msg); return gsm48_mm_tx_mm_status(ms, GSM48_REJECT_MSG_TYPE_NOT_IMPLEMENTED); diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 0449ee3..64d64f1 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -93,6 +93,7 @@ static int gsm48_rr_set_mode(struct osmocom_ms *ms, uint8_t chan_nr, uint8_t mode); static int gsm48_rr_rel_cnf(struct osmocom_ms *ms, struct msgb *msg); +int gsm414_rcv_test(struct osmocom_ms *ms, const struct msgb *msg); /* * support @@ -516,8 +517,8 @@ } /* push rsl header and send (RSL-SAP) */ -static int gsm48_send_rsl(struct osmocom_ms *ms, uint8_t msg_type, - struct msgb *msg, uint8_t link_id) +int gsm48_send_rsl(struct osmocom_ms *ms, uint8_t msg_type, + struct msgb *msg, uint8_t link_id) { struct gsm48_rrlayer *rr = &ms->rrlayer; @@ -879,7 +880,7 @@ */ /* send rr status request */ -static int gsm48_rr_tx_rr_status(struct osmocom_ms *ms, uint8_t cause) +int gsm48_rr_tx_rr_status(struct osmocom_ms *ms, uint8_t cause) { struct msgb *nmsg; struct gsm48_hdr *gh; @@ -3433,7 +3434,7 @@ /* setting (new) timing advance */ LOGP(DRR, LOGL_INFO, "setting TCH mode to %d, audio mode to %d\n", mode, rr->audio_mode); - l1ctl_tx_tch_mode_req(ms, mode, rr->audio_mode); + l1ctl_tx_tch_mode_req(ms, mode, rr->audio_mode, rr->tch_loop_mode); return 0; } @@ -4627,9 +4628,9 @@ struct gsm48_hdr *gh = msgb_l3(msg); struct gsm48_rr_hdr *rrh; uint8_t pdisc = gh->proto_discr & 0x0f; + int rc = -EINVAL; if (pdisc == GSM48_PDISC_RR) { - int rc = -EINVAL; uint8_t skip_ind = (gh->proto_discr & 0xf0) >> 4; /* ignore if skip indicator is not B'0000' */ @@ -4676,6 +4677,10 @@ msgb_free(msg); return rc; + } else if (pdisc == GSM48_PDISC_TEST) { + rc = gsm414_rcv_test(ms, msg); + msgb_free(msg); + return rc; } /* pull off RSL header up to L3 message */ @@ -5505,6 +5510,7 @@ start_rr_t_meas(rr, 1, 0); rr->audio_mode = AUDIO_TX_MICROPHONE | AUDIO_RX_SPEAKER; + rr->tch_loop_mode = L1CTL_TCH_LOOP_OPEN; return 0; } @@ -5707,6 +5713,5 @@ && ch_type != RSL_CHAN_Lm_ACCHs) return 0; - return l1ctl_tx_tch_mode_req(ms, rr->cd_now.mode, mode); + return l1ctl_tx_tch_mode_req(ms, rr->cd_now.mode, mode, rr->tch_loop_mode); } - -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If8efc57c7017aa8ea47b37c472d1bbb1914389ca Gerrit-Change-Number: 19459 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 17:46:19 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 30 Jul 2020 17:46:19 +0000 Subject: Change in osmocom-bb[master]: layer23/mobile: implement handling of TCH test loop commands In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19459 ) Change subject: layer23/mobile: implement handling of TCH test loop commands ...................................................................... Patch Set 1: This implementation is still to be tested. I am currently having problems with building working firmware images :/ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If8efc57c7017aa8ea47b37c472d1bbb1914389ca Gerrit-Change-Number: 19459 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 17:46:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 17:48:11 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 30 Jul 2020 17:48:11 +0000 Subject: Change in osmocom-bb[master]: layer23/mobile: implement handling of TCH test loop commands In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, Hoernchen, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/19459 to look at the new patch set (#2). Change subject: layer23/mobile: implement handling of TCH test loop commands ...................................................................... layer23/mobile: implement handling of TCH test loop commands For more information, see 3GPP TS 44.014, sections: - 5.1 "Single-slot TCH loops", and - 8 "Message definitions and contents". This feature has nothing to do with the Mobility Management, so let's handle GSM48_PDISC_TEST messages in the Radio Resources layer implementation (gsm48_mm.c -> gsm48_rr.c). Change-Id: If8efc57c7017aa8ea47b37c472d1bbb1914389ca --- M src/host/layer23/include/osmocom/bb/common/l1ctl.h M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h M src/host/layer23/src/common/l1ctl.c M src/host/layer23/src/mobile/Makefile.am A src/host/layer23/src/mobile/gsm414.c M src/host/layer23/src/mobile/gsm48_mm.c M src/host/layer23/src/mobile/gsm48_rr.c 7 files changed, 239 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/59/19459/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If8efc57c7017aa8ea47b37c472d1bbb1914389ca Gerrit-Change-Number: 19459 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 17:58:30 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 17:58:30 +0000 Subject: Change in libosmocore[master]: vty: Allow larger strlen parsing numerical range values In-Reply-To: References: Message-ID: pespin has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19423 ) Change subject: vty: Allow larger strlen parsing numerical range values ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id053acd6bf5e8fb7c468959f0b78b778f8c5e6c2 Gerrit-Change-Number: 19423 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 18:02:53 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 18:02:53 +0000 Subject: Change in libosmocore[master]: tests/fsm_test.c: Disable use color in logging output In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19337 to look at the new patch set (#3). Change subject: tests/fsm_test.c: Disable use color in logging output ...................................................................... tests/fsm_test.c: Disable use color in logging output This should avoid other problems in the future. Change-Id: I81368578c0830477d381566a54671fdde6067b23 --- M tests/fsm/fsm_test.c M tests/fsm/fsm_test.err 2 files changed, 45 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/19337/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I81368578c0830477d381566a54671fdde6067b23 Gerrit-Change-Number: 19337 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 18:04:27 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 18:04:27 +0000 Subject: Change in libosmocore[master]: logging: Avoid printing OSMO_LOGCOLOR_END if no color was used In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19336 ) Change subject: logging: Avoid printing OSMO_LOGCOLOR_END if no color was used ...................................................................... Patch Set 1: Any feedback regarding my last proposal? Given that it only affects one project I think it's good to get it merged now in order to avoid a worse situation in the future. Anyway most new versions of projects will require newer libosmocore due to feature been added there (like lbosmovty sched cpu-affinity stuff). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie38cc639d7f4acd908f357e5bfb3ced07147583e Gerrit-Change-Number: 19336 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jul 2020 18:04:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 18:32:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 18:32:06 +0000 Subject: Change in osmo-ccid-firmware[master]: Fix returned data in case of command TPDU References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19460 ) Change subject: Fix returned data in case of command TPDU ...................................................................... Fix returned data in case of command TPDU When Lc>0 (command TPDU), our response always copied the command data in front of the response (which is a SW of 2 bytes in this case). This of course confuses the hell out of users. The response to a Lc>0 TPDU should be just the two-bytes status word. Introduce the use of msgb->l4h for the point in the buffer from where we receive data from the card. all bytes before l4h are transmitted to the card. Change-Id: Ie3fc7437d39dc330b9f2b7d7960ad2560b6be4b7 --- M ccid_common/ccid_slot_fsm.c M ccid_common/iso7816_fsm.c 2 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/60/19460/1 diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c index 747fef3..4bd1b0d 100644 --- a/ccid_common/ccid_slot_fsm.c +++ b/ccid_common/ccid_slot_fsm.c @@ -172,7 +172,7 @@ tpdu = data; LOGPCS(cs, LOGL_DEBUG, "%s(event=%d, data=%s)\n", __func__, event, msgb_hexdump(tpdu)); - resp = ccid_gen_data_block(cs, ss->seq, CCID_CMD_STATUS_OK, 0, msgb_l2(tpdu), msgb_l2len(tpdu)); + resp = ccid_gen_data_block(cs, ss->seq, CCID_CMD_STATUS_OK, 0, msgb_l4(tpdu), msgb_l4len(tpdu)); ccid_slot_send_unbusy(cs, resp); msgb_free(tpdu); cs->event = 0; diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c index c76d97d..2796d30 100644 --- a/ccid_common/iso7816_fsm.c +++ b/ccid_common/iso7816_fsm.c @@ -1175,9 +1175,13 @@ /* start transmission of a TPDU by sending the 5-byte header */ tfp->tpdu = (struct msgb *)data; OSMO_ASSERT(msgb_length(tfp->tpdu) >= sizeof(*tpduh)); + /* l2h = after the 5byte header */ tfp->tpdu->l2h = msgb_data(tfp->tpdu) + sizeof(*tpduh); + /* l4h = where we start to receive from the card */ + tfp->tpdu->l4h = msgb_l2(tfp->tpdu) + msgb_l2len(tfp->tpdu); if (msgb_l2len(tfp->tpdu)) { tfp->is_command = true; + /* l3h = used as 'next byte to write' pointer */ tfp->tpdu->l3h = tfp->tpdu->l2h; /* next tx byte == first byte of body */ } else tfp->is_command = false; -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ie3fc7437d39dc330b9f2b7d7960ad2560b6be4b7 Gerrit-Change-Number: 19460 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 18:32:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 18:32:07 +0000 Subject: Change in osmo-ccid-firmware[master]: contrib/jenkins.sh: Disable libosmogb (we certainly don't need it) References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19461 ) Change subject: contrib/jenkins.sh: Disable libosmogb (we certainly don't need it) ...................................................................... contrib/jenkins.sh: Disable libosmogb (we certainly don't need it) Change-Id: I87daab75bbc04d0166ad3c137ccf3721e0b60e80 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/61/19461/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 1597a30..c28f550 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -42,7 +42,7 @@ autoreconf --install --force ./configure --enable-static --prefix="$inst/stow/libosmocore" --host=arm-none-eabi \ --enable-embedded --disable-doxygen --disable-shared --disable-pseudotalloc \ - --disable-libsctp --disable-libusb --enable-external-tests \ + --disable-libsctp --disable-libusb --disable-gb --enable-external-tests \ CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -mthumb -Os -mlong-calls -g3 -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -I /home/laforge/projects/git/osmo-ccid-firmware/sysmoOCTSIM -Wno-error=format" make $PARALLEL_MAKE install make clean -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19461 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I87daab75bbc04d0166ad3c137ccf3721e0b60e80 Gerrit-Change-Number: 19461 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 19:17:54 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 19:17:54 +0000 Subject: Change in osmo-ccid-firmware[master]: contrib/jenkins.sh: Disable libosmogb (we certainly don't need it) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19461 ) Change subject: contrib/jenkins.sh: Disable libosmogb (we certainly don't need it) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19461 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I87daab75bbc04d0166ad3c137ccf3721e0b60e80 Gerrit-Change-Number: 19461 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jul 2020 19:17:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 19:35:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 19:35:15 +0000 Subject: Change in libosmocore[master]: gsm0411_{smc, smr}.c: Work around newlib bug References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19462 ) Change subject: gsm0411_{smc,smr}.c: Work around newlib bug ...................................................................... gsm0411_{smc,smr}.c: Work around newlib bug At least on Debian unstable, newlib is [currently?] buggy in that we need to include sys/types.h before including inttypes.h, otherwise PRIu64 is not defined. Change-Id: Ic1c9cdf66cfd5b82bd7e20eaaf05b10e6bdb675e Closes: OS#4686 --- M src/gsm/gsm0411_smc.c M src/gsm/gsm0411_smr.c 2 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/19462/1 diff --git a/src/gsm/gsm0411_smc.c b/src/gsm/gsm0411_smc.c index 50d0f3e..a7d5e11 100644 --- a/src/gsm/gsm0411_smc.c +++ b/src/gsm/gsm0411_smc.c @@ -51,8 +51,9 @@ * */ -#include +#include #include +#include #include #include #include diff --git a/src/gsm/gsm0411_smr.c b/src/gsm/gsm0411_smr.c index 21d28c5..02b4199 100644 --- a/src/gsm/gsm0411_smr.c +++ b/src/gsm/gsm0411_smr.c @@ -49,9 +49,10 @@ */ +#include +#include #include #include -#include #include #include #include -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic1c9cdf66cfd5b82bd7e20eaaf05b10e6bdb675e Gerrit-Change-Number: 19462 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 19:35:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 19:35:16 +0000 Subject: Change in libosmocore[master]: log stderr: Increase output buffering using setvbuf() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19463 ) Change subject: log stderr: Increase output buffering using setvbuf() ...................................................................... log stderr: Increase output buffering using setvbuf() Change-Id: I59beadb8d1d10a942513efc4c0477701f967237a --- M src/logging.c 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/63/19463/1 diff --git a/src/logging.c b/src/logging.c index c14e696..683db97 100644 --- a/src/logging.c +++ b/src/logging.c @@ -903,6 +903,7 @@ struct log_target *log_target_create_file(const char *fname) { struct log_target *target; + int rc; target = log_target_create(); if (!target) @@ -913,6 +914,12 @@ if (!target->tgt_file.out) return NULL; + rc = setvbuf(target->tgt_file.out, NULL, _IOFBF, 128*1024); + if (rc != 0) { + LOGP(DLGLOBAL, LOGL_NOTICE, "Could not increase output buffer size for '%s': %s\n", + fname, strerror(errno)); + } + target->output = _file_output; target->tgt_file.fname = talloc_strdup(target, fname); @@ -980,12 +987,20 @@ * \returns 0 in case of success; negative otherwise */ int log_target_file_reopen(struct log_target *target) { + int rc; + fclose(target->tgt_file.out); target->tgt_file.out = fopen(target->tgt_file.fname, "a"); if (!target->tgt_file.out) return -errno; + rc = setvbuf(target->tgt_file.out, NULL, _IOFBF, 128*1024); + if (rc != 0) { + LOGP(DLGLOBAL, LOGL_NOTICE, "Could not increase output buffer size for '%s': %s\n", + target->tgt_file.fname, strerror(errno)); + } + /* we assume target->output already to be set */ return 0; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19463 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I59beadb8d1d10a942513efc4c0477701f967237a Gerrit-Change-Number: 19463 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 19:52:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 19:52:41 +0000 Subject: Change in libosmocore[master]: gsm0411_{smc, smr}.c: Work around newlib bug In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19462 ) Change subject: gsm0411_{smc,smr}.c: Work around newlib bug ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic1c9cdf66cfd5b82bd7e20eaaf05b10e6bdb675e Gerrit-Change-Number: 19462 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 19:52:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 19:52:44 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 19:52:44 +0000 Subject: Change in libosmocore[master]: gsm0411_{smc, smr}.c: Work around newlib bug In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19462 ) Change subject: gsm0411_{smc,smr}.c: Work around newlib bug ...................................................................... gsm0411_{smc,smr}.c: Work around newlib bug At least on Debian unstable, newlib is [currently?] buggy in that we need to include sys/types.h before including inttypes.h, otherwise PRIu64 is not defined. Change-Id: Ic1c9cdf66cfd5b82bd7e20eaaf05b10e6bdb675e Closes: OS#4686 --- M src/gsm/gsm0411_smc.c M src/gsm/gsm0411_smr.c 2 files changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gsm/gsm0411_smc.c b/src/gsm/gsm0411_smc.c index 50d0f3e..a7d5e11 100644 --- a/src/gsm/gsm0411_smc.c +++ b/src/gsm/gsm0411_smc.c @@ -51,8 +51,9 @@ * */ -#include +#include #include +#include #include #include #include diff --git a/src/gsm/gsm0411_smr.c b/src/gsm/gsm0411_smr.c index 21d28c5..02b4199 100644 --- a/src/gsm/gsm0411_smr.c +++ b/src/gsm/gsm0411_smr.c @@ -49,9 +49,10 @@ */ +#include +#include #include #include -#include #include #include #include -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic1c9cdf66cfd5b82bd7e20eaaf05b10e6bdb675e Gerrit-Change-Number: 19462 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 19:57:13 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 19:57:13 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp-client: fix memleak in case if no response is received In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19271 ) Change subject: libosmo-mgcp-client: fix memleak in case if no response is received ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I83938ff47fa8570b8d9dc810a184864a0c0b58aa Gerrit-Change-Number: 19271 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 30 Jul 2020 19:57:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:00:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 20:00:21 +0000 Subject: Change in osmo-ccid-firmware[master]: contrib/jenkins.sh: Disable thread-local storage in libosmocore References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19464 ) Change subject: contrib/jenkins.sh: Disable thread-local storage in libosmocore ...................................................................... contrib/jenkins.sh: Disable thread-local storage in libosmocore Let's disable thread-local-storage by re-defining __thread in the pre-processor. This is required at least on Debian unstable to get a sysmoOCTSIM build without any missing symbols to __tls_get_addr. Change-Id: Ie75fb7e71b316be164ed69d832ffcf2bd1a04fb7 --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/64/19464/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index c28f550..35625f1 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -43,7 +43,8 @@ ./configure --enable-static --prefix="$inst/stow/libosmocore" --host=arm-none-eabi \ --enable-embedded --disable-doxygen --disable-shared --disable-pseudotalloc \ --disable-libsctp --disable-libusb --disable-gb --enable-external-tests \ - CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -mthumb -Os -mlong-calls -g3 -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -I /home/laforge/projects/git/osmo-ccid-firmware/sysmoOCTSIM -Wno-error=format" + CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -mthumb -Os -mlong-calls -g3 -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -I /home/laforge/projects/git/osmo-ccid-firmware/sysmoOCTSIM -Wno-error=format" \ + CPPFLAGS="-D__thread=''" make $PARALLEL_MAKE install make clean STOW_DIR="$inst/stow" stow --restow libosmocore -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19464 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ie75fb7e71b316be164ed69d832ffcf2bd1a04fb7 Gerrit-Change-Number: 19464 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:03:36 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 20:03:36 +0000 Subject: Change in libosmocore[master]: log stderr: Increase output buffering using setvbuf() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19463 ) Change subject: log stderr: Increase output buffering using setvbuf() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19463/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/19463/1//COMMIT_MSG at 7 PS1, Line 7: log stderr: Increase output buffering using setvbuf() The changes you are doing here doesn't seem to correspond to log stderr, but to file targets. btw, any background on why the value 128KB is used would be great. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19463 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I59beadb8d1d10a942513efc4c0477701f967237a Gerrit-Change-Number: 19463 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 30 Jul 2020 20:03:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:12:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 20:12:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: CCID_Tests: Ensure the response to "SELET MF" is two bytes (SW) long References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19465 ) Change subject: CCID_Tests: Ensure the response to "SELET MF" is two bytes (SW) long ...................................................................... CCID_Tests: Ensure the response to "SELET MF" is two bytes (SW) long we used to accept arbitrary length responses, which made us fail to catch the bug described in OS#4684 Change-Id: I35721ce55b58a2f70ea30a0d1bd16d2ac58dfcab Related: OS#4684 --- M ccid/CCID_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/19465/1 diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn index c620b0b..2256025 100644 --- a/ccid/CCID_Tests.ttcn +++ b/ccid/CCID_Tests.ttcn @@ -379,7 +379,7 @@ f_ccid_power_on(); f_ccid_set_par(ts_ProtoDataT0(ISO7816_FI_512_5MHz, ISO7816_DI_32)); for (i := 0; i < 1000; i := i+1) { - f_ccid_xfr(c_UICC_SELECT_MF, ?); + f_ccid_xfr(c_UICC_SELECT_MF, '??'O); } } testcase TC_select_mf() runs on Test_CT -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19465 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I35721ce55b58a2f70ea30a0d1bd16d2ac58dfcab Gerrit-Change-Number: 19465 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:12:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 20:12:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: CCID_Tests: Fix USB VendorID References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19466 ) Change subject: CCID_Tests: Fix USB VendorID ...................................................................... CCID_Tests: Fix USB VendorID The VendorID of the sysmoOCTSIM is 0x1d50, not 0x1df0. Change-Id: Id0eda6e661bca6bed7367c3af1a38b795ea959b0 --- M ccid/CCID_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/19466/1 diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn index 2256025..f7423cd 100644 --- a/ccid/CCID_Tests.ttcn +++ b/ccid/CCID_Tests.ttcn @@ -17,7 +17,7 @@ import from CCID_Emulation all; modulepar { - USB_Device_Match mp_usb_dev_match := { vid_pid := { vid := '1df0'H, pid := '6141'H } }; + USB_Device_Match mp_usb_dev_match := { vid_pid := { vid := '1d50'H, pid := '6141'H } }; integer mp_use_slot_count := 8; boolean mp_test_power_off := true; boolean mp_quirk_resetpar_returns_slotsts := false; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19466 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id0eda6e661bca6bed7367c3af1a38b795ea959b0 Gerrit-Change-Number: 19466 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:13:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 20:13:16 +0000 Subject: Change in osmo-ccid-firmware[master]: Fix returned data in case of command TPDU In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19460 ) Change subject: Fix returned data in case of command TPDU ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ie3fc7437d39dc330b9f2b7d7960ad2560b6be4b7 Gerrit-Change-Number: 19460 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 20:13:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:13:20 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 20:13:20 +0000 Subject: Change in osmo-ccid-firmware[master]: contrib/jenkins.sh: Disable libosmogb (we certainly don't need it) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19461 ) Change subject: contrib/jenkins.sh: Disable libosmogb (we certainly don't need it) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19461 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I87daab75bbc04d0166ad3c137ccf3721e0b60e80 Gerrit-Change-Number: 19461 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jul 2020 20:13:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:13:36 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 20:13:36 +0000 Subject: Change in osmo-ccid-firmware[master]: Fix returned data in case of command TPDU In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19460 ) Change subject: Fix returned data in case of command TPDU ...................................................................... Fix returned data in case of command TPDU When Lc>0 (command TPDU), our response always copied the command data in front of the response (which is a SW of 2 bytes in this case). This of course confuses the hell out of users. The response to a Lc>0 TPDU should be just the two-bytes status word. Introduce the use of msgb->l4h for the point in the buffer from where we receive data from the card. all bytes before l4h are transmitted to the card. Change-Id: Ie3fc7437d39dc330b9f2b7d7960ad2560b6be4b7 --- M ccid_common/ccid_slot_fsm.c M ccid_common/iso7816_fsm.c 2 files changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c index 747fef3..4bd1b0d 100644 --- a/ccid_common/ccid_slot_fsm.c +++ b/ccid_common/ccid_slot_fsm.c @@ -172,7 +172,7 @@ tpdu = data; LOGPCS(cs, LOGL_DEBUG, "%s(event=%d, data=%s)\n", __func__, event, msgb_hexdump(tpdu)); - resp = ccid_gen_data_block(cs, ss->seq, CCID_CMD_STATUS_OK, 0, msgb_l2(tpdu), msgb_l2len(tpdu)); + resp = ccid_gen_data_block(cs, ss->seq, CCID_CMD_STATUS_OK, 0, msgb_l4(tpdu), msgb_l4len(tpdu)); ccid_slot_send_unbusy(cs, resp); msgb_free(tpdu); cs->event = 0; diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c index c76d97d..2796d30 100644 --- a/ccid_common/iso7816_fsm.c +++ b/ccid_common/iso7816_fsm.c @@ -1175,9 +1175,13 @@ /* start transmission of a TPDU by sending the 5-byte header */ tfp->tpdu = (struct msgb *)data; OSMO_ASSERT(msgb_length(tfp->tpdu) >= sizeof(*tpduh)); + /* l2h = after the 5byte header */ tfp->tpdu->l2h = msgb_data(tfp->tpdu) + sizeof(*tpduh); + /* l4h = where we start to receive from the card */ + tfp->tpdu->l4h = msgb_l2(tfp->tpdu) + msgb_l2len(tfp->tpdu); if (msgb_l2len(tfp->tpdu)) { tfp->is_command = true; + /* l3h = used as 'next byte to write' pointer */ tfp->tpdu->l3h = tfp->tpdu->l2h; /* next tx byte == first byte of body */ } else tfp->is_command = false; -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ie3fc7437d39dc330b9f2b7d7960ad2560b6be4b7 Gerrit-Change-Number: 19460 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:13:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 20:13:37 +0000 Subject: Change in osmo-ccid-firmware[master]: contrib/jenkins.sh: Disable libosmogb (we certainly don't need it) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19461 ) Change subject: contrib/jenkins.sh: Disable libosmogb (we certainly don't need it) ...................................................................... contrib/jenkins.sh: Disable libosmogb (we certainly don't need it) Change-Id: I87daab75bbc04d0166ad3c137ccf3721e0b60e80 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 1597a30..c28f550 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -42,7 +42,7 @@ autoreconf --install --force ./configure --enable-static --prefix="$inst/stow/libosmocore" --host=arm-none-eabi \ --enable-embedded --disable-doxygen --disable-shared --disable-pseudotalloc \ - --disable-libsctp --disable-libusb --enable-external-tests \ + --disable-libsctp --disable-libusb --disable-gb --enable-external-tests \ CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -mthumb -Os -mlong-calls -g3 -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -I /home/laforge/projects/git/osmo-ccid-firmware/sysmoOCTSIM -Wno-error=format" make $PARALLEL_MAKE install make clean -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19461 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I87daab75bbc04d0166ad3c137ccf3721e0b60e80 Gerrit-Change-Number: 19461 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:13:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 20:13:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: CCID_Tests: Ensure the response to "SELET MF" is two bytes (SW) long In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19465 ) Change subject: CCID_Tests: Ensure the response to "SELET MF" is two bytes (SW) long ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19465 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I35721ce55b58a2f70ea30a0d1bd16d2ac58dfcab Gerrit-Change-Number: 19465 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 20:13:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:14:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 20:14:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: CCID_Tests: Fix USB VendorID In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19466 ) Change subject: CCID_Tests: Fix USB VendorID ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19466 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id0eda6e661bca6bed7367c3af1a38b795ea959b0 Gerrit-Change-Number: 19466 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 30 Jul 2020 20:14:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:32:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 20:32:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: CCID_Tests: Ensure the response to "SELET MF" is two bytes (SW) long In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19465 ) Change subject: CCID_Tests: Ensure the response to "SELET MF" is two bytes (SW) long ...................................................................... CCID_Tests: Ensure the response to "SELET MF" is two bytes (SW) long we used to accept arbitrary length responses, which made us fail to catch the bug described in OS#4684 Change-Id: I35721ce55b58a2f70ea30a0d1bd16d2ac58dfcab Related: OS#4684 --- M ccid/CCID_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn index c620b0b..2256025 100644 --- a/ccid/CCID_Tests.ttcn +++ b/ccid/CCID_Tests.ttcn @@ -379,7 +379,7 @@ f_ccid_power_on(); f_ccid_set_par(ts_ProtoDataT0(ISO7816_FI_512_5MHz, ISO7816_DI_32)); for (i := 0; i < 1000; i := i+1) { - f_ccid_xfr(c_UICC_SELECT_MF, ?); + f_ccid_xfr(c_UICC_SELECT_MF, '??'O); } } testcase TC_select_mf() runs on Test_CT -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19465 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I35721ce55b58a2f70ea30a0d1bd16d2ac58dfcab Gerrit-Change-Number: 19465 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:32:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 20:32:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: CCID_Tests: Fix USB VendorID In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19466 ) Change subject: CCID_Tests: Fix USB VendorID ...................................................................... CCID_Tests: Fix USB VendorID The VendorID of the sysmoOCTSIM is 0x1d50, not 0x1df0. Change-Id: Id0eda6e661bca6bed7367c3af1a38b795ea959b0 --- M ccid/CCID_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn index 2256025..f7423cd 100644 --- a/ccid/CCID_Tests.ttcn +++ b/ccid/CCID_Tests.ttcn @@ -17,7 +17,7 @@ import from CCID_Emulation all; modulepar { - USB_Device_Match mp_usb_dev_match := { vid_pid := { vid := '1df0'H, pid := '6141'H } }; + USB_Device_Match mp_usb_dev_match := { vid_pid := { vid := '1d50'H, pid := '6141'H } }; integer mp_use_slot_count := 8; boolean mp_test_power_off := true; boolean mp_quirk_resetpar_returns_slotsts := false; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19466 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id0eda6e661bca6bed7367c3af1a38b795ea959b0 Gerrit-Change-Number: 19466 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:33:21 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 20:33:21 +0000 Subject: Change in libosmocore[master]: tests/fsm_test.c: Disable use color in logging output In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19337 ) Change subject: tests/fsm_test.c: Disable use color in logging output ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I81368578c0830477d381566a54671fdde6067b23 Gerrit-Change-Number: 19337 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 20:33:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:33:24 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 20:33:24 +0000 Subject: Change in libosmocore[master]: tests/fsm_test.c: Disable use color in logging output In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19337 ) Change subject: tests/fsm_test.c: Disable use color in logging output ...................................................................... tests/fsm_test.c: Disable use color in logging output This should avoid other problems in the future. Change-Id: I81368578c0830477d381566a54671fdde6067b23 --- M tests/fsm/fsm_test.c M tests/fsm/fsm_test.err 2 files changed, 45 insertions(+), 44 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c index 911aad8..fe48b2b 100644 --- a/tests/fsm/fsm_test.c +++ b/tests/fsm/fsm_test.c @@ -413,6 +413,7 @@ stderr_target = log_target_create_stderr(); log_add_target(stderr_target); log_set_print_filename(stderr_target, 0); + log_set_use_color(stderr_target, 0); g_ctrl = ctrl_handle_alloc(NULL, NULL, NULL); g_ctx = NULL; diff --git a/tests/fsm/fsm_test.err b/tests/fsm/fsm_test.err index 13cbacd..4cc5ca4 100644 --- a/tests/fsm/fsm_test.err +++ b/tests/fsm/fsm_test.err @@ -1,18 +1,18 @@ Checking FSM allocation -Test_FSM(my_id){NULL}: Allocated -Test_FSM(my_id){NULL}: Received Event EV_B -Test_FSM(my_id){NULL}: Event EV_B not permitted -Test_FSM(my_id){NULL}: Received Event EV_A -Test_FSM(my_id){NULL}: State change to ONE (no timeout) -Test_FSM(my_id){ONE}: Received Event EV_B -Test_FSM(my_id){ONE}: State change to TWO (T2342, 1s) -Test_FSM(my_id){TWO}: Timeout of T2342 -Timer -Test_FSM(my_id){TWO}: Deallocated - +Test_FSM(my_id){NULL}: Allocated +Test_FSM(my_id){NULL}: Received Event EV_B +Test_FSM(my_id){NULL}: Event EV_B not permitted +Test_FSM(my_id){NULL}: Received Event EV_A +Test_FSM(my_id){NULL}: State change to ONE (no timeout) +Test_FSM(my_id){ONE}: Received Event EV_B +Test_FSM(my_id){ONE}: State change to TWO (T2342, 1s) +Test_FSM(my_id){TWO}: Timeout of T2342 +Timer +Test_FSM(my_id){TWO}: Deallocated + --- test_id_api() Test_FSM{NULL}: Allocated - osmo_fsm_inst_name() == "Test_FSM" + osmo_fsm_inst_name() == "Test_FSM" osmo_fsm_inst_find_by_name("Test_FSM") == fi osmo_fsm_inst_update_id("my_id") rc == 0, ok @@ -39,23 +39,23 @@ osmo_fsm_inst_find_by_id("arbitrary_id") == fi osmo_fsm_inst_update_id("") Attempting to set illegal id for FSM instance of type 'Test_FSM': "" - rc == -22, ok + rc == -22, ok osmo_fsm_inst_name() == "Test_FSM(arbitrary_id)" osmo_fsm_inst_find_by_name("Test_FSM(arbitrary_id)") == fi osmo_fsm_inst_update_id("invalid.id") Attempting to set illegal id for FSM instance of type 'Test_FSM': "invalid.id" - rc == -22, ok + rc == -22, ok osmo_fsm_inst_name() == "Test_FSM(arbitrary_id)" osmo_fsm_inst_find_by_name("Test_FSM(arbitrary_id)") == fi --- id format tests... osmo_fsm_inst_update_id_f("format%cid", '.') Attempting to set illegal id for FSM instance of type 'Test_FSM': "format.id" - rc == -22, ok + rc == -22, ok osmo_fsm_inst_name() == "Test_FSM(arbitrary_id)" osmo_fsm_inst_find_by_name("Test_FSM(arbitrary_id)") == fi osmo_fsm_inst_update_id_f("%s", "") Attempting to set illegal id for FSM instance of type 'Test_FSM': "" - rc == -22, ok + rc == -22, ok osmo_fsm_inst_name() == "Test_FSM(arbitrary_id)" osmo_fsm_inst_find_by_name("Test_FSM(arbitrary_id)") == fi osmo_fsm_inst_update_id_f("format%xid%d", 0x23, 42) @@ -78,41 +78,41 @@ --- test_id_api() done Test_FSM(arbitrary_id){NULL}: Terminating (cause = OSMO_FSM_TERM_REQUEST) -Test_FSM(arbitrary_id){NULL}: Freeing instance -Test_FSM(arbitrary_id){NULL}: Deallocated - +Test_FSM(arbitrary_id){NULL}: Freeing instance +Test_FSM(arbitrary_id){NULL}: Deallocated + --- test_state_chg_keep_timer() Test_FSM{NULL}: Allocated -Test_FSM{NULL}: State change to ONE (no timeout) -Test_FSM{ONE}: State change to TWO (no timeout) -Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) -Test_FSM{TWO}: Freeing instance -Test_FSM{TWO}: Deallocated -Total time passed: 0.000000 s +Test_FSM{NULL}: State change to ONE (no timeout) +Test_FSM{ONE}: State change to TWO (no timeout) +Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +Test_FSM{TWO}: Freeing instance +Test_FSM{TWO}: Deallocated +Total time passed: 0.000000 s Test_FSM{NULL}: Allocated -Test_FSM{NULL}: State change to ONE (T10, 10s) -Total time passed: 2.000342 s +Test_FSM{NULL}: State change to ONE (T10, 10s) +Total time passed: 2.000342 s Test_FSM{ONE}: State change to TWO (keeping T10, 7.999s remaining) -Total time passed: 2.000342 s +Total time passed: 2.000342 s Total time passed: 9.999999 s Total time passed: 10.000000 s Test_FSM{TWO}: Timeout of T10 -Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) -Test_FSM{TWO}: Freeing instance -Test_FSM{TWO}: Deallocated ---- test_state_chg_keep_timer() done +Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +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 change to ONE (T42, 23s) -Test_FSM{ONE}: State change to TWO (no timeout) -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 change to ONE (T42, 23s) -Test_FSM{ONE}: State change to TWO (no timeout) -Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) -Test_FSM{TWO}: Freeing instance -Test_FSM{TWO}: Deallocated ---- test_state_chg_T() done +Test_FSM{NULL}: State change to ONE (T42, 23s) +Test_FSM{ONE}: State change to TWO (no timeout) +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 change to ONE (T42, 23s) +Test_FSM{ONE}: State change to TWO (no timeout) +Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +Test_FSM{TWO}: Freeing instance +Test_FSM{TWO}: Deallocated +--- test_state_chg_T() done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I81368578c0830477d381566a54671fdde6067b23 Gerrit-Change-Number: 19337 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:35:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 20:35:34 +0000 Subject: Change in osmocom-bb[master]: layer23/mobile: implement handling of TCH test loop commands In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19459 ) Change subject: layer23/mobile: implement handling of TCH test loop commands ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If8efc57c7017aa8ea47b37c472d1bbb1914389ca Gerrit-Change-Number: 19459 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 20:35:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:43:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 20:43:08 +0000 Subject: Change in libosmocore[master]: vty: Introduce support to set cpu-affinity and scheduler policy In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19442 ) Change subject: vty: Introduce support to set cpu-affinity and scheduler policy ...................................................................... Patch Set 4: (4 comments) https://gerrit.osmocom.org/c/libosmocore/+/19442/4/src/vty/sched_vty.c File src/vty/sched_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/19442/4/src/vty/sched_vty.c at 112 PS4, Line 112: parse_cpu_hex_mask might be a candidate for a unit test? (also the encoder) https://gerrit.osmocom.org/c/libosmocore/+/19442/4/src/vty/sched_vty.c at 259 PS4, Line 259: buf I think this still has the buffer overflow problem I mentioned in my review of the previous patch. rc could be sizeof(buf), and you're accessing buffer beyond its end. https://gerrit.osmocom.org/c/libosmocore/+/19442/4/src/vty/sched_vty.c at 353 PS4, Line 353: { : return -EINVAL; : } cosmetic: no curly braces needed https://gerrit.osmocom.org/c/libosmocore/+/19442/4/src/vty/sched_vty.c at 499 PS4, Line 499: sched sorry for noticing only now: I think this should be named 'cpu-sched' or the like. As GSM is a TDMA system, there may be all kinds of schedulers, and it would probably be best to clearly recognize this one. Not critical, but I think now is the time to fix it - after it's merged, we cannot touch naming. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If76a4bd2cc7b3c7adf5d84790a944d78be70e10a Gerrit-Change-Number: 19442 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jul 2020 20:43:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:43:51 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 20:43:51 +0000 Subject: Change in libosmocore[master]: tests: vty: Extend test to do some numeric range validations In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19456 ) Change subject: tests: vty: Extend test to do some numeric range validations ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id5b17bd96d7af4ed9a77ebbea0e6be4b0fcbde6c Gerrit-Change-Number: 19456 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 20:43:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:44:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 20:44:19 +0000 Subject: Change in libosmocore[master]: vty: Allow 64 bit values in numeric ranges if system supports it In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19457 ) Change subject: vty: Allow 64 bit values in numeric ranges if system supports it ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0afa0caabffe36083c36b92ba90696ded00bb7be Gerrit-Change-Number: 19457 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 20:44:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:44:39 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 30 Jul 2020 20:44:39 +0000 Subject: Change in libosmocore[master]: vty: Don't match negative values on purely positive ranges In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19424 ) Change subject: vty: Don't match negative values on purely positive ranges ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia95f6314a2dd3f94d21fc219cf69bb8d39b8e7f0 Gerrit-Change-Number: 19424 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 20:44:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:48:16 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 20:48:16 +0000 Subject: Change in osmocom-bb[master]: layer23/mobile: implement handling of TCH test loop commands In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19459 ) Change subject: layer23/mobile: implement handling of TCH test loop commands ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If8efc57c7017aa8ea47b37c472d1bbb1914389ca Gerrit-Change-Number: 19459 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 20:48:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 20:58:23 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 20:58:23 +0000 Subject: Change in libosmocore[master]: vty: Don't match negative values on purely positive ranges In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19424 ) Change subject: vty: Don't match negative values on purely positive ranges ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia95f6314a2dd3f94d21fc219cf69bb8d39b8e7f0 Gerrit-Change-Number: 19424 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 20:58:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:00:12 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 21:00:12 +0000 Subject: Change in libosmocore[master]: tests: vty: Extend test to do some numeric range validations In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19456 ) Change subject: tests: vty: Extend test to do some numeric range validations ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id5b17bd96d7af4ed9a77ebbea0e6be4b0fcbde6c Gerrit-Change-Number: 19456 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 21:00:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:00:30 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 21:00:30 +0000 Subject: Change in libosmocore[master]: vty: Allow 64 bit values in numeric ranges if system supports it In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19457 ) Change subject: vty: Allow 64 bit values in numeric ranges if system supports it ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0afa0caabffe36083c36b92ba90696ded00bb7be Gerrit-Change-Number: 19457 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 21:00:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:02:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 21:02:03 +0000 Subject: Change in libosmocore[master]: tests: vty: Extend test to do some numeric range validations In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19456 ) Change subject: tests: vty: Extend test to do some numeric range validations ...................................................................... tests: vty: Extend test to do some numeric range validations As per current status, the numeric tests are expected to fail due to a couple bugs which will be fixed in next commits. Change-Id: Id5b17bd96d7af4ed9a77ebbea0e6be4b0fcbde6c --- M tests/vty/vty_test.c M tests/vty/vty_test.ok 2 files changed, 40 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/vty/vty_test.c b/tests/vty/vty_test.c index 9627b6d..7146a1d 100644 --- a/tests/vty/vty_test.c +++ b/tests/vty/vty_test.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -438,6 +439,19 @@ return CMD_WARNING; } +DEFUN(cfg_numeric_range, cfg_numeric_range_cmd, +#if ULONG_MAX == 18446744073709551615UL + "numeric-range <0-18446744073709551615>", +#else + "numeric-range <0-4294967295>", +#endif + "testing numeric range\n" + "the numeric range\n") +{ + printf("Called: 'return-success'\n"); + return CMD_SUCCESS; +} + void test_vty_add_cmds() { install_element(CONFIG_NODE, &cfg_ret_warning_cmd); @@ -461,6 +475,8 @@ install_element_ve(&cfg_ambiguous_nr_2_cmd); install_element_ve(&cfg_ambiguous_str_1_cmd); install_element_ve(&cfg_ambiguous_str_2_cmd); + + install_element_ve(&cfg_numeric_range_cmd); } void test_is_cmd_ambiguous() @@ -482,6 +498,21 @@ destroy_test_vty(&test, vty); } +void test_numeric_range() +{ + struct vty *vty; + struct vty_test test; + + printf("Going to test test_numeric_range()\n"); + vty = create_test_vty(&test); + + OSMO_ASSERT(do_vty_command(vty, "numeric-range 0") == CMD_ERR_NO_MATCH); + OSMO_ASSERT(do_vty_command(vty, "numeric-range 40000") == CMD_ERR_NO_MATCH); + OSMO_ASSERT(do_vty_command(vty, "numeric-range -400000") == CMD_ERR_NO_MATCH); + + destroy_test_vty(&test, vty); +} + int main(int argc, char **argv) { struct vty_app_info vty_info = { @@ -535,6 +566,8 @@ test_is_cmd_ambiguous(); + test_numeric_range(); + /* Leak check */ OSMO_ASSERT(talloc_total_blocks(stats_ctx) == 1); diff --git a/tests/vty/vty_test.ok b/tests/vty/vty_test.ok index d2c9611..d81c6c7 100644 --- a/tests/vty/vty_test.ok +++ b/tests/vty/vty_test.ok @@ -311,4 +311,11 @@ Going to execute 'ambiguous_str arg keyword' Called: 'ambiguous_str ARG keyword' Returned: 0, Current node: 1 '%s> ' +Going to test test_numeric_range() +Going to execute 'numeric-range 0' +Returned: 2, Current node: 1 '%s> ' +Going to execute 'numeric-range 40000' +Returned: 2, Current node: 1 '%s> ' +Going to execute 'numeric-range -400000' +Returned: 2, Current node: 1 '%s> ' All tests passed -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id5b17bd96d7af4ed9a77ebbea0e6be4b0fcbde6c Gerrit-Change-Number: 19456 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:02:03 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 21:02:03 +0000 Subject: Change in libosmocore[master]: vty: Allow 64 bit values in numeric ranges if system supports it In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19457 ) Change subject: vty: Allow 64 bit values in numeric ranges if system supports it ...................................................................... vty: Allow 64 bit values in numeric ranges if system supports it This fixes commands not being matched due to providing a range with more than 10 digits. The last case (passing -4000 matching 0-ULONG_MAX) shows a different bug which will be fixed in next commit. Change-Id: I0afa0caabffe36083c36b92ba90696ded00bb7be --- M src/vty/command.c M tests/vty/vty_test.c M tests/vty/vty_test.ok 3 files changed, 31 insertions(+), 12 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/vty/command.c b/src/vty/command.c index 9b32d22..16dd07f 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -1262,12 +1263,27 @@ #endif /* HAVE_IPV6 */ -#define DECIMAL_STRLEN_MAX 10 + +#if ULONG_MAX == 18446744073709551615UL +#define DECIMAL_STRLEN_MAX_UNSIGNED 20 +#elif ULONG_MAX == 4294967295UL +#define DECIMAL_STRLEN_MAX_UNSIGNED 10 +#else +#error "ULONG_MAX not defined!" +#endif + +#if LONG_MAX == 9223372036854775807L +#define DECIMAL_STRLEN_MAX_SIGNED 19 +#elif LONG_MAX == 2147483647L +#define DECIMAL_STRLEN_MAX_SIGNED 10 +#else +#error "LONG_MAX not defined!" +#endif static int cmd_range_match(const char *range, const char *str) { char *p; - char buf[DECIMAL_STRLEN_MAX + 1]; + char buf[DECIMAL_STRLEN_MAX_UNSIGNED + 1]; char *endptr = NULL; if (str == NULL) @@ -1284,7 +1300,7 @@ p = strchr(range, '-'); if (p == NULL) return 0; - if (p - range > DECIMAL_STRLEN_MAX) + if (p - range > DECIMAL_STRLEN_MAX_SIGNED) return 0; strncpy(buf, range, p - range); buf[p - range] = '\0'; @@ -1296,7 +1312,7 @@ p = strchr(range, '>'); if (p == NULL) return 0; - if (p - range > DECIMAL_STRLEN_MAX) + if (p - range > DECIMAL_STRLEN_MAX_SIGNED) return 0; strncpy(buf, range, p - range); buf[p - range] = '\0'; @@ -1317,7 +1333,7 @@ p = strchr(range, '-'); if (p == NULL) return 0; - if (p - range > DECIMAL_STRLEN_MAX) + if (p - range > DECIMAL_STRLEN_MAX_UNSIGNED) return 0; strncpy(buf, range, p - range); buf[p - range] = '\0'; @@ -1329,7 +1345,7 @@ p = strchr(range, '>'); if (p == NULL) return 0; - if (p - range > DECIMAL_STRLEN_MAX) + if (p - range > DECIMAL_STRLEN_MAX_UNSIGNED) return 0; strncpy(buf, range, p - range); buf[p - range] = '\0'; diff --git a/tests/vty/vty_test.c b/tests/vty/vty_test.c index 7146a1d..a7aef11 100644 --- a/tests/vty/vty_test.c +++ b/tests/vty/vty_test.c @@ -506,9 +506,9 @@ printf("Going to test test_numeric_range()\n"); vty = create_test_vty(&test); - OSMO_ASSERT(do_vty_command(vty, "numeric-range 0") == CMD_ERR_NO_MATCH); - OSMO_ASSERT(do_vty_command(vty, "numeric-range 40000") == CMD_ERR_NO_MATCH); - OSMO_ASSERT(do_vty_command(vty, "numeric-range -400000") == CMD_ERR_NO_MATCH); + OSMO_ASSERT(do_vty_command(vty, "numeric-range 0") == CMD_SUCCESS); + OSMO_ASSERT(do_vty_command(vty, "numeric-range 40000") == CMD_SUCCESS); + OSMO_ASSERT(do_vty_command(vty, "numeric-range -400000") == CMD_SUCCESS); destroy_test_vty(&test, vty); } diff --git a/tests/vty/vty_test.ok b/tests/vty/vty_test.ok index d81c6c7..bac083d 100644 --- a/tests/vty/vty_test.ok +++ b/tests/vty/vty_test.ok @@ -313,9 +313,12 @@ Returned: 0, Current node: 1 '%s> ' Going to test test_numeric_range() Going to execute 'numeric-range 0' -Returned: 2, Current node: 1 '%s> ' +Called: 'return-success' +Returned: 0, Current node: 1 '%s> ' Going to execute 'numeric-range 40000' -Returned: 2, Current node: 1 '%s> ' +Called: 'return-success' +Returned: 0, Current node: 1 '%s> ' Going to execute 'numeric-range -400000' -Returned: 2, Current node: 1 '%s> ' +Called: 'return-success' +Returned: 0, Current node: 1 '%s> ' All tests passed -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0afa0caabffe36083c36b92ba90696ded00bb7be Gerrit-Change-Number: 19457 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:02:05 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 21:02:05 +0000 Subject: Change in libosmocore[master]: vty: Don't match negative values on purely positive ranges In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19424 ) Change subject: vty: Don't match negative values on purely positive ranges ...................................................................... vty: Don't match negative values on purely positive ranges Without this patch, for instance having a range 0-ULONG_MAX would match if someones types value -3, which would be converted to unsigned but that's clearly what is expected here from user point of view. Change-Id: Ia95f6314a2dd3f94d21fc219cf69bb8d39b8e7f0 --- M src/vty/command.c M tests/vty/vty_test.c M tests/vty/vty_test.ok 3 files changed, 5 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/vty/command.c b/src/vty/command.c index 16dd07f..278ceb5 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -1325,6 +1325,9 @@ } else { unsigned long min, max, val; + if (str[0] == '-') + return 0; + val = strtoul(str, &endptr, 10); if (*endptr != '\0') return 0; diff --git a/tests/vty/vty_test.c b/tests/vty/vty_test.c index a7aef11..b2d34ad 100644 --- a/tests/vty/vty_test.c +++ b/tests/vty/vty_test.c @@ -508,7 +508,7 @@ OSMO_ASSERT(do_vty_command(vty, "numeric-range 0") == CMD_SUCCESS); OSMO_ASSERT(do_vty_command(vty, "numeric-range 40000") == CMD_SUCCESS); - OSMO_ASSERT(do_vty_command(vty, "numeric-range -400000") == CMD_SUCCESS); + OSMO_ASSERT(do_vty_command(vty, "numeric-range -400000") == CMD_ERR_NO_MATCH); destroy_test_vty(&test, vty); } diff --git a/tests/vty/vty_test.ok b/tests/vty/vty_test.ok index bac083d..5f509f6 100644 --- a/tests/vty/vty_test.ok +++ b/tests/vty/vty_test.ok @@ -319,6 +319,5 @@ Called: 'return-success' Returned: 0, Current node: 1 '%s> ' Going to execute 'numeric-range -400000' -Called: 'return-success' -Returned: 0, Current node: 1 '%s> ' +Returned: 2, Current node: 1 '%s> ' All tests passed -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia95f6314a2dd3f94d21fc219cf69bb8d39b8e7f0 Gerrit-Change-Number: 19424 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:02:40 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 30 Jul 2020 21:02:40 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC ramping during whole BTS life cycle In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19376 ) Change subject: Introduce support for ACC ramping during whole BTS life cycle ...................................................................... Patch Set 4: ping -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id17f947c92cdfc0eb9541a9bf066338169caaeb5 Gerrit-Change-Number: 19376 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jul 2020 21:02:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:06:38 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 21:06:38 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC ramping during whole BTS life cycle In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19376 ) Change subject: Introduce support for ACC ramping during whole BTS life cycle ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id17f947c92cdfc0eb9541a9bf066338169caaeb5 Gerrit-Change-Number: 19376 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Jul 2020 21:06:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:23:35 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 21:23:35 +0000 Subject: Change in osmo-ccid-firmware[master]: Revert "WIP: enable timers" References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19467 ) Change subject: Revert "WIP: enable timers" ...................................................................... Revert "WIP: enable timers" This reverts commit 349a39fba5b22230bf1f2666a22b579bbb657eb4. Change-Id: If3a18dd1d52f877f3821435d420154c91f10374d --- M sysmoOCTSIM/cuart_driver_asf4_usart_async.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/67/19467/1 diff --git a/sysmoOCTSIM/cuart_driver_asf4_usart_async.c b/sysmoOCTSIM/cuart_driver_asf4_usart_async.c index 0e83385..87f5123 100644 --- a/sysmoOCTSIM/cuart_driver_asf4_usart_async.c +++ b/sysmoOCTSIM/cuart_driver_asf4_usart_async.c @@ -419,7 +419,7 @@ return 20e6 / ncn8025_div_val[settings.clkdiv]; break; default: - return 0; + return -EINVAL; } return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19467 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: If3a18dd1d52f877f3821435d420154c91f10374d Gerrit-Change-Number: 19467 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:23:35 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 21:23:35 +0000 Subject: Change in osmo-ccid-firmware[master]: handle card ejection during poweron/wait for ATR References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19468 ) Change subject: handle card ejection during poweron/wait for ATR ...................................................................... handle card ejection during poweron/wait for ATR Change-Id: Ied51af8f37ddad32e3d1464134c22ee4929c5f4e --- M ccid_common/iso7816_fsm.c 1 file changed, 26 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/68/19468/1 diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c index c76d97d..d5220fc 100644 --- a/ccid_common/iso7816_fsm.c +++ b/ccid_common/iso7816_fsm.c @@ -128,6 +128,17 @@ 0xf0, 0x70, 0xb0, 0x30, 0xd0, 0x50, 0x90, 0x10, 0xe0, 0x60, 0xa0, 0x20, 0xc0, 0x40, 0x80, 0x00, }; +struct atr_fsm_priv { + uint8_t hist_len; /*!< store the number of expected historical bytes */ + uint8_t y; /*!< last mask of the upcoming TA, TB, TC, TD interface bytes */ + uint8_t i; /*!< interface byte subgroup number */ + struct msgb *atr; /*!< ATR data */ + uint8_t computed_checksum; + uint16_t protocol_support; +}; + +static struct atr_fsm_priv *get_atr_fsm_priv(struct osmo_fsm_inst *fi); + /*********************************************************************** * ISO7816-3 Main FSM ***********************************************************************/ @@ -376,11 +387,15 @@ static void iso7816_3_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { OSMO_ASSERT(fi->fsm == &iso7816_3_fsm); + struct iso7816_3_priv *ip = get_iso7816_3_priv(fi); + struct atr_fsm_priv *atp = get_atr_fsm_priv(ip->atr_fi); switch (event) { case ISO7816_E_HW_ERR_IND: case ISO7816_E_CARD_REMOVAL: /* FIXME: power off? */ + if(fi->state == ISO7816_S_WAIT_ATR || fi->state == ISO7816_S_IN_ATR) + ip->user_cb(fi, ISO7816_E_ATR_ERR_IND, 0, atp->atr); osmo_fsm_inst_state_chg(fi, ISO7816_S_RESET, 0, 0); break; case ISO7816_E_POWER_DN_IND: @@ -541,14 +556,13 @@ * ATR FSM ***********************************************************************/ -struct atr_fsm_priv { - uint8_t hist_len; /*!< store the number of expected historical bytes */ - uint8_t y; /*!< last mask of the upcoming TA, TB, TC, TD interface bytes */ - uint8_t i; /*!< interface byte subgroup number */ - struct msgb *atr; /*!< ATR data */ - uint8_t computed_checksum; - uint16_t protocol_support; -}; +/* type-safe method to obtain atr_fsm_priv from fi */ +static struct atr_fsm_priv *get_atr_fsm_priv(struct osmo_fsm_inst *fi) +{ + OSMO_ASSERT(fi); + OSMO_ASSERT(fi->fsm == &atr_fsm); + return (struct atr_fsm_priv *) fi->priv; +} /* obtain the [software] guard time in milli-seconds from the atr fsm_inst */ static uint32_t atr_fi_gt_ms(struct osmo_fsm_inst *fi) @@ -579,7 +593,7 @@ /* append a single byte to the ATR */ static int atr_append_byte(struct osmo_fsm_inst *fi, uint8_t byte) { - struct atr_fsm_priv *atp = fi->priv; + struct atr_fsm_priv *atp = get_atr_fsm_priv(fi); if (!msgb_tailroom(atp->atr)) { LOGPFSML(fi, LOGL_ERROR, "ATR overflow !?!"); @@ -592,7 +606,7 @@ static void atr_wait_ts_onenter(struct osmo_fsm_inst *fi, uint32_t old_state) { - struct atr_fsm_priv *atp = fi->priv; + struct atr_fsm_priv *atp = get_atr_fsm_priv(fi); /* reset state to its initial value */ atp->hist_len = 0; @@ -608,7 +622,7 @@ static void atr_wait_ts_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct atr_fsm_priv *atp = fi->priv; + struct atr_fsm_priv *atp = get_atr_fsm_priv(fi); struct osmo_fsm_inst *parent_fi = fi->proc.parent; struct iso7816_3_priv *ip = get_iso7816_3_priv(parent_fi); uint8_t byte; @@ -654,7 +668,7 @@ static void atr_wait_tX_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct atr_fsm_priv *atp = fi->priv; + struct atr_fsm_priv *atp = get_atr_fsm_priv(fi); uint32_t guard_time_ms = atr_fi_gt_ms(fi); uint8_t byte; -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ied51af8f37ddad32e3d1464134c22ee4929c5f4e Gerrit-Change-Number: 19468 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:23:36 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 21:23:36 +0000 Subject: Change in osmo-ccid-firmware[master]: Revert "Revert "WIP: enable timers"" References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19469 ) Change subject: Revert "Revert "WIP: enable timers"" ...................................................................... Revert "Revert "WIP: enable timers"" Timers should work now This reverts commit 72c64d2a1634423ffe7356f67f71801280e68c3c. Change-Id: I2600a6c29688bd9270a69ffe764815937ad6f889 --- M sysmoOCTSIM/cuart_driver_asf4_usart_async.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/69/19469/1 diff --git a/sysmoOCTSIM/cuart_driver_asf4_usart_async.c b/sysmoOCTSIM/cuart_driver_asf4_usart_async.c index 87f5123..0e83385 100644 --- a/sysmoOCTSIM/cuart_driver_asf4_usart_async.c +++ b/sysmoOCTSIM/cuart_driver_asf4_usart_async.c @@ -419,7 +419,7 @@ return 20e6 / ncn8025_div_val[settings.clkdiv]; break; default: - return -EINVAL; + return 0; } return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I2600a6c29688bd9270a69ffe764815937ad6f889 Gerrit-Change-Number: 19469 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:23:36 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 21:23:36 +0000 Subject: Change in osmo-ccid-firmware[master]: ccid: handle timeouts References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19470 ) Change subject: ccid: handle timeouts ...................................................................... ccid: handle timeouts Empty trays caused a hang, because the timeout was not handled. This fixes this, and allows manual voltage selection by attempting slot powerup with different voltages after timeout until it succeeds. Change-Id: I4dfc8d6d0e25008765615d3c4149a75efc0ef44d --- M ccid_common/ccid_slot_fsm.c 1 file changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/70/19470/1 diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c index 747fef3..dc90a38 100644 --- a/ccid_common/ccid_slot_fsm.c +++ b/ccid_common/ccid_slot_fsm.c @@ -122,6 +122,7 @@ case ISO7816_E_TPDU_FAILED_IND: case ISO7816_E_PPS_DONE_IND: case ISO7816_E_PPS_FAILED_IND: + case ISO7816_E_WTIME_EXP: cs->event_data = data; #ifdef OCTSIMFWBUILD asm volatile("dmb st": : :"memory"); @@ -143,10 +144,25 @@ if(!event) return 0; - if(event && !data) - return 0; +// if(event && !data) +// return 0; switch (event) { + case ISO7816_E_WTIME_EXP: + tpdu = data; + LOGPCS(cs, LOGL_DEBUG, "%s(event=%d, data=0)\n", __func__, event); + + + /* perform deactivation */ + card_uart_ctrl(ss->cuart, CUART_CTL_RST, true); + card_uart_ctrl(ss->cuart, CUART_CTL_POWER, false); + cs->icc_powered = false; + + + resp = ccid_gen_data_block(cs, ss->seq, CCID_CMD_STATUS_FAILED, CCID_ERR_ICC_MUTE, 0, 0); + ccid_slot_send_unbusy(cs, resp); + cs->event = 0; + break; case ISO7816_E_ATR_DONE_IND: tpdu = data; LOGPCS(cs, LOGL_DEBUG, "%s(event=%d, data=%s)\n", __func__, event, -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I4dfc8d6d0e25008765615d3c4149a75efc0ef44d Gerrit-Change-Number: 19470 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:23:36 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 21:23:36 +0000 Subject: Change in osmo-ccid-firmware[master]: ccid: support warm reset References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19471 ) Change subject: ccid: support warm reset ...................................................................... ccid: support warm reset Change-Id: I4b0a119afcb37edb1d30badc85834165883a12b5 --- M ccid_common/ccid_slot_fsm.c 1 file changed, 26 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/71/19471/1 diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c index dc90a38..13d1139 100644 --- a/ccid_common/ccid_slot_fsm.c +++ b/ccid_common/ccid_slot_fsm.c @@ -91,22 +91,33 @@ ss->seq = ipo->hdr.bSeq; LOGPCS(cs, LOGL_DEBUG, "scheduling power-up\n"); - /* FIXME: do this via a FSM? */ - card_uart_ctrl(ss->cuart, CUART_CTL_RST, true); - osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_RESET_ACT_IND, NULL); - card_uart_ctrl(ss->cuart, CUART_CTL_POWER, true); - osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_POWER_UP_IND, NULL); - cs->icc_powered = true; - card_uart_ctrl(ss->cuart, CUART_CTL_CLOCK, true); -#ifdef OCTSIMFWBUILD - delay_us(10000); -#else - usleep(10000); -#endif + if (! cs->icc_powered) { + /* FIXME: do this via a FSM? */ + card_uart_ctrl(ss->cuart, CUART_CTL_RST, true); + osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_RESET_ACT_IND, NULL); + card_uart_ctrl(ss->cuart, CUART_CTL_POWER, true); + osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_POWER_UP_IND, NULL); + cs->icc_powered = true; + card_uart_ctrl(ss->cuart, CUART_CTL_CLOCK, true); + #ifdef OCTSIMFWBUILD + delay_us(10000); + #else + usleep(10000); + #endif - osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_RESET_REL_IND, NULL); - card_uart_ctrl(ss->cuart, CUART_CTL_RST, false); - + osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_RESET_REL_IND, NULL); + card_uart_ctrl(ss->cuart, CUART_CTL_RST, false); + } else { /* warm reset */ + card_uart_ctrl(ss->cuart, CUART_CTL_RST, true); + osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_RESET_ACT_IND, NULL); + #ifdef OCTSIMFWBUILD + delay_us(10000); + #else + usleep(10000); + #endif + osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_RESET_REL_IND, NULL); + card_uart_ctrl(ss->cuart, CUART_CTL_RST, false); + } msgb_free(msg); /* continues in iso_fsm_clot_user_cb once ATR is received */ } -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I4b0a119afcb37edb1d30badc85834165883a12b5 Gerrit-Change-Number: 19471 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:23:36 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 21:23:36 +0000 Subject: Change in osmo-ccid-firmware[master]: relax the timeouts References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19472 ) Change subject: relax the timeouts ...................................................................... relax the timeouts High baud rates lead to incredibly small wait times that are infeasible as long as software timers are being used, but this is not really a problem - they can just be increased to a reasonable value. At the end of the day the timers need to take the latency of the firmware into account, and timeouts only occur on powerup with wrong voltages/dead cards, or in rare error cases. The actual timeout value does therefore not really matter that much. Change-Id: Icb733f2d46f45c1a7dcd2abe6bc292bd41d6b9c2 --- M ccid_common/cuart.c 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/72/19472/1 diff --git a/ccid_common/cuart.c b/ccid_common/cuart.c index 1d777f9..7094a86 100644 --- a/ccid_common/cuart.c +++ b/ccid_common/cuart.c @@ -52,9 +52,16 @@ if(!cuart->current_wtime_byte) return; + int etu_in_us = get_etu_in_us(cuart) + 1; + cuart->wtime_etu = cuart->wtime_etu ? cuart->wtime_etu : 1; + /* timemout is wtime * ETU + expected number of bytes * (12ETU+1 slack)ETU */ - usecs = get_etu_in_us(cuart) * cuart->wtime_etu + - get_etu_in_us(cuart) * cuart->current_wtime_byte * (12+1); + usecs = etu_in_us * cuart->wtime_etu + + etu_in_us * cuart->current_wtime_byte * (12+1); + + /* limit lower wait time to reasonable value */ + usecs = usecs < 300000 ? 300000 : usecs; + if (usecs > 1000000) { secs = usecs / 1000000; usecs = usecs % 1000000; -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Icb733f2d46f45c1a7dcd2abe6bc292bd41d6b9c2 Gerrit-Change-Number: 19472 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:23:37 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 21:23:37 +0000 Subject: Change in osmo-ccid-firmware[master]: proper card powerup handling References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19473 ) Change subject: proper card powerup handling ...................................................................... proper card powerup handling Now that the timers work as intended other voltages (that lead to timeouts) may be used. Change-Id: I6105ce7f827aaec8ac36b940766fe05d47145edb --- M ccid_common/ccid_slot_fsm.c M ccid_common/cuart.h M sysmoOCTSIM/cuart_driver_asf4_usart_async.c 3 files changed, 36 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/73/19473/1 diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c index 13d1139..6b5ab6e 100644 --- a/ccid_common/ccid_slot_fsm.c +++ b/ccid_common/ccid_slot_fsm.c @@ -77,7 +77,7 @@ if (!present) { osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_CARD_REMOVAL, NULL); card_uart_ctrl(ss->cuart, CUART_CTL_RST, true); - card_uart_ctrl(ss->cuart, CUART_CTL_POWER, false); + card_uart_ctrl(ss->cuart, CUART_CTL_POWER_5V0, false); cs->icc_powered = false; cs->cmd_busy = false; } @@ -87,15 +87,24 @@ const struct ccid_pc_to_rdr_icc_power_on *ipo) { struct iso_fsm_slot *ss = ccid_slot2iso_fsm_slot(cs); + enum ccid_power_select pwrsel = ipo->bPowerSelect; + enum card_uart_ctl cctl; ss->seq = ipo->hdr.bSeq; LOGPCS(cs, LOGL_DEBUG, "scheduling power-up\n"); + switch (pwrsel) { + case CCID_PWRSEL_5V0: cctl = CUART_CTL_POWER_5V0; break; + case CCID_PWRSEL_3V0: cctl = CUART_CTL_POWER_3V0; break; + case CCID_PWRSEL_1V8: cctl = CUART_CTL_POWER_1V8; break; + default: cctl = CUART_CTL_POWER_5V0; + } + if (! cs->icc_powered) { /* FIXME: do this via a FSM? */ card_uart_ctrl(ss->cuart, CUART_CTL_RST, true); osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_RESET_ACT_IND, NULL); - card_uart_ctrl(ss->cuart, CUART_CTL_POWER, true); + card_uart_ctrl(ss->cuart, cctl, true); osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_POWER_UP_IND, NULL); cs->icc_powered = true; card_uart_ctrl(ss->cuart, CUART_CTL_CLOCK, true); @@ -166,7 +175,7 @@ /* perform deactivation */ card_uart_ctrl(ss->cuart, CUART_CTL_RST, true); - card_uart_ctrl(ss->cuart, CUART_CTL_POWER, false); + card_uart_ctrl(ss->cuart, CUART_CTL_POWER_5V0, false); cs->icc_powered = false; @@ -285,10 +294,10 @@ struct iso_fsm_slot *ss = ccid_slot2iso_fsm_slot(cs); if (enable) { - card_uart_ctrl(ss->cuart, CUART_CTL_POWER, true); + card_uart_ctrl(ss->cuart, CUART_CTL_POWER_5V0, true); cs->icc_powered = true; } else { - card_uart_ctrl(ss->cuart, CUART_CTL_POWER, false); + card_uart_ctrl(ss->cuart, CUART_CTL_POWER_5V0, false); cs->icc_powered = false; } } diff --git a/ccid_common/cuart.h b/ccid_common/cuart.h index 1df0c49..6f8ba70 100644 --- a/ccid_common/cuart.h +++ b/ccid_common/cuart.h @@ -25,7 +25,9 @@ CUART_CTL_RX, /* enable/disable receiver */ CUART_CTL_RX_TIMER_HINT, /* tell cuart approximate number of rx bytes */ CUART_CTL_NO_RXTX, /* enable/disable receiver */ - CUART_CTL_POWER, /* enable/disable ICC power */ + CUART_CTL_POWER_5V0, + CUART_CTL_POWER_3V0, + CUART_CTL_POWER_1V8, CUART_CTL_CLOCK, /* enable/disable ICC clock */ CUART_CTL_SET_CLOCK_FREQ, /* set ICC clock frequency (hz)*/ CUART_CTL_RST, /* enable/disable ICC reset */ diff --git a/sysmoOCTSIM/cuart_driver_asf4_usart_async.c b/sysmoOCTSIM/cuart_driver_asf4_usart_async.c index 0e83385..89cd734 100644 --- a/sysmoOCTSIM/cuart_driver_asf4_usart_async.c +++ b/sysmoOCTSIM/cuart_driver_asf4_usart_async.c @@ -373,15 +373,32 @@ settings.rstin = arg ? true : false; ncn8025_set(cuart->u.asf4.slot_nr, &settings); usart_async_flush_rx_buffer(cuart->u.asf4.usa_pd); + + /* reset everything, card reset resets pps params */ + if (arg) + slot_set_isorate(cuart, SIM_CLKDIV_8, ISO7816_3_DEFAULT_FD, ISO7816_3_DEFAULT_DD); + break; - case CUART_CTL_POWER: + + case CUART_CTL_POWER_5V0: + case CUART_CTL_POWER_3V0: + case CUART_CTL_POWER_1V8: /* reset everything */ slot_set_isorate(cuart, SIM_CLKDIV_8, ISO7816_3_DEFAULT_FD, ISO7816_3_DEFAULT_DD); + + enum ncn8025_sim_voltage v = CUART_CTL_POWER_5V0; + switch (ctl) { + case CUART_CTL_POWER_5V0: v = SIM_VOLT_5V0; break; + case CUART_CTL_POWER_3V0: v = SIM_VOLT_3V0; break; + case CUART_CTL_POWER_1V8: v = SIM_VOLT_1V8; break; + default: break; + } + ncn8025_get(cuart->u.asf4.slot_nr, &settings); settings.cmdvcc = arg ? true : false; settings.led = arg ? true : false; - settings.vsel = SIM_VOLT_5V0; + settings.vsel = v; ncn8025_set(cuart->u.asf4.slot_nr, &settings); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I6105ce7f827aaec8ac36b940766fe05d47145edb Gerrit-Change-Number: 19473 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:32:28 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 21:32:28 +0000 Subject: Change in osmo-ccid-firmware[master]: WIP: enable timers In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17122 to look at the new patch set (#3). Change subject: WIP: enable timers ...................................................................... WIP: enable timers Timers are currently broken due to the wrong return value, and they are completely untested due to the octsims broken sim emu feature. Change-Id: Ib96fc5b5172c9ab9870c33545702368526d5a835 --- M sysmoOCTSIM/cuart_driver_asf4_usart_async.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/22/17122/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ib96fc5b5172c9ab9870c33545702368526d5a835 Gerrit-Change-Number: 17122 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:32:28 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 21:32:28 +0000 Subject: Change in osmo-ccid-firmware[master]: Revert "WIP: enable timers" In-Reply-To: References: Message-ID: Hoernchen has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19467 ) Change subject: Revert "WIP: enable timers" ...................................................................... Revert "WIP: enable timers" This reverts commit 349a39fba5b22230bf1f2666a22b579bbb657eb4. Change-Id: If3a18dd1d52f877f3821435d420154c91f10374d --- M sysmoOCTSIM/cuart_driver_asf4_usart_async.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/67/19467/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19467 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: If3a18dd1d52f877f3821435d420154c91f10374d Gerrit-Change-Number: 19467 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:32:28 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 21:32:28 +0000 Subject: Change in osmo-ccid-firmware[master]: handle card ejection during poweron/wait for ATR In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19468 to look at the new patch set (#3). Change subject: handle card ejection during poweron/wait for ATR ...................................................................... handle card ejection during poweron/wait for ATR Change-Id: Ied51af8f37ddad32e3d1464134c22ee4929c5f4e --- M ccid_common/iso7816_fsm.c 1 file changed, 26 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/68/19468/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ied51af8f37ddad32e3d1464134c22ee4929c5f4e Gerrit-Change-Number: 19468 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:32:28 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 21:32:28 +0000 Subject: Change in osmo-ccid-firmware[master]: Revert "Revert "WIP: enable timers"" In-Reply-To: References: Message-ID: Hoernchen has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19469 ) Change subject: Revert "Revert "WIP: enable timers"" ...................................................................... Revert "Revert "WIP: enable timers"" Timers should work now This reverts commit 72c64d2a1634423ffe7356f67f71801280e68c3c. Change-Id: I2600a6c29688bd9270a69ffe764815937ad6f889 --- M sysmoOCTSIM/cuart_driver_asf4_usart_async.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/69/19469/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I2600a6c29688bd9270a69ffe764815937ad6f889 Gerrit-Change-Number: 19469 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:32:28 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 21:32:28 +0000 Subject: Change in osmo-ccid-firmware[master]: ccid: handle timeouts In-Reply-To: References: Message-ID: Hoernchen has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19470 ) Change subject: ccid: handle timeouts ...................................................................... ccid: handle timeouts Empty trays caused a hang, because the timeout was not handled. This fixes this, and allows manual voltage selection by attempting slot powerup with different voltages after timeout until it succeeds. Change-Id: I4dfc8d6d0e25008765615d3c4149a75efc0ef44d --- M ccid_common/ccid_slot_fsm.c 1 file changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/70/19470/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I4dfc8d6d0e25008765615d3c4149a75efc0ef44d Gerrit-Change-Number: 19470 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:32:28 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 21:32:28 +0000 Subject: Change in osmo-ccid-firmware[master]: ccid: support warm reset In-Reply-To: References: Message-ID: Hoernchen has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19471 ) Change subject: ccid: support warm reset ...................................................................... ccid: support warm reset Change-Id: I4b0a119afcb37edb1d30badc85834165883a12b5 --- M ccid_common/ccid_slot_fsm.c 1 file changed, 26 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/71/19471/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I4b0a119afcb37edb1d30badc85834165883a12b5 Gerrit-Change-Number: 19471 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:32:28 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 21:32:28 +0000 Subject: Change in osmo-ccid-firmware[master]: relax the timeouts In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19472 to look at the new patch set (#3). Change subject: relax the timeouts ...................................................................... relax the timeouts High baud rates lead to incredibly small wait times that are infeasible as long as software timers are being used, but this is not really a problem - they can just be increased to a reasonable value. At the end of the day the timers need to take the latency of the firmware into account, and timeouts only occur on powerup with wrong voltages/dead cards, or in rare error cases. The actual timeout value does therefore not really matter that much. Change-Id: Icb733f2d46f45c1a7dcd2abe6bc292bd41d6b9c2 --- M ccid_common/cuart.c 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/72/19472/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Icb733f2d46f45c1a7dcd2abe6bc292bd41d6b9c2 Gerrit-Change-Number: 19472 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:32:28 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 30 Jul 2020 21:32:28 +0000 Subject: Change in osmo-ccid-firmware[master]: proper card powerup handling In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19473 to look at the new patch set (#3). Change subject: proper card powerup handling ...................................................................... proper card powerup handling Now that the timers work as intended other voltages (that lead to timeouts) may be used. Change-Id: I6105ce7f827aaec8ac36b940766fe05d47145edb --- M ccid_common/ccid_slot_fsm.c M ccid_common/cuart.h M sysmoOCTSIM/cuart_driver_asf4_usart_async.c 3 files changed, 36 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/73/19473/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I6105ce7f827aaec8ac36b940766fe05d47145edb Gerrit-Change-Number: 19473 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:36:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 30 Jul 2020 21:36:29 +0000 Subject: Change in osmocom-bb[master]: firmware: add possibility to configure TCH loops in the DSP In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19458 ) Change subject: firmware: add possibility to configure TCH loops in the DSP ...................................................................... Patch Set 1: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ide7b0527ad64a044977a10da4a82a8ecd1fbd8dc Gerrit-Change-Number: 19458 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 21:36:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 21:39:03 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 30 Jul 2020 21:39:03 +0000 Subject: Change in osmocom-bb[master]: firmware: add possibility to configure TCH loops in the DSP In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19458 ) Change subject: firmware: add possibility to configure TCH loops in the DSP ...................................................................... Patch Set 1: Verified+1 I have no possibility to test against an MS tester (because I don't have one), but on the burst level it behaves in a similar way as a regular phone with a special "test" SIM does. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ide7b0527ad64a044977a10da4a82a8ecd1fbd8dc Gerrit-Change-Number: 19458 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 30 Jul 2020 21:39:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Jul 30 22:07:44 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 30 Jul 2020 22:07:44 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: do not enable CBCH slots by default References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/19474 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: do not enable CBCH slots by default ...................................................................... ttcn3-bts-test/osmo-bsc.cfg: do not enable CBCH slots by default As it turns out, test cases from BTS_Tests_SMSCB configure the CBCH slots "on the fly" depending on the test case parameters. This configuration also makes some test cases fail, so let's (re)configure SDCCH8+CBCH timeslots to SDCCH8. Change-Id: I3699450542dc1350971fbf87ad60a330428dec27 --- M ttcn3-bts-test/osmo-bsc.cfg 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/74/19474/1 diff --git a/ttcn3-bts-test/osmo-bsc.cfg b/ttcn3-bts-test/osmo-bsc.cfg index f1d2315..3978548 100644 --- a/ttcn3-bts-test/osmo-bsc.cfg +++ b/ttcn3-bts-test/osmo-bsc.cfg @@ -151,7 +151,7 @@ phys_chan_config TCH/F hopping enabled 0 timeslot 1 - phys_chan_config SDCCH8+CBCH + phys_chan_config SDCCH8 hopping enabled 0 timeslot 2 phys_chan_config PDCH @@ -184,7 +184,7 @@ phys_chan_config PDCH hopping enabled 0 timeslot 2 - phys_chan_config SDCCH8+CBCH + phys_chan_config SDCCH8 hopping enabled 0 timeslot 3 phys_chan_config PDCH @@ -217,7 +217,7 @@ phys_chan_config TCH/H hopping enabled 0 timeslot 3 - phys_chan_config SDCCH8+CBCH + phys_chan_config SDCCH8 hopping enabled 0 timeslot 4 phys_chan_config PDCH -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3699450542dc1350971fbf87ad60a330428dec27 Gerrit-Change-Number: 19474 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Jul 30 22:10:43 2020 From: admin at opensuse.org (OBS Notification) Date: Thu, 30 Jul 2020 22:10:43 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f234576950d0_67502ac3bb5765f830426b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 158s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 158s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 158s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 158s] | | [ 158s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 158s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 158s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 158s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 158s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 158s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 158s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 159s] cc1: all warnings being treated as errors [ 159s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 159s] make[3]: *** Waiting for unfinished jobs.... [ 159s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 159s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 159s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 159s] make[1]: *** [Makefile:166: all] Error 2 [ 159s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 159s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 159s] make: *** [debian/rules:9: build] Error 25 [ 159s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 159s] ### VM INTERACTION START ### [ 162s] [ 139.324074] sysrq: SysRq : Power Off [ 162s] [ 139.329733] reboot: Power down [ 162s] ### VM INTERACTION END ### [ 162s] [ 162s] cloud121 failed "build ulfius_2.5.2-4.1.dsc" at Thu Jul 30 22:10:36 UTC 2020. [ 162s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Jul 31 00:13:41 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 31 Jul 2020 00:13:41 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: do not enable CBCH slots by default In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19474 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: do not enable CBCH slots by default ...................................................................... Patch Set 1: Verified+1 Tested, makes all CBCH test cases pass. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3699450542dc1350971fbf87ad60a330428dec27 Gerrit-Change-Number: 19474 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 00:13:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 00:14:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 31 Jul 2020 00:14:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests/SMSCB: improve SDCCH8+CBCH handling and configuration References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19475 ) Change subject: BTS_Tests/SMSCB: improve SDCCH8+CBCH handling and configuration ...................................................................... BTS_Tests/SMSCB: improve SDCCH8+CBCH handling and configuration Change-Id: I130a028df7dc476ab765733261a1f007f19f39a8 --- M bts/BTS_Tests_SMSCB.ttcn 1 file changed, 62 insertions(+), 60 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/19475/1 diff --git a/bts/BTS_Tests_SMSCB.ttcn b/bts/BTS_Tests_SMSCB.ttcn index 1e17703..11855bf 100644 --- a/bts/BTS_Tests_SMSCB.ttcn +++ b/bts/BTS_Tests_SMSCB.ttcn @@ -54,8 +54,8 @@ /* CBCH test parameters for most of our tests */ type record CbchTestPars { - /* should we execute on SDCCH4 (true) or SDCCH8 (false) ? */ - boolean use_sdcch4, + /* Should we execute on SDCCH4 or SDCCH8? */ + RslChannelNr chan_nr, /* Parameters for BASIC CBCH */ CbchTestParsChan basic, /* Parameters for EXTENDED CBCH */ @@ -195,29 +195,51 @@ } } -private function f_vty_cbch_setup(boolean use_sdcch4 := true) runs on test_CT { +private function f_vty_cbch_setup(in RslChannelNr chan_nr) runs on test_CT { - if (use_sdcch4 == true) { - f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 0"}, + if (match(chan_nr, t_RslChanNr_CBCH4(0))) { + f_vty_config2(BSCVTY, { "network", "bts 0", "trx 0", "timeslot 0"}, "phys_chan_config CCCH+SDCCH4+CBCH"); - f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 6"}, - "phys_chan_config SDCCH8"); - } else { - f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 0"}, + /* (Re)configure timeslots 1..3 as TCH/F */ + for (var integer tn := 1; tn <= 3; tn := tn + 1) { + f_vty_config2(BSCVTY, { "network", "bts 0", "trx 0", + "timeslot " & int2str(tn) }, + "phys_chan_config TCH/F"); + } + } else if (match(chan_nr, t_RslChanNr_CBCH8(?))) { + f_vty_config2(BSCVTY, { "network", "bts 0", "trx 0", "timeslot 0"}, "phys_chan_config CCCH+SDCCH4"); - f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 6"}, + f_vty_config2(BSCVTY, { "network", "bts 0", "trx 0", + "timeslot " & int2str(chan_nr.tn) }, "phys_chan_config SDCCH8+CBCH"); + + /* (Re)configure timeslots 1..3 (excluding the given one) as TCH/F */ + for (var integer tn := 1; tn <= 3; tn := tn + 1) { + if (tn == chan_nr.tn) + { continue; } + f_vty_config2(BSCVTY, { "network", "bts 0", "trx 0", + "timeslot " & int2str(tn) }, + "phys_chan_config TCH/F"); + } } f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); f_sleep(2.0); } private function f_smscb_setup(inout CbchTestPars pars) runs on test_CT { + /* Make sure we've got either SDCCH4+CBCH or SDCCH8+CBCH. + * SDCCH4+CBCH can only be allocated on TS0, SDCCH8+CBCH on TS0..3. + * On C0 the first timeslot shall always transmit BCCH, thus TS1..3.*/ + if (not match(pars.chan_nr, (t_RslChanNr_CBCH4(0), t_RslChanNr_CBCH8(1), + t_RslChanNr_CBCH8(2), t_RslChanNr_CBCH8(3)))) { + setverdict(inconc, "Unhandled channel number: ", pars.chan_nr); + mtc.stop; + } f_cbch_compute_exp_blocks(pars); f_init_vty_bsc(); /* ensure that a CBCH is present in channel combination */ - f_vty_cbch_setup(pars.use_sdcch4); + f_vty_cbch_setup(pars.chan_nr); f_init(); f_init_l1ctl(); @@ -231,14 +253,6 @@ } } -private function f_smscb_cleanup() runs on test_CT { - /* reset timeslot 0 channel combination to default */ - f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 0"}, - "phys_chan_config CCCH+SDCCH4"); - f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 6"}, - "phys_chan_config SDCCH8"); -} - /* construct a receive/match template for given block_nr in given msg */ private function f_get_block_template(CbchTestMsg msg, integer block_nr) return template CBCH_Block { var template CBCH_Block tr; @@ -326,17 +340,8 @@ } } -private function t_cbch_chan_nr(CbchTestPars pars, template uint8_t tn) return template RslChannelNr { - if (pars.use_sdcch4) { - return t_RslChanNr_CBCH4(tn); - } else { - return t_RslChanNr_CBCH8(tn); - } -} - /* shared function doing the heavy lifting for most CBCH tests */ private function f_TC_smscb(CbchTestPars pars) runs on test_CT { - var template RslChannelNr t_chan_nr := t_cbch_chan_nr(pars, 0); /* FIXME: TS number */ var L1ctlDlMessage dl; var integer msg_count; timer T; @@ -358,7 +363,7 @@ T.start(5.0 + 3.0 * int2float(msg_count)); /* Expect this to show up exactly once on the basic CBCH (four blocks) */ alt { - [] L1CTL.receive(tr_L1CTL_DATA_IND(t_chan_nr)) -> value dl { + [] L1CTL.receive(tr_L1CTL_DATA_IND(pars.chan_nr)) -> value dl { var integer tb := f_cbch_fn2tb(dl.dl_info.frame_nr); var CBCH_Block cb := dec_CBCH_Block(dl.payload.data_ind.payload); log("Tb=", tb, ", CBCH: ", dl, ", block: ", cb); @@ -386,12 +391,10 @@ } } - f_smscb_cleanup(); Misc_Helpers.f_shutdown(__BFILE__, __LINE__, pass); } private function f_TC_smscb_default_only(CbchTestPars pars) runs on test_CT { - var template RslChannelNr t_chan_nr := t_cbch_chan_nr(pars, 0); /* FIXME: TS number */ var L1ctlDlMessage dl; timer T := 5.0; @@ -403,7 +406,7 @@ T.start; alt { - [] L1CTL.receive(tr_L1CTL_DATA_IND(t_chan_nr)) -> value dl { + [] L1CTL.receive(tr_L1CTL_DATA_IND(pars.chan_nr)) -> value dl { var integer tb := f_cbch_fn2tb(dl.dl_info.frame_nr); log("CBCH: ", dl); var CBCH_Block cb := dec_CBCH_Block(dl.payload.data_ind.payload); @@ -436,7 +439,6 @@ [] T.timeout {} } - f_smscb_cleanup(); /* don't shut down; some tests still want to continue */ } @@ -505,7 +507,7 @@ /* transmit single-block SMSCB COMMAND */ testcase TC_sms_cb_cmd_sdcch4_1block() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_1b_norm)), extended := omit }; @@ -513,7 +515,7 @@ } testcase TC_sms_cb_cmd_sdcch8_1block() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := false, + chan_nr := valueof(ts_RslChanNr_CBCH8(2)), basic := valueof(t_CbchPC(msgs_1m_1b_norm)), extended := omit }; @@ -523,7 +525,7 @@ /* transmit dual-block SMSCB COMMAND */ testcase TC_sms_cb_cmd_sdcch4_2block() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_2b_norm)), extended := omit }; @@ -531,7 +533,7 @@ } testcase TC_sms_cb_cmd_sdcch8_2block() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := false, + chan_nr := valueof(ts_RslChanNr_CBCH8(2)), basic := valueof(t_CbchPC(msgs_1m_2b_norm)), extended := omit }; @@ -541,7 +543,7 @@ /* transmit triple-block SMSCB COMMAND */ testcase TC_sms_cb_cmd_sdcch4_3block() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_3b_norm)), extended := omit }; @@ -549,7 +551,7 @@ } testcase TC_sms_cb_cmd_sdcch8_3block() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := false, + chan_nr := valueof(ts_RslChanNr_CBCH8(2)), basic := valueof(t_CbchPC(msgs_1m_3b_norm)), extended := omit }; @@ -559,7 +561,7 @@ /* transmit quad-block SMSCB COMMAND */ testcase TC_sms_cb_cmd_sdcch4_4block() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_4b_norm)), extended := omit }; @@ -567,7 +569,7 @@ } testcase TC_sms_cb_cmd_sdcch8_4block() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := false, + chan_nr := valueof(ts_RslChanNr_CBCH8(2)), basic := valueof(t_CbchPC(msgs_1m_4b_norm)), extended := omit }; @@ -577,7 +579,7 @@ /* transmit multiple commands of each 4 blocks */ testcase TC_sms_cb_cmd_sdcch4_multi() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_3m_4b_norm)), extended := omit }; @@ -585,7 +587,7 @@ } testcase TC_sms_cb_cmd_sdcch8_multi() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := false, + chan_nr := valueof(ts_RslChanNr_CBCH8(2)), basic := valueof(t_CbchPC(msgs_3m_4b_norm)), extended := omit }; @@ -595,7 +597,7 @@ /* transmit multiple commands of each 4 blocks on CBCH EXTD */ testcase TC_sms_cb_cmd_sdcch4_extd_multi() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC({})), extended := valueof(t_CbchPC(msgs_3m_4b_norm)) }; @@ -603,7 +605,7 @@ } testcase TC_sms_cb_cmd_sdcch8_extd_multi() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := false, + chan_nr := valueof(ts_RslChanNr_CBCH8(2)), basic := valueof(t_CbchPC({})), extended := valueof(t_CbchPC(msgs_3m_4b_norm)) }; @@ -613,7 +615,7 @@ /* transmit SMSCB COMMAND with SCHEDULE payload */ testcase TC_sms_cb_cmd_sdcch4_schedule() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_4b_sched)), extended := omit }; @@ -621,7 +623,7 @@ } testcase TC_sms_cb_cmd_sdcch8_schedule() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := false, + chan_nr := valueof(ts_RslChanNr_CBCH8(2)), basic := valueof(t_CbchPC(msgs_1m_4b_sched)), extended := omit }; @@ -631,7 +633,7 @@ /* set a DEFAULT message; verify it gets transmitted all the time */ testcase TC_sms_cb_cmd_sdcch4_default_only() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_3b_default)), extended := omit }; @@ -640,7 +642,7 @@ } testcase TC_sms_cb_cmd_sdcch8_default_only() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_3b_default)), extended := omit }; @@ -650,7 +652,7 @@ testcase TC_sms_cb_cmd_sdcch4_default_and_normal() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_3b_norm, msg_default)), extended := omit }; @@ -658,7 +660,7 @@ } testcase TC_sms_cb_cmd_sdcch8_default_and_normal() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH8(2)), basic := valueof(t_CbchPC(msgs_1m_3b_norm, msg_default)), extended := omit }; @@ -668,7 +670,7 @@ /* first set a DEFAULT message, then disable it again */ testcase TC_sms_cb_cmd_sdcch4_default_then_null() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_3b_default)), extended := omit }; @@ -772,17 +774,17 @@ } } } - f_smscb_cleanup(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } testcase TC_cbc_sdcch4_load_idle() runs on test_CT { f_init_vty_bsc(); - f_vty_cbch_setup(use_sdcch4 := true); + f_vty_cbch_setup(valueof(ts_RslChanNr_CBCH4(0))); f_TC_cbc_load_idle(); } testcase TC_cbc_sdcch8_load_idle() runs on test_CT { f_init_vty_bsc(); - f_vty_cbch_setup(use_sdcch4 := false); + f_vty_cbch_setup(valueof(ts_RslChanNr_CBCH8(2))); f_TC_cbc_load_idle(); } @@ -853,29 +855,29 @@ } } } - f_smscb_cleanup(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } testcase TC_cbc_sdcch4_load_overload() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_3b_norm)), extended := omit }; f_init_vty_bsc(); - f_vty_cbch_setup(use_sdcch4 := true); + f_vty_cbch_setup(pars.chan_nr); f_TC_cbc_load_overload(pars); } testcase TC_cbc_sdcch8_load_overload() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(2)), basic := valueof(t_CbchPC(msgs_1m_3b_norm)), extended := omit }; f_init_vty_bsc(); - f_vty_cbch_setup(use_sdcch4 := true); + f_vty_cbch_setup(pars.chan_nr); f_TC_cbc_load_overload(pars); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I130a028df7dc476ab765733261a1f007f19f39a8 Gerrit-Change-Number: 19475 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 00:14:29 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 31 Jul 2020 00:14:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests/SMSCB: establish a dedicated channel in f_smscb_setup() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476 ) Change subject: BTS_Tests/SMSCB: establish a dedicated channel in f_smscb_setup() ...................................................................... BTS_Tests/SMSCB: establish a dedicated channel in f_smscb_setup() Change-Id: I3f061a4d48209b1aa5eaea2fd05fc4752de0c70f --- M bts/BTS_Tests_SMSCB.ttcn 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/19476/1 diff --git a/bts/BTS_Tests_SMSCB.ttcn b/bts/BTS_Tests_SMSCB.ttcn index 11855bf..92e8094 100644 --- a/bts/BTS_Tests_SMSCB.ttcn +++ b/bts/BTS_Tests_SMSCB.ttcn @@ -243,8 +243,17 @@ f_init(); f_init_l1ctl(); - f_l1_tune(L1CTL, ccch_mode := CCCH_MODE_COMBINED_CBCH); - /* FIXME: switch to dedicated mode for SDCCH/8 */ + + /* Tune L1 to the given CBCH timeslot (SDCCH4+CBCH or SDCCH8+CBCH) */ + if (match(pars.chan_nr, t_RslChanNr_CBCH4(0))) { + f_l1_tune(L1CTL, ccch_mode := CCCH_MODE_COMBINED_CBCH); + } else { + f_l1_tune(L1CTL, ccch_mode := CCCH_MODE_COMBINED); + /* TODO: also handle frequency hopping parameters */ + L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(pars.chan_nr, + 7 /* TODO: mp_tsc */, + mp_trx0_arfcn)); + } /* send SMSCB[s] via RSL */ f_smscb_setup_rsl_chan(pars.basic, false); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f061a4d48209b1aa5eaea2fd05fc4752de0c70f Gerrit-Change-Number: 19476 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 00:14:30 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 31 Jul 2020 00:14:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests/SMSCB: enable test cases for CBCH on SDCCH/8 References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19477 ) Change subject: BTS_Tests/SMSCB: enable test cases for CBCH on SDCCH/8 ...................................................................... BTS_Tests/SMSCB: enable test cases for CBCH on SDCCH/8 Change-Id: I15286bb784ce828bd9fa709945382af9b2b62b44 --- M bts/BTS_Tests_SMSCB.ttcn 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/19477/1 diff --git a/bts/BTS_Tests_SMSCB.ttcn b/bts/BTS_Tests_SMSCB.ttcn index 92e8094..29489fc 100644 --- a/bts/BTS_Tests_SMSCB.ttcn +++ b/bts/BTS_Tests_SMSCB.ttcn @@ -1084,7 +1084,6 @@ execute( TC_cbc_sdcch4_load_idle() ); execute( TC_cbc_sdcch4_load_overload() ); - if (false) { /* FIXME: SDCCH/8 support broken, needs trxcon + L1CTL work */ execute( TC_sms_cb_cmd_sdcch8_1block() ); execute( TC_sms_cb_cmd_sdcch8_2block() ); execute( TC_sms_cb_cmd_sdcch8_3block() ); @@ -1095,7 +1094,6 @@ execute( TC_sms_cb_cmd_sdcch8_default_and_normal() ); execute( TC_cbc_sdcch8_load_idle() ); execute( TC_cbc_sdcch8_load_overload() ); - } execute( TC_etws_p1ro() ); execute( TC_etws_p1ro_end() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I15286bb784ce828bd9fa709945382af9b2b62b44 Gerrit-Change-Number: 19477 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 01:24:32 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 31 Jul 2020 01:24:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19434 ) Change subject: bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH ...................................................................... Patch Set 1: > Patch Set 1: Code-Review-1 > > Unless I'm missing something, this will likely break a variety of resource exhaustion tests that have assumptions on the number of available SDCCH. Has this patch been tested gainst the full site of BSC_Tests.ttcn without any regressions? Feel free to remove -1 if it does. you're correct: pass->FAIL BSC_Tests.TC_chan_exhaustion -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iac46ee2cc5bc0978d5f5baa550baf493a7c56b1b Gerrit-Change-Number: 19434 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Fri, 31 Jul 2020 01:24:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 01:28:28 2020 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 31 Jul 2020 01:28:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc CBSP: f_page2rsl: fix nr of blocks calculation In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19436 ) Change subject: bsc CBSP: f_page2rsl: fix nr of blocks calculation ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19436/2/bsc/BSC_Tests_CBSP.ttcn File bsc/BSC_Tests_CBSP.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19436/2/bsc/BSC_Tests_CBSP.ttcn at 307 PS2, Line 307: private function f_page2rsl(CBSP_IE page, uint16_t msg_id, uint16_t ser_no, boolean ext_cbch := false, integer expect_blocks := -1) > shouldn't expect_blocks be a template := ?, then use match() in line 322? Otherwise default -1 will [?] I unconsciously applied C logic, we can do it in template logic too of course (but it's just going to be a cosmetic change) -1 will not always fail because <= 0 skips the validation. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I06cc144bd92e94d461dac3f56a738da8e055b73a Gerrit-Change-Number: 19436 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 01:28:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Jul 31 01:39:18 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 31 Jul 2020 01:39:18 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <5f237655d72a8_67502ac3bb5765f8337728@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 155s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_board_qmod.o:(.rodata.cst4+0x0): warning: undefined reference to `__stack_chk_guard' [ 155s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_board_qmod.o:(.rodata.cst4+0x4): warning: undefined reference to `__stack_chk_guard' [ 155s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_board_qmod.o: in function `board_override_enter_dfu': [ 155s] ./firmware/libboard/qmod/source/board_qmod.c:408: warning: undefined reference to `__stack_chk_fail' [ 155s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_main.o:(.rodata.cst4+0x0): warning: undefined reference to `__stack_chk_guard' [ 155s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_main.o: in function `USBDFU_handle_dnload': [ 155s] ./firmware/apps/dfu/main.c:150: warning: undefined reference to `__stack_chk_fail' [ 155s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_dfu_desc.o:(.rodata.cst4+0x0): warning: undefined reference to `__stack_chk_guard' [ 155s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_dfu_desc.o: in function `set_usb_serial_str': [ 155s] ./firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:211: warning: undefined reference to `__stack_chk_fail' [ 155s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_dfu_driver.o:(.rodata.cst4+0x0): warning: undefined reference to `__stack_chk_guard' [ 155s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: obj/qmod/flash_dfu_driver.o: in function `handle_getstate': [ 155s] ./firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 155s] collect2: error: ld returned 1 exit status [ 155s] % [ 155s] make[2]: *** [Makefile:234: flash] Error 1 [ 155s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 155s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 155s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 155s] dh_auto_build: error: make -j1 returned exit code 2 [ 155s] make: *** [debian/rules:16: build] Error 25 [ 155s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 155s] ### VM INTERACTION START ### [ 158s] [ 148.558849] sysrq: SysRq : Power Off [ 158s] [ 148.563526] reboot: Power down [ 158s] ### VM INTERACTION END ### [ 158s] [ 158s] lamb10 failed "build simtrace2_0.7.0.60.859f.dsc" at Fri Jul 31 01:39:13 UTC 2020. [ 158s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 31 03:43:35 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 31 Jul 2020 03:43:35 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f2393846802_67502ac3bb5765f83552ca@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 114s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 114s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 114s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 114s] | | [ 114s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 114s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 114s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 114s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 114s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 114s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 114s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 115s] cc1: all warnings being treated as errors [ 115s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 115s] make[3]: *** Waiting for unfinished jobs.... [ 115s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 115s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 115s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 115s] make[1]: *** [Makefile:166: all] Error 2 [ 115s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 115s] dh_auto_build: error: cd build && make -j4 "INSTALL=install --strip-program=true" returned exit code 2 [ 115s] make: *** [debian/rules:9: build] Error 25 [ 115s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 115s] ### VM INTERACTION START ### [ 118s] [ 92.980362] sysrq: SysRq : Power Off [ 118s] [ 92.994914] reboot: Power down [ 118s] ### VM INTERACTION END ### [ 118s] [ 118s] cloud116 failed "build ulfius_2.5.2-4.1.dsc" at Fri Jul 31 03:43:34 UTC 2020. [ 118s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Jul 31 06:55:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 06:55:10 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: do not enable CBCH slots by default In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19474 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: do not enable CBCH slots by default ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3699450542dc1350971fbf87ad60a330428dec27 Gerrit-Change-Number: 19474 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 06:55:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 06:55:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 06:55:34 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: exit early on full disk In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19429 ) Change subject: jenkins-common.sh: exit early on full disk ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6540797c8e0ee3e7b09d4a80592d5e270e7d9adc Gerrit-Change-Number: 19429 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jul 2020 06:55:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 06:57:41 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 06:57:41 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/osmo-bsc.cfg: do not enable CBCH slots by default In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19474 ) Change subject: ttcn3-bts-test/osmo-bsc.cfg: do not enable CBCH slots by default ...................................................................... ttcn3-bts-test/osmo-bsc.cfg: do not enable CBCH slots by default As it turns out, test cases from BTS_Tests_SMSCB configure the CBCH slots "on the fly" depending on the test case parameters. This configuration also makes some test cases fail, so let's (re)configure SDCCH8+CBCH timeslots to SDCCH8. Change-Id: I3699450542dc1350971fbf87ad60a330428dec27 --- M ttcn3-bts-test/osmo-bsc.cfg 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: fixeria: Verified laforge: Looks good to me, approved diff --git a/ttcn3-bts-test/osmo-bsc.cfg b/ttcn3-bts-test/osmo-bsc.cfg index f1d2315..3978548 100644 --- a/ttcn3-bts-test/osmo-bsc.cfg +++ b/ttcn3-bts-test/osmo-bsc.cfg @@ -151,7 +151,7 @@ phys_chan_config TCH/F hopping enabled 0 timeslot 1 - phys_chan_config SDCCH8+CBCH + phys_chan_config SDCCH8 hopping enabled 0 timeslot 2 phys_chan_config PDCH @@ -184,7 +184,7 @@ phys_chan_config PDCH hopping enabled 0 timeslot 2 - phys_chan_config SDCCH8+CBCH + phys_chan_config SDCCH8 hopping enabled 0 timeslot 3 phys_chan_config PDCH @@ -217,7 +217,7 @@ phys_chan_config TCH/H hopping enabled 0 timeslot 3 - phys_chan_config SDCCH8+CBCH + phys_chan_config SDCCH8 hopping enabled 0 timeslot 4 phys_chan_config PDCH -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3699450542dc1350971fbf87ad60a330428dec27 Gerrit-Change-Number: 19474 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 09:55:55 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 31 Jul 2020 09:55:55 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp-client: fix memleak in case if no response is received In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19271 ) Change subject: libosmo-mgcp-client: fix memleak in case if no response is received ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I83938ff47fa8570b8d9dc810a184864a0c0b58aa Gerrit-Change-Number: 19271 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 31 Jul 2020 09:55:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 09:56:22 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 31 Jul 2020 09:56:22 +0000 Subject: Change in osmo-ccid-firmware[master]: contrib/jenkins.sh: Disable thread-local storage in libosmocore In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19464 ) Change subject: contrib/jenkins.sh: Disable thread-local storage in libosmocore ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19464 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ie75fb7e71b316be164ed69d832ffcf2bd1a04fb7 Gerrit-Change-Number: 19464 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 09:56:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 09:56:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 31 Jul 2020 09:56:46 +0000 Subject: Change in osmo-bsc[master]: Introduce support for ACC ramping during whole BTS life cycle In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19376 ) Change subject: Introduce support for ACC ramping during whole BTS life cycle ...................................................................... Introduce support for ACC ramping during whole BTS life cycle Prior to this patch, ACC ramping was only used to go 0->N in the number of allowed ACCs during BTS startup. It could optionally dynamically stretch or extend the ramping time based on channel load. With this patch, ACC ramping is kept alive during the entire time the BTS is active, and subset of allowed ACCs can now be incresed or decreased based on channel load. A new VTY command "access-control-class-ramping-chan-load" is added to configure a lower and an upper threshold. Channel load under the low threshold will potentially trigger an increment of the subset size of allowed ACCs, while a channel load over the upper threshold will potentially trigger the opposite (a decrease in size). The time between checks is kept fixed per VTY command (reusing old "access-control-class-ramping-step-size"), but the "dynamic" option is deprecated and ignored from now on since it provides nothing valuable in the new implementation, because the size always dynamically changes based on channel load (configured thresholds). Related: SYS#4912 Change-Id: Id17f947c92cdfc0eb9541a9bf066338169caaeb5 --- M include/osmocom/bsc/acc.h M src/osmo-bsc/acc.c M src/osmo-bsc/bsc_vty.c M tests/acc/acc_test.c M tests/acc/acc_test.ok 5 files changed, 902 insertions(+), 180 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/acc.h b/include/osmocom/bsc/acc.h index bd75f95..c7be38c 100644 --- a/include/osmocom/bsc/acc.h +++ b/include/osmocom/bsc/acc.h @@ -71,9 +71,12 @@ #define ACC_RAMP_STEP_SIZE_DEFAULT ACC_RAMP_STEP_SIZE_MIN #define ACC_RAMP_STEP_SIZE_MAX 10 /* allow all ACC in one step (effectively disables ramping) */ -#define ACC_RAMP_STEP_INTERVAL_MIN 30 /* 30 seconds */ +#define ACC_RAMP_STEP_INTERVAL_MIN 5 /* 5 seconds */ #define ACC_RAMP_STEP_INTERVAL_MAX 600 /* 10 minutes */ +#define ACC_RAMP_CHAN_LOAD_THRESHOLD_LOW 71 +#define ACC_RAMP_CHAN_LOAD_THRESHOLD_UP 89 + /*! * Data structure used to manage ACC ramping. Please avoid setting or reading fields * in this structure directly. Use the accessor functions below instead. @@ -97,8 +100,17 @@ * it has been overridden by VTY configuration. */ unsigned int step_interval_sec; - bool step_interval_is_fixed; struct osmo_timer_list step_timer; + + /*! + * Channel Load Upper/Lower Thresholds: + * They control how ramping subset size of allowed ACCs changes in + * relation to current channel load (%, 0-100): Under the lower + * threshold, subset size may be increased; above the upper threshold, + * subset size may be decreased. + */ + unsigned int chan_load_lower_threshold; + unsigned int chan_load_upper_threshold; }; /*! @@ -141,17 +153,17 @@ } /*! - * If the step interval is dynamic, return true, else return false. + * Return the current ACC ramp step interval (in seconds) * \param[in] acc_ramp Pointer to acc_ramp structure. */ -static inline bool acc_ramp_step_interval_is_dynamic(struct acc_ramp *acc_ramp) +static inline unsigned int acc_ramp_is_running(struct acc_ramp *acc_ramp) { - return !(acc_ramp->step_interval_is_fixed); + return acc_ramp->step_interval_sec; } void acc_ramp_init(struct acc_ramp *acc_ramp, struct gsm_bts *bts); int acc_ramp_set_step_size(struct acc_ramp *acc_ramp, unsigned int step_size); int acc_ramp_set_step_interval(struct acc_ramp *acc_ramp, unsigned int step_interval); -void acc_ramp_set_step_interval_dynamic(struct acc_ramp *acc_ramp); +int acc_ramp_set_chan_load_thresholds(struct acc_ramp *acc_ramp, unsigned int low_threshold, unsigned int up_threshold); void acc_ramp_trigger(struct acc_ramp *acc_ramp); void acc_ramp_abort(struct acc_ramp *acc_ramp); diff --git a/src/osmo-bsc/acc.c b/src/osmo-bsc/acc.c index 72b4591..74ebe99 100644 --- a/src/osmo-bsc/acc.c +++ b/src/osmo-bsc/acc.c @@ -362,40 +362,42 @@ ////////////////////////// // acc_ramp ////////////////////////// -static unsigned int get_next_step_interval(struct acc_ramp *acc_ramp) -{ - struct gsm_bts *bts = acc_ramp->bts; - uint64_t load; - - if (acc_ramp->step_interval_is_fixed) - return acc_ramp->step_interval_sec; - - /* Scale the step interval to current channel load average. */ - load = (bts->chan_load_avg << 8); /* convert to fixed-point */ - acc_ramp->step_interval_sec = ((load * ACC_RAMP_STEP_INTERVAL_MAX) / 100) >> 8; - if (acc_ramp->step_interval_sec < ACC_RAMP_STEP_SIZE_MIN) - acc_ramp->step_interval_sec = ACC_RAMP_STEP_INTERVAL_MIN; - else if (acc_ramp->step_interval_sec > ACC_RAMP_STEP_INTERVAL_MAX) - acc_ramp->step_interval_sec = ACC_RAMP_STEP_INTERVAL_MAX; - - LOG_BTS(bts, DRSL, LOGL_DEBUG, - "ACC RAMP: step interval set to %u seconds based on %u%% channel load average\n", - acc_ramp->step_interval_sec, bts->chan_load_avg); - return acc_ramp->step_interval_sec; -} - static void do_acc_ramping_step(void *data) { struct acc_ramp *acc_ramp = data; - struct acc_mgr *acc_mgr = &acc_ramp->bts->acc_mgr; + struct gsm_bts *bts = acc_ramp->bts; + struct acc_mgr *acc_mgr = &bts->acc_mgr; + uint8_t old_len = acc_mgr_get_len_allowed_ramp(acc_mgr); - uint8_t new_len = OSMO_MIN(10, old_len + acc_ramp->step_size); + uint8_t new_len = old_len; - acc_mgr_set_len_allowed_ramp(acc_mgr, new_len); + /* Remark dec: Never decrease back to 0, it is desirable to always allow at + * least 1 ACC at ramping lvl to allow subscribers to eventually use the + * network. If total barring is desired, it can be controlled by the + * adminsitrative subset length through VTY. + * Remark inc: Never try going over the admin subset size, since it + * wouldn't change final subset size anyway and it would create a fake + * sense of safe load handling capacity. If then load became high, being + * on upper size would mean the BTS requires more time to effectively + * drop down the final subset size, hence delaying recovery. + */ + if (bts->chan_load_avg > acc_ramp->chan_load_upper_threshold) + new_len = (uint8_t)OSMO_MAX(1, (int)(old_len - acc_ramp->step_size)); + else if (bts->chan_load_avg < acc_ramp->chan_load_lower_threshold) + new_len = OSMO_MIN(acc_mgr_get_len_allowed_adm(acc_mgr), + old_len + acc_ramp->step_size); + else + new_len = old_len; - /* If we have not allowed all ACCs yet, schedule another ramping step. */ - if (new_len != 10) - osmo_timer_schedule(&acc_ramp->step_timer, get_next_step_interval(acc_ramp), 0); + if (new_len != old_len) { + LOG_BTS(bts, DRSL, LOGL_DEBUG, + "ACC RAMP: changing ramping subset size %" PRIu8 + " -> %" PRIu8 ", chan_load_avg=%" PRIu8 "%%\n", + old_len, new_len, bts->chan_load_avg); + acc_mgr_set_len_allowed_ramp(acc_mgr, new_len); + } + + osmo_timer_schedule(&acc_ramp->step_timer, acc_ramp->step_interval_sec, 0); } /* Implements osmo_signal_cbfn() -- trigger or abort ACC ramping upon changes RF lock state. */ @@ -533,7 +535,8 @@ acc_ramp_set_enabled(acc_ramp, false); acc_ramp->step_size = ACC_RAMP_STEP_SIZE_DEFAULT; acc_ramp->step_interval_sec = ACC_RAMP_STEP_INTERVAL_MIN; - acc_ramp->step_interval_is_fixed = false; + acc_ramp->chan_load_lower_threshold = ACC_RAMP_CHAN_LOAD_THRESHOLD_LOW; + acc_ramp->chan_load_upper_threshold = ACC_RAMP_CHAN_LOAD_THRESHOLD_UP; osmo_timer_setup(&acc_ramp->step_timer, do_acc_ramping_step, acc_ramp); osmo_signal_register_handler(SS_NM, acc_ramp_nm_sig_cb, acc_ramp); } @@ -566,21 +569,30 @@ return -ERANGE; acc_ramp->step_interval_sec = step_interval; - acc_ramp->step_interval_is_fixed = true; LOG_BTS(acc_ramp->bts, DRSL, LOGL_DEBUG, "ACC RAMP: ramping step interval set to %u seconds\n", step_interval); return 0; } /*! - * Clear a previously set fixed ramping step interval, so that the interval - * is again automatically scaled to the BTS channel load average. + * Change the ramping channel load thresholds. They control how ramping subset + * size of allowed ACCs changes in relation to current channel load (%, 0-100): + * Under the lower threshold, subset size may be increased; above the upper + * threshold, subset size may be decreased. * \param[in] acc_ramp Pointer to acc_ramp structure. + * \param[in] low_threshold The new minimum threshold: values under it allow for increasing the ramping subset size. + * \param[in] up_threshold The new maximum threshold: values under it allow for increasing the ramping subset size. */ -void acc_ramp_set_step_interval_dynamic(struct acc_ramp *acc_ramp) +int acc_ramp_set_chan_load_thresholds(struct acc_ramp *acc_ramp, unsigned int low_threshold, unsigned int up_threshold) { - acc_ramp->step_interval_is_fixed = false; - LOG_BTS(acc_ramp->bts, DRSL, LOGL_DEBUG, "ACC RAMP: ramping step interval set to 'dynamic'\n"); + /* for instance, high=49 and lower=50 makes sense: + [50-100] -> decrease, [0-49] -> increase */ + if ((int)up_threshold - (int)low_threshold < -1) + return -ERANGE; + + acc_ramp->chan_load_lower_threshold = low_threshold; + acc_ramp->chan_load_upper_threshold = up_threshold; + return 0; } /*! @@ -593,13 +605,23 @@ */ void acc_ramp_trigger(struct acc_ramp *acc_ramp) { - /* Abort any previously running ramping process and allow all available ACCs. */ - acc_ramp_abort(acc_ramp); - if (acc_ramp_is_enabled(acc_ramp)) { + if (osmo_timer_pending(&acc_ramp->step_timer)) + return; /* Already started, nothing to do */ + /* Set all available ACCs to barred and start ramping up. */ acc_mgr_set_len_allowed_ramp(&acc_ramp->bts->acc_mgr, 0); + if (acc_ramp->chan_load_lower_threshold == 0 && + acc_ramp->chan_load_upper_threshold == 100) { + LOG_BTS(acc_ramp->bts, DRSL, LOGL_ERROR, + "ACC RAMP: starting ramp up with 0 ACCs and " + "no possibility to grow the allowed subset size! " + "Check VTY cmd access-control-class-ramping-chan-load\n"); + } do_acc_ramping_step(acc_ramp); + } else { + /* Abort any previously running ramping process and allow all available ACCs. */ + acc_ramp_abort(acc_ramp); } } diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 0be4e6d..e4842f7 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -409,11 +409,11 @@ vty_out(vty, " Access Control Class ramping: %senabled%s", acc_ramp_is_enabled(&bts->acc_ramp) ? "" : "not ", VTY_NEWLINE); if (acc_ramp_is_enabled(&bts->acc_ramp)) { - if (!acc_ramp_step_interval_is_dynamic(&bts->acc_ramp)) - vty_out(vty, " Access Control Class ramping step interval: %u seconds%s", - acc_ramp_get_step_interval(&bts->acc_ramp), VTY_NEWLINE); - else - vty_out(vty, " Access Control Class ramping step interval: dynamic%s", VTY_NEWLINE); + vty_out(vty, " Access Control Class ramping step interval: %u seconds%s", + acc_ramp_get_step_interval(&bts->acc_ramp), VTY_NEWLINE); + vty_out(vty, " Access Control Class channel load thresholds: (%" PRIu8 ", %" PRIu8 ")%s", + bts->acc_ramp.chan_load_lower_threshold, + bts->acc_ramp.chan_load_upper_threshold, VTY_NEWLINE); vty_out(vty, " enabling %u Access Control Class%s per ramping step%s", acc_ramp_get_step_size(&bts->acc_ramp), acc_ramp_get_step_size(&bts->acc_ramp) > 1 ? "es" : "", VTY_NEWLINE); @@ -955,14 +955,12 @@ if (bts->acc_mgr.rotation_time_sec != ACC_MGR_QUANTUM_DEFAULT) vty_out(vty, " access-control-class-rotate-quantum %" PRIu32 "%s", bts->acc_mgr.rotation_time_sec, VTY_NEWLINE); vty_out(vty, " %saccess-control-class-ramping%s", acc_ramp_is_enabled(&bts->acc_ramp) ? "" : "no ", VTY_NEWLINE); - if (!acc_ramp_step_interval_is_dynamic(&bts->acc_ramp)) { - vty_out(vty, " access-control-class-ramping-step-interval %u%s", - acc_ramp_get_step_interval(&bts->acc_ramp), VTY_NEWLINE); - } else { - vty_out(vty, " access-control-class-ramping-step-interval dynamic%s", VTY_NEWLINE); - } + vty_out(vty, " access-control-class-ramping-step-interval %u%s", + acc_ramp_get_step_interval(&bts->acc_ramp), VTY_NEWLINE); vty_out(vty, " access-control-class-ramping-step-size %u%s", acc_ramp_get_step_size(&bts->acc_ramp), VTY_NEWLINE); + vty_out(vty, " access-control-class-ramping-chan-load %u %u%s", + bts->acc_ramp.chan_load_lower_threshold, bts->acc_ramp.chan_load_upper_threshold, VTY_NEWLINE); if (!bts->si_unused_send_empty) vty_out(vty, " no system-information unused-send-empty%s", VTY_NEWLINE); for (i = SYSINFO_TYPE_1; i < _MAX_SYSINFO_TYPE; i++) { @@ -3679,9 +3677,18 @@ "Enable Access Control Class ramping\n") { struct gsm_bts *bts = vty->index; + struct gsm_bts_trx *trx; - if (!acc_ramp_is_enabled(&bts->acc_ramp)) + if (!acc_ramp_is_enabled(&bts->acc_ramp)) { acc_ramp_set_enabled(&bts->acc_ramp, true); + /* Start ramping if at least one TRX is usable */ + llist_for_each_entry(trx, &bts->trx_list, list) { + if (trx_is_usable(trx)) { + acc_ramp_trigger(&bts->acc_ramp); + break; + } + } + } /* * ACC ramping takes effect either when the BTS reconnects RSL, @@ -3713,14 +3720,14 @@ OSMO_STRINGIFY_VAL(ACC_RAMP_STEP_INTERVAL_MAX) ">|dynamic)", "Configure Access Control Class ramping step interval\n" "Set a fixed step interval (in seconds)\n" - "Use dynamic step interval based on BTS channel load\n") + "Use dynamic step interval based on BTS channel load (deprecated, don't use, ignored)\n") { struct gsm_bts *bts = vty->index; bool dynamic = (strcmp(argv[0], "dynamic") == 0); int error; if (dynamic) { - acc_ramp_set_step_interval_dynamic(&bts->acc_ramp); + vty_out(vty, "%% access-control-class-ramping-step-interval 'dynamic' value is deprecated, ignoring it%s", VTY_NEWLINE); return CMD_SUCCESS; } @@ -3759,6 +3766,25 @@ return CMD_SUCCESS; } +DEFUN(cfg_bts_acc_ramping_chan_load, + cfg_bts_acc_ramping_chan_load_cmd, + "access-control-class-ramping-chan-load <0-100> <0-100>", + "Configure Access Control Class ramping channel load thresholds\n" + "Lower Channel load threshold (%) below which subset size of allowed broadcast ACCs can be increased\n" + "Upper channel load threshold (%) above which subset size of allowed broadcast ACCs can be decreased\n") +{ + struct gsm_bts *bts = vty->index; + int rc; + + rc = acc_ramp_set_chan_load_thresholds(&bts->acc_ramp, atoi(argv[0]), atoi(argv[1])); + if (rc < 0) { + vty_out(vty, "Unable to set ACC channel load thresholds%s", VTY_NEWLINE); + return CMD_WARNING; + } + + return CMD_SUCCESS; +} + #define EXCL_RFLOCK_STR "Exclude this BTS from the global RF Lock\n" DEFUN(cfg_bts_excl_rf_lock, @@ -6532,6 +6558,7 @@ install_element(BTS_NODE, &cfg_bts_no_acc_ramping_cmd); install_element(BTS_NODE, &cfg_bts_acc_ramping_step_interval_cmd); install_element(BTS_NODE, &cfg_bts_acc_ramping_step_size_cmd); + install_element(BTS_NODE, &cfg_bts_acc_ramping_chan_load_cmd); install_element(BTS_NODE, &cfg_bts_t3113_dynamic_cmd); install_element(BTS_NODE, &cfg_bts_no_t3113_dynamic_cmd); neighbor_ident_vty_init(network, network->neighbor_bss_cells); diff --git a/tests/acc/acc_test.c b/tests/acc/acc_test.c index 54f3de1..72d3212 100644 --- a/tests/acc/acc_test.c +++ b/tests/acc/acc_test.c @@ -63,6 +63,8 @@ rate_ctr_group_free(bts->bts_ctrs); if (osmo_timer_pending(&bts->acc_mgr.rotate_timer)) osmo_timer_del(&bts->acc_mgr.rotate_timer); + if (osmo_timer_pending(&bts->acc_ramp.step_timer)) + osmo_timer_del(&bts->acc_ramp.step_timer); /* no need to llist_del(&bts->list), we never registered the bts there. */ talloc_free(bts); fprintf(stderr, "BTS deallocated OK in %s()\n", msg); @@ -230,7 +232,7 @@ bts_del(bts); } -static void test_acc_ramp_fixed(struct gsm_network *net) +static void test_acc_ramp(struct gsm_network *net) { fprintf(stderr, "===%s===\n", __func__); int i; @@ -242,14 +244,13 @@ OSMO_ASSERT(acc_ramp_is_enabled(acc_ramp) == false); OSMO_ASSERT(acc_ramp_get_step_size(acc_ramp) == ACC_RAMP_STEP_SIZE_DEFAULT); OSMO_ASSERT(acc_ramp_get_step_interval(acc_ramp) == ACC_RAMP_STEP_INTERVAL_MIN); - OSMO_ASSERT(acc_ramp_step_interval_is_dynamic(acc_ramp) == true); /* Set super high rotation time so it doesn't interfer here: */ acc_mgr_set_rotation_time(acc_mgr, 5000); - //acc_ramp_set_step_interval_dynamic(acc_ramp); OSMO_ASSERT(acc_ramp_set_step_interval(acc_ramp, 1) == -ERANGE); OSMO_ASSERT(acc_ramp_set_step_interval(acc_ramp, 50) == 0); + OSMO_ASSERT(acc_ramp_set_chan_load_thresholds(acc_ramp, 100, 100) == 0); acc_ramp_set_step_size(acc_ramp, 1); acc_ramp_set_enabled(acc_ramp, true); @@ -265,7 +266,7 @@ bts_del(bts); } -static void test_acc_ramp_fixed2(struct gsm_network *net) +static void test_acc_ramp2(struct gsm_network *net) { fprintf(stderr, "===%s===\n", __func__); int i; @@ -277,7 +278,6 @@ OSMO_ASSERT(acc_ramp_is_enabled(acc_ramp) == false); OSMO_ASSERT(acc_ramp_get_step_size(acc_ramp) == ACC_RAMP_STEP_SIZE_DEFAULT); OSMO_ASSERT(acc_ramp_get_step_interval(acc_ramp) == ACC_RAMP_STEP_INTERVAL_MIN); - OSMO_ASSERT(acc_ramp_step_interval_is_dynamic(acc_ramp) == true); /* Set super high rotation time so it doesn't interfer here: */ acc_mgr_set_rotation_time(acc_mgr, 5000); @@ -299,7 +299,7 @@ bts_del(bts); } -static void test_acc_ramp_fixed3(struct gsm_network *net) +static void test_acc_ramp3(struct gsm_network *net) { fprintf(stderr, "===%s===\n", __func__); int i; @@ -311,7 +311,6 @@ OSMO_ASSERT(acc_ramp_is_enabled(acc_ramp) == false); OSMO_ASSERT(acc_ramp_get_step_size(acc_ramp) == ACC_RAMP_STEP_SIZE_DEFAULT); OSMO_ASSERT(acc_ramp_get_step_interval(acc_ramp) == ACC_RAMP_STEP_INTERVAL_MIN); - OSMO_ASSERT(acc_ramp_step_interval_is_dynamic(acc_ramp) == true); /* Set super high rotation time so it doesn't interfer here: */ acc_mgr_set_rotation_time(acc_mgr, 5000); @@ -336,58 +335,19 @@ bts_del(bts); } -static void test_acc_ramp_dynamic(struct gsm_network *net) +static void test_acc_ramp_up_rotate(struct gsm_network *net, unsigned int chan_load, unsigned int low_threshold, unsigned int up_threshold) { - fprintf(stderr, "===%s===\n", __func__); - char buf[128]; - unsigned int step_sec; + fprintf(stderr, "===%s(%u, %u, %u)===\n", + __func__, chan_load, low_threshold, up_threshold); struct gsm_bts *bts = bts_init(net); struct acc_mgr *acc_mgr = &bts->acc_mgr; struct acc_ramp *acc_ramp = &bts->acc_ramp; + int n; /* Validate are all allowed by default after allocation: */ OSMO_ASSERT(acc_ramp_is_enabled(acc_ramp) == false); OSMO_ASSERT(acc_ramp_get_step_size(acc_ramp) == ACC_RAMP_STEP_SIZE_DEFAULT); OSMO_ASSERT(acc_ramp_get_step_interval(acc_ramp) == ACC_RAMP_STEP_INTERVAL_MIN); - OSMO_ASSERT(acc_ramp_step_interval_is_dynamic(acc_ramp) == true); - - /* Set super high rotation time so it doesn't interfer here: */ - acc_mgr_set_rotation_time(acc_mgr, 5000); - - acc_ramp_set_step_interval_dynamic(acc_ramp); - acc_ramp_set_step_size(acc_ramp, 1); - acc_ramp_set_enabled(acc_ramp, true); - - bts->chan_load_avg = 0; /*set 70% channel load */ - - osmo_gettimeofday_override_time = (struct timeval) {0, 0}; - acc_ramp_trigger(acc_ramp); - - while (osmo_timer_pending(&acc_ramp->step_timer)) { - bts->chan_load_avg += 10; - step_sec = ((bts->chan_load_avg * ACC_RAMP_STEP_INTERVAL_MAX) / 100); - osmo_gettimeofday_override_time.tv_sec += step_sec; - snprintf(buf, sizeof(buf), "select(): load=%" PRIu8 " -> step_sec=%u", - bts->chan_load_avg, step_sec); - clock_debug(buf); - osmo_select_main(0); - } - - bts_del(bts); -} - -static void test_acc_ramp_fixed_rotate(struct gsm_network *net) -{ - fprintf(stderr, "===%s===\n", __func__); - struct gsm_bts *bts = bts_init(net); - struct acc_mgr *acc_mgr = &bts->acc_mgr; - struct acc_ramp *acc_ramp = &bts->acc_ramp; - - /* Validate are all allowed by default after allocation: */ - OSMO_ASSERT(acc_ramp_is_enabled(acc_ramp) == false); - OSMO_ASSERT(acc_ramp_get_step_size(acc_ramp) == ACC_RAMP_STEP_SIZE_DEFAULT); - OSMO_ASSERT(acc_ramp_get_step_interval(acc_ramp) == ACC_RAMP_STEP_INTERVAL_MIN); - OSMO_ASSERT(acc_ramp_step_interval_is_dynamic(acc_ramp) == true); OSMO_ASSERT(acc_ramp_set_step_interval(acc_ramp, 250) == 0); acc_mgr_set_rotation_time(acc_mgr, 100); @@ -396,26 +356,31 @@ bts->si_common.rach_control.t2 |= 0x02; acc_mgr_perm_subset_changed(acc_mgr, &bts->si_common.rach_control); - acc_ramp_set_step_size(acc_ramp, 1); + OSMO_ASSERT(acc_ramp_set_step_size(acc_ramp, 1) == 0); + OSMO_ASSERT(acc_ramp_set_chan_load_thresholds(acc_ramp, low_threshold, up_threshold) == 0); acc_ramp_set_enabled(acc_ramp, true); + bts->chan_load_avg = chan_load; /*set % channel load */ + osmo_gettimeofday_override_time = (struct timeval) {0, 0}; acc_ramp_trigger(acc_ramp); + n = 5; while (true) { + OSMO_ASSERT(osmo_timer_pending(&acc_ramp->step_timer)); if (osmo_timer_pending(&acc_mgr->rotate_timer)) { if ((osmo_gettimeofday_override_time.tv_sec + 50) % 250 == 0) osmo_gettimeofday_override_time.tv_sec += 50; else osmo_gettimeofday_override_time.tv_sec += 100; - } else if (osmo_timer_pending(&acc_ramp->step_timer)) { - osmo_gettimeofday_override_time.tv_sec -= osmo_gettimeofday_override_time.tv_sec % 250; - osmo_gettimeofday_override_time.tv_sec += 250; } else { /* Once ramping is done, adm level is big enough and hence - * rotation is not needed and will be disabled. We are then done - */ - break; + * rotation is not needed and will be disabled. Run + * ramping a bit more and we are then done */ + osmo_gettimeofday_override_time.tv_sec -= osmo_gettimeofday_override_time.tv_sec % 250; + osmo_gettimeofday_override_time.tv_sec += 250; + if (n-- == 0) + break; } clock_debug("select()"); osmo_select_main(0); @@ -424,6 +389,76 @@ bts_del(bts); } +static void test_acc_ramp_updown_rotate(struct gsm_network *net, unsigned int low_threshold, unsigned int up_threshold, + unsigned int min_load, unsigned int max_load, unsigned load_step) +{ + fprintf(stderr, "===%s(%u, %u, %u, %u, %u)===\n", + __func__, low_threshold, up_threshold, + min_load, max_load, load_step); + struct gsm_bts *bts = bts_init(net); + struct acc_mgr *acc_mgr = &bts->acc_mgr; + struct acc_ramp *acc_ramp = &bts->acc_ramp; + int i; + char buf[256]; + bool up = true; + + /* Validate are all allowed by default after allocation: */ + OSMO_ASSERT(acc_ramp_is_enabled(acc_ramp) == false); + OSMO_ASSERT(acc_ramp_get_step_size(acc_ramp) == ACC_RAMP_STEP_SIZE_DEFAULT); + OSMO_ASSERT(acc_ramp_get_step_interval(acc_ramp) == ACC_RAMP_STEP_INTERVAL_MIN); + + OSMO_ASSERT(acc_ramp_set_step_interval(acc_ramp, 250) == 0); + acc_mgr_set_rotation_time(acc_mgr, 100); + /* Test that ramping + rotation won't go over permanently barred ACC*/ + fprintf(stderr, "*** Barring one ACC ***\n"); + bts->si_common.rach_control.t2 |= 0x02; + acc_mgr_perm_subset_changed(acc_mgr, &bts->si_common.rach_control); + + OSMO_ASSERT(acc_ramp_set_step_size(acc_ramp, 1) == 0); + OSMO_ASSERT(acc_ramp_set_chan_load_thresholds(acc_ramp, low_threshold, up_threshold) == 0); + acc_ramp_set_enabled(acc_ramp, true); + + bts->chan_load_avg = min_load; /* set % channel load */ + + osmo_gettimeofday_override_time = (struct timeval) {0, 0}; + acc_ramp_trigger(acc_ramp); + + /* 50 ev loop iterations */ + for (i = 0; i < 50; i++) { + OSMO_ASSERT(osmo_timer_pending(&acc_ramp->step_timer)); + if (osmo_timer_pending(&acc_mgr->rotate_timer)) { + if ((osmo_gettimeofday_override_time.tv_sec + 50) % 250 == 0) + osmo_gettimeofday_override_time.tv_sec += 50; + else + osmo_gettimeofday_override_time.tv_sec += 100; + } else { + /* Once ramping is done, adm level is big enough and hence + * rotation is not needed and will be disabled. */ + osmo_gettimeofday_override_time.tv_sec -= osmo_gettimeofday_override_time.tv_sec % 250; + osmo_gettimeofday_override_time.tv_sec += 250; + } + snprintf(buf, sizeof(buf), "select(%d): chan_load_avg=%" PRIu8, i, bts->chan_load_avg); + clock_debug(buf); + osmo_select_main(0); + + if (up) { + bts->chan_load_avg += load_step; + if (bts->chan_load_avg >= max_load) + up = false; + if (bts->chan_load_avg > max_load) + bts->chan_load_avg = max_load; + } else { + bts->chan_load_avg = (uint8_t)OSMO_MAX((int)(bts->chan_load_avg - load_step), 0); + if (bts->chan_load_avg <= min_load) + up = true; + if (bts->chan_load_avg < min_load) + bts->chan_load_avg = max_load; + } + } + + bts_del(bts); +} + static const struct log_info_cat log_categories[] = { [DRSL] = { .name = "DRSL", @@ -460,11 +495,16 @@ test_acc_mgr_no_ramp(net); test_acc_mgr_manual_ramp(net); test_acc_mgr_rotate(net); - test_acc_ramp_fixed(net); - test_acc_ramp_fixed2(net); - test_acc_ramp_fixed3(net); - test_acc_ramp_dynamic(net); - test_acc_ramp_fixed_rotate(net); + test_acc_ramp(net); + test_acc_ramp2(net); + test_acc_ramp3(net); + test_acc_ramp_up_rotate(net, 0, 100, 100); + test_acc_ramp_up_rotate(net, 0, 20, 50); + test_acc_ramp_up_rotate(net, 70, 80, 90); + test_acc_ramp_updown_rotate(net, 80, 90, 0, 100, 15); + test_acc_ramp_updown_rotate(net, 30, 50, 10, 100, 15); + test_acc_ramp_updown_rotate(net, 50, 49, 0, 100, 10); + test_acc_ramp_updown_rotate(net, 30, 80, 30, 80, 5); return EXIT_SUCCESS; } diff --git a/tests/acc/acc_test.ok b/tests/acc/acc_test.ok index f377651..bb6fe10 100644 --- a/tests/acc/acc_test.ok +++ b/tests/acc/acc_test.ok @@ -413,9 +413,9 @@ (bts=0) ACC: rotate ACC allowed active subset 0x1c1 -> 0x0c3 (active_len=4, ramp_len=10, adm_len=4, perm_len=9, rotation=on) pcu_info_update(): t2=0x03 t3=0x3c BTS deallocated OK in test_acc_mgr_rotate() -===test_acc_ramp_fixed=== +===test_acc_ramp=== (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) -BTS allocation OK in test_acc_ramp_fixed() +BTS allocation OK in test_acc_ramp() (bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) @@ -447,27 +447,27 @@ sys={450.000000}: select() (bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) pcu_info_update(): t2=0x00 t3=0x00 -BTS deallocated OK in test_acc_ramp_fixed() -===test_acc_ramp_fixed2=== +BTS deallocated OK in test_acc_ramp() +===test_acc_ramp2=== (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) -BTS allocation OK in test_acc_ramp_fixed2() +BTS allocation OK in test_acc_ramp2() (bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x3f8 (active_len=7, ramp_len=10, adm_len=7, perm_len=10, rotation=on) pcu_info_update(): t2=0x00 t3=0x07 (bts=0) ACC: update ACC allowed active subset 0x3f8 -> 0x000 (active_len=0, ramp_len=0, adm_len=7, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x007 (active_len=3, ramp_len=3, adm_len=7, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xf8 -sys={30.000000}: select() +sys={5.000000}: select() (bts=0) ACC: update ACC allowed active subset 0x007 -> 0x03f (active_len=6, ramp_len=6, adm_len=7, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xc0 -sys={60.000000}: select() -(bts=0) ACC: update ACC allowed active subset 0x03f -> 0x07f (active_len=7, ramp_len=9, adm_len=7, perm_len=10, rotation=on) +sys={10.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x03f -> 0x07f (active_len=7, ramp_len=7, adm_len=7, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0x80 -sys={90.000000}: select() -BTS deallocated OK in test_acc_ramp_fixed2() -===test_acc_ramp_fixed3=== +sys={15.000000}: select() +BTS deallocated OK in test_acc_ramp2() +===test_acc_ramp3=== (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) -BTS allocation OK in test_acc_ramp_fixed3() +BTS allocation OK in test_acc_ramp3() *** Barring some ACCs *** (bts=0) ACC: New ACC allowed subset 0x15a (active_len=5, ramp_len=10, adm_len=10, perm_len=5, rotation=off) pcu_info_update(): t2=0x02 t3=0xa5 @@ -475,67 +475,32 @@ pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x002 (active_len=1, ramp_len=1, adm_len=10, perm_len=5, rotation=on) pcu_info_update(): t2=0x03 t3=0xfd -sys={30.000000}: select() +sys={5.000000}: select() (bts=0) ACC: update ACC allowed active subset 0x002 -> 0x00a (active_len=2, ramp_len=2, adm_len=10, perm_len=5, rotation=on) pcu_info_update(): t2=0x03 t3=0xf5 -sys={60.000000}: select() +sys={10.000000}: select() (bts=0) ACC: update ACC allowed active subset 0x00a -> 0x01a (active_len=3, ramp_len=3, adm_len=10, perm_len=5, rotation=on) pcu_info_update(): t2=0x03 t3=0xe5 -sys={90.000000}: select() +sys={15.000000}: select() (bts=0) ACC: update ACC allowed active subset 0x01a -> 0x05a (active_len=4, ramp_len=4, adm_len=10, perm_len=5, rotation=on) pcu_info_update(): t2=0x03 t3=0xa5 -sys={120.000000}: select() +sys={20.000000}: select() (bts=0) ACC: update ACC allowed active subset 0x05a -> 0x15a (active_len=5, ramp_len=5, adm_len=10, perm_len=5, rotation=off) pcu_info_update(): t2=0x02 t3=0xa5 -sys={150.000000}: select() +sys={25.000000}: select() (bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=6, adm_len=10, perm_len=5, rotation=off) -sys={180.000000}: select() +sys={30.000000}: select() (bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=7, adm_len=10, perm_len=5, rotation=off) -sys={210.000000}: select() +sys={35.000000}: select() (bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=8, adm_len=10, perm_len=5, rotation=off) -sys={240.000000}: select() +sys={40.000000}: select() (bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=9, adm_len=10, perm_len=5, rotation=off) -sys={270.000000}: select() +sys={45.000000}: select() (bts=0) ACC: update ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=10, adm_len=10, perm_len=5, rotation=off) -BTS deallocated OK in test_acc_ramp_fixed3() -===test_acc_ramp_dynamic=== +BTS deallocated OK in test_acc_ramp3() +===test_acc_ramp_up_rotate(0, 100, 100)=== (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) -BTS allocation OK in test_acc_ramp_dynamic() -(bts=0) ACC: update ACC allowed active subset 0x3ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) -pcu_info_update(): t2=0x03 t3=0xff -(bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) -pcu_info_update(): t2=0x03 t3=0xfe -sys={60.000000}: select(): load=10 -> step_sec=60 -(bts=0) ACC: update ACC allowed active subset 0x001 -> 0x003 (active_len=2, ramp_len=2, adm_len=10, perm_len=10, rotation=on) -pcu_info_update(): t2=0x03 t3=0xfc -sys={180.000000}: select(): load=20 -> step_sec=120 -(bts=0) ACC: update ACC allowed active subset 0x003 -> 0x007 (active_len=3, ramp_len=3, adm_len=10, perm_len=10, rotation=on) -pcu_info_update(): t2=0x03 t3=0xf8 -sys={360.000000}: select(): load=30 -> step_sec=180 -(bts=0) ACC: update ACC allowed active subset 0x007 -> 0x00f (active_len=4, ramp_len=4, adm_len=10, perm_len=10, rotation=on) -pcu_info_update(): t2=0x03 t3=0xf0 -sys={600.000000}: select(): load=40 -> step_sec=240 -(bts=0) ACC: update ACC allowed active subset 0x00f -> 0x01f (active_len=5, ramp_len=5, adm_len=10, perm_len=10, rotation=on) -pcu_info_update(): t2=0x03 t3=0xe0 -sys={900.000000}: select(): load=50 -> step_sec=300 -(bts=0) ACC: update ACC allowed active subset 0x01f -> 0x03f (active_len=6, ramp_len=6, adm_len=10, perm_len=10, rotation=on) -pcu_info_update(): t2=0x03 t3=0xc0 -sys={1260.000000}: select(): load=60 -> step_sec=360 -(bts=0) ACC: update ACC allowed active subset 0x03f -> 0x07f (active_len=7, ramp_len=7, adm_len=10, perm_len=10, rotation=on) -pcu_info_update(): t2=0x03 t3=0x80 -sys={1680.000000}: select(): load=70 -> step_sec=420 -(bts=0) ACC: update ACC allowed active subset 0x07f -> 0x0ff (active_len=8, ramp_len=8, adm_len=10, perm_len=10, rotation=on) -pcu_info_update(): t2=0x03 t3=0x00 -sys={2160.000000}: select(): load=80 -> step_sec=480 -(bts=0) ACC: update ACC allowed active subset 0x0ff -> 0x1ff (active_len=9, ramp_len=9, adm_len=10, perm_len=10, rotation=on) -pcu_info_update(): t2=0x02 t3=0x00 -sys={2700.000000}: select(): load=90 -> step_sec=540 -(bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) -pcu_info_update(): t2=0x00 t3=0x00 -BTS deallocated OK in test_acc_ramp_dynamic() -===test_acc_ramp_fixed_rotate=== -(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) -BTS allocation OK in test_acc_ramp_fixed_rotate() +BTS allocation OK in test_acc_ramp_up_rotate() *** Barring one ACC *** (bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) pcu_info_update(): t2=0x02 t3=0x00 @@ -617,4 +582,660 @@ pcu_info_update(): t2=0x02 t3=0x00 sys={2250.000000}: select() (bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) -BTS deallocated OK in test_acc_ramp_fixed_rotate() +sys={2500.000000}: select() +sys={2750.000000}: select() +sys={3000.000000}: select() +sys={3250.000000}: select() +BTS deallocated OK in test_acc_ramp_up_rotate() +===test_acc_ramp_up_rotate(0, 20, 50)=== +(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +BTS allocation OK in test_acc_ramp_up_rotate() +*** Barring one ACC *** +(bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) +pcu_info_update(): t2=0x02 t3=0x00 +(bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=9, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfe +sys={100.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x001 -> 0x002 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfd +sys={200.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x002 -> 0x004 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfb +sys={250.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x004 -> 0x00c (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf3 +sys={350.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x00c -> 0x018 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe7 +sys={450.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x018 -> 0x030 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xcf +sys={500.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x030 -> 0x070 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x8f +sys={600.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x070 -> 0x0e0 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x1f +sys={700.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x0e0 -> 0x1c0 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x3f +sys={750.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x1c0 -> 0x1c1 (active_len=4, ramp_len=4, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x3e +sys={850.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x1c1 -> 0x0c3 (active_len=4, ramp_len=4, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x3c +sys={950.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x0c3 -> 0x047 (active_len=4, ramp_len=4, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xb8 +sys={1000.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x047 -> 0x0c7 (active_len=5, ramp_len=5, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x38 +sys={1100.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x0c7 -> 0x04f (active_len=5, ramp_len=5, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xb0 +sys={1200.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x04f -> 0x01f (active_len=5, ramp_len=5, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe0 +sys={1250.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x01f -> 0x03f (active_len=6, ramp_len=6, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xc0 +sys={1350.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x03f -> 0x07e (active_len=6, ramp_len=6, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x81 +sys={1450.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x07e -> 0x0fc (active_len=6, ramp_len=6, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x03 +sys={1500.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x0fc -> 0x1fc (active_len=7, ramp_len=7, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x03 +sys={1600.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x1fc -> 0x1f9 (active_len=7, ramp_len=7, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x06 +sys={1700.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x1f9 -> 0x0fb (active_len=7, ramp_len=7, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x04 +sys={1750.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x0fb -> 0x1fb (active_len=8, ramp_len=8, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x04 +sys={1850.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x1fb -> 0x0ff (active_len=8, ramp_len=8, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x00 +sys={1950.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x0ff -> 0x1fe (active_len=8, ramp_len=8, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x01 +sys={2000.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x1fe -> 0x1ff (active_len=9, ramp_len=9, adm_len=10, perm_len=9, rotation=off) +pcu_info_update(): t2=0x02 t3=0x00 +sys={2250.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) +sys={2500.000000}: select() +sys={2750.000000}: select() +sys={3000.000000}: select() +sys={3250.000000}: select() +BTS deallocated OK in test_acc_ramp_up_rotate() +===test_acc_ramp_up_rotate(70, 80, 90)=== +(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +BTS allocation OK in test_acc_ramp_up_rotate() +*** Barring one ACC *** +(bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) +pcu_info_update(): t2=0x02 t3=0x00 +(bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=9, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfe +sys={100.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x001 -> 0x002 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfd +sys={200.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x002 -> 0x004 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfb +sys={250.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x004 -> 0x00c (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf3 +sys={350.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x00c -> 0x018 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe7 +sys={450.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x018 -> 0x030 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xcf +sys={500.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x030 -> 0x070 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x8f +sys={600.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x070 -> 0x0e0 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x1f +sys={700.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x0e0 -> 0x1c0 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x3f +sys={750.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x1c0 -> 0x1c1 (active_len=4, ramp_len=4, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x3e +sys={850.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x1c1 -> 0x0c3 (active_len=4, ramp_len=4, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x3c +sys={950.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x0c3 -> 0x047 (active_len=4, ramp_len=4, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xb8 +sys={1000.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x047 -> 0x0c7 (active_len=5, ramp_len=5, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x38 +sys={1100.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x0c7 -> 0x04f (active_len=5, ramp_len=5, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xb0 +sys={1200.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x04f -> 0x01f (active_len=5, ramp_len=5, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe0 +sys={1250.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x01f -> 0x03f (active_len=6, ramp_len=6, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xc0 +sys={1350.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x03f -> 0x07e (active_len=6, ramp_len=6, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x81 +sys={1450.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x07e -> 0x0fc (active_len=6, ramp_len=6, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x03 +sys={1500.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x0fc -> 0x1fc (active_len=7, ramp_len=7, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x03 +sys={1600.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x1fc -> 0x1f9 (active_len=7, ramp_len=7, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x06 +sys={1700.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x1f9 -> 0x0fb (active_len=7, ramp_len=7, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x04 +sys={1750.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x0fb -> 0x1fb (active_len=8, ramp_len=8, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x04 +sys={1850.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x1fb -> 0x0ff (active_len=8, ramp_len=8, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x00 +sys={1950.000000}: select() +(bts=0) ACC: rotate ACC allowed active subset 0x0ff -> 0x1fe (active_len=8, ramp_len=8, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x01 +sys={2000.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x1fe -> 0x1ff (active_len=9, ramp_len=9, adm_len=10, perm_len=9, rotation=off) +pcu_info_update(): t2=0x02 t3=0x00 +sys={2250.000000}: select() +(bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) +sys={2500.000000}: select() +sys={2750.000000}: select() +sys={3000.000000}: select() +sys={3250.000000}: select() +BTS deallocated OK in test_acc_ramp_up_rotate() +===test_acc_ramp_updown_rotate(80, 90, 0, 100, 15)=== +(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +BTS allocation OK in test_acc_ramp_updown_rotate() +*** Barring one ACC *** +(bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) +pcu_info_update(): t2=0x02 t3=0x00 +(bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=9, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfe +sys={100.000000}: select(0): chan_load_avg=0 +(bts=0) ACC: rotate ACC allowed active subset 0x001 -> 0x002 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfd +sys={200.000000}: select(1): chan_load_avg=15 +(bts=0) ACC: rotate ACC allowed active subset 0x002 -> 0x004 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfb +sys={250.000000}: select(2): chan_load_avg=30 +(bts=0) ACC: update ACC allowed active subset 0x004 -> 0x00c (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf3 +sys={350.000000}: select(3): chan_load_avg=45 +(bts=0) ACC: rotate ACC allowed active subset 0x00c -> 0x018 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe7 +sys={450.000000}: select(4): chan_load_avg=60 +(bts=0) ACC: rotate ACC allowed active subset 0x018 -> 0x030 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xcf +sys={500.000000}: select(5): chan_load_avg=75 +(bts=0) ACC: update ACC allowed active subset 0x030 -> 0x070 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x8f +sys={600.000000}: select(6): chan_load_avg=90 +(bts=0) ACC: rotate ACC allowed active subset 0x070 -> 0x0e0 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x1f +sys={700.000000}: select(7): chan_load_avg=100 +(bts=0) ACC: rotate ACC allowed active subset 0x0e0 -> 0x1c0 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x3f +sys={750.000000}: select(8): chan_load_avg=85 +sys={850.000000}: select(9): chan_load_avg=70 +(bts=0) ACC: rotate ACC allowed active subset 0x1c0 -> 0x181 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x7e +sys={950.000000}: select(10): chan_load_avg=55 +(bts=0) ACC: rotate ACC allowed active subset 0x181 -> 0x083 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x7c +sys={1000.000000}: select(11): chan_load_avg=40 +(bts=0) ACC: update ACC allowed active subset 0x083 -> 0x183 (active_len=4, ramp_len=4, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x7c +sys={1100.000000}: select(12): chan_load_avg=25 +(bts=0) ACC: rotate ACC allowed active subset 0x183 -> 0x087 (active_len=4, ramp_len=4, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x78 +sys={1200.000000}: select(13): chan_load_avg=10 +(bts=0) ACC: rotate ACC allowed active subset 0x087 -> 0x00f (active_len=4, ramp_len=4, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf0 +sys={1250.000000}: select(14): chan_load_avg=0 +(bts=0) ACC: update ACC allowed active subset 0x00f -> 0x01f (active_len=5, ramp_len=5, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe0 +sys={1350.000000}: select(15): chan_load_avg=15 +(bts=0) ACC: rotate ACC allowed active subset 0x01f -> 0x03e (active_len=5, ramp_len=5, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xc1 +sys={1450.000000}: select(16): chan_load_avg=30 +(bts=0) ACC: rotate ACC allowed active subset 0x03e -> 0x07c (active_len=5, ramp_len=5, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x83 +sys={1500.000000}: select(17): chan_load_avg=45 +(bts=0) ACC: update ACC allowed active subset 0x07c -> 0x0fc (active_len=6, ramp_len=6, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x03 +sys={1600.000000}: select(18): chan_load_avg=60 +(bts=0) ACC: rotate ACC allowed active subset 0x0fc -> 0x1f8 (active_len=6, ramp_len=6, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x07 +sys={1700.000000}: select(19): chan_load_avg=75 +(bts=0) ACC: rotate ACC allowed active subset 0x1f8 -> 0x1f1 (active_len=6, ramp_len=6, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x0e +sys={1750.000000}: select(20): chan_load_avg=90 +sys={1850.000000}: select(21): chan_load_avg=100 +(bts=0) ACC: rotate ACC allowed active subset 0x1f1 -> 0x0f3 (active_len=6, ramp_len=6, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x0c +sys={1950.000000}: select(22): chan_load_avg=85 +(bts=0) ACC: rotate ACC allowed active subset 0x0f3 -> 0x077 (active_len=6, ramp_len=6, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x88 +sys={2000.000000}: select(23): chan_load_avg=70 +(bts=0) ACC: update ACC allowed active subset 0x077 -> 0x0f7 (active_len=7, ramp_len=7, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x08 +sys={2100.000000}: select(24): chan_load_avg=55 +(bts=0) ACC: rotate ACC allowed active subset 0x0f7 -> 0x07f (active_len=7, ramp_len=7, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x80 +sys={2200.000000}: select(25): chan_load_avg=40 +(bts=0) ACC: rotate ACC allowed active subset 0x07f -> 0x0fe (active_len=7, ramp_len=7, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x01 +sys={2250.000000}: select(26): chan_load_avg=25 +(bts=0) ACC: update ACC allowed active subset 0x0fe -> 0x1fe (active_len=8, ramp_len=8, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x01 +sys={2350.000000}: select(27): chan_load_avg=10 +(bts=0) ACC: rotate ACC allowed active subset 0x1fe -> 0x1fd (active_len=8, ramp_len=8, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x02 +sys={2450.000000}: select(28): chan_load_avg=0 +(bts=0) ACC: rotate ACC allowed active subset 0x1fd -> 0x0ff (active_len=8, ramp_len=8, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x00 +sys={2500.000000}: select(29): chan_load_avg=15 +(bts=0) ACC: update ACC allowed active subset 0x0ff -> 0x1ff (active_len=9, ramp_len=9, adm_len=10, perm_len=9, rotation=off) +pcu_info_update(): t2=0x02 t3=0x00 +sys={2750.000000}: select(30): chan_load_avg=30 +(bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) +sys={3000.000000}: select(31): chan_load_avg=45 +sys={3250.000000}: select(32): chan_load_avg=60 +sys={3500.000000}: select(33): chan_load_avg=75 +sys={3750.000000}: select(34): chan_load_avg=90 +sys={4000.000000}: select(35): chan_load_avg=100 +sys={4250.000000}: select(36): chan_load_avg=85 +sys={4500.000000}: select(37): chan_load_avg=70 +(bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) +sys={4750.000000}: select(38): chan_load_avg=55 +sys={5000.000000}: select(39): chan_load_avg=40 +sys={5250.000000}: select(40): chan_load_avg=25 +sys={5500.000000}: select(41): chan_load_avg=10 +sys={5750.000000}: select(42): chan_load_avg=0 +sys={6000.000000}: select(43): chan_load_avg=15 +sys={6250.000000}: select(44): chan_load_avg=30 +sys={6500.000000}: select(45): chan_load_avg=45 +sys={6750.000000}: select(46): chan_load_avg=60 +sys={7000.000000}: select(47): chan_load_avg=75 +sys={7250.000000}: select(48): chan_load_avg=90 +sys={7500.000000}: select(49): chan_load_avg=100 +BTS deallocated OK in test_acc_ramp_updown_rotate() +===test_acc_ramp_updown_rotate(30, 50, 10, 100, 15)=== +(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +BTS allocation OK in test_acc_ramp_updown_rotate() +*** Barring one ACC *** +(bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) +pcu_info_update(): t2=0x02 t3=0x00 +(bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=9, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfe +sys={100.000000}: select(0): chan_load_avg=10 +(bts=0) ACC: rotate ACC allowed active subset 0x001 -> 0x002 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfd +sys={200.000000}: select(1): chan_load_avg=25 +(bts=0) ACC: rotate ACC allowed active subset 0x002 -> 0x004 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfb +sys={250.000000}: select(2): chan_load_avg=40 +sys={350.000000}: select(3): chan_load_avg=55 +(bts=0) ACC: rotate ACC allowed active subset 0x004 -> 0x008 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf7 +sys={450.000000}: select(4): chan_load_avg=70 +(bts=0) ACC: rotate ACC allowed active subset 0x008 -> 0x010 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xef +sys={500.000000}: select(5): chan_load_avg=85 +sys={600.000000}: select(6): chan_load_avg=100 +(bts=0) ACC: rotate ACC allowed active subset 0x010 -> 0x020 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xdf +sys={700.000000}: select(7): chan_load_avg=85 +(bts=0) ACC: rotate ACC allowed active subset 0x020 -> 0x040 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xbf +sys={750.000000}: select(8): chan_load_avg=70 +sys={850.000000}: select(9): chan_load_avg=55 +(bts=0) ACC: rotate ACC allowed active subset 0x040 -> 0x080 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x7f +sys={950.000000}: select(10): chan_load_avg=40 +(bts=0) ACC: rotate ACC allowed active subset 0x080 -> 0x100 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0xff +sys={1000.000000}: select(11): chan_load_avg=25 +(bts=0) ACC: update ACC allowed active subset 0x100 -> 0x101 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0xfe +sys={1100.000000}: select(12): chan_load_avg=10 +(bts=0) ACC: rotate ACC allowed active subset 0x101 -> 0x003 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfc +sys={1200.000000}: select(13): chan_load_avg=25 +(bts=0) ACC: rotate ACC allowed active subset 0x003 -> 0x006 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf9 +sys={1250.000000}: select(14): chan_load_avg=40 +sys={1350.000000}: select(15): chan_load_avg=55 +(bts=0) ACC: rotate ACC allowed active subset 0x006 -> 0x00c (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf3 +sys={1450.000000}: select(16): chan_load_avg=70 +(bts=0) ACC: rotate ACC allowed active subset 0x00c -> 0x018 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe7 +sys={1500.000000}: select(17): chan_load_avg=85 +(bts=0) ACC: update ACC allowed active subset 0x018 -> 0x010 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xef +sys={1600.000000}: select(18): chan_load_avg=100 +(bts=0) ACC: rotate ACC allowed active subset 0x010 -> 0x020 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xdf +sys={1700.000000}: select(19): chan_load_avg=85 +(bts=0) ACC: rotate ACC allowed active subset 0x020 -> 0x040 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xbf +sys={1750.000000}: select(20): chan_load_avg=70 +sys={1850.000000}: select(21): chan_load_avg=55 +(bts=0) ACC: rotate ACC allowed active subset 0x040 -> 0x080 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x7f +sys={1950.000000}: select(22): chan_load_avg=40 +(bts=0) ACC: rotate ACC allowed active subset 0x080 -> 0x100 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0xff +sys={2000.000000}: select(23): chan_load_avg=25 +(bts=0) ACC: update ACC allowed active subset 0x100 -> 0x101 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0xfe +sys={2100.000000}: select(24): chan_load_avg=10 +(bts=0) ACC: rotate ACC allowed active subset 0x101 -> 0x003 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfc +sys={2200.000000}: select(25): chan_load_avg=25 +(bts=0) ACC: rotate ACC allowed active subset 0x003 -> 0x006 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf9 +sys={2250.000000}: select(26): chan_load_avg=40 +sys={2350.000000}: select(27): chan_load_avg=55 +(bts=0) ACC: rotate ACC allowed active subset 0x006 -> 0x00c (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf3 +sys={2450.000000}: select(28): chan_load_avg=70 +(bts=0) ACC: rotate ACC allowed active subset 0x00c -> 0x018 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe7 +sys={2500.000000}: select(29): chan_load_avg=85 +(bts=0) ACC: update ACC allowed active subset 0x018 -> 0x010 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xef +sys={2600.000000}: select(30): chan_load_avg=100 +(bts=0) ACC: rotate ACC allowed active subset 0x010 -> 0x020 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xdf +sys={2700.000000}: select(31): chan_load_avg=85 +(bts=0) ACC: rotate ACC allowed active subset 0x020 -> 0x040 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xbf +sys={2750.000000}: select(32): chan_load_avg=70 +sys={2850.000000}: select(33): chan_load_avg=55 +(bts=0) ACC: rotate ACC allowed active subset 0x040 -> 0x080 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x7f +sys={2950.000000}: select(34): chan_load_avg=40 +(bts=0) ACC: rotate ACC allowed active subset 0x080 -> 0x100 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0xff +sys={3000.000000}: select(35): chan_load_avg=25 +(bts=0) ACC: update ACC allowed active subset 0x100 -> 0x101 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0xfe +sys={3100.000000}: select(36): chan_load_avg=10 +(bts=0) ACC: rotate ACC allowed active subset 0x101 -> 0x003 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfc +sys={3200.000000}: select(37): chan_load_avg=25 +(bts=0) ACC: rotate ACC allowed active subset 0x003 -> 0x006 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf9 +sys={3250.000000}: select(38): chan_load_avg=40 +sys={3350.000000}: select(39): chan_load_avg=55 +(bts=0) ACC: rotate ACC allowed active subset 0x006 -> 0x00c (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf3 +sys={3450.000000}: select(40): chan_load_avg=70 +(bts=0) ACC: rotate ACC allowed active subset 0x00c -> 0x018 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe7 +sys={3500.000000}: select(41): chan_load_avg=85 +(bts=0) ACC: update ACC allowed active subset 0x018 -> 0x010 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xef +sys={3600.000000}: select(42): chan_load_avg=100 +(bts=0) ACC: rotate ACC allowed active subset 0x010 -> 0x020 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xdf +sys={3700.000000}: select(43): chan_load_avg=85 +(bts=0) ACC: rotate ACC allowed active subset 0x020 -> 0x040 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xbf +sys={3750.000000}: select(44): chan_load_avg=70 +sys={3850.000000}: select(45): chan_load_avg=55 +(bts=0) ACC: rotate ACC allowed active subset 0x040 -> 0x080 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x7f +sys={3950.000000}: select(46): chan_load_avg=40 +(bts=0) ACC: rotate ACC allowed active subset 0x080 -> 0x100 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0xff +sys={4000.000000}: select(47): chan_load_avg=25 +(bts=0) ACC: update ACC allowed active subset 0x100 -> 0x101 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0xfe +sys={4100.000000}: select(48): chan_load_avg=10 +(bts=0) ACC: rotate ACC allowed active subset 0x101 -> 0x003 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfc +sys={4200.000000}: select(49): chan_load_avg=25 +(bts=0) ACC: rotate ACC allowed active subset 0x003 -> 0x006 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf9 +BTS deallocated OK in test_acc_ramp_updown_rotate() +===test_acc_ramp_updown_rotate(50, 49, 0, 100, 10)=== +(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +BTS allocation OK in test_acc_ramp_updown_rotate() +*** Barring one ACC *** +(bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) +pcu_info_update(): t2=0x02 t3=0x00 +(bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=9, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +(bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfe +sys={100.000000}: select(0): chan_load_avg=0 +(bts=0) ACC: rotate ACC allowed active subset 0x001 -> 0x002 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfd +sys={200.000000}: select(1): chan_load_avg=10 +(bts=0) ACC: rotate ACC allowed active subset 0x002 -> 0x004 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfb +sys={250.000000}: select(2): chan_load_avg=20 +(bts=0) ACC: update ACC allowed active subset 0x004 -> 0x00c (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf3 +sys={350.000000}: select(3): chan_load_avg=30 +(bts=0) ACC: rotate ACC allowed active subset 0x00c -> 0x018 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe7 +sys={450.000000}: select(4): chan_load_avg=40 +(bts=0) ACC: rotate ACC allowed active subset 0x018 -> 0x030 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xcf +sys={500.000000}: select(5): chan_load_avg=50 +(bts=0) ACC: update ACC allowed active subset 0x030 -> 0x020 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xdf +sys={600.000000}: select(6): chan_load_avg=60 +(bts=0) ACC: rotate ACC allowed active subset 0x020 -> 0x040 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xbf +sys={700.000000}: select(7): chan_load_avg=70 +(bts=0) ACC: rotate ACC allowed active subset 0x040 -> 0x080 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x7f +sys={750.000000}: select(8): chan_load_avg=80 +sys={850.000000}: select(9): chan_load_avg=90 +(bts=0) ACC: rotate ACC allowed active subset 0x080 -> 0x100 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0xff +sys={950.000000}: select(10): chan_load_avg=100 +(bts=0) ACC: rotate ACC allowed active subset 0x100 -> 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfe +sys={1000.000000}: select(11): chan_load_avg=90 +sys={1100.000000}: select(12): chan_load_avg=80 +(bts=0) ACC: rotate ACC allowed active subset 0x001 -> 0x002 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfd +sys={1200.000000}: select(13): chan_load_avg=70 +(bts=0) ACC: rotate ACC allowed active subset 0x002 -> 0x004 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfb +sys={1250.000000}: select(14): chan_load_avg=60 +sys={1350.000000}: select(15): chan_load_avg=50 +(bts=0) ACC: rotate ACC allowed active subset 0x004 -> 0x008 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf7 +sys={1450.000000}: select(16): chan_load_avg=40 +(bts=0) ACC: rotate ACC allowed active subset 0x008 -> 0x010 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xef +sys={1500.000000}: select(17): chan_load_avg=30 +(bts=0) ACC: update ACC allowed active subset 0x010 -> 0x030 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xcf +sys={1600.000000}: select(18): chan_load_avg=20 +(bts=0) ACC: rotate ACC allowed active subset 0x030 -> 0x060 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x9f +sys={1700.000000}: select(19): chan_load_avg=10 +(bts=0) ACC: rotate ACC allowed active subset 0x060 -> 0x0c0 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x3f +sys={1750.000000}: select(20): chan_load_avg=0 +(bts=0) ACC: update ACC allowed active subset 0x0c0 -> 0x1c0 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x3f +sys={1850.000000}: select(21): chan_load_avg=10 +(bts=0) ACC: rotate ACC allowed active subset 0x1c0 -> 0x181 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x7e +sys={1950.000000}: select(22): chan_load_avg=20 +(bts=0) ACC: rotate ACC allowed active subset 0x181 -> 0x083 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x7c +sys={2000.000000}: select(23): chan_load_avg=30 +(bts=0) ACC: update ACC allowed active subset 0x083 -> 0x183 (active_len=4, ramp_len=4, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x7c +sys={2100.000000}: select(24): chan_load_avg=40 +(bts=0) ACC: rotate ACC allowed active subset 0x183 -> 0x087 (active_len=4, ramp_len=4, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x78 +sys={2200.000000}: select(25): chan_load_avg=50 +(bts=0) ACC: rotate ACC allowed active subset 0x087 -> 0x00f (active_len=4, ramp_len=4, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf0 +sys={2250.000000}: select(26): chan_load_avg=60 +(bts=0) ACC: update ACC allowed active subset 0x00f -> 0x00e (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf1 +sys={2350.000000}: select(27): chan_load_avg=70 +(bts=0) ACC: rotate ACC allowed active subset 0x00e -> 0x01c (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe3 +sys={2450.000000}: select(28): chan_load_avg=80 +(bts=0) ACC: rotate ACC allowed active subset 0x01c -> 0x038 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xc7 +sys={2500.000000}: select(29): chan_load_avg=90 +(bts=0) ACC: update ACC allowed active subset 0x038 -> 0x030 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xcf +sys={2600.000000}: select(30): chan_load_avg=100 +(bts=0) ACC: rotate ACC allowed active subset 0x030 -> 0x060 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x9f +sys={2700.000000}: select(31): chan_load_avg=90 +(bts=0) ACC: rotate ACC allowed active subset 0x060 -> 0x0c0 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x3f +sys={2750.000000}: select(32): chan_load_avg=80 +(bts=0) ACC: update ACC allowed active subset 0x0c0 -> 0x080 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x7f +sys={2850.000000}: select(33): chan_load_avg=70 +(bts=0) ACC: rotate ACC allowed active subset 0x080 -> 0x100 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0xff +sys={2950.000000}: select(34): chan_load_avg=60 +(bts=0) ACC: rotate ACC allowed active subset 0x100 -> 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfe +sys={3000.000000}: select(35): chan_load_avg=50 +sys={3100.000000}: select(36): chan_load_avg=40 +(bts=0) ACC: rotate ACC allowed active subset 0x001 -> 0x002 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfd +sys={3200.000000}: select(37): chan_load_avg=30 +(bts=0) ACC: rotate ACC allowed active subset 0x002 -> 0x004 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xfb +sys={3250.000000}: select(38): chan_load_avg=20 +(bts=0) ACC: update ACC allowed active subset 0x004 -> 0x00c (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf3 +sys={3350.000000}: select(39): chan_load_avg=10 +(bts=0) ACC: rotate ACC allowed active subset 0x00c -> 0x018 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe7 +sys={3450.000000}: select(40): chan_load_avg=0 +(bts=0) ACC: rotate ACC allowed active subset 0x018 -> 0x030 (active_len=2, ramp_len=2, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xcf +sys={3500.000000}: select(41): chan_load_avg=10 +(bts=0) ACC: update ACC allowed active subset 0x030 -> 0x070 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x8f +sys={3600.000000}: select(42): chan_load_avg=20 +(bts=0) ACC: rotate ACC allowed active subset 0x070 -> 0x0e0 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x1f +sys={3700.000000}: select(43): chan_load_avg=30 +(bts=0) ACC: rotate ACC allowed active subset 0x0e0 -> 0x1c0 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x3f +sys={3750.000000}: select(44): chan_load_avg=40 +(bts=0) ACC: update ACC allowed active subset 0x1c0 -> 0x1c1 (active_len=4, ramp_len=4, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x02 t3=0x3e +sys={3850.000000}: select(45): chan_load_avg=50 +(bts=0) ACC: rotate ACC allowed active subset 0x1c1 -> 0x0c3 (active_len=4, ramp_len=4, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0x3c +sys={3950.000000}: select(46): chan_load_avg=60 +(bts=0) ACC: rotate ACC allowed active subset 0x0c3 -> 0x047 (active_len=4, ramp_len=4, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xb8 +sys={4000.000000}: select(47): chan_load_avg=70 +(bts=0) ACC: update ACC allowed active subset 0x047 -> 0x046 (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xb9 +sys={4100.000000}: select(48): chan_load_avg=80 +(bts=0) ACC: rotate ACC allowed active subset 0x046 -> 0x00e (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xf1 +sys={4200.000000}: select(49): chan_load_avg=90 +(bts=0) ACC: rotate ACC allowed active subset 0x00e -> 0x01c (active_len=3, ramp_len=3, adm_len=10, perm_len=9, rotation=on) +pcu_info_update(): t2=0x03 t3=0xe3 +BTS deallocated OK in test_acc_ramp_updown_rotate() +===test_acc_ramp_updown_rotate(30, 80, 30, 80, 5)=== +(bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) +BTS allocation OK in test_acc_ramp_updown_rotate() +*** Barring one ACC *** +(bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) +pcu_info_update(): t2=0x02 t3=0x00 +(bts=0) ACC: update ACC allowed active subset 0x1ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=9, rotation=off) +pcu_info_update(): t2=0x03 t3=0xff +sys={250.000000}: select(0): chan_load_avg=30 +sys={500.000000}: select(1): chan_load_avg=35 +sys={750.000000}: select(2): chan_load_avg=40 +sys={1000.000000}: select(3): chan_load_avg=45 +sys={1250.000000}: select(4): chan_load_avg=50 +sys={1500.000000}: select(5): chan_load_avg=55 +sys={1750.000000}: select(6): chan_load_avg=60 +sys={2000.000000}: select(7): chan_load_avg=65 +sys={2250.000000}: select(8): chan_load_avg=70 +sys={2500.000000}: select(9): chan_load_avg=75 +sys={2750.000000}: select(10): chan_load_avg=80 +sys={3000.000000}: select(11): chan_load_avg=75 +sys={3250.000000}: select(12): chan_load_avg=70 +sys={3500.000000}: select(13): chan_load_avg=65 +sys={3750.000000}: select(14): chan_load_avg=60 +sys={4000.000000}: select(15): chan_load_avg=55 +sys={4250.000000}: select(16): chan_load_avg=50 +sys={4500.000000}: select(17): chan_load_avg=45 +sys={4750.000000}: select(18): chan_load_avg=40 +sys={5000.000000}: select(19): chan_load_avg=35 +sys={5250.000000}: select(20): chan_load_avg=30 +sys={5500.000000}: select(21): chan_load_avg=35 +sys={5750.000000}: select(22): chan_load_avg=40 +sys={6000.000000}: select(23): chan_load_avg=45 +sys={6250.000000}: select(24): chan_load_avg=50 +sys={6500.000000}: select(25): chan_load_avg=55 +sys={6750.000000}: select(26): chan_load_avg=60 +sys={7000.000000}: select(27): chan_load_avg=65 +sys={7250.000000}: select(28): chan_load_avg=70 +sys={7500.000000}: select(29): chan_load_avg=75 +sys={7750.000000}: select(30): chan_load_avg=80 +sys={8000.000000}: select(31): chan_load_avg=75 +sys={8250.000000}: select(32): chan_load_avg=70 +sys={8500.000000}: select(33): chan_load_avg=65 +sys={8750.000000}: select(34): chan_load_avg=60 +sys={9000.000000}: select(35): chan_load_avg=55 +sys={9250.000000}: select(36): chan_load_avg=50 +sys={9500.000000}: select(37): chan_load_avg=45 +sys={9750.000000}: select(38): chan_load_avg=40 +sys={10000.000000}: select(39): chan_load_avg=35 +sys={10250.000000}: select(40): chan_load_avg=30 +sys={10500.000000}: select(41): chan_load_avg=35 +sys={10750.000000}: select(42): chan_load_avg=40 +sys={11000.000000}: select(43): chan_load_avg=45 +sys={11250.000000}: select(44): chan_load_avg=50 +sys={11500.000000}: select(45): chan_load_avg=55 +sys={11750.000000}: select(46): chan_load_avg=60 +sys={12000.000000}: select(47): chan_load_avg=65 +sys={12250.000000}: select(48): chan_load_avg=70 +sys={12500.000000}: select(49): chan_load_avg=75 +BTS deallocated OK in test_acc_ramp_updown_rotate() -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id17f947c92cdfc0eb9541a9bf066338169caaeb5 Gerrit-Change-Number: 19376 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:02:06 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 31 Jul 2020 10:02:06 +0000 Subject: Change in osmocom-bb[master]: firmware: add possibility to configure TCH loops in the DSP In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19458 ) Change subject: firmware: add possibility to configure TCH loops in the DSP ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ide7b0527ad64a044977a10da4a82a8ecd1fbd8dc Gerrit-Change-Number: 19458 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 10:02:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:03:24 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 31 Jul 2020 10:03:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests/SMSCB: improve SDCCH8+CBCH handling and configuration In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19475 ) Change subject: BTS_Tests/SMSCB: improve SDCCH8+CBCH handling and configuration ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I130a028df7dc476ab765733261a1f007f19f39a8 Gerrit-Change-Number: 19475 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 10:03:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:04:31 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 31 Jul 2020 10:04:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests/SMSCB: establish a dedicated channel in f_smscb_setup() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476 ) Change subject: BTS_Tests/SMSCB: establish a dedicated channel in f_smscb_setup() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476/1/bts/BTS_Tests_SMSCB.ttcn File bts/BTS_Tests_SMSCB.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476/1/bts/BTS_Tests_SMSCB.ttcn at 254 PS1, Line 254: 7 /* TODO: mp_tsc */, what's this TODO exactly about? what needs to be done? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f061a4d48209b1aa5eaea2fd05fc4752de0c70f Gerrit-Change-Number: 19476 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 10:04:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:04:51 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 31 Jul 2020 10:04:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests/SMSCB: enable test cases for CBCH on SDCCH/8 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19477 ) Change subject: BTS_Tests/SMSCB: enable test cases for CBCH on SDCCH/8 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I15286bb784ce828bd9fa709945382af9b2b62b44 Gerrit-Change-Number: 19477 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 10:04:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:19:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 10:19:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests/SMSCB: improve SDCCH8+CBCH handling and configuration In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19475 ) Change subject: BTS_Tests/SMSCB: improve SDCCH8+CBCH handling and configuration ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I130a028df7dc476ab765733261a1f007f19f39a8 Gerrit-Change-Number: 19475 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 10:19:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:19:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 10:19:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests/SMSCB: establish a dedicated channel in f_smscb_setup() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476 ) Change subject: BTS_Tests/SMSCB: establish a dedicated channel in f_smscb_setup() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476/1/bts/BTS_Tests_SMSCB.ttcn File bts/BTS_Tests_SMSCB.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476/1/bts/BTS_Tests_SMSCB.ttcn at 254 PS1, Line 254: 7 /* TODO: mp_tsc */, > what's this TODO exactly about? what needs to be done? the todo is about not using 7 as a hard-coded training sequence code, I guess -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f061a4d48209b1aa5eaea2fd05fc4752de0c70f Gerrit-Change-Number: 19476 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 10:19:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:20:00 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 10:20:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests/SMSCB: enable test cases for CBCH on SDCCH/8 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19477 ) Change subject: BTS_Tests/SMSCB: enable test cases for CBCH on SDCCH/8 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I15286bb784ce828bd9fa709945382af9b2b62b44 Gerrit-Change-Number: 19477 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 10:20:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:21:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 10:21:08 +0000 Subject: Change in osmocom-bb[master]: firmware: add possibility to configure TCH loops in the DSP In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19458 ) Change subject: firmware: add possibility to configure TCH loops in the DSP ...................................................................... Patch Set 1: Code-Review+2 > I have no possibility to test against an MS tester (because I don't have one) There is a Racal 6103 at the sysmocom office, Eric could test this code using it. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ide7b0527ad64a044977a10da4a82a8ecd1fbd8dc Gerrit-Change-Number: 19458 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 10:21:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:21:15 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 10:21:15 +0000 Subject: Change in osmocom-bb[master]: firmware: add possibility to configure TCH loops in the DSP In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19458 ) Change subject: firmware: add possibility to configure TCH loops in the DSP ...................................................................... firmware: add possibility to configure TCH loops in the DSP Change-Id: Ide7b0527ad64a044977a10da4a82a8ecd1fbd8dc --- M include/l1ctl_proto.h M src/target/firmware/include/layer1/sync.h M src/target/firmware/layer1/l23_api.c M src/target/firmware/layer1/prim_tch.c 4 files changed, 25 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Verified Hoernchen: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h index 05d65de..cf41ac7 100644 --- a/include/l1ctl_proto.h +++ b/include/l1ctl_proto.h @@ -149,11 +149,24 @@ uint8_t padding[3]; } __attribute__((packed)); +/* 3GPP TS 44.014, section 5.1 (Calypso specific numbers) */ +enum l1ctl_tch_loop_mode { + L1CTL_TCH_LOOP_OPEN = 0x00, + L1CTL_TCH_LOOP_A = 0x01, + L1CTL_TCH_LOOP_B = 0x02, + L1CTL_TCH_LOOP_C = 0x03, + L1CTL_TCH_LOOP_D = 0x04, + L1CTL_TCH_LOOP_E = 0x05, + L1CTL_TCH_LOOP_F = 0x06, + L1CTL_TCH_LOOP_I = 0x07, +}; + /* TCH mode was changed */ struct l1ctl_tch_mode_conf { uint8_t tch_mode; /* enum tch_mode */ uint8_t audio_mode; - uint8_t padding[2]; + uint8_t tch_loop_mode; /* enum l1ctl_tch_loop_mode */ + uint8_t padding[1]; } __attribute__((packed)); /* data on the CCCH was found. This is following the header */ @@ -231,7 +244,8 @@ #define AUDIO_RX_SPEAKER (1<<2) #define AUDIO_RX_TRAFFIC_IND (1<<3) uint8_t audio_mode; - uint8_t padding[2]; + uint8_t tch_loop_mode; /* enum l1ctl_tch_loop_mode */ + uint8_t padding[1]; } __attribute__((packed)); /* the l1_info_ul header is in front */ diff --git a/src/target/firmware/include/layer1/sync.h b/src/target/firmware/include/layer1/sync.h index 6ed3890..dd93242 100644 --- a/src/target/firmware/include/layer1/sync.h +++ b/src/target/firmware/include/layer1/sync.h @@ -83,6 +83,9 @@ uint8_t tch_sync; uint8_t audio_mode; + /* 3GPP TS 44.014, section 5.1 (Calypso DSP specific numbers) */ + enum l1ctl_tch_loop_mode tch_loop_mode; + /* Transmit queues of pending packets for main DCCH and ACCH */ struct llist_head tx_queue[_NUM_L1S_CHAN]; struct msgb *tx_meas; diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c index d52d8f6..62c21f6 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -352,6 +352,7 @@ dsp_load_ciph_param(0, NULL); l1a_tch_mode_set(GSM48_CMODE_SIGN); audio_set_enabled(GSM48_CMODE_SIGN, 0); + l1s.tch_loop_mode = L1CTL_TCH_LOOP_OPEN; l1s.neigh_pm.n = 0; } @@ -521,6 +522,7 @@ msgb_put(msg, sizeof(*mode_conf)); mode_conf->tch_mode = tch_mode; mode_conf->audio_mode = audio_mode; + mode_conf->tch_loop_mode = l1s.tch_loop_mode; l1_queue_for_l2(msg); } @@ -542,6 +544,7 @@ audio_set_enabled(tch_mode, audio_mode); l1s.tch_sync = 1; /* Needed for audio to work */ + l1s.tch_loop_mode = tch_mode_req->tch_loop_mode; l1ctl_tx_tch_mode_conf(tch_mode, audio_mode); } diff --git a/src/target/firmware/layer1/prim_tch.c b/src/target/firmware/layer1/prim_tch.c index 0254654..40ef8f3 100644 --- a/src/target/firmware/layer1/prim_tch.c +++ b/src/target/firmware/layer1/prim_tch.c @@ -526,7 +526,7 @@ dsp_load_tch_param( &l1s.next_time, tch_mode, tch_f_hn ? TCH_F : TCH_H, tch_sub, - 0, sync, tn + l1s.tch_loop_mode, sync, tn ); dsp_load_rx_task( @@ -585,7 +585,7 @@ dsp_load_tch_param( &l1s.next_time, tch_mode, tch_f_hn ? TCH_F : TCH_H, tch_sub, - 0, 0, tn + l1s.tch_loop_mode, 0, tn ); dsp_load_rx_task(TCHD_DSP_TASK, 0, tsc); /* burst_id unused for TCH */ @@ -791,7 +791,7 @@ dsp_load_tch_param( &l1s.next_time, tch_mode, tch_f_hn ? TCH_F : TCH_H, tch_sub, - 0, 0, tn + l1s.tch_loop_mode, 0, tn ); dsp_load_rx_task( -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ide7b0527ad64a044977a10da4a82a8ecd1fbd8dc Gerrit-Change-Number: 19458 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:21:16 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 10:21:16 +0000 Subject: Change in osmocom-bb[master]: layer23/mobile: implement handling of TCH test loop commands In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19459 ) Change subject: layer23/mobile: implement handling of TCH test loop commands ...................................................................... layer23/mobile: implement handling of TCH test loop commands For more information, see 3GPP TS 44.014, sections: - 5.1 "Single-slot TCH loops", and - 8 "Message definitions and contents". This feature has nothing to do with the Mobility Management, so let's handle GSM48_PDISC_TEST messages in the Radio Resources layer implementation (gsm48_mm.c -> gsm48_rr.c). Change-Id: If8efc57c7017aa8ea47b37c472d1bbb1914389ca --- M src/host/layer23/include/osmocom/bb/common/l1ctl.h M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h M src/host/layer23/src/common/l1ctl.c M src/host/layer23/src/mobile/Makefile.am A src/host/layer23/src/mobile/gsm414.c M src/host/layer23/src/mobile/gsm48_mm.c M src/host/layer23/src/mobile/gsm48_rr.c 7 files changed, 239 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/common/l1ctl.h b/src/host/layer23/include/osmocom/bb/common/l1ctl.h index e4dbded..02ffa34 100644 --- a/src/host/layer23/include/osmocom/bb/common/l1ctl.h +++ b/src/host/layer23/include/osmocom/bb/common/l1ctl.h @@ -49,7 +49,7 @@ /* Transmit TCH_MODE_REQ */ int l1ctl_tx_tch_mode_req(struct osmocom_ms *ms, uint8_t tch_mode, - uint8_t audio_mode); + uint8_t audio_mode, uint8_t tch_loop_mode); /* Transmit ECHO_REQ */ int l1ctl_tx_echo_req(struct osmocom_ms *ms, unsigned int len); diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h index 6996ff3..9b499a6 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h @@ -188,6 +188,9 @@ /* audio flow */ uint8_t audio_mode; + /* 3GPP TS 44.014 TCH test loop mode (L1CTL specific format) */ + uint8_t tch_loop_mode; + /* sapi 3 */ uint8_t sapi3_state; uint8_t sapi3_link_id; diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 54c7452..da30767 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -461,7 +461,7 @@ /* Transmit L1CTL_TCH_MODE_REQ */ int l1ctl_tx_tch_mode_req(struct osmocom_ms *ms, uint8_t tch_mode, - uint8_t audio_mode) + uint8_t audio_mode, uint8_t tch_loop_mode) { struct msgb *msg; struct l1ctl_tch_mode_req *req; @@ -475,6 +475,7 @@ req = (struct l1ctl_tch_mode_req *) msgb_put(msg, sizeof(*req)); req->tch_mode = tch_mode; req->audio_mode = audio_mode; + req->tch_loop_mode = tch_loop_mode; return osmo_send_l1(ms, msg); } diff --git a/src/host/layer23/src/mobile/Makefile.am b/src/host/layer23/src/mobile/Makefile.am index 4e80e4e..783ae16 100644 --- a/src/host/layer23/src/mobile/Makefile.am +++ b/src/host/layer23/src/mobile/Makefile.am @@ -4,7 +4,7 @@ noinst_LIBRARIES = libmobile.a libmobile_a_SOURCES = gsm322.c gsm480_ss.c gsm411_sms.c gsm48_cc.c gsm48_mm.c \ - gsm48_rr.c mnccms.c settings.c subscriber.c support.c \ + gsm48_rr.c gsm414.c mnccms.c settings.c subscriber.c support.c \ transaction.c vty_interface.c voice.c mncc_sock.c primitives.c bin_PROGRAMS = mobile diff --git a/src/host/layer23/src/mobile/gsm414.c b/src/host/layer23/src/mobile/gsm414.c new file mode 100644 index 0000000..2f630df --- /dev/null +++ b/src/host/layer23/src/mobile/gsm414.c @@ -0,0 +1,220 @@ +/* + * (C) 2020 by sysmocom - s.f.m.c. GmbH + * Author: Vadim Yanitskiy + * + * 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 + +#include +#include + +#include + +int gsm48_rr_tx_rr_status(struct osmocom_ms *ms, uint8_t cause); +int gsm48_send_rsl(struct osmocom_ms *ms, uint8_t msg_type, + struct msgb *msg, uint8_t link_id); +struct msgb *gsm48_l3_msgb_alloc(void); + +#define loop_mode_name(mode) \ + get_value_string(loop_mode_names, mode) + +static const struct value_string loop_mode_names[] = { + { L1CTL_TCH_LOOP_OPEN, "(OPEN)" }, + { L1CTL_TCH_LOOP_A, "A" }, + { L1CTL_TCH_LOOP_B, "B" }, + { L1CTL_TCH_LOOP_C, "C" }, + { L1CTL_TCH_LOOP_D, "D" }, + { L1CTL_TCH_LOOP_E, "E" }, + { L1CTL_TCH_LOOP_F, "F" }, + { L1CTL_TCH_LOOP_I, "I" }, + { 0, NULL } +}; + +static struct msgb *alloc_gsm414_msg(uint8_t msg_type) +{ + struct gsm48_hdr *ngh; + struct msgb *nmsg; + + nmsg = gsm48_l3_msgb_alloc(); + if (nmsg == NULL) + return NULL; + + ngh = (struct gsm48_hdr *) msgb_put(nmsg, sizeof(*ngh)); + ngh->proto_discr = GSM48_PDISC_TEST; + ngh->msg_type = msg_type; + + return nmsg; +} + +static int handle_close_tch_loop(struct osmocom_ms *ms, const struct msgb *msg) +{ + struct gsm48_rrlayer *rr = &ms->rrlayer; + const struct gsm48_hdr *gh = msgb_l3(msg); + unsigned int msg_len = msgb_l3len(msg); + struct msgb *nmsg; + + /* Make sure that we have an active connection */ + if (rr->state != GSM48_RR_ST_DEDICATED) { + LOGP(DMM, LOGL_NOTICE, "TCH loop requires an active connection\n"); + gsm48_rr_tx_rr_status(ms, GSM48_RR_CAUSE_MSG_TYPE_N_COMPAT); + return -EINVAL; + } + + /* Make sure that the established channel is either TCH/F or TCH/H */ + if ((rr->cd_now.chan_nr & 0xf8) != RSL_CHAN_Bm_ACCHs + && (rr->cd_now.chan_nr & 0xf0) != RSL_CHAN_Lm_ACCHs) { + LOGP(DMM, LOGL_NOTICE, "TCH loop requires a TCH/F or TCH/H connection\n"); + gsm48_rr_tx_rr_status(ms, GSM48_RR_CAUSE_MSG_TYPE_N_COMPAT); + return -EINVAL; + } + + /* Check if a loop is already closed */ + if (rr->tch_loop_mode != L1CTL_TCH_LOOP_OPEN) { + LOGP(DMM, LOGL_NOTICE, "TCH loop has already been closed\n"); + gsm48_rr_tx_rr_status(ms, GSM48_RR_CAUSE_MSG_TYPE_N_COMPAT); + return -EINVAL; + } + + if ((msg_len - sizeof(*gh)) < 1) + return -EINVAL; + + /* Parse type of the TCH test loop, convert to L1CTL format */ + uint8_t gsm414_loop_mode = (gh->data[0] >> 1) & 0x1f; + + /* NOTE: some bits are not specified, so they can be 0 or 1 */ + if (gsm414_loop_mode == GSM414_LOOP_A) + rr->tch_loop_mode = L1CTL_TCH_LOOP_A; + else if (gsm414_loop_mode == GSM414_LOOP_B) + rr->tch_loop_mode = L1CTL_TCH_LOOP_B; + else if ((gsm414_loop_mode & 0x1e) == GSM414_LOOP_C) + rr->tch_loop_mode = L1CTL_TCH_LOOP_C; + else if ((gsm414_loop_mode & 0x1c) == GSM414_LOOP_D) + rr->tch_loop_mode = L1CTL_TCH_LOOP_D; + else if ((gsm414_loop_mode & 0x1c) == GSM414_LOOP_E) + rr->tch_loop_mode = L1CTL_TCH_LOOP_E; + else if ((gsm414_loop_mode & 0x1c) == GSM414_LOOP_F) + rr->tch_loop_mode = L1CTL_TCH_LOOP_F; + else if ((gsm414_loop_mode & 0x1c) == GSM414_LOOP_I) + rr->tch_loop_mode = L1CTL_TCH_LOOP_I; + else { + LOGP(DMM, LOGL_NOTICE, "Unhandled 3GPP TS 44.014 TCH loop " + "mode=0x%02x => rejecting\n", gsm414_loop_mode); + gsm48_rr_tx_rr_status(ms, GSM48_RR_CAUSE_MSG_TYPE_N); + return -ENOTSUP; + } + + LOGP(DMM, LOGL_NOTICE, "(%s) Closing 3GPP TS 44.014 TCH loop mode '%s'\n", + rsl_chan_nr_str(rr->cd_now.chan_nr), loop_mode_name(rr->tch_loop_mode)); + + /* Instruct the L1 to enable received TCH loopback mode + * FIXME: delay applying this mode, so we can send the ACK first */ + l1ctl_tx_tch_mode_req(ms, rr->cd_now.mode, rr->audio_mode, rr->tch_loop_mode); + + /* Craft and send the ACKnowledgement */ + nmsg = alloc_gsm414_msg(GSM414_MT_CLOSE_TCH_LOOP_ACK); + if (nmsg == NULL) + return -ENOMEM; + + return gsm48_send_rsl(ms, RSL_MT_DATA_REQ, nmsg, 0); +} + +static int handle_open_tch_loop(struct osmocom_ms *ms, const struct msgb *msg) +{ + struct gsm48_rrlayer *rr = &ms->rrlayer; + struct msgb *nmsg; + + /* Make sure that we have an active connection */ + if (rr->state != GSM48_RR_ST_DEDICATED) { + LOGP(DMM, LOGL_NOTICE, "TCH loop requires an active connection\n"); + gsm48_rr_tx_rr_status(ms, GSM48_RR_CAUSE_MSG_TYPE_N_COMPAT); + return -EINVAL; + } + + /* Make sure that the established channel is either TCH/F or TCH/H */ + if ((rr->cd_now.chan_nr & 0xf8) != RSL_CHAN_Bm_ACCHs + && (rr->cd_now.chan_nr & 0xf0) != RSL_CHAN_Lm_ACCHs) { + LOGP(DMM, LOGL_NOTICE, "TCH loop requires a TCH/F or TCH/H connection\n"); + gsm48_rr_tx_rr_status(ms, GSM48_RR_CAUSE_MSG_TYPE_N_COMPAT); + return -EINVAL; + } + + /* Check if a loop actually needs to be closed */ + if (rr->tch_loop_mode == L1CTL_TCH_LOOP_OPEN) { + LOGP(DMM, LOGL_NOTICE, "TCH loop has not been closed (already open)\n"); + gsm48_rr_tx_rr_status(ms, GSM48_RR_CAUSE_MSG_TYPE_N_COMPAT); + return -EINVAL; + } + + LOGP(DMM, LOGL_NOTICE, "(%s) Opening 3GPP TS 44.014 TCH loop mode '%s'\n", + rsl_chan_nr_str(rr->cd_now.chan_nr), loop_mode_name(rr->tch_loop_mode)); + + /* Instruct the L1 to disable the TCH loopback mode */ + l1ctl_tx_tch_mode_req(ms, rr->cd_now.mode, rr->audio_mode, L1CTL_TCH_LOOP_OPEN); + + /* Only the loop mode C needs to be ACKnowledged */ + bool needs_ack = rr->tch_loop_mode == L1CTL_TCH_LOOP_C; + rr->tch_loop_mode = L1CTL_TCH_LOOP_OPEN; + if (!needs_ack) + return 0; + + /* Craft and send the ACKnowledgement */ + nmsg = alloc_gsm414_msg(GSM414_MT_OPEN_LOOP_CMD); + if (nmsg == NULL) + return -ENOMEM; + + msgb_put_u8(nmsg, GSM414_OPEN_LOOP_ACK_IE); + + return gsm48_send_rsl(ms, RSL_MT_DATA_REQ, nmsg, 0); +} + +int gsm414_rcv_test(struct osmocom_ms *ms, const struct msgb *msg) +{ + const struct gsm48_hdr *gh = msgb_l3(msg); + + LOGP(DMM, LOGL_INFO, "Received 3GPP TS 44.014 message '%s' (0x%02x)\n", + get_value_string(gsm414_msgt_names, gh->msg_type), gh->msg_type); + + /* TODO: check if the test SIM (special EF.ADM) is inserted */ + switch (gh->msg_type) { + case GSM414_MT_CLOSE_TCH_LOOP_CMD: + return handle_close_tch_loop(ms, msg); + case GSM414_MT_OPEN_LOOP_CMD: + return handle_open_tch_loop(ms, msg); + default: + LOGP(DMM, LOGL_NOTICE, "Unhandled 3GPP TS 44.014 message '%s' (0x%02x)\n", + get_value_string(gsm414_msgt_names, gh->msg_type), gh->msg_type); + gsm48_rr_tx_rr_status(ms, GSM48_RR_CAUSE_MSG_TYPE_N); + return -ENOTSUP; + } +} diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 52c6fe9..49cc2bc 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -4076,14 +4076,9 @@ msgb_free(msg); return rc; - case GSM48_PDISC_TEST: /* test TS 04.14 */ - LOGP(DMM, LOGL_NOTICE, "Test protocol 0x%02x according to " - "TS 04.14 is not supported.\n", pdisc); - goto status; default: LOGP(DMM, LOGL_NOTICE, "Protocol type 0x%02x unsupported.\n", pdisc); -status: msgb_free(msg); return gsm48_mm_tx_mm_status(ms, GSM48_REJECT_MSG_TYPE_NOT_IMPLEMENTED); diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 0449ee3..64d64f1 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -93,6 +93,7 @@ static int gsm48_rr_set_mode(struct osmocom_ms *ms, uint8_t chan_nr, uint8_t mode); static int gsm48_rr_rel_cnf(struct osmocom_ms *ms, struct msgb *msg); +int gsm414_rcv_test(struct osmocom_ms *ms, const struct msgb *msg); /* * support @@ -516,8 +517,8 @@ } /* push rsl header and send (RSL-SAP) */ -static int gsm48_send_rsl(struct osmocom_ms *ms, uint8_t msg_type, - struct msgb *msg, uint8_t link_id) +int gsm48_send_rsl(struct osmocom_ms *ms, uint8_t msg_type, + struct msgb *msg, uint8_t link_id) { struct gsm48_rrlayer *rr = &ms->rrlayer; @@ -879,7 +880,7 @@ */ /* send rr status request */ -static int gsm48_rr_tx_rr_status(struct osmocom_ms *ms, uint8_t cause) +int gsm48_rr_tx_rr_status(struct osmocom_ms *ms, uint8_t cause) { struct msgb *nmsg; struct gsm48_hdr *gh; @@ -3433,7 +3434,7 @@ /* setting (new) timing advance */ LOGP(DRR, LOGL_INFO, "setting TCH mode to %d, audio mode to %d\n", mode, rr->audio_mode); - l1ctl_tx_tch_mode_req(ms, mode, rr->audio_mode); + l1ctl_tx_tch_mode_req(ms, mode, rr->audio_mode, rr->tch_loop_mode); return 0; } @@ -4627,9 +4628,9 @@ struct gsm48_hdr *gh = msgb_l3(msg); struct gsm48_rr_hdr *rrh; uint8_t pdisc = gh->proto_discr & 0x0f; + int rc = -EINVAL; if (pdisc == GSM48_PDISC_RR) { - int rc = -EINVAL; uint8_t skip_ind = (gh->proto_discr & 0xf0) >> 4; /* ignore if skip indicator is not B'0000' */ @@ -4676,6 +4677,10 @@ msgb_free(msg); return rc; + } else if (pdisc == GSM48_PDISC_TEST) { + rc = gsm414_rcv_test(ms, msg); + msgb_free(msg); + return rc; } /* pull off RSL header up to L3 message */ @@ -5505,6 +5510,7 @@ start_rr_t_meas(rr, 1, 0); rr->audio_mode = AUDIO_TX_MICROPHONE | AUDIO_RX_SPEAKER; + rr->tch_loop_mode = L1CTL_TCH_LOOP_OPEN; return 0; } @@ -5707,6 +5713,5 @@ && ch_type != RSL_CHAN_Lm_ACCHs) return 0; - return l1ctl_tx_tch_mode_req(ms, rr->cd_now.mode, mode); + return l1ctl_tx_tch_mode_req(ms, rr->cd_now.mode, mode, rr->tch_loop_mode); } - -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If8efc57c7017aa8ea47b37c472d1bbb1914389ca Gerrit-Change-Number: 19459 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:21:29 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 10:21:29 +0000 Subject: Change in osmo-ccid-firmware[master]: contrib/jenkins.sh: Disable thread-local storage in libosmocore In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19464 ) Change subject: contrib/jenkins.sh: Disable thread-local storage in libosmocore ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19464 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ie75fb7e71b316be164ed69d832ffcf2bd1a04fb7 Gerrit-Change-Number: 19464 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 10:21:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:21:35 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 10:21:35 +0000 Subject: Change in osmo-ccid-firmware[master]: contrib/jenkins.sh: Disable thread-local storage in libosmocore In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19464 ) Change subject: contrib/jenkins.sh: Disable thread-local storage in libosmocore ...................................................................... contrib/jenkins.sh: Disable thread-local storage in libosmocore Let's disable thread-local-storage by re-defining __thread in the pre-processor. This is required at least on Debian unstable to get a sysmoOCTSIM build without any missing symbols to __tls_get_addr. Change-Id: Ie75fb7e71b316be164ed69d832ffcf2bd1a04fb7 --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index c28f550..35625f1 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -43,7 +43,8 @@ ./configure --enable-static --prefix="$inst/stow/libosmocore" --host=arm-none-eabi \ --enable-embedded --disable-doxygen --disable-shared --disable-pseudotalloc \ --disable-libsctp --disable-libusb --disable-gb --enable-external-tests \ - CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -mthumb -Os -mlong-calls -g3 -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -I /home/laforge/projects/git/osmo-ccid-firmware/sysmoOCTSIM -Wno-error=format" + CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -mthumb -Os -mlong-calls -g3 -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -I /home/laforge/projects/git/osmo-ccid-firmware/sysmoOCTSIM -Wno-error=format" \ + CPPFLAGS="-D__thread=''" make $PARALLEL_MAKE install make clean STOW_DIR="$inst/stow" stow --restow libosmocore -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19464 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ie75fb7e71b316be164ed69d832ffcf2bd1a04fb7 Gerrit-Change-Number: 19464 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:21:46 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 10:21:46 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp-client: fix memleak in case if no response is received In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19271 ) Change subject: libosmo-mgcp-client: fix memleak in case if no response is received ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I83938ff47fa8570b8d9dc810a184864a0c0b58aa Gerrit-Change-Number: 19271 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 31 Jul 2020 10:21:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:21:49 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 10:21:49 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp-client: fix memleak in case if no response is received In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19271 ) Change subject: libosmo-mgcp-client: fix memleak in case if no response is received ...................................................................... libosmo-mgcp-client: fix memleak in case if no response is received This problem was noticed while running several LCLS test cases from ttcn3-bsc-test. Every test case makes osmo-bsc leak at least two chunks named 'struct mgcp_response_pending'. Here is the related osmo-bsc output with additional debug messages: DRLL ERROR mgcp_client_fsm.c:525 MGCP_CONN(to-MSC)[0x612000016120]{ST_READY}: MGW/DLCX: abrupt FSM termination with connections still present, sending unconditional DLCX... DLMGCP DEBUG mgcp_client.c:1010 mgcp_client_next_trans_id(id=35): new trans ID DLMGCP DEBUG mgcp_client.c:918 mgcp_client_pending_add(id=35): allocated and queued DLMGCP DEBUG mgcp_client.c:962 Queued 53 bytes for MGCP GW DLMGCP DEBUG mgcp_client.c:725 Tx MGCP: r=127.0.0.1:2427<->l=127.0.0.1:2727: len=53 'DLCX 35 rtpbridge/1 at mgw MGCP 1.0\r\nC: 5\r\nI:'... DLMGCP ERROR mgcp_client.c:704 Failed to read: r=127.0.0.1:2427<->l=127.0.0.1:2727: 111='Connection refused' The MGCP client FSM enqueues a DLCX from its fsm_cleanup_cb(), and terminates. Thus if the remote MGCP peer becomes unavailable (e.g. due to a network failure), we would never get a response, and since the FSM is already terminated, nobody would pop and free() the response handler from the queue (mgcp->responses_pending). As a simple workaround, let's avoid allocating dummy entries of 'struct mgcp_response_pending' without a response handler. The only case where an MGCP message is sent without a handler is exactly during the FSM termination. Change-Id: I83938ff47fa8570b8d9dc810a184864a0c0b58aa Related: OS#4619 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 10 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 1ca7483..ffba074 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -985,7 +985,7 @@ int mgcp_client_tx(struct mgcp_client *mgcp, struct msgb *msg, mgcp_response_cb_t response_cb, void *priv) { - struct mgcp_response_pending *pending; + struct mgcp_response_pending *pending = NULL; mgcp_trans_id_t trans_id; int rc; @@ -997,10 +997,13 @@ return -EINVAL; } - pending = mgcp_client_pending_add(mgcp, trans_id, response_cb, priv); - if (!pending) { - talloc_free(msg); - return -ENOMEM; + /* Do not allocate a dummy 'mgcp_response_pending' entry */ + if (response_cb != NULL) { + pending = mgcp_client_pending_add(mgcp, trans_id, response_cb, priv); + if (!pending) { + talloc_free(msg); + return -ENOMEM; + } } if (msgb_l2len(msg) > 4096) { @@ -1023,6 +1026,8 @@ return 0; mgcp_tx_error: + if (!pending) + return -1; /* Dequeue pending response, it's going to be free()d */ llist_del(&pending->entry); /* Pass NULL to response cb to indicate an error */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I83938ff47fa8570b8d9dc810a184864a0c0b58aa Gerrit-Change-Number: 19271 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:21:50 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 10:21:50 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp-client: mgcp_client_tx(): return rc on error In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19293 ) Change subject: libosmo-mgcp-client: mgcp_client_tx(): return rc on error ...................................................................... libosmo-mgcp-client: mgcp_client_tx(): return rc on error Change-Id: Ic2080241ceb9e00109a5222b78c35b7971320c21 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index ffba074..b1909f0 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -1027,12 +1027,12 @@ mgcp_tx_error: if (!pending) - return -1; + return rc; /* Dequeue pending response, it's going to be free()d */ llist_del(&pending->entry); /* Pass NULL to response cb to indicate an error */ mgcp_client_handle_response(mgcp, pending, NULL); - return -1; + return rc; } /*! Cancel a pending transaction. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic2080241ceb9e00109a5222b78c35b7971320c21 Gerrit-Change-Number: 19293 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:23:10 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 10:23:10 +0000 Subject: Change in osmo-ccid-firmware[master]: WIP: enable timers In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17122 ) Change subject: WIP: enable timers ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17122/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17122/3//COMMIT_MSG at 10 PS3, Line 10: octsims "simtrace2 broken cardem feature"? -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ib96fc5b5172c9ab9870c33545702368526d5a835 Gerrit-Change-Number: 17122 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 31 Jul 2020 10:23:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:24:14 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 10:24:14 +0000 Subject: Change in osmo-ccid-firmware[master]: handle card ejection during poweron/wait for ATR In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19468 ) Change subject: handle card ejection during poweron/wait for ATR ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ied51af8f37ddad32e3d1464134c22ee4929c5f4e Gerrit-Change-Number: 19468 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jul 2020 10:24:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:24:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 10:24:53 +0000 Subject: Change in osmo-ccid-firmware[master]: Revert "WIP: enable timers" In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19467 ) Change subject: Revert "WIP: enable timers" ...................................................................... Patch Set 3: Code-Review-1 i guess a simple rebase -i dropping the previous commit and this one is needed. -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19467 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: If3a18dd1d52f877f3821435d420154c91f10374d Gerrit-Change-Number: 19467 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jul 2020 10:24:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:25:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 10:25:26 +0000 Subject: Change in osmo-ccid-firmware[master]: ccid: handle timeouts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19470 ) Change subject: ccid: handle timeouts ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I4dfc8d6d0e25008765615d3c4149a75efc0ef44d Gerrit-Change-Number: 19470 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jul 2020 10:25:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:26:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 10:26:04 +0000 Subject: Change in osmo-ccid-firmware[master]: ccid: support warm reset In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19471 ) Change subject: ccid: support warm reset ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I4b0a119afcb37edb1d30badc85834165883a12b5 Gerrit-Change-Number: 19471 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jul 2020 10:26:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:27:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 10:27:04 +0000 Subject: Change in osmo-ccid-firmware[master]: relax the timeouts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19472 ) Change subject: relax the timeouts ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Icb733f2d46f45c1a7dcd2abe6bc292bd41d6b9c2 Gerrit-Change-Number: 19472 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jul 2020 10:27:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 10:35:16 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 31 Jul 2020 10:35:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests/SMSCB: establish a dedicated channel in f_smscb_setup() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476 ) Change subject: BTS_Tests/SMSCB: establish a dedicated channel in f_smscb_setup() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476/1/bts/BTS_Tests_SMSCB.ttcn File bts/BTS_Tests_SMSCB.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476/1/bts/BTS_Tests_SMSCB.ttcn at 254 PS1, Line 254: 7 /* TODO: mp_tsc */, > the todo is about not using 7 as a hard-coded training sequence code, I guess Sure I understand that, I mean which are the steps to go, as in simply using mp_tsc, or something more elaborate is needed, or whether he didn't think about it yet. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f061a4d48209b1aa5eaea2fd05fc4752de0c70f Gerrit-Change-Number: 19476 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 10:35:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 11:08:46 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 31 Jul 2020 11:08:46 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Fix use-after-free in ipaccess_drop() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19478 ) Change subject: ipaccess: Fix use-after-free in ipaccess_drop() ...................................................................... ipaccess: Fix use-after-free in ipaccess_drop() Recent commit b8ea0ff521a3e01c22a9dd1948b9a853521f575e introduced a heap-use-after-free while getting rid of memleaks and clearing up the reference counting lifecycle of the line object. In that commit, e1inp_line_put2() was added in ipaccess_drop() which may potentially free the line object (and its children e1inp_ts objects) under specific conditions/scenarions. However, the function still used the child object e1i_ts which in those scenarios would access already freed memory. Let's keep a local reference during the life of the function to make sure the object is non-freed during e1inp_line_put2(), so that we can notify upper layers that the link is down. Detected by enabling ASan and running BSC_Tests.TC_chopped_ipa_ping TTCN3 test. Related: OS#4688 Change-Id: I4f56af28ad8297846bcdc8ba7afe51fff0f9a00f --- M src/input/ipaccess.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/78/19478/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index d81191c..30bcaf9 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -82,6 +82,7 @@ { int ret = 1; struct e1inp_ts *e1i_ts = ipaccess_line_ts(bfd, line); + e1inp_line_get2(line, __func__); ipaccess_keepalive_fsm_cleanup(e1i_ts); @@ -108,6 +109,7 @@ /* e1inp_sign_link_destroy releases the socket descriptors for us. */ line->ops->sign_link_down(line); + e1inp_line_put2(line, __func__); return ret; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I4f56af28ad8297846bcdc8ba7afe51fff0f9a00f Gerrit-Change-Number: 19478 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 11:14:17 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 31 Jul 2020 11:14:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests/SMSCB: establish a dedicated channel in f_smscb_setup() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476 ) Change subject: BTS_Tests/SMSCB: establish a dedicated channel in f_smscb_setup() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476/1/bts/BTS_Tests_SMSCB.ttcn File bts/BTS_Tests_SMSCB.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476/1/bts/BTS_Tests_SMSCB.ttcn at 254 PS1, Line 254: 7 /* TODO: mp_tsc */, > the todo is about not using 7 as a hard-coded training sequence code, I guess Yes, we should introduce and use a module parameter for that (like mp_trx0_arfcn); > I mean which are the steps to go, as in simply using mp_tsc, or something more If we had this parameter, for sure I would just use it. It does not exist yet, and since adding it goes beyond the scope/topic of this change, I am simply adding TODO for now. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f061a4d48209b1aa5eaea2fd05fc4752de0c70f Gerrit-Change-Number: 19476 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 11:14:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 11:50:34 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 31 Jul 2020 11:50:34 +0000 Subject: Change in libosmocore[master]: vty: Introduce support to set cpu-affinity and scheduler policy In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19442 to look at the new patch set (#5). Change subject: vty: Introduce support to set cpu-affinity and scheduler policy ...................................................................... vty: Introduce support to set cpu-affinity and scheduler policy Process willing to support this kind of configuration through VTY simply need to call "osmo_sched_vty_init(tall_ctx);" during startup to register the commands. For multithreaded processes, new threads willing to get their cpu-affinity mask according to VTY config should call osmo_sched_vty_apply_localthread() (potentially after setting the thread name through pthread_setname_np()). Related: SYS#4986 Change-Id: If76a4bd2cc7b3c7adf5d84790a944d78be70e10a --- M include/Makefile.am M include/osmocom/vty/command.h A include/osmocom/vty/cpu_sched_vty.h M src/vty/Makefile.am A src/vty/cpu_sched_vty.c 5 files changed, 714 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/19442/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If76a4bd2cc7b3c7adf5d84790a944d78be70e10a Gerrit-Change-Number: 19442 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 11:50:49 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 31 Jul 2020 11:50:49 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters: Introduce vty_cpu_sched.adoc chapter In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19443 to look at the new patch set (#2). Change subject: chapters: Introduce vty_cpu_sched.adoc chapter ...................................................................... chapters: Introduce vty_cpu_sched.adoc chapter Documents new features added in libosmocore.git Change-Id If76a4bd2cc7b3c7adf5d84790a944d78be70e10a. This file will be imported in user manuals of programs using the mentioned libosmovty features. Related: SYS#4986 Change-Id: Icd75769ef630c3fa985fc5e2154d5521689cdd3c --- A common/chapters/vty_cpu_sched.adoc 1 file changed, 117 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/43/19443/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Icd75769ef630c3fa985fc5e2154d5521689cdd3c Gerrit-Change-Number: 19443 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 11:51:14 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 31 Jul 2020 11:51:14 +0000 Subject: Change in osmo-bts[master]: common: Support setting rt prio through new libosmovty sched VTY cmds In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19444 to look at the new patch set (#2). Change subject: common: Support setting rt prio through new libosmovty sched VTY cmds ...................................................................... common: Support setting rt prio through new libosmovty sched VTY cmds We gain other features from libosmovty for free, like configuring cpu-affinity of the only thread in the process. Depends: libosmocore.git Change-Id If76a4bd2cc7b3c7adf5d84790a944d78be70e10a Depends: osmo-gsm-masnuals.git Change-Id Icd75769ef630c3fa985fc5e2154d5521689cdd3c Related: SYS#4986 Change-Id: Ice46e406b84fa11afcc7ba31e521e7677df73cf3 --- M TODO-RELEASE M doc/manuals/osmobts-usermanual.adoc M src/common/main.c 3 files changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/44/19444/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19444 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ice46e406b84fa11afcc7ba31e521e7677df73cf3 Gerrit-Change-Number: 19444 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 11:54:56 2020 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 31 Jul 2020 11:54:56 +0000 Subject: Change in osmo-trx[master]: Use new libosmovty cpu sched config features In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/19445 to look at the new patch set (#2). Change subject: Use new libosmovty cpu sched config features ...................................................................... Use new libosmovty cpu sched config features Using the new libosmovty features allow for: * Setting different cpu-affinity masks for each thread in the process, both at startup through .cfg file as well as changing it at runtime. * Unified VTY interface to change the scheduling policy of the process inherited by all osmocom processes enabling the feature. Depends: libosmocore.git Change-Id If76a4bd2cc7b3c7adf5d84790a944d78be70e10a Depends: osmo-gsm-masnuals.git Change-Id Icd75769ef630c3fa985fc5e2154d5521689cdd3c Related: SYS#4986 Change-Id: I3798603779b88ea37da03033cf7737a6e4751d6e --- M CommonLibs/trx_vty.c A TODO-RELEASE M Transceiver52M/Transceiver.cpp M Transceiver52M/device/uhd/UHDDevice.cpp M Transceiver52M/osmo-trx.cpp M Transceiver52M/radioInterface.cpp M doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg M doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg M doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg M doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg M doc/manuals/osmotrx-usermanual.adoc 11 files changed, 32 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/45/19445/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/19445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3798603779b88ea37da03033cf7737a6e4751d6e Gerrit-Change-Number: 19445 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 12:16:59 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 31 Jul 2020 12:16:59 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/scheduler: refactor dummy burst scheduling In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19029 ) Change subject: osmo-bts-trx/scheduler: refactor dummy burst scheduling ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8c3651c27d2991079e83b8abdb7e2c3f95b97a43 Gerrit-Change-Number: 19029 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 12:16:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Jul 31 13:33:56 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 31 Jul 2020 13:33:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5f241dec693e3_67502ac3bb5765f84435b6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Raspbian_10/armv7l Package network:osmocom:nightly/osmo-msc failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: Reading from filehandle failed at ./bs_worker line 1365. (worker was armbuild04:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 31 13:39:56 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 31 Jul 2020 13:39:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_10/armv7l In-Reply-To: References: Message-ID: <5f241f398d1f8_67502ac3bb5765f84465db@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_10/armv7l Package network:osmocom:nightly/osmo-msc failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: File is not a perl storable at /usr/lib/perl5/5.30.1/aarch64-linux-thread-multi/Storable.pm line 443, at ./bs_worker line 1170. (worker was armbuild04:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 31 13:40:13 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 31 Jul 2020 13:40:13 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_10/armv7l In-Reply-To: References: Message-ID: <5f241f50efa33_67502ac3bb5765f84466e5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_10/armv7l Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: File is not a perl storable at /usr/lib/perl5/5.30.1/aarch64-linux-thread-multi/Storable.pm line 443, at ./bs_worker line 1170. (worker was armbuild04:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 31 13:43:56 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 31 Jul 2020 13:43:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_10/armv7l In-Reply-To: References: Message-ID: <5f242024e37cd_67502ac3bb5765f8447714@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_10/armv7l Package network:osmocom:nightly/osmo-bsc failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: File is not a perl storable at /usr/lib/perl5/5.30.1/aarch64-linux-thread-multi/Storable.pm line 443, at ./bs_worker line 1170. (worker was armbuild04:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 31 13:43:57 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 31 Jul 2020 13:43:57 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5f242029e9133_67502ac3bb5765f84481a1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Raspbian_10/armv7l Package network:osmocom:nightly/osmo-sgsn failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: Reading from filehandle failed at ./bs_worker line 1365. (worker was armbuild04:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 31 13:46:13 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 31 Jul 2020 13:46:13 +0000 Subject: Build failure of network:osmocom:nightly/yder in openSUSE_Factory_ARM/armv7l In-Reply-To: References: Message-ID: <5f2420b738574_67502ac3bb5765f844903f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/yder/openSUSE_Factory_ARM/armv7l Package network:osmocom:nightly/yder failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly yder Last lines of build log: File is not a perl storable at /usr/lib/perl5/5.30.1/aarch64-linux-thread-multi/Storable.pm line 443, at ./bs_worker line 1170. (worker was armbuild04:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 31 13:48:13 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 31 Jul 2020 13:48:13 +0000 Subject: Build failure of network:osmocom:nightly/sofia-sip in openSUSE_Factory_ARM/armv7l In-Reply-To: References: Message-ID: <5f242133b113d_67502ac3bb5765f84508c4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/sofia-sip/openSUSE_Factory_ARM/armv7l Package network:osmocom:nightly/sofia-sip failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly sofia-sip Last lines of build log: File is not a perl storable at /usr/lib/perl5/5.30.1/aarch64-linux-thread-multi/Storable.pm line 443, at ./bs_worker line 1170. (worker was armbuild04:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 31 13:48:13 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 31 Jul 2020 13:48:13 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in openSUSE_Factory_ARM/armv7l In-Reply-To: References: Message-ID: <5f2421349f81a_67502ac3bb5765f845094b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/openSUSE_Factory_ARM/armv7l Package network:osmocom:nightly/osmo-sip-connector failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: File is not a perl storable at /usr/lib/perl5/5.30.1/aarch64-linux-thread-multi/Storable.pm line 443, at ./bs_worker line 1170. (worker was armbuild04:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Jul 31 14:01:50 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 31 Jul 2020 14:01:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests/SMSCB: establish a dedicated channel in f_smscb_setup() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476 ) Change subject: BTS_Tests/SMSCB: establish a dedicated channel in f_smscb_setup() ...................................................................... Patch Set 1: Code-Review+2 1+1=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f061a4d48209b1aa5eaea2fd05fc4752de0c70f Gerrit-Change-Number: 19476 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 14:01:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 14:02:03 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 31 Jul 2020 14:02:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests/SMSCB: improve SDCCH8+CBCH handling and configuration In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19475 ) Change subject: BTS_Tests/SMSCB: improve SDCCH8+CBCH handling and configuration ...................................................................... BTS_Tests/SMSCB: improve SDCCH8+CBCH handling and configuration Change-Id: I130a028df7dc476ab765733261a1f007f19f39a8 --- M bts/BTS_Tests_SMSCB.ttcn 1 file changed, 62 insertions(+), 60 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bts/BTS_Tests_SMSCB.ttcn b/bts/BTS_Tests_SMSCB.ttcn index 1e17703..11855bf 100644 --- a/bts/BTS_Tests_SMSCB.ttcn +++ b/bts/BTS_Tests_SMSCB.ttcn @@ -54,8 +54,8 @@ /* CBCH test parameters for most of our tests */ type record CbchTestPars { - /* should we execute on SDCCH4 (true) or SDCCH8 (false) ? */ - boolean use_sdcch4, + /* Should we execute on SDCCH4 or SDCCH8? */ + RslChannelNr chan_nr, /* Parameters for BASIC CBCH */ CbchTestParsChan basic, /* Parameters for EXTENDED CBCH */ @@ -195,29 +195,51 @@ } } -private function f_vty_cbch_setup(boolean use_sdcch4 := true) runs on test_CT { +private function f_vty_cbch_setup(in RslChannelNr chan_nr) runs on test_CT { - if (use_sdcch4 == true) { - f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 0"}, + if (match(chan_nr, t_RslChanNr_CBCH4(0))) { + f_vty_config2(BSCVTY, { "network", "bts 0", "trx 0", "timeslot 0"}, "phys_chan_config CCCH+SDCCH4+CBCH"); - f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 6"}, - "phys_chan_config SDCCH8"); - } else { - f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 0"}, + /* (Re)configure timeslots 1..3 as TCH/F */ + for (var integer tn := 1; tn <= 3; tn := tn + 1) { + f_vty_config2(BSCVTY, { "network", "bts 0", "trx 0", + "timeslot " & int2str(tn) }, + "phys_chan_config TCH/F"); + } + } else if (match(chan_nr, t_RslChanNr_CBCH8(?))) { + f_vty_config2(BSCVTY, { "network", "bts 0", "trx 0", "timeslot 0"}, "phys_chan_config CCCH+SDCCH4"); - f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 6"}, + f_vty_config2(BSCVTY, { "network", "bts 0", "trx 0", + "timeslot " & int2str(chan_nr.tn) }, "phys_chan_config SDCCH8+CBCH"); + + /* (Re)configure timeslots 1..3 (excluding the given one) as TCH/F */ + for (var integer tn := 1; tn <= 3; tn := tn + 1) { + if (tn == chan_nr.tn) + { continue; } + f_vty_config2(BSCVTY, { "network", "bts 0", "trx 0", + "timeslot " & int2str(tn) }, + "phys_chan_config TCH/F"); + } } f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); f_sleep(2.0); } private function f_smscb_setup(inout CbchTestPars pars) runs on test_CT { + /* Make sure we've got either SDCCH4+CBCH or SDCCH8+CBCH. + * SDCCH4+CBCH can only be allocated on TS0, SDCCH8+CBCH on TS0..3. + * On C0 the first timeslot shall always transmit BCCH, thus TS1..3.*/ + if (not match(pars.chan_nr, (t_RslChanNr_CBCH4(0), t_RslChanNr_CBCH8(1), + t_RslChanNr_CBCH8(2), t_RslChanNr_CBCH8(3)))) { + setverdict(inconc, "Unhandled channel number: ", pars.chan_nr); + mtc.stop; + } f_cbch_compute_exp_blocks(pars); f_init_vty_bsc(); /* ensure that a CBCH is present in channel combination */ - f_vty_cbch_setup(pars.use_sdcch4); + f_vty_cbch_setup(pars.chan_nr); f_init(); f_init_l1ctl(); @@ -231,14 +253,6 @@ } } -private function f_smscb_cleanup() runs on test_CT { - /* reset timeslot 0 channel combination to default */ - f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 0"}, - "phys_chan_config CCCH+SDCCH4"); - f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 6"}, - "phys_chan_config SDCCH8"); -} - /* construct a receive/match template for given block_nr in given msg */ private function f_get_block_template(CbchTestMsg msg, integer block_nr) return template CBCH_Block { var template CBCH_Block tr; @@ -326,17 +340,8 @@ } } -private function t_cbch_chan_nr(CbchTestPars pars, template uint8_t tn) return template RslChannelNr { - if (pars.use_sdcch4) { - return t_RslChanNr_CBCH4(tn); - } else { - return t_RslChanNr_CBCH8(tn); - } -} - /* shared function doing the heavy lifting for most CBCH tests */ private function f_TC_smscb(CbchTestPars pars) runs on test_CT { - var template RslChannelNr t_chan_nr := t_cbch_chan_nr(pars, 0); /* FIXME: TS number */ var L1ctlDlMessage dl; var integer msg_count; timer T; @@ -358,7 +363,7 @@ T.start(5.0 + 3.0 * int2float(msg_count)); /* Expect this to show up exactly once on the basic CBCH (four blocks) */ alt { - [] L1CTL.receive(tr_L1CTL_DATA_IND(t_chan_nr)) -> value dl { + [] L1CTL.receive(tr_L1CTL_DATA_IND(pars.chan_nr)) -> value dl { var integer tb := f_cbch_fn2tb(dl.dl_info.frame_nr); var CBCH_Block cb := dec_CBCH_Block(dl.payload.data_ind.payload); log("Tb=", tb, ", CBCH: ", dl, ", block: ", cb); @@ -386,12 +391,10 @@ } } - f_smscb_cleanup(); Misc_Helpers.f_shutdown(__BFILE__, __LINE__, pass); } private function f_TC_smscb_default_only(CbchTestPars pars) runs on test_CT { - var template RslChannelNr t_chan_nr := t_cbch_chan_nr(pars, 0); /* FIXME: TS number */ var L1ctlDlMessage dl; timer T := 5.0; @@ -403,7 +406,7 @@ T.start; alt { - [] L1CTL.receive(tr_L1CTL_DATA_IND(t_chan_nr)) -> value dl { + [] L1CTL.receive(tr_L1CTL_DATA_IND(pars.chan_nr)) -> value dl { var integer tb := f_cbch_fn2tb(dl.dl_info.frame_nr); log("CBCH: ", dl); var CBCH_Block cb := dec_CBCH_Block(dl.payload.data_ind.payload); @@ -436,7 +439,6 @@ [] T.timeout {} } - f_smscb_cleanup(); /* don't shut down; some tests still want to continue */ } @@ -505,7 +507,7 @@ /* transmit single-block SMSCB COMMAND */ testcase TC_sms_cb_cmd_sdcch4_1block() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_1b_norm)), extended := omit }; @@ -513,7 +515,7 @@ } testcase TC_sms_cb_cmd_sdcch8_1block() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := false, + chan_nr := valueof(ts_RslChanNr_CBCH8(2)), basic := valueof(t_CbchPC(msgs_1m_1b_norm)), extended := omit }; @@ -523,7 +525,7 @@ /* transmit dual-block SMSCB COMMAND */ testcase TC_sms_cb_cmd_sdcch4_2block() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_2b_norm)), extended := omit }; @@ -531,7 +533,7 @@ } testcase TC_sms_cb_cmd_sdcch8_2block() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := false, + chan_nr := valueof(ts_RslChanNr_CBCH8(2)), basic := valueof(t_CbchPC(msgs_1m_2b_norm)), extended := omit }; @@ -541,7 +543,7 @@ /* transmit triple-block SMSCB COMMAND */ testcase TC_sms_cb_cmd_sdcch4_3block() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_3b_norm)), extended := omit }; @@ -549,7 +551,7 @@ } testcase TC_sms_cb_cmd_sdcch8_3block() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := false, + chan_nr := valueof(ts_RslChanNr_CBCH8(2)), basic := valueof(t_CbchPC(msgs_1m_3b_norm)), extended := omit }; @@ -559,7 +561,7 @@ /* transmit quad-block SMSCB COMMAND */ testcase TC_sms_cb_cmd_sdcch4_4block() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_4b_norm)), extended := omit }; @@ -567,7 +569,7 @@ } testcase TC_sms_cb_cmd_sdcch8_4block() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := false, + chan_nr := valueof(ts_RslChanNr_CBCH8(2)), basic := valueof(t_CbchPC(msgs_1m_4b_norm)), extended := omit }; @@ -577,7 +579,7 @@ /* transmit multiple commands of each 4 blocks */ testcase TC_sms_cb_cmd_sdcch4_multi() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_3m_4b_norm)), extended := omit }; @@ -585,7 +587,7 @@ } testcase TC_sms_cb_cmd_sdcch8_multi() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := false, + chan_nr := valueof(ts_RslChanNr_CBCH8(2)), basic := valueof(t_CbchPC(msgs_3m_4b_norm)), extended := omit }; @@ -595,7 +597,7 @@ /* transmit multiple commands of each 4 blocks on CBCH EXTD */ testcase TC_sms_cb_cmd_sdcch4_extd_multi() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC({})), extended := valueof(t_CbchPC(msgs_3m_4b_norm)) }; @@ -603,7 +605,7 @@ } testcase TC_sms_cb_cmd_sdcch8_extd_multi() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := false, + chan_nr := valueof(ts_RslChanNr_CBCH8(2)), basic := valueof(t_CbchPC({})), extended := valueof(t_CbchPC(msgs_3m_4b_norm)) }; @@ -613,7 +615,7 @@ /* transmit SMSCB COMMAND with SCHEDULE payload */ testcase TC_sms_cb_cmd_sdcch4_schedule() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_4b_sched)), extended := omit }; @@ -621,7 +623,7 @@ } testcase TC_sms_cb_cmd_sdcch8_schedule() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := false, + chan_nr := valueof(ts_RslChanNr_CBCH8(2)), basic := valueof(t_CbchPC(msgs_1m_4b_sched)), extended := omit }; @@ -631,7 +633,7 @@ /* set a DEFAULT message; verify it gets transmitted all the time */ testcase TC_sms_cb_cmd_sdcch4_default_only() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_3b_default)), extended := omit }; @@ -640,7 +642,7 @@ } testcase TC_sms_cb_cmd_sdcch8_default_only() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_3b_default)), extended := omit }; @@ -650,7 +652,7 @@ testcase TC_sms_cb_cmd_sdcch4_default_and_normal() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_3b_norm, msg_default)), extended := omit }; @@ -658,7 +660,7 @@ } testcase TC_sms_cb_cmd_sdcch8_default_and_normal() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH8(2)), basic := valueof(t_CbchPC(msgs_1m_3b_norm, msg_default)), extended := omit }; @@ -668,7 +670,7 @@ /* first set a DEFAULT message, then disable it again */ testcase TC_sms_cb_cmd_sdcch4_default_then_null() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_3b_default)), extended := omit }; @@ -772,17 +774,17 @@ } } } - f_smscb_cleanup(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } testcase TC_cbc_sdcch4_load_idle() runs on test_CT { f_init_vty_bsc(); - f_vty_cbch_setup(use_sdcch4 := true); + f_vty_cbch_setup(valueof(ts_RslChanNr_CBCH4(0))); f_TC_cbc_load_idle(); } testcase TC_cbc_sdcch8_load_idle() runs on test_CT { f_init_vty_bsc(); - f_vty_cbch_setup(use_sdcch4 := false); + f_vty_cbch_setup(valueof(ts_RslChanNr_CBCH8(2))); f_TC_cbc_load_idle(); } @@ -853,29 +855,29 @@ } } } - f_smscb_cleanup(); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } testcase TC_cbc_sdcch4_load_overload() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(0)), basic := valueof(t_CbchPC(msgs_1m_3b_norm)), extended := omit }; f_init_vty_bsc(); - f_vty_cbch_setup(use_sdcch4 := true); + f_vty_cbch_setup(pars.chan_nr); f_TC_cbc_load_overload(pars); } testcase TC_cbc_sdcch8_load_overload() runs on test_CT { var CbchTestPars pars := { - use_sdcch4 := true, + chan_nr := valueof(ts_RslChanNr_CBCH4(2)), basic := valueof(t_CbchPC(msgs_1m_3b_norm)), extended := omit }; f_init_vty_bsc(); - f_vty_cbch_setup(use_sdcch4 := true); + f_vty_cbch_setup(pars.chan_nr); f_TC_cbc_load_overload(pars); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I130a028df7dc476ab765733261a1f007f19f39a8 Gerrit-Change-Number: 19475 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 14:02:03 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 31 Jul 2020 14:02:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests/SMSCB: establish a dedicated channel in f_smscb_setup() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476 ) Change subject: BTS_Tests/SMSCB: establish a dedicated channel in f_smscb_setup() ...................................................................... BTS_Tests/SMSCB: establish a dedicated channel in f_smscb_setup() Change-Id: I3f061a4d48209b1aa5eaea2fd05fc4752de0c70f --- M bts/BTS_Tests_SMSCB.ttcn 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/bts/BTS_Tests_SMSCB.ttcn b/bts/BTS_Tests_SMSCB.ttcn index 11855bf..92e8094 100644 --- a/bts/BTS_Tests_SMSCB.ttcn +++ b/bts/BTS_Tests_SMSCB.ttcn @@ -243,8 +243,17 @@ f_init(); f_init_l1ctl(); - f_l1_tune(L1CTL, ccch_mode := CCCH_MODE_COMBINED_CBCH); - /* FIXME: switch to dedicated mode for SDCCH/8 */ + + /* Tune L1 to the given CBCH timeslot (SDCCH4+CBCH or SDCCH8+CBCH) */ + if (match(pars.chan_nr, t_RslChanNr_CBCH4(0))) { + f_l1_tune(L1CTL, ccch_mode := CCCH_MODE_COMBINED_CBCH); + } else { + f_l1_tune(L1CTL, ccch_mode := CCCH_MODE_COMBINED); + /* TODO: also handle frequency hopping parameters */ + L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(pars.chan_nr, + 7 /* TODO: mp_tsc */, + mp_trx0_arfcn)); + } /* send SMSCB[s] via RSL */ f_smscb_setup_rsl_chan(pars.basic, false); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f061a4d48209b1aa5eaea2fd05fc4752de0c70f Gerrit-Change-Number: 19476 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 14:02:04 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 31 Jul 2020 14:02:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests/SMSCB: enable test cases for CBCH on SDCCH/8 In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19477 ) Change subject: BTS_Tests/SMSCB: enable test cases for CBCH on SDCCH/8 ...................................................................... BTS_Tests/SMSCB: enable test cases for CBCH on SDCCH/8 Change-Id: I15286bb784ce828bd9fa709945382af9b2b62b44 --- M bts/BTS_Tests_SMSCB.ttcn 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bts/BTS_Tests_SMSCB.ttcn b/bts/BTS_Tests_SMSCB.ttcn index 92e8094..29489fc 100644 --- a/bts/BTS_Tests_SMSCB.ttcn +++ b/bts/BTS_Tests_SMSCB.ttcn @@ -1084,7 +1084,6 @@ execute( TC_cbc_sdcch4_load_idle() ); execute( TC_cbc_sdcch4_load_overload() ); - if (false) { /* FIXME: SDCCH/8 support broken, needs trxcon + L1CTL work */ execute( TC_sms_cb_cmd_sdcch8_1block() ); execute( TC_sms_cb_cmd_sdcch8_2block() ); execute( TC_sms_cb_cmd_sdcch8_3block() ); @@ -1095,7 +1094,6 @@ execute( TC_sms_cb_cmd_sdcch8_default_and_normal() ); execute( TC_cbc_sdcch8_load_idle() ); execute( TC_cbc_sdcch8_load_overload() ); - } execute( TC_etws_p1ro() ); execute( TC_etws_p1ro_end() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I15286bb784ce828bd9fa709945382af9b2b62b44 Gerrit-Change-Number: 19477 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 15:23:58 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 31 Jul 2020 15:23:58 +0000 Subject: Change in osmocom-bb[master]: firmware/layer1: refactor multi-frame task mask composition References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19479 ) Change subject: firmware/layer1: refactor multi-frame task mask composition ...................................................................... firmware/layer1: refactor multi-frame task mask composition Change-Id: I91780146d066c45c42b037c22cb49fd8a96e832b --- M src/target/firmware/layer1/l23_api.c 1 file changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/79/19479/1 diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c index 62c21f6..e9ce032 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -79,8 +79,8 @@ uint8_t lch_idx; enum mframe_task master_task = 0; enum mframe_task second_task = 0; - uint32_t neigh_task = 0; enum mf_type multiframe = 0; + uint32_t task_mask = 0x00; if (cbits == 0x01) { lch_idx = 0; @@ -121,22 +121,27 @@ master_task = MF_TASK_BCCH_CCCH; #endif } + + /* Primary and secondary tasks */ + task_mask |= (1 << master_task) | (1 << second_task); + switch (neigh_mode) { case NEIGH_MODE_PM: switch (multiframe) { case MF51: - neigh_task = (1 << MF_TASK_NEIGH_PM51); + task_mask |= (1 << MF_TASK_NEIGH_PM51); break; case MF26EVEN: - neigh_task = (1 << MF_TASK_NEIGH_PM26E); + task_mask |= (1 << MF_TASK_NEIGH_PM26E); break; case MF26ODD: - neigh_task = (1 << MF_TASK_NEIGH_PM26O); + task_mask |= (1 << MF_TASK_NEIGH_PM26O); break; } break; } - return (1 << master_task) | (1 << second_task) | neigh_task; + + return task_mask; } static int chan_nr2dchan_type(uint8_t chan_nr) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19479 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I91780146d066c45c42b037c22cb49fd8a96e832b Gerrit-Change-Number: 19479 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 15:23:59 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 31 Jul 2020 15:23:59 +0000 Subject: Change in osmocom-bb[master]: firmware/layer1: fix properly apply secondary multi-frame task References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19480 ) Change subject: firmware/layer1: fix properly apply secondary multi-frame task ...................................................................... firmware/layer1: fix properly apply secondary multi-frame task When a dedicated channel is activated, in chan_nr2mf_task_mask() we calculate a bitmask of the corresponding multi-frame tasks to be enabled. Three logical kinds of the multi-frame tasks exist: - primary (master) - the main burst processing task, e.g. MF_TASK_{TCH_F_ODD,SDCCH4_0,GPRS_PDTCH}; - secondary - additional burst processing task (optional), e.g. MF_TASK_GPRS_PTCCH; - measurement - neighbour measurement task (optional), e.g. MF_TASK_NEIGH_{PM51,PM26E,PM26O}. By default, the primary task is set to MF_TASK_BCCH_NORM (0x00). Due to a mistake, the secondary task has also been set to BCCH, so when we switch to a dedicated mode, we also enable the BCCH. This leads to a race condition between the multi-frame tasks, when both primary and secondary ones read bursts from the DSP at the same time, so the firmware hangs because of that: nb_cmd(0) and rxnb.msg != NULL BURST ID 2!=0 BURST ID 3!=1 This regression was introduced together with experimental PDCH support [1]. Let's use value -1 to indicate that the secondary task is not set, and apply it properly. Change-Id: I4d667b2106fd8453eac9e24019bdfb14358d75e3 Fixes: [1] I44531bbe8743c188cc5d4a6ca2a63000e41d6189 Related: OS#3155 --- M src/target/firmware/layer1/l23_api.c 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/80/19480/1 diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c index e9ce032..4621bfc 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -77,8 +77,8 @@ uint8_t cbits = chan_nr >> 3; uint8_t tn = chan_nr & 0x7; uint8_t lch_idx; - enum mframe_task master_task = 0; - enum mframe_task second_task = 0; + enum mframe_task master_task = MF_TASK_BCCH_NORM; + enum mframe_task second_task = -1; /* optional */ enum mf_type multiframe = 0; uint32_t task_mask = 0x00; @@ -123,7 +123,9 @@ } /* Primary and secondary tasks */ - task_mask |= (1 << master_task) | (1 << second_task); + task_mask |= (1 << master_task); + if (second_task >= 0) /* optional */ + task_mask |= (1 << second_task); switch (neigh_mode) { case NEIGH_MODE_PM: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4d667b2106fd8453eac9e24019bdfb14358d75e3 Gerrit-Change-Number: 19480 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 15:40:33 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 31 Jul 2020 15:40:33 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/scheduler: refactor dummy burst scheduling In-Reply-To: References: Message-ID: Hello Jenkins Builder, Hoernchen, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19029 to look at the new patch set (#2). Change subject: osmo-bts-trx/scheduler: refactor dummy burst scheduling ...................................................................... osmo-bts-trx/scheduler: refactor dummy burst scheduling This change facilitates the upcoming freq. hopping implementation, in particular scheduling of dummy bursts on C0 with hopping time- slots. One problem is that we cannot know in advance, whether to send a dummy burst on a given timeslot unless all transceivers are processed. For example, trx#3 may want to send a normal burst on ARFCN of trx#0 (C0), while we have already sent a dummy burst... Another important aspect is that we shall not be sending dummy bursts on transceivers other than C0. Scheduling dummy bursts from _sched_dl_burst() in the context of a single hopping timeslot of a single transceiver leaves trx_sched_fn() no way to know whether it's a dummy burst or something else. Let's solve both problems by moving dummy burst scheduling logic from _sched_dl_burst() to trx_sched_fn(). Maintain C0 slot-mask in the inner (per-trx) loop, so that we can fill missing bursts with dummy bursts afterwards. Change-Id: I8c3651c27d2991079e83b8abdb7e2c3f95b97a43 Related: SYS#4868, OS#4546 --- M include/osmo-bts/scheduler_backend.h M src/common/scheduler.c M src/osmo-bts-trx/scheduler_trx.c 3 files changed, 29 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/29/19029/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8c3651c27d2991079e83b8abdb7e2c3f95b97a43 Gerrit-Change-Number: 19029 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 15:40:33 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 31 Jul 2020 15:40:33 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: indicate support of BTS_FEAT_HOPPING In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/19031 to look at the new patch set (#2). Change subject: osmo-bts-trx: indicate support of BTS_FEAT_HOPPING ...................................................................... osmo-bts-trx: indicate support of BTS_FEAT_HOPPING Change-Id: I81c35d76d4ca0aa54b18c6fd1909a97b4f5f7b68 Related: SYS#4868, OS#4546 --- M src/osmo-bts-trx/main.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/31/19031/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I81c35d76d4ca0aa54b18c6fd1909a97b4f5f7b68 Gerrit-Change-Number: 19031 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 16:08:58 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 16:08:58 +0000 Subject: Change in osmocom-bb[master]: firmware/layer1: fix properly apply secondary multi-frame task In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19480 ) Change subject: firmware/layer1: fix properly apply secondary multi-frame task ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4d667b2106fd8453eac9e24019bdfb14358d75e3 Gerrit-Change-Number: 19480 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jul 2020 16:08:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 16:09:22 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 16:09:22 +0000 Subject: Change in osmocom-bb[master]: firmware/layer1: refactor multi-frame task mask composition In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19479 ) Change subject: firmware/layer1: refactor multi-frame task mask composition ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19479 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I91780146d066c45c42b037c22cb49fd8a96e832b Gerrit-Change-Number: 19479 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jul 2020 16:09:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 16:09:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 16:09:26 +0000 Subject: Change in osmocom-bb[master]: firmware/layer1: refactor multi-frame task mask composition In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19479 ) Change subject: firmware/layer1: refactor multi-frame task mask composition ...................................................................... firmware/layer1: refactor multi-frame task mask composition Change-Id: I91780146d066c45c42b037c22cb49fd8a96e832b --- M src/target/firmware/layer1/l23_api.c 1 file changed, 10 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c index 62c21f6..e9ce032 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -79,8 +79,8 @@ uint8_t lch_idx; enum mframe_task master_task = 0; enum mframe_task second_task = 0; - uint32_t neigh_task = 0; enum mf_type multiframe = 0; + uint32_t task_mask = 0x00; if (cbits == 0x01) { lch_idx = 0; @@ -121,22 +121,27 @@ master_task = MF_TASK_BCCH_CCCH; #endif } + + /* Primary and secondary tasks */ + task_mask |= (1 << master_task) | (1 << second_task); + switch (neigh_mode) { case NEIGH_MODE_PM: switch (multiframe) { case MF51: - neigh_task = (1 << MF_TASK_NEIGH_PM51); + task_mask |= (1 << MF_TASK_NEIGH_PM51); break; case MF26EVEN: - neigh_task = (1 << MF_TASK_NEIGH_PM26E); + task_mask |= (1 << MF_TASK_NEIGH_PM26E); break; case MF26ODD: - neigh_task = (1 << MF_TASK_NEIGH_PM26O); + task_mask |= (1 << MF_TASK_NEIGH_PM26O); break; } break; } - return (1 << master_task) | (1 << second_task) | neigh_task; + + return task_mask; } static int chan_nr2dchan_type(uint8_t chan_nr) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19479 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I91780146d066c45c42b037c22cb49fd8a96e832b Gerrit-Change-Number: 19479 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 16:09:26 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 16:09:26 +0000 Subject: Change in osmocom-bb[master]: firmware/layer1: fix properly apply secondary multi-frame task In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19480 ) Change subject: firmware/layer1: fix properly apply secondary multi-frame task ...................................................................... firmware/layer1: fix properly apply secondary multi-frame task When a dedicated channel is activated, in chan_nr2mf_task_mask() we calculate a bitmask of the corresponding multi-frame tasks to be enabled. Three logical kinds of the multi-frame tasks exist: - primary (master) - the main burst processing task, e.g. MF_TASK_{TCH_F_ODD,SDCCH4_0,GPRS_PDTCH}; - secondary - additional burst processing task (optional), e.g. MF_TASK_GPRS_PTCCH; - measurement - neighbour measurement task (optional), e.g. MF_TASK_NEIGH_{PM51,PM26E,PM26O}. By default, the primary task is set to MF_TASK_BCCH_NORM (0x00). Due to a mistake, the secondary task has also been set to BCCH, so when we switch to a dedicated mode, we also enable the BCCH. This leads to a race condition between the multi-frame tasks, when both primary and secondary ones read bursts from the DSP at the same time, so the firmware hangs because of that: nb_cmd(0) and rxnb.msg != NULL BURST ID 2!=0 BURST ID 3!=1 This regression was introduced together with experimental PDCH support [1]. Let's use value -1 to indicate that the secondary task is not set, and apply it properly. Change-Id: I4d667b2106fd8453eac9e24019bdfb14358d75e3 Fixes: [1] I44531bbe8743c188cc5d4a6ca2a63000e41d6189 Related: OS#3155 --- M src/target/firmware/layer1/l23_api.c 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c index e9ce032..4621bfc 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -77,8 +77,8 @@ uint8_t cbits = chan_nr >> 3; uint8_t tn = chan_nr & 0x7; uint8_t lch_idx; - enum mframe_task master_task = 0; - enum mframe_task second_task = 0; + enum mframe_task master_task = MF_TASK_BCCH_NORM; + enum mframe_task second_task = -1; /* optional */ enum mf_type multiframe = 0; uint32_t task_mask = 0x00; @@ -123,7 +123,9 @@ } /* Primary and secondary tasks */ - task_mask |= (1 << master_task) | (1 << second_task); + task_mask |= (1 << master_task); + if (second_task >= 0) /* optional */ + task_mask |= (1 << second_task); switch (neigh_mode) { case NEIGH_MODE_PM: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4d667b2106fd8453eac9e24019bdfb14358d75e3 Gerrit-Change-Number: 19480 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 16:22:40 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 16:22:40 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/scheduler: refactor dummy burst scheduling In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19029 ) Change subject: osmo-bts-trx/scheduler: refactor dummy burst scheduling ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/19029/1/src/common/scheduler.c File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/19029/1/src/common/scheduler.c at 56 PS1, Line 56: const ubit_t _sched_dummy_burst[] = { > if it's GSM_BURST_LEN size, then please leave it there, it's convenient to quickly understand sizes [?] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8c3651c27d2991079e83b8abdb7e2c3f95b97a43 Gerrit-Change-Number: 19029 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 16:22:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 16:23:34 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 16:23:34 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: indicate support of BTS_FEAT_HOPPING In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19031 ) Change subject: osmo-bts-trx: indicate support of BTS_FEAT_HOPPING ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I81c35d76d4ca0aa54b18c6fd1909a97b4f5f7b68 Gerrit-Change-Number: 19031 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 16:23:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 17:23:56 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 31 Jul 2020 17:23:56 +0000 Subject: Change in osmo-ccid-firmware[master]: handle card ejection during poweron/wait for ATR In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19468 to look at the new patch set (#4). Change subject: handle card ejection during poweron/wait for ATR ...................................................................... handle card ejection during poweron/wait for ATR Change-Id: Ied51af8f37ddad32e3d1464134c22ee4929c5f4e --- M ccid_common/iso7816_fsm.c 1 file changed, 26 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/68/19468/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ied51af8f37ddad32e3d1464134c22ee4929c5f4e Gerrit-Change-Number: 19468 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 17:23:56 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 31 Jul 2020 17:23:56 +0000 Subject: Change in osmo-ccid-firmware[master]: Enable timers In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19469 to look at the new patch set (#4). Change subject: Enable timers ...................................................................... Enable timers Timers should now work as expected Change-Id: I2600a6c29688bd9270a69ffe764815937ad6f889 --- M sysmoOCTSIM/cuart_driver_asf4_usart_async.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/69/19469/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I2600a6c29688bd9270a69ffe764815937ad6f889 Gerrit-Change-Number: 19469 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 17:23:56 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 31 Jul 2020 17:23:56 +0000 Subject: Change in osmo-ccid-firmware[master]: ccid: handle timeouts In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19470 to look at the new patch set (#4). Change subject: ccid: handle timeouts ...................................................................... ccid: handle timeouts Empty trays caused a hang, because the timeout was not handled. This fixes this, and allows manual voltage selection by attempting slot powerup with different voltages after timeout until it succeeds. Change-Id: I4dfc8d6d0e25008765615d3c4149a75efc0ef44d --- M ccid_common/ccid_slot_fsm.c 1 file changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/70/19470/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I4dfc8d6d0e25008765615d3c4149a75efc0ef44d Gerrit-Change-Number: 19470 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 17:23:56 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 31 Jul 2020 17:23:56 +0000 Subject: Change in osmo-ccid-firmware[master]: ccid: support warm reset In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19471 to look at the new patch set (#4). Change subject: ccid: support warm reset ...................................................................... ccid: support warm reset Change-Id: I4b0a119afcb37edb1d30badc85834165883a12b5 --- M ccid_common/ccid_slot_fsm.c 1 file changed, 26 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/71/19471/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I4b0a119afcb37edb1d30badc85834165883a12b5 Gerrit-Change-Number: 19471 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 17:23:56 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 31 Jul 2020 17:23:56 +0000 Subject: Change in osmo-ccid-firmware[master]: relax the timeouts In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19472 to look at the new patch set (#4). Change subject: relax the timeouts ...................................................................... relax the timeouts High baud rates lead to incredibly small wait times that are infeasible as long as software timers are being used, but this is not really a problem - they can just be increased to a reasonable value. At the end of the day the timers need to take the latency of the firmware into account, and timeouts only occur on powerup with wrong voltages/dead cards, or in rare error cases. The actual timeout value does therefore not really matter that much. Change-Id: Icb733f2d46f45c1a7dcd2abe6bc292bd41d6b9c2 --- M ccid_common/cuart.c 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/72/19472/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Icb733f2d46f45c1a7dcd2abe6bc292bd41d6b9c2 Gerrit-Change-Number: 19472 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 17:23:56 2020 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 31 Jul 2020 17:23:56 +0000 Subject: Change in osmo-ccid-firmware[master]: proper card powerup handling In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19473 to look at the new patch set (#4). Change subject: proper card powerup handling ...................................................................... proper card powerup handling Now that the timers work as intended other voltages (that lead to timeouts) may be used. Change-Id: I6105ce7f827aaec8ac36b940766fe05d47145edb --- M ccid_common/ccid_slot_fsm.c M ccid_common/cuart.h M sysmoOCTSIM/cuart_driver_asf4_usart_async.c 3 files changed, 36 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/73/19473/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I6105ce7f827aaec8ac36b940766fe05d47145edb Gerrit-Change-Number: 19473 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 18:15:30 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 31 Jul 2020 18:15:30 +0000 Subject: Change in libosmocore[master]: gsm_08_58: add missing RSL error cause codes In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19448 to look at the new patch set (#5). Change subject: gsm_08_58: add missing RSL error cause codes ...................................................................... gsm_08_58: add missing RSL error cause codes The define constants for the cause codes "BTS not equipped", "remote transcoder failure" and "notification overflow" are missing. Lets add them including value strings. Change-Id: Ic3e936da00bd256bae03867887851f1a4e30e218 --- M include/osmocom/gsm/protocol/gsm_08_58.h M src/gsm/rsl.c 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/48/19448/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic3e936da00bd256bae03867887851f1a4e30e218 Gerrit-Change-Number: 19448 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 18:15:31 2020 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 31 Jul 2020 18:15:31 +0000 Subject: Change in libosmocore[master]: i460_mux: add callback to notify empty tx queue References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/19481 ) Change subject: i460_mux: add callback to notify empty tx queue ...................................................................... i460_mux: add callback to notify empty tx queue There is no way for the API user to know if the TX queue of the multiplexer runs empty. However, this is criticil since an empty TX queue will cause dropout of a TRAU frame, which can have quite severe effects to the receiving end. Lets add a callback that allows the APU user to insert appropiate idle frames or silent frames into the queue before it runs empty. Change-Id: I88a87724235fe50d55ce6215bb385c044072226e Related: OS#2547 --- M include/osmocom/gsm/i460_mux.h M src/gsm/i460_mux.c 2 files changed, 21 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/81/19481/1 diff --git a/include/osmocom/gsm/i460_mux.h b/include/osmocom/gsm/i460_mux.h index 2e33b37..1c18a3f 100644 --- a/include/osmocom/gsm/i460_mux.h +++ b/include/osmocom/gsm/i460_mux.h @@ -52,9 +52,13 @@ void *user_data; }; +typedef void (*in_cb_queue_empty_t)(void *user_data); + struct osmo_i460_subchan_mux { /*! list of to-be-transmitted message buffers */ struct llist_head tx_queue; + in_cb_queue_empty_t in_cb_queue_empty; + void *user_data; }; struct osmo_i460_subchan { @@ -87,6 +91,13 @@ /* opaque user data pointer to pass to out_cb */ void *user_data; } demux; + + struct { + /* FIXME: docstring */ + in_cb_queue_empty_t in_cb_queue_empty; + /* opaque user data pointer to pass to in_cb */ + void *user_data; + } mux; }; void osmo_i460_demux_in(struct osmo_i460_timeslot *ts, const uint8_t *data, size_t data_len); diff --git a/src/gsm/i460_mux.c b/src/gsm/i460_mux.c index 50cb56e..dfd50e5 100644 --- a/src/gsm/i460_mux.c +++ b/src/gsm/i460_mux.c @@ -175,9 +175,15 @@ ubit_t bit; /* if we don't have anything to transmit, return '1' bits */ - if (llist_empty(&mux->tx_queue)) - return 0x01; + if (llist_empty(&mux->tx_queue)) { + /* User code now has a last chance to put something into the queue. */ + if (mux->in_cb_queue_empty) + mux->in_cb_queue_empty(mux->user_data); + /* If the queue is still empty, return idle bits */ + if (llist_empty(&mux->tx_queue)) + return 0x01; + } msg = llist_entry(mux->tx_queue.next, struct msgb, list); bit = msgb_pull_u8(msg); @@ -360,6 +366,8 @@ schan->demux.out_cb_bits = chd->demux.out_cb_bits; schan->demux.out_cb_bytes = chd->demux.out_cb_bytes; schan->demux.user_data = chd->demux.user_data; + schan->mux.in_cb_queue_empty = chd->mux.in_cb_queue_empty; + schan->mux.user_data = chd->mux.user_data; rc = alloc_bitbuf(ctx, schan, chd->demux.num_bits); if (rc < 0) { subchan_reset(schan, false); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I88a87724235fe50d55ce6215bb385c044072226e Gerrit-Change-Number: 19481 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 19:21:03 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 31 Jul 2020 19:21:03 +0000 Subject: Change in libosmocore[master]: i460_mux: add callback to notify empty tx queue In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19481 ) Change subject: i460_mux: add callback to notify empty tx queue ...................................................................... Patch Set 1: The ABI changes need to be reflected in TODO-RELEASE. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I88a87724235fe50d55ce6215bb385c044072226e Gerrit-Change-Number: 19481 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 31 Jul 2020 19:21:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 19:23:25 2020 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 31 Jul 2020 19:23:25 +0000 Subject: Change in libosmocore[master]: i460_mux: add callback to notify empty tx queue In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19481 ) Change subject: i460_mux: add callback to notify empty tx queue ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I88a87724235fe50d55ce6215bb385c044072226e Gerrit-Change-Number: 19481 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 31 Jul 2020 19:23:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 21:23:53 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 21:23:53 +0000 Subject: Change in libosmocore[master]: gsm_08_58: add missing RSL error cause codes In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#6) to the change originally created by dexter. ( https://gerrit.osmocom.org/c/libosmocore/+/19448 ) Change subject: gsm_08_58: add missing RSL error cause codes ...................................................................... gsm_08_58: add missing RSL error cause codes The define constants for the cause codes "BTS not equipped", "remote transcoder failure" and "notification overflow" are missing. Lets add them including value strings. Change-Id: Ic3e936da00bd256bae03867887851f1a4e30e218 --- M include/osmocom/gsm/protocol/gsm_08_58.h M src/gsm/rsl.c 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/48/19448/6 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic3e936da00bd256bae03867887851f1a4e30e218 Gerrit-Change-Number: 19448 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 21:24:04 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 21:24:04 +0000 Subject: Change in libosmocore[master]: gsm_08_58: add missing RSL error cause codes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19448 ) Change subject: gsm_08_58: add missing RSL error cause codes ...................................................................... Patch Set 6: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic3e936da00bd256bae03867887851f1a4e30e218 Gerrit-Change-Number: 19448 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jul 2020 21:24:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 21:24:06 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 21:24:06 +0000 Subject: Change in libosmocore[master]: gsm_08_58: add missing RSL error cause codes In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19448 ) Change subject: gsm_08_58: add missing RSL error cause codes ...................................................................... gsm_08_58: add missing RSL error cause codes The define constants for the cause codes "BTS not equipped", "remote transcoder failure" and "notification overflow" are missing. Lets add them including value strings. Change-Id: Ic3e936da00bd256bae03867887851f1a4e30e218 --- M include/osmocom/gsm/protocol/gsm_08_58.h M src/gsm/rsl.c 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h index da55a8d..cd13a7d 100644 --- a/include/osmocom/gsm/protocol/gsm_08_58.h +++ b/include/osmocom/gsm/protocol/gsm_08_58.h @@ -542,6 +542,9 @@ #define RSL_ERR_CCCH_OVERLOAD 0x23 #define RSL_ERR_ACCH_OVERLOAD 0x24 #define RSL_ERR_PROCESSOR_OVERLOAD 0x25 +#define RSL_ERR_BTS_NOT_EQUIPPED 0x27 +#define RSL_ERR_REMOTE_TRANSC_FAIL 0x28 +#define RSL_ERR_NOTIFICATION_OVERFL 0x29 #define RSL_ERR_RES_UNAVAIL 0x2f /* service or option not available */ #define RSL_ERR_TRANSC_UNAVAIL 0x30 diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c index 5534aa2..cdbdf91 100644 --- a/src/gsm/rsl.c +++ b/src/gsm/rsl.c @@ -295,6 +295,9 @@ { RSL_ERR_CCCH_OVERLOAD, "CCCH Overload" }, { RSL_ERR_ACCH_OVERLOAD, "ACCH Overload" }, { RSL_ERR_PROCESSOR_OVERLOAD, "Processor Overload" }, + { RSL_ERR_BTS_NOT_EQUIPPED, "BTS not equipped" }, + { RSL_ERR_REMOTE_TRANSC_FAIL, "Remote Transcoder Failure" }, + { RSL_ERR_NOTIFICATION_OVERFL, "Notification Overflow" }, { RSL_ERR_RES_UNAVAIL, "Resource not available, unspecified" }, { RSL_ERR_TRANSC_UNAVAIL, "Transcoding not available" }, { RSL_ERR_SERV_OPT_UNAVAIL, "Service or Option not available" }, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic3e936da00bd256bae03867887851f1a4e30e218 Gerrit-Change-Number: 19448 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 21:26:19 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 21:26:19 +0000 Subject: Change in libosmocore[master]: i460_mux: add callback to notify empty tx queue In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19481 ) Change subject: i460_mux: add callback to notify empty tx queue ...................................................................... Patch Set 1: Code-Review+1 > Patch Set 1: > > The ABI changes need to be reflected in TODO-RELEASE. normally, yes. But I don't think this API/ABI has been part of any release yet, so it is not needed. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I88a87724235fe50d55ce6215bb385c044072226e Gerrit-Change-Number: 19481 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jul 2020 21:26:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 21:27:37 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 21:27:37 +0000 Subject: Change in osmo-ccid-firmware[master]: Enable timers In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19469 ) Change subject: Enable timers ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I2600a6c29688bd9270a69ffe764815937ad6f889 Gerrit-Change-Number: 19469 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jul 2020 21:27:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 21:27:57 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 21:27:57 +0000 Subject: Change in osmo-ccid-firmware[master]: Enable timers In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19469 ) Change subject: Enable timers ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I2600a6c29688bd9270a69ffe764815937ad6f889 Gerrit-Change-Number: 19469 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jul 2020 21:27:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 21:28:02 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 21:28:02 +0000 Subject: Change in osmo-ccid-firmware[master]: handle card ejection during poweron/wait for ATR In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19468 ) Change subject: handle card ejection during poweron/wait for ATR ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ied51af8f37ddad32e3d1464134c22ee4929c5f4e Gerrit-Change-Number: 19468 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 31 Jul 2020 21:28:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 21:28:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 21:28:07 +0000 Subject: Change in osmo-ccid-firmware[master]: handle card ejection during poweron/wait for ATR In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19468 ) Change subject: handle card ejection during poweron/wait for ATR ...................................................................... handle card ejection during poweron/wait for ATR Change-Id: Ied51af8f37ddad32e3d1464134c22ee4929c5f4e --- M ccid_common/iso7816_fsm.c 1 file changed, 26 insertions(+), 12 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c index 2796d30..307dac3 100644 --- a/ccid_common/iso7816_fsm.c +++ b/ccid_common/iso7816_fsm.c @@ -128,6 +128,17 @@ 0xf0, 0x70, 0xb0, 0x30, 0xd0, 0x50, 0x90, 0x10, 0xe0, 0x60, 0xa0, 0x20, 0xc0, 0x40, 0x80, 0x00, }; +struct atr_fsm_priv { + uint8_t hist_len; /*!< store the number of expected historical bytes */ + uint8_t y; /*!< last mask of the upcoming TA, TB, TC, TD interface bytes */ + uint8_t i; /*!< interface byte subgroup number */ + struct msgb *atr; /*!< ATR data */ + uint8_t computed_checksum; + uint16_t protocol_support; +}; + +static struct atr_fsm_priv *get_atr_fsm_priv(struct osmo_fsm_inst *fi); + /*********************************************************************** * ISO7816-3 Main FSM ***********************************************************************/ @@ -376,11 +387,15 @@ static void iso7816_3_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { OSMO_ASSERT(fi->fsm == &iso7816_3_fsm); + struct iso7816_3_priv *ip = get_iso7816_3_priv(fi); + struct atr_fsm_priv *atp = get_atr_fsm_priv(ip->atr_fi); switch (event) { case ISO7816_E_HW_ERR_IND: case ISO7816_E_CARD_REMOVAL: /* FIXME: power off? */ + if(fi->state == ISO7816_S_WAIT_ATR || fi->state == ISO7816_S_IN_ATR) + ip->user_cb(fi, ISO7816_E_ATR_ERR_IND, 0, atp->atr); osmo_fsm_inst_state_chg(fi, ISO7816_S_RESET, 0, 0); break; case ISO7816_E_POWER_DN_IND: @@ -541,14 +556,13 @@ * ATR FSM ***********************************************************************/ -struct atr_fsm_priv { - uint8_t hist_len; /*!< store the number of expected historical bytes */ - uint8_t y; /*!< last mask of the upcoming TA, TB, TC, TD interface bytes */ - uint8_t i; /*!< interface byte subgroup number */ - struct msgb *atr; /*!< ATR data */ - uint8_t computed_checksum; - uint16_t protocol_support; -}; +/* type-safe method to obtain atr_fsm_priv from fi */ +static struct atr_fsm_priv *get_atr_fsm_priv(struct osmo_fsm_inst *fi) +{ + OSMO_ASSERT(fi); + OSMO_ASSERT(fi->fsm == &atr_fsm); + return (struct atr_fsm_priv *) fi->priv; +} /* obtain the [software] guard time in milli-seconds from the atr fsm_inst */ static uint32_t atr_fi_gt_ms(struct osmo_fsm_inst *fi) @@ -579,7 +593,7 @@ /* append a single byte to the ATR */ static int atr_append_byte(struct osmo_fsm_inst *fi, uint8_t byte) { - struct atr_fsm_priv *atp = fi->priv; + struct atr_fsm_priv *atp = get_atr_fsm_priv(fi); if (!msgb_tailroom(atp->atr)) { LOGPFSML(fi, LOGL_ERROR, "ATR overflow !?!"); @@ -592,7 +606,7 @@ static void atr_wait_ts_onenter(struct osmo_fsm_inst *fi, uint32_t old_state) { - struct atr_fsm_priv *atp = fi->priv; + struct atr_fsm_priv *atp = get_atr_fsm_priv(fi); /* reset state to its initial value */ atp->hist_len = 0; @@ -608,7 +622,7 @@ static void atr_wait_ts_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct atr_fsm_priv *atp = fi->priv; + struct atr_fsm_priv *atp = get_atr_fsm_priv(fi); struct osmo_fsm_inst *parent_fi = fi->proc.parent; struct iso7816_3_priv *ip = get_iso7816_3_priv(parent_fi); uint8_t byte; @@ -654,7 +668,7 @@ static void atr_wait_tX_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct atr_fsm_priv *atp = fi->priv; + struct atr_fsm_priv *atp = get_atr_fsm_priv(fi); uint32_t guard_time_ms = atr_fi_gt_ms(fi); uint8_t byte; -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ied51af8f37ddad32e3d1464134c22ee4929c5f4e Gerrit-Change-Number: 19468 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 21:28:07 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 21:28:07 +0000 Subject: Change in osmo-ccid-firmware[master]: Enable timers In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19469 ) Change subject: Enable timers ...................................................................... Enable timers Timers should now work as expected Change-Id: I2600a6c29688bd9270a69ffe764815937ad6f889 --- M sysmoOCTSIM/cuart_driver_asf4_usart_async.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/sysmoOCTSIM/cuart_driver_asf4_usart_async.c b/sysmoOCTSIM/cuart_driver_asf4_usart_async.c index 87f5123..0e83385 100644 --- a/sysmoOCTSIM/cuart_driver_asf4_usart_async.c +++ b/sysmoOCTSIM/cuart_driver_asf4_usart_async.c @@ -419,7 +419,7 @@ return 20e6 / ncn8025_div_val[settings.clkdiv]; break; default: - return -EINVAL; + return 0; } return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I2600a6c29688bd9270a69ffe764815937ad6f889 Gerrit-Change-Number: 19469 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 21:28:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 21:28:08 +0000 Subject: Change in osmo-ccid-firmware[master]: ccid: handle timeouts In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19470 ) Change subject: ccid: handle timeouts ...................................................................... ccid: handle timeouts Empty trays caused a hang, because the timeout was not handled. This fixes this, and allows manual voltage selection by attempting slot powerup with different voltages after timeout until it succeeds. Change-Id: I4dfc8d6d0e25008765615d3c4149a75efc0ef44d --- M ccid_common/ccid_slot_fsm.c 1 file changed, 18 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c index 4bd1b0d..8b8fdd2 100644 --- a/ccid_common/ccid_slot_fsm.c +++ b/ccid_common/ccid_slot_fsm.c @@ -122,6 +122,7 @@ case ISO7816_E_TPDU_FAILED_IND: case ISO7816_E_PPS_DONE_IND: case ISO7816_E_PPS_FAILED_IND: + case ISO7816_E_WTIME_EXP: cs->event_data = data; #ifdef OCTSIMFWBUILD asm volatile("dmb st": : :"memory"); @@ -143,10 +144,25 @@ if(!event) return 0; - if(event && !data) - return 0; +// if(event && !data) +// return 0; switch (event) { + case ISO7816_E_WTIME_EXP: + tpdu = data; + LOGPCS(cs, LOGL_DEBUG, "%s(event=%d, data=0)\n", __func__, event); + + + /* perform deactivation */ + card_uart_ctrl(ss->cuart, CUART_CTL_RST, true); + card_uart_ctrl(ss->cuart, CUART_CTL_POWER, false); + cs->icc_powered = false; + + + resp = ccid_gen_data_block(cs, ss->seq, CCID_CMD_STATUS_FAILED, CCID_ERR_ICC_MUTE, 0, 0); + ccid_slot_send_unbusy(cs, resp); + cs->event = 0; + break; case ISO7816_E_ATR_DONE_IND: tpdu = data; LOGPCS(cs, LOGL_DEBUG, "%s(event=%d, data=%s)\n", __func__, event, -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I4dfc8d6d0e25008765615d3c4149a75efc0ef44d Gerrit-Change-Number: 19470 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 21:28:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 21:28:08 +0000 Subject: Change in osmo-ccid-firmware[master]: ccid: support warm reset In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19471 ) Change subject: ccid: support warm reset ...................................................................... ccid: support warm reset Change-Id: I4b0a119afcb37edb1d30badc85834165883a12b5 --- M ccid_common/ccid_slot_fsm.c 1 file changed, 26 insertions(+), 15 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c index 8b8fdd2..a00375e 100644 --- a/ccid_common/ccid_slot_fsm.c +++ b/ccid_common/ccid_slot_fsm.c @@ -91,22 +91,33 @@ ss->seq = ipo->hdr.bSeq; LOGPCS(cs, LOGL_DEBUG, "scheduling power-up\n"); - /* FIXME: do this via a FSM? */ - card_uart_ctrl(ss->cuart, CUART_CTL_RST, true); - osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_RESET_ACT_IND, NULL); - card_uart_ctrl(ss->cuart, CUART_CTL_POWER, true); - osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_POWER_UP_IND, NULL); - cs->icc_powered = true; - card_uart_ctrl(ss->cuart, CUART_CTL_CLOCK, true); -#ifdef OCTSIMFWBUILD - delay_us(10000); -#else - usleep(10000); -#endif + if (! cs->icc_powered) { + /* FIXME: do this via a FSM? */ + card_uart_ctrl(ss->cuart, CUART_CTL_RST, true); + osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_RESET_ACT_IND, NULL); + card_uart_ctrl(ss->cuart, CUART_CTL_POWER, true); + osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_POWER_UP_IND, NULL); + cs->icc_powered = true; + card_uart_ctrl(ss->cuart, CUART_CTL_CLOCK, true); + #ifdef OCTSIMFWBUILD + delay_us(10000); + #else + usleep(10000); + #endif - osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_RESET_REL_IND, NULL); - card_uart_ctrl(ss->cuart, CUART_CTL_RST, false); - + osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_RESET_REL_IND, NULL); + card_uart_ctrl(ss->cuart, CUART_CTL_RST, false); + } else { /* warm reset */ + card_uart_ctrl(ss->cuart, CUART_CTL_RST, true); + osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_RESET_ACT_IND, NULL); + #ifdef OCTSIMFWBUILD + delay_us(10000); + #else + usleep(10000); + #endif + osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_RESET_REL_IND, NULL); + card_uart_ctrl(ss->cuart, CUART_CTL_RST, false); + } msgb_free(msg); /* continues in iso_fsm_clot_user_cb once ATR is received */ } -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I4b0a119afcb37edb1d30badc85834165883a12b5 Gerrit-Change-Number: 19471 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 21:28:08 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 21:28:08 +0000 Subject: Change in osmo-ccid-firmware[master]: relax the timeouts In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19472 ) Change subject: relax the timeouts ...................................................................... relax the timeouts High baud rates lead to incredibly small wait times that are infeasible as long as software timers are being used, but this is not really a problem - they can just be increased to a reasonable value. At the end of the day the timers need to take the latency of the firmware into account, and timeouts only occur on powerup with wrong voltages/dead cards, or in rare error cases. The actual timeout value does therefore not really matter that much. Change-Id: Icb733f2d46f45c1a7dcd2abe6bc292bd41d6b9c2 --- M ccid_common/cuart.c 1 file changed, 9 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ccid_common/cuart.c b/ccid_common/cuart.c index 1d777f9..7094a86 100644 --- a/ccid_common/cuart.c +++ b/ccid_common/cuart.c @@ -52,9 +52,16 @@ if(!cuart->current_wtime_byte) return; + int etu_in_us = get_etu_in_us(cuart) + 1; + cuart->wtime_etu = cuart->wtime_etu ? cuart->wtime_etu : 1; + /* timemout is wtime * ETU + expected number of bytes * (12ETU+1 slack)ETU */ - usecs = get_etu_in_us(cuart) * cuart->wtime_etu + - get_etu_in_us(cuart) * cuart->current_wtime_byte * (12+1); + usecs = etu_in_us * cuart->wtime_etu + + etu_in_us * cuart->current_wtime_byte * (12+1); + + /* limit lower wait time to reasonable value */ + usecs = usecs < 300000 ? 300000 : usecs; + if (usecs > 1000000) { secs = usecs / 1000000; usecs = usecs % 1000000; -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Icb733f2d46f45c1a7dcd2abe6bc292bd41d6b9c2 Gerrit-Change-Number: 19472 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 21:29:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 21:29:25 +0000 Subject: Change in libosmocore[master]: vty: Introduce support to set cpu-affinity and scheduler policy In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19442 ) Change subject: vty: Introduce support to set cpu-affinity and scheduler policy ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If76a4bd2cc7b3c7adf5d84790a944d78be70e10a Gerrit-Change-Number: 19442 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 31 Jul 2020 21:29:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 21:31:25 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 21:31:25 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters: Introduce vty_cpu_sched.adoc chapter In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19443 ) Change subject: chapters: Introduce vty_cpu_sched.adoc chapter ...................................................................... Patch Set 2: (3 comments) https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19443/2/common/chapters/vty_cpu_sched.adoc File common/chapters/vty_cpu_sched.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19443/2/common/chapters/vty_cpu_sched.adoc at 43 PS2, Line 43: Hence, for instance a cpu-affinity mask of _0x00_ means the thread is not : allowed on any CPU, which will cause the thread to stall until a new value is : applied I don't think we should permit a mask of 0x00 in that case https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19443/2/common/chapters/vty_cpu_sched.adoc at 48 PS2, Line 48: For single-threaded processes (mot of Osmocom are), it is usually enough to set most https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19443/2/common/chapters/vty_cpu_sched.adoc at 109 PS2, Line 109: reprot report -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/19443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Icd75769ef630c3fa985fc5e2154d5521689cdd3c Gerrit-Change-Number: 19443 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 31 Jul 2020 21:31:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 21:32:03 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 21:32:03 +0000 Subject: Change in osmo-ccid-firmware[master]: WIP: enable timers In-Reply-To: References: Message-ID: laforge has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17122 ) Change subject: WIP: enable timers ...................................................................... Abandoned next commit just reverts this -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ib96fc5b5172c9ab9870c33545702368526d5a835 Gerrit-Change-Number: 17122 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Jul 31 21:32:12 2020 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 31 Jul 2020 21:32:12 +0000 Subject: Change in osmo-ccid-firmware[master]: Revert "WIP: enable timers" In-Reply-To: References: Message-ID: laforge has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19467 ) Change subject: Revert "WIP: enable timers" ...................................................................... Abandoned we abandoned the original commit -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19467 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: If3a18dd1d52f877f3821435d420154c91f10374d Gerrit-Change-Number: 19467 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Jul 31 22:34:13 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 31 Jul 2020 22:34:13 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f249c6c7152a_67502ac3bb5765f8623054@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 117s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 117s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 117s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 117s] | | [ 117s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 117s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 117s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 117s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 117s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 117s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 117s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 117s] cc1: all warnings being treated as errors [ 117s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 117s] make[3]: *** Waiting for unfinished jobs.... [ 117s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 117s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 117s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 117s] make[1]: *** [Makefile:166: all] Error 2 [ 117s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 117s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 117s] make: *** [debian/rules:9: build] Error 25 [ 117s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 117s] ### VM INTERACTION START ### [ 120s] [ 108.621073] sysrq: SysRq : Power Off [ 120s] [ 108.626148] reboot: Power down [ 120s] ### VM INTERACTION END ### [ 120s] [ 120s] lamb66 failed "build ulfius_2.5.2-4.1.dsc" at Fri Jul 31 22:34:00 UTC 2020. [ 120s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Jul 31 22:36:30 2020 From: admin at opensuse.org (OBS Notification) Date: Fri, 31 Jul 2020 22:36:30 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5f249d04b817d_67502ac3bb5765f86236ba@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 568s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5 of 'MHD_start_daemon' from incompatible pointer type [-Werror=incompatible-pointer-types] [ 568s] 839 | mhd_flags, u_instance->port, NULL, NULL, &ulfius_webservice_dispatcher, (void *)u_instance, [ 568s] | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 568s] | | [ 568s] | int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)} [ 568s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46, [ 568s] from /usr/src/packages/BUILD/include/u_private.h:29, [ 568s] from /usr/src/packages/BUILD/src/ulfius.c:29: [ 568s] /usr/include/microhttpd.h:2428:45: note: expected 'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char *, const char *, const char *, const char *, long unsigned int *, void **)'} [ 568s] 2428 | MHD_AccessHandlerCallback dh, void *dh_cls, [ 568s] | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~ [ 569s] cc1: all warnings being treated as errors [ 569s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144: CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1 [ 569s] make[3]: *** Waiting for unfinished jobs.... [ 569s] make[3]: Leaving directory '/usr/src/packages/BUILD/build' [ 569s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all] Error 2 [ 569s] make[2]: Leaving directory '/usr/src/packages/BUILD/build' [ 569s] make[1]: *** [Makefile:166: all] Error 2 [ 569s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 569s] dh_auto_build: error: cd build && make -j8 "INSTALL=install --strip-program=true" returned exit code 2 [ 569s] make: *** [debian/rules:9: build] Error 25 [ 569s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 569s] ### VM INTERACTION START ### [ 573s] [ 553.628515] sysrq: SysRq : Power Off [ 573s] [ 553.649227] reboot: Power down [ 573s] ### VM INTERACTION END ### [ 573s] [ 573s] lamb23 failed "build ulfius_2.5.2-4.1.dsc" at Fri Jul 31 22:36:17 UTC 2020. [ 573s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)